diff --git a/.appveyor.yml b/.appveyor.yml
index 0a93da90..49ee4709 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,5 +1,5 @@
 version: '2.0.0-develop-{build}'
-image: Visual Studio 2017
+image: Visual Studio 2019
 before_build:
   - nuget restore Parse.sln
 build_script:
@@ -9,7 +9,7 @@ before_test:
   - choco install opencover.portable
   - choco install codecov
 test_script:
-  - OpenCover.Console.exe -target:dotnet.exe -targetargs:"test --test-adapter-path:. --logger:Appveyor /p:DebugType=full .\Parse.Test\Parse.Test.csproj" -filter:"+[Parse*]* -[Parse.Test*]*" -oldstyle -output:parse_sdk_dotnet_coverage.xml -register:user
+  - OpenCover.Console.exe -target:dotnet.exe -targetargs:"test --test-adapter-path:. --logger:Appveyor /p:DebugType=full .\Parse.Tests\Parse.Tests.csproj" -filter:"+[Parse*]* -[Parse.Tests*]*" -oldstyle -output:parse_sdk_dotnet_coverage.xml -register:user
 after_test:
   - codecov -f "parse_sdk_dotnet_coverage.xml"
 artifacts:
diff --git a/.editorconfig b/.editorconfig
index ef749478..330d330b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -81,4 +81,16 @@ csharp_space_between_method_call_parameter_list_parentheses         = false
 csharp_space_between_parentheses                                    = false
 
 csharp_preserve_single_line_statements                              = false
-csharp_preserve_single_line_blocks                                  = true
\ No newline at end of file
+csharp_preserve_single_line_blocks                                  = true
+
+# CC0005: Empty Object Initializer
+dotnet_diagnostic.CC0005.severity                                   = none
+
+# CC0105: You should use 'var' whenever possible.
+dotnet_diagnostic.CC0105.severity                                   = none
+
+# CC0001: You should use 'var' whenever possible.
+dotnet_diagnostic.CC0001.severity                                   = none
+
+# CC0057: Unused parameters
+dotnet_diagnostic.CC0057.severity                                   = none
\ No newline at end of file
diff --git a/Parse.Test/AnalyticsTests.cs b/Parse.Test/AnalyticsTests.cs
deleted file mode 100644
index ca4cd3d4..00000000
--- a/Parse.Test/AnalyticsTests.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using Moq;
-using Parse;
-using Parse.Analytics.Internal;
-using Parse.Core.Internal;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Parse.Test
-{
-    [TestClass]
-    public class AnalyticsTests
-    {
-        [TestCleanup]
-        public void TearDown() => ParseAnalyticsPlugins.Instance.Reset();
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(AnalyticsTests))]
-        public Task TestTrackEvent()
-        {
-            Mock<IParseAnalyticsController> mockController = new Mock<IParseAnalyticsController>();
-            Mock<IParseCorePlugins> mockCorePlugins = new Mock<IParseCorePlugins>();
-            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController>();
-
-            mockCorePlugins.Setup(corePlugins => corePlugins.CurrentUserController).Returns(mockCurrentUserController.Object);
-
-            mockCurrentUserController.Setup(controller => controller.GetCurrentSessionTokenAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult("sessionToken"));
-
-            ParseAnalyticsPlugins.Instance = new ParseAnalyticsPlugins
-            {
-                AnalyticsController = mockController.Object,
-                CorePlugins = mockCorePlugins.Object
-            };
-
-            return ParseAnalytics.TrackEventAsync("SomeEvent").ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockController.Verify(obj => obj.TrackEventAsync(It.Is<string>(eventName => eventName == "SomeEvent"), It.Is<IDictionary<string, string>>(dict => dict == null), It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(AnalyticsTests))]
-        public Task TestTrackEventWithDimension()
-        {
-            Mock<IParseAnalyticsController> mockController = new Mock<IParseAnalyticsController>();
-            Mock<IParseCorePlugins> mockCorePlugins = new Mock<IParseCorePlugins>();
-            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController>();
-
-            mockCorePlugins.Setup(corePlugins => corePlugins.CurrentUserController).Returns(mockCurrentUserController.Object);
-
-            mockCurrentUserController.Setup(controller => controller.GetCurrentSessionTokenAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult("sessionToken"));
-
-            ParseAnalyticsPlugins.Instance = new ParseAnalyticsPlugins
-            {
-                AnalyticsController = mockController.Object,
-                CorePlugins = mockCorePlugins.Object
-            };
-
-            return ParseAnalytics.TrackEventAsync("SomeEvent", new Dictionary<string, string> { ["facebook"] = "hq" }).ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockController.Verify(obj => obj.TrackEventAsync(It.Is<string>(eventName => eventName == "SomeEvent"), It.Is<IDictionary<string, string>>(dict => dict != null && dict.Count == 1), It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(AnalyticsTests))]
-        public Task TestTrackAppOpened()
-        {
-            Mock<IParseAnalyticsController> mockController = new Mock<IParseAnalyticsController>();
-            Mock<IParseCorePlugins> mockCorePlugins = new Mock<IParseCorePlugins>();
-            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController>();
-
-            mockCorePlugins.Setup(corePlugins => corePlugins.CurrentUserController).Returns(mockCurrentUserController.Object);
-
-            mockCurrentUserController.Setup(controller => controller.GetCurrentSessionTokenAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult("sessionToken"));
-
-            ParseAnalyticsPlugins.Instance = new ParseAnalyticsPlugins
-            {
-                AnalyticsController = mockController.Object,
-                CorePlugins = mockCorePlugins.Object
-            };
-
-            return ParseAnalytics.TrackAppOpenedAsync().ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockController.Verify(obj => obj.TrackAppOpenedAsync(It.Is<string>(pushHash => pushHash == null), It.IsAny<string>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
-            });
-        }
-    }
-}
diff --git a/Parse.Test/CloudControllerTests.cs b/Parse.Test/CloudControllerTests.cs
deleted file mode 100644
index 3c76b121..00000000
--- a/Parse.Test/CloudControllerTests.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using Moq;
-using Parse;
-using Parse.Core.Internal;
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Parse.Test
-{
-    [TestClass]
-    public class CloudControllerTests
-    {
-        [TestInitialize]
-        public void SetUp() => ParseClient.Initialize(new ParseClient.Configuration { ApplicationID = "", Key = "" });
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(CloudControllerTests))]
-        public Task TestEmptyCallFunction() => new ParseCloudCodeController(CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, null)).Object).CallFunctionAsync<string>("someFunction", null, null, CancellationToken.None).ContinueWith(t =>
-        {
-            Assert.IsTrue(t.IsFaulted);
-            Assert.IsFalse(t.IsCanceled);
-        });
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(CloudControllerTests))]
-        public Task TestCallFunction()
-        {
-            Dictionary<string, object> responseDict = new Dictionary<string, object> { ["result"] = "gogo" };
-            Tuple<HttpStatusCode, IDictionary<string, object>> response = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, responseDict);
-            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(response);
-
-            ParseCloudCodeController controller = new ParseCloudCodeController(mockRunner.Object);
-            return controller.CallFunctionAsync<string>("someFunction", null, null, CancellationToken.None).ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                Assert.AreEqual("gogo", t.Result);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(CloudControllerTests))]
-        public Task TestCallFunctionWithComplexType() => new ParseCloudCodeController(CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, new Dictionary<string, object>() { { "result", new Dictionary<string, object> { { "fosco", "ben" }, { "list", new List<object> { 1, 2, 3 } } } } })).Object).CallFunctionAsync<IDictionary<string, object>>("someFunction", null, null, CancellationToken.None).ContinueWith(t =>
-        {
-            Assert.IsFalse(t.IsFaulted);
-            Assert.IsFalse(t.IsCanceled);
-            Assert.IsInstanceOfType(t.Result, typeof(IDictionary<string, object>));
-            Assert.AreEqual("ben", t.Result["fosco"]);
-            Assert.IsInstanceOfType(t.Result["list"], typeof(IList<object>));
-        });
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(CloudControllerTests))]
-        public Task TestCallFunctionWithWrongType() => new ParseCloudCodeController(this.CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, new Dictionary<string, object>() { { "result", "gogo" } })).Object).CallFunctionAsync<int>("someFunction", null, null, CancellationToken.None).ContinueWith(t =>
-        {
-            Assert.IsTrue(t.IsFaulted);
-            Assert.IsFalse(t.IsCanceled);
-        });
-
-        private Mock<IParseCommandRunner> CreateMockRunner(Tuple<HttpStatusCode, IDictionary<string, object>> response)
-        {
-            Mock<IParseCommandRunner> mockRunner = new Mock<IParseCommandRunner> { };
-            mockRunner.Setup(obj => obj.RunCommandAsync(It.IsAny<ParseCommand>(), It.IsAny<IProgress<ParseUploadProgressEventArgs>>(), It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response));
-
-            return mockRunner;
-        }
-    }
-}
diff --git a/Parse.Test/CloudTests.cs b/Parse.Test/CloudTests.cs
deleted file mode 100644
index de373103..00000000
--- a/Parse.Test/CloudTests.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using Moq;
-using Parse;
-using Parse.Core.Internal;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Parse.Test
-{
-    [TestClass]
-    public class CloudTests
-    {
-        [TestCleanup]
-        public void TearDown() => ParseCorePlugins.Instance.Reset();
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(CloudTests))]
-        public Task TestCloudFunctions()
-        {
-            Mock<IParseCloudCodeController> mockController = new Mock<IParseCloudCodeController>();
-            mockController.Setup(obj => obj.CallFunctionAsync<IDictionary<string, object>>(It.IsAny<string>(), It.IsAny<IDictionary<string, object>>(), It.IsAny<string>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult<IDictionary<string, object>>(new Dictionary<string, object> { ["fosco"] = "ben", ["list"] = new List<object> { 1, 2, 3 } }));
-
-            ParseCorePlugins.Instance = new ParseCorePlugins
-            {
-                CloudCodeController = mockController.Object,
-                CurrentUserController = new Mock<IParseCurrentUserController>().Object
-            };
-
-            return ParseCloud.CallFunctionAsync<IDictionary<string, object>>("someFunction", null, CancellationToken.None).ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                Assert.IsInstanceOfType(t.Result, typeof(IDictionary<string, object>));
-                Assert.AreEqual("ben", t.Result["fosco"]);
-                Assert.IsInstanceOfType(t.Result["list"], typeof(IList<object>));
-            });
-        }
-    }
-}
diff --git a/Parse.Test/CommandTests.cs b/Parse.Test/CommandTests.cs
deleted file mode 100644
index f46980bb..00000000
--- a/Parse.Test/CommandTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using Moq;
-using Parse;
-using Parse.Common.Internal;
-using Parse.Core.Internal;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Parse.Test
-{
-    [TestClass]
-    public class CommandTests
-    {
-        [TestInitialize]
-        public void SetUp() => ParseClient.Initialize(new ParseClient.Configuration { ApplicationID = "", Key = "" });
-
-        [TestCleanup]
-        public void TearDown() => ParseCorePlugins.Instance.Reset();
-
-        [TestMethod]
-        public void TestMakeCommand()
-        {
-            ParseCommand command = new ParseCommand("endpoint", method: "GET", sessionToken: "abcd", headers: null, data: null);
-
-            Assert.AreEqual("/1/endpoint", command.Uri.AbsolutePath);
-            Assert.AreEqual("GET", command.Method);
-            Assert.IsTrue(command.Headers.Any(pair => pair.Key == "X-Parse-Session-Token" && pair.Value == "abcd"));
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(CommandTests))]
-        public Task TestRunCommand()
-        {
-            Mock<IHttpClient> mockHttpClient = new Mock<IHttpClient>();
-            Mock<IInstallationIdController> mockInstallationIdController = new Mock<IInstallationIdController>();
-            Task<Tuple<HttpStatusCode, string>> fakeResponse = Task.FromResult(new Tuple<HttpStatusCode, string>(HttpStatusCode.OK, "{}"));
-            mockHttpClient.Setup(obj => obj.ExecuteAsync(It.IsAny<HttpRequest>(), It.IsAny<IProgress<ParseUploadProgressEventArgs>>(), It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(), It.IsAny<CancellationToken>())).Returns(fakeResponse);
-
-            mockInstallationIdController.Setup(i => i.GetAsync()).Returns(Task.FromResult<Guid?>(null));
-
-            return new ParseCommandRunner(mockHttpClient.Object, mockInstallationIdController.Object).RunCommandAsync(new ParseCommand("endpoint", method: "GET", data: null)).ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                Assert.IsInstanceOfType(t.Result.Item2, typeof(IDictionary<string, object>));
-                Assert.AreEqual(0, t.Result.Item2.Count);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(CommandTests))]
-        public Task TestRunCommandWithArrayResult()
-        {
-            Mock<IHttpClient> mockHttpClient = new Mock<IHttpClient>();
-            Mock<IInstallationIdController> mockInstallationIdController = new Mock<IInstallationIdController>();
-            mockHttpClient.Setup(obj => obj.ExecuteAsync(It.IsAny<HttpRequest>(), It.IsAny<IProgress<ParseUploadProgressEventArgs>>(), It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(new Tuple<HttpStatusCode, string>(HttpStatusCode.OK, "[]")));
-
-            mockInstallationIdController.Setup(i => i.GetAsync()).Returns(Task.FromResult<Guid?>(null));
-
-            return new ParseCommandRunner(mockHttpClient.Object, mockInstallationIdController.Object).RunCommandAsync(new ParseCommand("endpoint", method: "GET", data: null)).ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                Assert.IsInstanceOfType(t.Result.Item2, typeof(IDictionary<string, object>));
-                Assert.AreEqual(1, t.Result.Item2.Count);
-                Assert.IsTrue(t.Result.Item2.ContainsKey("results"));
-                Assert.IsInstanceOfType(t.Result.Item2["results"], typeof(IList<object>));
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(CommandTests))]
-        public Task TestRunCommandWithInvalidString()
-        {
-            Mock<IHttpClient> mockHttpClient = new Mock<IHttpClient>();
-            Mock<IInstallationIdController> mockInstallationIdController = new Mock<IInstallationIdController>();
-            mockHttpClient.Setup(obj => obj.ExecuteAsync(It.IsAny<HttpRequest>(), It.IsAny<IProgress<ParseUploadProgressEventArgs>>(), It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(new Tuple<HttpStatusCode, string>(HttpStatusCode.OK, "invalid")));
-
-            mockInstallationIdController.Setup(i => i.GetAsync()).Returns(Task.FromResult<Guid?>(null));
-
-            return new ParseCommandRunner(mockHttpClient.Object, mockInstallationIdController.Object).RunCommandAsync(new ParseCommand("endpoint", method: "GET", data: null)).ContinueWith(t =>
-            {
-                Assert.IsTrue(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                Assert.IsInstanceOfType(t.Exception.InnerException, typeof(ParseException));
-                Assert.AreEqual(ParseException.ErrorCode.OtherCause, (t.Exception.InnerException as ParseException).Code);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(CommandTests))]
-        public Task TestRunCommandWithErrorCode()
-        {
-            Mock<IHttpClient> mockHttpClient = new Mock<IHttpClient>();
-            Mock<IInstallationIdController> mockInstallationIdController = new Mock<IInstallationIdController>();
-            mockHttpClient.Setup(obj => obj.ExecuteAsync(It.IsAny<HttpRequest>(), It.IsAny<IProgress<ParseUploadProgressEventArgs>>(), It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(new Tuple<HttpStatusCode, string>(HttpStatusCode.NotFound, "{ \"code\": 101, \"error\": \"Object not found.\" }")));
-
-            mockInstallationIdController.Setup(i => i.GetAsync()).Returns(Task.FromResult<Guid?>(null));
-
-            return new ParseCommandRunner(mockHttpClient.Object, mockInstallationIdController.Object).RunCommandAsync(new ParseCommand("endpoint", method: "GET", data: null)).ContinueWith(t =>
-            {
-                Assert.IsTrue(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                Assert.IsInstanceOfType(t.Exception.InnerException, typeof(ParseException));
-                ParseException parseException = t.Exception.InnerException as ParseException;
-                Assert.AreEqual(ParseException.ErrorCode.ObjectNotFound, parseException.Code);
-                Assert.AreEqual("Object not found.", parseException.Message);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(CommandTests))]
-        public Task TestRunCommandWithInternalServerError()
-        {
-            Mock<IHttpClient> mockHttpClient = new Mock<IHttpClient>();
-            Mock<IInstallationIdController> mockInstallationIdController = new Mock<IInstallationIdController>();
-            mockHttpClient.Setup(obj => obj.ExecuteAsync(It.IsAny<HttpRequest>(), It.IsAny<IProgress<ParseUploadProgressEventArgs>>(), It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(new Tuple<HttpStatusCode, string>(HttpStatusCode.InternalServerError, null)));
-
-            mockInstallationIdController.Setup(i => i.GetAsync()).Returns(Task.FromResult<Guid?>(null));
-
-            return new ParseCommandRunner(mockHttpClient.Object, mockInstallationIdController.Object).RunCommandAsync(new ParseCommand("endpoint", method: "GET", data: null)).ContinueWith(t =>
-            {
-                Assert.IsTrue(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                Assert.IsInstanceOfType(t.Exception.InnerException, typeof(ParseException));
-                Assert.AreEqual(ParseException.ErrorCode.InternalServerError, (t.Exception.InnerException as ParseException).Code);
-            });
-        }
-    }
-}
diff --git a/Parse.Test/ConfigTests.cs b/Parse.Test/ConfigTests.cs
deleted file mode 100644
index 172a4777..00000000
--- a/Parse.Test/ConfigTests.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-using Moq;
-using Parse;
-using Parse.Common.Internal;
-using Parse.Core.Internal;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
-
-namespace Parse.Test
-{
-    [TestClass]
-    public class ConfigTests
-    {
-        private IParseConfigController MockedConfigController
-        {
-            get
-            {
-                Mock<IParseConfigController> mockedConfigController = new Mock<IParseConfigController>();
-                Mock<IParseCurrentConfigController> mockedCurrentConfigController = new Mock<IParseCurrentConfigController>();
-
-                ParseConfig theConfig = ParseConfigExtensions.Create(new Dictionary<string, object> { ["params"] = new Dictionary<string, object> { ["testKey"] = "testValue" } });
-
-                mockedCurrentConfigController.Setup(obj => obj.GetCurrentConfigAsync()).Returns(Task.FromResult(theConfig));
-
-                mockedConfigController.Setup(obj => obj.CurrentConfigController).Returns(mockedCurrentConfigController.Object);
-
-                TaskCompletionSource<ParseConfig> tcs = new TaskCompletionSource<ParseConfig>();
-                tcs.TrySetCanceled();
-
-                mockedConfigController.Setup(obj => obj.FetchConfigAsync(It.IsAny<string>(), It.Is<CancellationToken>(ct => ct.IsCancellationRequested))).Returns(tcs.Task);
-
-                mockedConfigController.Setup(obj => obj.FetchConfigAsync(It.IsAny<string>(), It.Is<CancellationToken>(ct => !ct.IsCancellationRequested))).Returns(Task.FromResult(theConfig));
-
-                return mockedConfigController.Object;
-            }
-        }
-
-        [TestInitialize]
-        public void SetUp() => ParseCorePlugins.Instance = new ParseCorePlugins { ConfigController = MockedConfigController, CurrentUserController = new Mock<IParseCurrentUserController>().Object };
-
-        [TestCleanup]
-        public void TearDown() => ParseCorePlugins.Instance = null;
-
-        [TestMethod]
-        public void TestCurrentConfig()
-        {
-            ParseConfig config = ParseConfig.CurrentConfig;
-
-            Assert.AreEqual("testValue", config["testKey"]);
-            Assert.AreEqual("testValue", config.Get<string>("testKey"));
-        }
-
-        [TestMethod]
-        public void TestToJSON()
-        {
-            IDictionary<string, object> expectedJson = new Dictionary<string, object> { { "params", new Dictionary<string, object> { { "testKey", "testValue" } } } };
-            Assert.AreEqual(JsonConvert.SerializeObject((ParseConfig.CurrentConfig as IJsonConvertible).ToJSON()), JsonConvert.SerializeObject(expectedJson));
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(ConfigTests))]
-        public Task TestGetConfig() => ParseConfig.GetAsync().ContinueWith(t =>
-        {
-            Assert.AreEqual("testValue", t.Result["testKey"]);
-            Assert.AreEqual("testValue", t.Result.Get<string>("testKey"));
-        });
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(ConfigTests))]
-        public Task TestGetConfigCancel()
-        {
-            CancellationTokenSource tokenSource = new CancellationTokenSource();
-            tokenSource.Cancel();
-            return ParseConfig.GetAsync(tokenSource.Token).ContinueWith(t => Assert.IsTrue(t.IsCanceled));
-        }
-    }
-}
diff --git a/Parse.Test/ProgressTests.cs b/Parse.Test/ProgressTests.cs
deleted file mode 100644
index 5c29f383..00000000
--- a/Parse.Test/ProgressTests.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using Moq;
-using Parse;
-using System;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Parse.Test
-{
-    [TestClass]
-    public class ProgressTests
-    {
-        [TestMethod]
-        public void TestDownloadProgressEventGetterSetter()
-        {
-            ParseDownloadProgressEventArgs downloadProgressEvent = new ParseDownloadProgressEventArgs { Progress = 0.5f };
-            Assert.AreEqual(0.5f, downloadProgressEvent.Progress);
-
-            downloadProgressEvent.Progress = 1.0f;
-            Assert.AreEqual(1.0f, downloadProgressEvent.Progress);
-        }
-
-        [TestMethod]
-        public void TestUploadProgressEventGetterSetter()
-        {
-            ParseDownloadProgressEventArgs uploadProgressEvent = new ParseDownloadProgressEventArgs { Progress = 0.5f };
-            Assert.AreEqual(0.5f, uploadProgressEvent.Progress);
-
-            uploadProgressEvent.Progress = 1.0f;
-            Assert.AreEqual(1.0f, uploadProgressEvent.Progress);
-        }
-
-        [TestMethod]
-        public void TestObservingDownloadProgress()
-        {
-            int called = 0;
-            Mock<IProgress<ParseDownloadProgressEventArgs>> mockProgress = new Mock<IProgress<ParseDownloadProgressEventArgs>>();
-            mockProgress.Setup(obj => obj.Report(It.IsAny<ParseDownloadProgressEventArgs>())).Callback(() => called++);
-            IProgress<ParseDownloadProgressEventArgs> progress = mockProgress.Object;
-
-            progress.Report(new ParseDownloadProgressEventArgs { Progress = 0.2f });
-            progress.Report(new ParseDownloadProgressEventArgs { Progress = 0.42f });
-            progress.Report(new ParseDownloadProgressEventArgs { Progress = 0.53f });
-            progress.Report(new ParseDownloadProgressEventArgs { Progress = 0.68f });
-            progress.Report(new ParseDownloadProgressEventArgs { Progress = 0.88f });
-
-            Assert.AreEqual(5, called);
-        }
-
-        [TestMethod]
-        public void TestObservingUploadProgress()
-        {
-            int called = 0;
-            Mock<IProgress<ParseUploadProgressEventArgs>> mockProgress = new Mock<IProgress<ParseUploadProgressEventArgs>>();
-            mockProgress.Setup(obj => obj.Report(It.IsAny<ParseUploadProgressEventArgs>())).Callback(() => called++);
-            IProgress<ParseUploadProgressEventArgs> progress = mockProgress.Object;
-
-            progress.Report(new ParseUploadProgressEventArgs { Progress = 0.2f });
-            progress.Report(new ParseUploadProgressEventArgs { Progress = 0.42f });
-            progress.Report(new ParseUploadProgressEventArgs { Progress = 0.53f });
-            progress.Report(new ParseUploadProgressEventArgs { Progress = 0.68f });
-            progress.Report(new ParseUploadProgressEventArgs { Progress = 0.88f });
-
-            Assert.AreEqual(5, called);
-        }
-    }
-}
diff --git a/Parse.Test/PushTests.cs b/Parse.Test/PushTests.cs
deleted file mode 100644
index 646b8429..00000000
--- a/Parse.Test/PushTests.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-using Moq;
-using Parse;
-using Parse.Common.Internal;
-using Parse.Core.Internal;
-using Parse.Push.Internal;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Parse.Test
-{
-    [TestClass]
-    public class PushTests
-    {
-        private IParsePushController GetMockedPushController(IPushState expectedPushState)
-        {
-            Mock<IParsePushController> mockedController = new Mock<IParsePushController>(MockBehavior.Strict);
-
-            mockedController.Setup(
-              obj => obj.SendPushNotificationAsync(
-                It.Is<IPushState>(s => s.Equals(expectedPushState)),
-                It.IsAny<CancellationToken>()
-              )
-            ).Returns(Task.FromResult(false));
-
-            return mockedController.Object;
-        }
-
-        private IParsePushChannelsController GetMockedPushChannelsController(IEnumerable<string> channels)
-        {
-            Mock<IParsePushChannelsController> mockedChannelsController = new Mock<IParsePushChannelsController>(MockBehavior.Strict);
-
-            mockedChannelsController.Setup(
-              obj => obj.SubscribeAsync(
-                It.Is<IEnumerable<string>>(it => it.CollectionsEqual(channels)),
-                It.IsAny<CancellationToken>()
-              )
-            ).Returns(Task.FromResult(false));
-
-            mockedChannelsController.Setup(
-              obj => obj.UnsubscribeAsync(
-                It.Is<IEnumerable<string>>(it => it.CollectionsEqual(channels)),
-                It.IsAny<CancellationToken>()
-              )
-            ).Returns(Task.FromResult(false));
-
-            return mockedChannelsController.Object;
-        }
-
-        [TestCleanup]
-        public void TearDown()
-        {
-            ParseCorePlugins.Instance = null;
-            ParsePushPlugins.Instance = null;
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(PushTests))]
-        public Task TestSendPush()
-        {
-            MutablePushState state = new MutablePushState
-            {
-                Query = ParseInstallation.Query
-            };
-
-            ParsePush thePush = new ParsePush();
-            ParsePushPlugins.Instance = new ParsePushPlugins
-            {
-                PushController = GetMockedPushController(state)
-            };
-
-            thePush.Alert = "Alert";
-            state.Alert = "Alert";
-
-            return thePush.SendAsync().ContinueWith(t =>
-            {
-                Assert.IsTrue(t.IsCompleted);
-                Assert.IsFalse(t.IsFaulted);
-
-                thePush.Channels = new List<string> { { "channel" } };
-                state.Channels = new List<string> { { "channel" } };
-
-                return thePush.SendAsync();
-            }).Unwrap().ContinueWith(t =>
-            {
-                Assert.IsTrue(t.IsCompleted);
-                Assert.IsFalse(t.IsFaulted);
-
-                ParseQuery<ParseInstallation> query = new ParseQuery<ParseInstallation>("aClass");
-                thePush.Query = query;
-                state.Query = query;
-
-                return thePush.SendAsync();
-            }).Unwrap().ContinueWith(t =>
-            {
-                Assert.IsTrue(t.IsCompleted);
-                Assert.IsFalse(t.IsFaulted);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(PushTests))]
-        public Task TestSubscribe()
-        {
-            List<string> channels = new List<string>();
-            ParsePushPlugins.Instance = new ParsePushPlugins
-            {
-                PushChannelsController = GetMockedPushChannelsController(channels)
-            };
-
-            channels.Add("test");
-            return ParsePush.SubscribeAsync("test").ContinueWith(t =>
-            {
-                Assert.IsTrue(t.IsCompleted);
-                Assert.IsFalse(t.IsFaulted);
-
-                return ParsePush.SubscribeAsync(new List<string> { { "test" } });
-            }).Unwrap().ContinueWith(t =>
-            {
-                Assert.IsTrue(t.IsCompleted);
-                Assert.IsFalse(t.IsFaulted);
-
-                CancellationTokenSource cts = new CancellationTokenSource();
-                return ParsePush.SubscribeAsync(new List<string> { { "test" } }, cts.Token);
-            }).Unwrap().ContinueWith(t =>
-            {
-                Assert.IsTrue(t.IsCompleted);
-                Assert.IsFalse(t.IsFaulted);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(PushTests))]
-        public Task TestUnsubscribe()
-        {
-            List<string> channels = new List<string>();
-            ParsePushPlugins.Instance = new ParsePushPlugins
-            {
-                PushChannelsController = GetMockedPushChannelsController(channels)
-            };
-
-            channels.Add("test");
-            return ParsePush.UnsubscribeAsync("test").ContinueWith(t =>
-            {
-                Assert.IsTrue(t.IsCompleted);
-                Assert.IsFalse(t.IsFaulted);
-
-                return ParsePush.UnsubscribeAsync(new List<string> { { "test" } });
-            }).ContinueWith(t =>
-            {
-                Assert.IsTrue(t.IsCompleted);
-                Assert.IsFalse(t.IsFaulted);
-
-                CancellationTokenSource cts = new CancellationTokenSource();
-                return ParsePush.UnsubscribeAsync(new List<string> { { "test" } }, cts.Token);
-            }).ContinueWith(t =>
-            {
-                Assert.IsTrue(t.IsCompleted);
-                Assert.IsFalse(t.IsFaulted);
-            });
-        }
-    }
-}
diff --git a/Parse.Test/SessionControllerTests.cs b/Parse.Test/SessionControllerTests.cs
deleted file mode 100644
index 1a8e4bf0..00000000
--- a/Parse.Test/SessionControllerTests.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using Moq;
-using Parse;
-using Parse.Core.Internal;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Parse.Test
-{
-    [TestClass]
-    public class SessionControllerTests
-    {
-        [TestInitialize]
-        public void SetUp() => ParseClient.Initialize(new ParseClient.Configuration { ApplicationID = "", Key = "" });
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(SessionControllerTests))]
-        public Task TestGetSessionWithEmptyResult()
-        {
-            return new ParseSessionController(this.CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, null)).Object).GetSessionAsync("S0m3Se551on", CancellationToken.None).ContinueWith(t =>
-            {
-                Assert.IsTrue(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(SessionControllerTests))]
-        public Task TestGetSession()
-        {
-            Tuple<HttpStatusCode, IDictionary<string, object>> response = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted,
-                new Dictionary<string, object>() {
-            { "__type", "Object" },
-            { "className", "Session" },
-            { "sessionToken", "S0m3Se551on" },
-            { "restricted", true }
-                });
-            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(response);
-
-            return new ParseSessionController(mockRunner.Object).GetSessionAsync("S0m3Se551on", CancellationToken.None).ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Uri.AbsolutePath == "/1/sessions/me"),
-                  It.IsAny<IProgress<ParseUploadProgressEventArgs>>(),
-                  It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(),
-                  It.IsAny<CancellationToken>()), Times.Exactly(1));
-
-                IObjectState session = t.Result;
-                Assert.AreEqual(2, session.Count());
-                Assert.IsTrue((bool) session["restricted"]);
-                Assert.AreEqual("S0m3Se551on", session["sessionToken"]);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(SessionControllerTests))]
-        public Task TestRevoke()
-        {
-            Tuple<HttpStatusCode, IDictionary<string, object>> response = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, null);
-            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(response);
-
-            ParseSessionController controller = new ParseSessionController(mockRunner.Object);
-            return controller.RevokeAsync("S0m3Se551on", CancellationToken.None).ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Uri.AbsolutePath == "/1/logout"),
-                  It.IsAny<IProgress<ParseUploadProgressEventArgs>>(),
-                  It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(),
-                  It.IsAny<CancellationToken>()), Times.Exactly(1));
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(SessionControllerTests))]
-        public Task TestUpgradeToRevocableSession()
-        {
-            Tuple<HttpStatusCode, IDictionary<string, object>> response = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted,
-                new Dictionary<string, object>() {
-            { "__type", "Object" },
-            { "className", "Session" },
-            { "sessionToken", "S0m3Se551on" },
-            { "restricted", true }
-                });
-            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(response);
-
-            ParseSessionController controller = new ParseSessionController(mockRunner.Object);
-            return controller.UpgradeToRevocableSessionAsync("S0m3Se551on", CancellationToken.None).ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Uri.AbsolutePath == "/1/upgradeToRevocableSession"),
-                  It.IsAny<IProgress<ParseUploadProgressEventArgs>>(),
-                  It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(),
-                  It.IsAny<CancellationToken>()), Times.Exactly(1));
-
-                IObjectState session = t.Result;
-                Assert.AreEqual(2, session.Count());
-                Assert.IsTrue((bool) session["restricted"]);
-                Assert.AreEqual("S0m3Se551on", session["sessionToken"]);
-            });
-        }
-
-        [TestMethod]
-        public void TestIsRevocableSessionToken()
-        {
-            IParseSessionController sessionController = new ParseSessionController(Mock.Of<IParseCommandRunner>());
-            Assert.IsTrue(sessionController.IsRevocableSessionToken("r:session"));
-            Assert.IsTrue(sessionController.IsRevocableSessionToken("r:session:r:"));
-            Assert.IsTrue(sessionController.IsRevocableSessionToken("session:r:"));
-            Assert.IsFalse(sessionController.IsRevocableSessionToken("session:s:d:r"));
-            Assert.IsFalse(sessionController.IsRevocableSessionToken("s:ession:s:d:r"));
-            Assert.IsFalse(sessionController.IsRevocableSessionToken(""));
-        }
-
-
-        private Mock<IParseCommandRunner> CreateMockRunner(Tuple<HttpStatusCode, IDictionary<string, object>> response)
-        {
-            Mock<IParseCommandRunner> mockRunner = new Mock<IParseCommandRunner>();
-            mockRunner.Setup(obj => obj.RunCommandAsync(It.IsAny<ParseCommand>(),
-                It.IsAny<IProgress<ParseUploadProgressEventArgs>>(),
-                It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(),
-                It.IsAny<CancellationToken>()))
-                .Returns(Task.FromResult(response));
-
-            return mockRunner;
-        }
-    }
-}
diff --git a/Parse.Test/SessionTests.cs b/Parse.Test/SessionTests.cs
deleted file mode 100644
index a7ddb7fc..00000000
--- a/Parse.Test/SessionTests.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Moq;
-using Parse;
-using Parse.Core.Internal;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Parse.Test
-{
-    [TestClass]
-    public class SessionTests
-    {
-        [TestInitialize]
-        public void SetUp()
-        {
-            ParseObject.RegisterSubclass<ParseSession>();
-            ParseObject.RegisterSubclass<ParseUser>();
-        }
-
-        [TestCleanup]
-        public void TearDown() => ParseCorePlugins.Instance.Reset();
-
-        [TestMethod]
-        public void TestGetSessionQuery() => Assert.IsInstanceOfType(ParseSession.Query, typeof(ParseQuery<ParseSession>));
-
-        [TestMethod]
-        public void TestGetSessionToken()
-        {
-            ParseSession session = ParseObjectExtensions.FromState<ParseSession>(new MutableObjectState { ServerData = new Dictionary<string, object>() { { "sessionToken", "llaKcolnu" } } }, "_Session");
-            Assert.IsNotNull(session);
-            Assert.AreEqual("llaKcolnu", session.SessionToken);
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(SessionTests))]
-        public Task TestGetCurrentSession()
-        {
-            IObjectState sessionState = new MutableObjectState
-            {
-                ServerData = new Dictionary<string, object>() {
-          { "sessionToken", "newllaKcolnu" }
-        }
-            };
-            Mock<IParseSessionController> mockController = new Mock<IParseSessionController>();
-            mockController.Setup(obj => obj.GetSessionAsync(It.IsAny<string>(),
-                It.IsAny<CancellationToken>())).Returns(Task.FromResult(sessionState));
-
-            IObjectState userState = new MutableObjectState
-            {
-                ServerData = new Dictionary<string, object>() {
-          { "sessionToken", "llaKcolnu" }
-        }
-            };
-            ParseUser user = ParseObjectExtensions.FromState<ParseUser>(userState, "_User");
-            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController>();
-            mockCurrentUserController.Setup(obj => obj.GetAsync(It.IsAny<CancellationToken>()))
-                .Returns(Task.FromResult(user));
-            ParseCorePlugins.Instance = new ParseCorePlugins
-            {
-                SessionController = mockController.Object,
-                CurrentUserController = mockCurrentUserController.Object,
-            };
-            ParseObject.RegisterSubclass<ParseSession>();
-
-            return ParseSession.GetCurrentSessionAsync().ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockController.Verify(obj => obj.GetSessionAsync(It.Is<string>(sessionToken => sessionToken == "llaKcolnu"),
-                    It.IsAny<CancellationToken>()), Times.Exactly(1));
-
-                ParseSession session = t.Result;
-                Assert.AreEqual("newllaKcolnu", session.SessionToken);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(SessionTests))]
-        public Task TestGetCurrentSessionWithNoCurrentUser()
-        {
-            Mock<IParseSessionController> mockController = new Mock<IParseSessionController>();
-            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController>();
-            ParseCorePlugins.Instance = new ParseCorePlugins
-            {
-                SessionController = mockController.Object,
-                CurrentUserController = mockCurrentUserController.Object,
-            };
-
-            return ParseSession.GetCurrentSessionAsync().ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                Assert.IsNull(t.Result);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(SessionTests))]
-        public Task TestRevoke()
-        {
-            Mock<IParseSessionController> mockController = new Mock<IParseSessionController>();
-            mockController
-              .Setup(sessionController => sessionController.IsRevocableSessionToken(It.IsAny<string>()))
-              .Returns(true);
-
-            ParseCorePlugins.Instance = new ParseCorePlugins
-            {
-                SessionController = mockController.Object
-            };
-
-            CancellationTokenSource source = new CancellationTokenSource();
-            return ParseSessionExtensions.RevokeAsync("r:someSession", source.Token).ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockController.Verify(obj => obj.RevokeAsync(It.Is<string>(sessionToken => sessionToken == "r:someSession"),
-                    source.Token), Times.Exactly(1));
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(SessionTests))]
-        public Task TestUpgradeToRevocableSession()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ServerData = new Dictionary<string, object>() {
-          { "sessionToken", "llaKcolnu" }
-        }
-            };
-            Mock<IParseSessionController> mockController = new Mock<IParseSessionController>();
-            mockController.Setup(obj => obj.UpgradeToRevocableSessionAsync(It.IsAny<string>(),
-                It.IsAny<CancellationToken>())).Returns(Task.FromResult(state));
-
-            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController>();
-            ParseCorePlugins.Instance = new ParseCorePlugins
-            {
-                SessionController = mockController.Object,
-                CurrentUserController = mockCurrentUserController.Object,
-            };
-            ParseObject.RegisterSubclass<ParseUser>();
-            ParseObject.RegisterSubclass<ParseSession>();
-
-            CancellationTokenSource source = new CancellationTokenSource();
-            return ParseSessionExtensions.UpgradeToRevocableSessionAsync("someSession", source.Token).ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockController.Verify(obj => obj.UpgradeToRevocableSessionAsync(It.Is<string>(sessionToken => sessionToken == "someSession"),
-                    source.Token), Times.Exactly(1));
-
-                Assert.AreEqual("llaKcolnu", t.Result);
-            });
-        }
-    }
-}
diff --git a/Parse.Test/UserControllerTests.cs b/Parse.Test/UserControllerTests.cs
deleted file mode 100644
index 49d25d7c..00000000
--- a/Parse.Test/UserControllerTests.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Moq;
-using Parse;
-using Parse.Core.Internal;
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Parse.Test
-{
-    [TestClass]
-    public class UserControllerTests
-    {
-        [TestInitialize]
-        public void SetUp() => ParseClient.Initialize(new ParseClient.Configuration { ApplicationID = "", Key = "" });
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(UserControllerTests))]
-        public Task TestSignUp()
-        {
-            MutableObjectState state = new MutableObjectState
-            {
-                ClassName = "_User",
-                ServerData = new Dictionary<string, object>() {
-          { "username", "hallucinogen" },
-          { "password", "secret" }
-        }
-            };
-            Dictionary<string, IParseFieldOperation> operations = new Dictionary<string, IParseFieldOperation>() {
-        { "gogo", new Mock<IParseFieldOperation>().Object }
-      };
-
-            Dictionary<string, object> responseDict = new Dictionary<string, object>() {
-        { "__type", "Object" },
-        { "className", "_User" },
-        { "objectId", "d3ImSh3ki" },
-        { "sessionToken", "s3ss10nt0k3n" },
-        { "createdAt", "2015-09-18T18:11:28.943Z" }
-      };
-            Tuple<HttpStatusCode, IDictionary<string, object>> response = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, responseDict);
-            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(response);
-
-            ParseUserController controller = new ParseUserController(mockRunner.Object);
-            return controller.SignUpAsync(state, operations, CancellationToken.None).ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Uri.AbsolutePath == "/1/classes/_User"),
-                  It.IsAny<IProgress<ParseUploadProgressEventArgs>>(),
-                  It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(),
-                  It.IsAny<CancellationToken>()), Times.Exactly(1));
-
-                IObjectState newState = t.Result;
-                Assert.AreEqual("s3ss10nt0k3n", newState["sessionToken"]);
-                Assert.AreEqual("d3ImSh3ki", newState.ObjectId);
-                Assert.IsNotNull(newState.CreatedAt);
-                Assert.IsNotNull(newState.UpdatedAt);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(UserControllerTests))]
-        public Task TestLogInWithUsernamePassword()
-        {
-            Dictionary<string, object> responseDict = new Dictionary<string, object>() {
-        { "__type", "Object" },
-        { "className", "_User" },
-        { "objectId", "d3ImSh3ki" },
-        { "sessionToken", "s3ss10nt0k3n" },
-        { "createdAt", "2015-09-18T18:11:28.943Z" }
-      };
-            Tuple<HttpStatusCode, IDictionary<string, object>> response = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, responseDict);
-            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(response);
-
-            ParseUserController controller = new ParseUserController(mockRunner.Object);
-            return controller.LogInAsync("grantland", "123grantland123", CancellationToken.None).ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Uri.AbsolutePath == "/1/login"),
-                  It.IsAny<IProgress<ParseUploadProgressEventArgs>>(),
-                  It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(),
-                  It.IsAny<CancellationToken>()), Times.Exactly(1));
-
-                IObjectState newState = t.Result;
-                Assert.AreEqual("s3ss10nt0k3n", newState["sessionToken"]);
-                Assert.AreEqual("d3ImSh3ki", newState.ObjectId);
-                Assert.IsNotNull(newState.CreatedAt);
-                Assert.IsNotNull(newState.UpdatedAt);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(UserControllerTests))]
-        public Task TestLogInWithAuthData()
-        {
-            Dictionary<string, object> responseDict = new Dictionary<string, object>() {
-        { "__type", "Object" },
-        { "className", "_User" },
-        { "objectId", "d3ImSh3ki" },
-        { "sessionToken", "s3ss10nt0k3n" },
-        { "createdAt", "2015-09-18T18:11:28.943Z" }
-      };
-            Tuple<HttpStatusCode, IDictionary<string, object>> response = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, responseDict);
-            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(response);
-
-            ParseUserController controller = new ParseUserController(mockRunner.Object);
-            return controller.LogInAsync("facebook", data: null, cancellationToken: CancellationToken.None).ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Uri.AbsolutePath == "/1/users"),
-                  It.IsAny<IProgress<ParseUploadProgressEventArgs>>(),
-                  It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(),
-                  It.IsAny<CancellationToken>()), Times.Exactly(1));
-
-                IObjectState newState = t.Result;
-                Assert.AreEqual("s3ss10nt0k3n", newState["sessionToken"]);
-                Assert.AreEqual("d3ImSh3ki", newState.ObjectId);
-                Assert.IsNotNull(newState.CreatedAt);
-                Assert.IsNotNull(newState.UpdatedAt);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(UserControllerTests))]
-        public Task TestGetUserFromSessionToken()
-        {
-            Dictionary<string, object> responseDict = new Dictionary<string, object>() {
-        { "__type", "Object" },
-        { "className", "_User" },
-        { "objectId", "d3ImSh3ki" },
-        { "sessionToken", "s3ss10nt0k3n" },
-        { "createdAt", "2015-09-18T18:11:28.943Z" }
-      };
-            Tuple<HttpStatusCode, IDictionary<string, object>> response = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, responseDict);
-            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(response);
-
-            ParseUserController controller = new ParseUserController(mockRunner.Object);
-            return controller.GetUserAsync("s3ss10nt0k3n", CancellationToken.None).ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Uri.AbsolutePath == "/1/users/me"),
-                  It.IsAny<IProgress<ParseUploadProgressEventArgs>>(),
-                  It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(),
-                  It.IsAny<CancellationToken>()), Times.Exactly(1));
-
-                IObjectState newState = t.Result;
-                Assert.AreEqual("s3ss10nt0k3n", newState["sessionToken"]);
-                Assert.AreEqual("d3ImSh3ki", newState.ObjectId);
-                Assert.IsNotNull(newState.CreatedAt);
-                Assert.IsNotNull(newState.UpdatedAt);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(UserControllerTests))]
-        public Task TestRequestPasswordReset()
-        {
-            Dictionary<string, object> responseDict = new Dictionary<string, object>();
-            Tuple<HttpStatusCode, IDictionary<string, object>> response = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, responseDict);
-            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(response);
-
-            ParseUserController controller = new ParseUserController(mockRunner.Object);
-            return controller.RequestPasswordResetAsync("gogo@parse.com", CancellationToken.None).ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Uri.AbsolutePath == "/1/requestPasswordReset"),
-                  It.IsAny<IProgress<ParseUploadProgressEventArgs>>(),
-                  It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(),
-                  It.IsAny<CancellationToken>()), Times.Exactly(1));
-            });
-        }
-
-        private Mock<IParseCommandRunner> CreateMockRunner(Tuple<HttpStatusCode, IDictionary<string, object>> response)
-        {
-            Mock<IParseCommandRunner> mockRunner = new Mock<IParseCommandRunner>();
-            mockRunner.Setup(obj => obj.RunCommandAsync(It.IsAny<ParseCommand>(),
-                It.IsAny<IProgress<ParseUploadProgressEventArgs>>(),
-                It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(),
-                It.IsAny<CancellationToken>()))
-                .Returns(Task<Tuple<HttpStatusCode, IDictionary<string, object>>>.FromResult(response));
-
-            return mockRunner;
-        }
-    }
-}
diff --git a/Parse.Test/UserTests.cs b/Parse.Test/UserTests.cs
deleted file mode 100644
index 01b98caa..00000000
--- a/Parse.Test/UserTests.cs
+++ /dev/null
@@ -1,771 +0,0 @@
-using Moq;
-using Parse;
-using Parse.Core.Internal;
-using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Parse.Test
-{
-    [TestClass]
-    public class UserTests
-    {
-        [TestInitialize]
-        public void SetUp()
-        {
-            ParseObject.RegisterSubclass<ParseUser>();
-            ParseObject.RegisterSubclass<ParseSession>();
-        }
-
-        [TestCleanup]
-        public void TearDown() => ParseCorePlugins.Instance = null;
-
-        [TestMethod]
-        public void TestRemoveFields()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ServerData = new Dictionary<string, object>() {
-          { "username", "kevin" },
-          { "name", "andrew" }
-        }
-            };
-            ParseUser user = ParseObjectExtensions.FromState<ParseUser>(state, "_User");
-            Assert.ThrowsException<ArgumentException>(() => user.Remove("username"));
-            try
-            { user.Remove("name"); }
-            catch { Assert.Fail(); }
-            Assert.IsFalse(user.ContainsKey("name"));
-        }
-
-        [TestMethod]
-        public void TestSessionTokenGetter()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ServerData = new Dictionary<string, object>() {
-          { "username", "kevin" },
-          { "sessionToken", "se551onT0k3n" }
-        }
-            };
-            ParseUser user = ParseObjectExtensions.FromState<ParseUser>(state, "_User");
-            Assert.AreEqual("se551onT0k3n", user.SessionToken);
-        }
-
-        [TestMethod]
-        public void TestUsernameGetterSetter()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ServerData = new Dictionary<string, object>() {
-          { "username", "kevin" },
-        }
-            };
-            ParseUser user = ParseObjectExtensions.FromState<ParseUser>(state, "_User");
-            Assert.AreEqual("kevin", user.Username);
-            user.Username = "ilya";
-            Assert.AreEqual("ilya", user.Username);
-        }
-
-        [TestMethod]
-        public void TestPasswordGetterSetter()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ServerData = new Dictionary<string, object>() {
-          { "username", "kevin" },
-          { "password", "hurrah" },
-        }
-            };
-            ParseUser user = ParseObjectExtensions.FromState<ParseUser>(state, "_User");
-            Assert.AreEqual("hurrah", user.GetState()["password"]);
-            user.Password = "david";
-            Assert.IsNotNull(user.GetCurrentOperations()["password"]);
-        }
-
-        [TestMethod]
-        public void TestEmailGetterSetter()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ServerData = new Dictionary<string, object>() {
-          { "email", "james@parse.com" },
-          { "name", "andrew" },
-          { "sessionToken", "se551onT0k3n" }
-        }
-            };
-            ParseUser user = ParseObjectExtensions.FromState<ParseUser>(state, "_User");
-            Assert.AreEqual("james@parse.com", user.Email);
-            user.Email = "bryan@parse.com";
-            Assert.AreEqual("bryan@parse.com", user.Email);
-        }
-
-        [TestMethod]
-        public void TestAuthDataGetter()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ServerData = new Dictionary<string, object>() {
-          { "email", "james@parse.com" },
-          { "authData", new Dictionary<string, object>() {
-            { "facebook", new Dictionary<string, object>() {
-              { "sessionToken", "none" }
-            }}
-          }}
-        }
-            };
-            ParseUser user = ParseObjectExtensions.FromState<ParseUser>(state, "_User");
-            Assert.AreEqual(1, user.GetAuthData().Count);
-            Assert.IsInstanceOfType(user.GetAuthData()["facebook"], typeof(IDictionary<string, object>));
-        }
-
-        [TestMethod]
-        public void TestGetUserQuery() => Assert.IsInstanceOfType(ParseUser.Query, typeof(ParseQuery<ParseUser>));
-
-        [TestMethod]
-        public void TestIsAuthenticated()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ObjectId = "wagimanPutraPetir",
-                ServerData = new Dictionary<string, object>() {
-          { "sessionToken", "llaKcolnu" }
-        }
-            };
-            ParseUser user = ParseObjectExtensions.FromState<ParseUser>(state, "_User");
-            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController>();
-            mockCurrentUserController.Setup(obj => obj.GetAsync(It.IsAny<CancellationToken>()))
-                .Returns(Task.FromResult(user));
-            ParseCorePlugins.Instance = new ParseCorePlugins
-            {
-                CurrentUserController = mockCurrentUserController.Object
-            };
-            ParseObject.RegisterSubclass<ParseUser>();
-            ParseObject.RegisterSubclass<ParseSession>();
-
-            Assert.IsTrue(user.IsAuthenticated);
-        }
-
-        [TestMethod]
-        public void TestIsAuthenticatedWithOtherParseUser()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ObjectId = "wagimanPutraPetir",
-                ServerData = new Dictionary<string, object>() {
-          { "sessionToken", "llaKcolnu" }
-        }
-            };
-            IObjectState state2 = new MutableObjectState
-            {
-                ObjectId = "wagimanPutraPetir2",
-                ServerData = new Dictionary<string, object>() {
-          { "sessionToken", "llaKcolnu" }
-        }
-            };
-            ParseUser user = ParseObjectExtensions.FromState<ParseUser>(state, "_User");
-            ParseUser user2 = ParseObjectExtensions.FromState<ParseUser>(state2, "_User");
-            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController>();
-            mockCurrentUserController.Setup(obj => obj.GetAsync(It.IsAny<CancellationToken>()))
-                .Returns(Task.FromResult(user));
-            ParseCorePlugins.Instance = new ParseCorePlugins
-            {
-                CurrentUserController = mockCurrentUserController.Object
-            };
-            ParseObject.RegisterSubclass<ParseUser>();
-            ParseObject.RegisterSubclass<ParseSession>();
-
-            Assert.IsFalse(user2.IsAuthenticated);
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(UserTests))]
-        public Task TestSignUpWithInvalidServerData()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ServerData = new Dictionary<string, object>() {
-          { "sessionToken", "llaKcolnu" }
-        }
-            };
-            ParseUser user = ParseObjectExtensions.FromState<ParseUser>(state, "_User");
-
-            return user.SignUpAsync().ContinueWith(t =>
-            {
-                Assert.IsTrue(t.IsFaulted);
-                Assert.IsInstanceOfType(t.Exception.InnerException, typeof(InvalidOperationException));
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(UserTests))]
-        public Task TestSignUp()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ServerData = new Dictionary<string, object>() {
-          { "sessionToken", "llaKcolnu" },
-          { "username", "ihave" },
-          { "password", "adream" }
-        }
-            };
-            IObjectState newState = new MutableObjectState
-            {
-                ObjectId = "some0neTol4v4"
-            };
-            ParseUser user = ParseObjectExtensions.FromState<ParseUser>(state, "_User");
-            Mock<IParseUserController> mockController = new Mock<IParseUserController>();
-            mockController.Setup(obj => obj.SignUpAsync(It.IsAny<IObjectState>(),
-                It.IsAny<IDictionary<string, IParseFieldOperation>>(),
-                It.IsAny<CancellationToken>())).Returns(Task.FromResult(newState));
-            ParseCorePlugins.Instance = new ParseCorePlugins
-            {
-                UserController = mockController.Object
-            };
-            ParseObject.RegisterSubclass<ParseUser>();
-            ParseObject.RegisterSubclass<ParseSession>();
-
-            return user.SignUpAsync().ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockController.Verify(obj => obj.SignUpAsync(It.IsAny<IObjectState>(),
-                  It.IsAny<IDictionary<string, IParseFieldOperation>>(),
-                  It.IsAny<CancellationToken>()), Times.Exactly(1));
-                Assert.IsFalse(user.IsDirty);
-                Assert.AreEqual("ihave", user.Username);
-                Assert.IsFalse(user.GetState().ContainsKey("password"));
-                Assert.AreEqual("some0neTol4v4", user.ObjectId);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(UserTests))]
-        public Task TestLogIn()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ServerData = new Dictionary<string, object>() {
-          { "sessionToken", "llaKcolnu" },
-          { "username", "ihave" },
-          { "password", "adream" }
-        }
-            };
-            IObjectState newState = new MutableObjectState
-            {
-                ObjectId = "some0neTol4v4"
-            };
-            Mock<IParseUserController> mockController = new Mock<IParseUserController>();
-            mockController.Setup(obj => obj.LogInAsync("ihave",
-                "adream",
-                It.IsAny<CancellationToken>())).Returns(Task.FromResult(newState));
-            ParseCorePlugins.Instance = new ParseCorePlugins
-            {
-                UserController = mockController.Object
-            };
-            ParseObject.RegisterSubclass<ParseUser>();
-            ParseObject.RegisterSubclass<ParseSession>();
-
-            return ParseUser.LogInAsync("ihave", "adream").ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockController.Verify(obj => obj.LogInAsync("ihave",
-                  "adream",
-                  It.IsAny<CancellationToken>()), Times.Exactly(1));
-
-                ParseUser user = t.Result;
-                Assert.IsFalse(user.IsDirty);
-                Assert.IsNull(user.Username);
-                Assert.AreEqual("some0neTol4v4", user.ObjectId);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(UserTests))]
-        public Task TestBecome()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ObjectId = "some0neTol4v4",
-                ServerData = new Dictionary<string, object> { ["sessionToken"] = "llaKcolnu" }
-            };
-            Mock<IParseUserController> mockController = new Mock<IParseUserController>();
-            mockController.Setup(obj => obj.GetUserAsync("llaKcolnu", It.IsAny<CancellationToken>())).Returns(Task.FromResult(state));
-            ParseCorePlugins.Instance = new ParseCorePlugins
-            {
-                UserController = mockController.Object
-            };
-            ParseObject.RegisterSubclass<ParseUser>();
-            ParseObject.RegisterSubclass<ParseSession>();
-
-            return ParseUser.BecomeAsync("llaKcolnu").ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockController.Verify(obj => obj.GetUserAsync("llaKcolnu", It.IsAny<CancellationToken>()), Times.Exactly(1));
-
-                ParseUser user = t.Result;
-                Assert.AreEqual("some0neTol4v4", user.ObjectId);
-                Assert.AreEqual("llaKcolnu", user.SessionToken);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(UserTests))]
-        public Task TestLogOut()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ServerData = new Dictionary<string, object>() {
-          { "sessionToken", "r:llaKcolnu" }
-        }
-            };
-            ParseUser user = ParseObjectExtensions.FromState<ParseUser>(state, "_User");
-            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController>();
-            mockCurrentUserController.Setup(obj => obj.GetAsync(It.IsAny<CancellationToken>()))
-                .Returns(Task.FromResult(user));
-            Mock<IParseSessionController> mockSessionController = new Mock<IParseSessionController>();
-            mockSessionController.Setup(c => c.IsRevocableSessionToken(It.IsAny<string>())).Returns(true);
-
-            ParseCorePlugins.Instance = new ParseCorePlugins
-            {
-                CurrentUserController = mockCurrentUserController.Object,
-                SessionController = mockSessionController.Object
-            };
-            ParseObject.RegisterSubclass<ParseUser>();
-            ParseObject.RegisterSubclass<ParseSession>();
-
-            return ParseUser.LogOutAsync().ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockCurrentUserController.Verify(obj => obj.LogOutAsync(It.IsAny<CancellationToken>()), Times.Exactly(1));
-                mockSessionController.Verify(obj => obj.RevokeAsync("r:llaKcolnu", It.IsAny<CancellationToken>()), Times.Exactly(1));
-            });
-        }
-
-        [TestMethod]
-        public void TestCurrentUser()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ServerData = new Dictionary<string, object>() {
-          { "sessionToken", "llaKcolnu" }
-        }
-            };
-            ParseUser user = ParseObjectExtensions.FromState<ParseUser>(state, "_User");
-            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController>();
-            mockCurrentUserController.Setup(obj => obj.GetAsync(It.IsAny<CancellationToken>()))
-                .Returns(Task.FromResult(user));
-            ParseCorePlugins.Instance = new ParseCorePlugins
-            {
-                CurrentUserController = mockCurrentUserController.Object,
-            };
-            ParseObject.RegisterSubclass<ParseUser>();
-            ParseObject.RegisterSubclass<ParseSession>();
-
-            Assert.AreEqual(user, ParseUser.CurrentUser);
-        }
-
-        [TestMethod]
-        public void TestCurrentUserWithEmptyResult()
-        {
-            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController>();
-            ParseCorePlugins.Instance = new ParseCorePlugins
-            {
-                CurrentUserController = mockCurrentUserController.Object
-            };
-            ParseObject.RegisterSubclass<ParseUser>();
-            ParseObject.RegisterSubclass<ParseSession>();
-
-            Assert.IsNull(ParseUser.CurrentUser);
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(UserTests))]
-        public Task TestRevocableSession()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ServerData = new Dictionary<string, object>() {
-          { "sessionToken", "llaKcolnu" }
-        }
-            };
-            IObjectState newState = new MutableObjectState
-            {
-                ServerData = new Dictionary<string, object>() {
-          { "sessionToken", "r:llaKcolnu" }
-        }
-            };
-            ParseUser user = ParseObjectExtensions.FromState<ParseUser>(state, "_User");
-            Mock<IParseSessionController> mockSessionController = new Mock<IParseSessionController>();
-            mockSessionController.Setup(obj => obj.UpgradeToRevocableSessionAsync("llaKcolnu",
-                It.IsAny<CancellationToken>())).Returns(Task.FromResult(newState));
-            ParseCorePlugins.Instance = new ParseCorePlugins
-            {
-                SessionController = mockSessionController.Object
-            };
-            ParseObject.RegisterSubclass<ParseUser>();
-            ParseObject.RegisterSubclass<ParseSession>();
-
-            return user.UpgradeToRevocableSessionAsync(CancellationToken.None).ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockSessionController.Verify(obj => obj.UpgradeToRevocableSessionAsync("llaKcolnu",
-                    It.IsAny<CancellationToken>()), Times.Exactly(1));
-                Assert.AreEqual("r:llaKcolnu", user.SessionToken);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(UserTests))]
-        public Task TestRequestPasswordReset()
-        {
-            Mock<IParseUserController> mockController = new Mock<IParseUserController>();
-            ParseCorePlugins.Instance = new ParseCorePlugins
-            {
-                UserController = mockController.Object
-            };
-            ParseObject.RegisterSubclass<ParseUser>();
-            ParseObject.RegisterSubclass<ParseSession>();
-
-            return ParseUser.RequestPasswordResetAsync("gogo@parse.com").ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockController.Verify(obj => obj.RequestPasswordResetAsync("gogo@parse.com",
-                    It.IsAny<CancellationToken>()), Times.Exactly(1));
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(UserTests))]
-        public Task TestUserSave()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ObjectId = "some0neTol4v4",
-                ServerData = new Dictionary<string, object>() {
-          { "sessionToken", "llaKcolnu" },
-          { "username", "ihave" },
-          { "password", "adream" }
-        }
-            };
-            IObjectState newState = new MutableObjectState
-            {
-                ServerData = new Dictionary<string, object>() {
-          { "Alliance", "rekt" }
-        }
-            };
-            ParseUser user = ParseObjectExtensions.FromState<ParseUser>(state, "_User");
-            Mock<IParseObjectController> mockObjectController = new Mock<IParseObjectController>();
-            mockObjectController.Setup(obj => obj.SaveAsync(It.IsAny<IObjectState>(),
-                It.IsAny<IDictionary<string, IParseFieldOperation>>(),
-                It.IsAny<string>(),
-                It.IsAny<CancellationToken>())).Returns(Task.FromResult(newState));
-            ParseCorePlugins.Instance = new ParseCorePlugins
-            {
-                ObjectController = mockObjectController.Object,
-                CurrentUserController = new Mock<IParseCurrentUserController>().Object
-            };
-            ParseObject.RegisterSubclass<ParseUser>();
-            ParseObject.RegisterSubclass<ParseSession>();
-            user["Alliance"] = "rekt";
-
-            return user.SaveAsync().ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockObjectController.Verify(obj => obj.SaveAsync(It.IsAny<IObjectState>(),
-                  It.IsAny<IDictionary<string, IParseFieldOperation>>(),
-                  It.IsAny<string>(),
-                  It.IsAny<CancellationToken>()), Times.Exactly(1));
-                Assert.IsFalse(user.IsDirty);
-                Assert.AreEqual("ihave", user.Username);
-                Assert.IsFalse(user.GetState().ContainsKey("password"));
-                Assert.AreEqual("some0neTol4v4", user.ObjectId);
-                Assert.AreEqual("rekt", user["Alliance"]);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(UserTests))]
-        public Task TestUserFetch()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ObjectId = "some0neTol4v4",
-                ServerData = new Dictionary<string, object>() {
-          { "sessionToken", "llaKcolnu" },
-          { "username", "ihave" },
-          { "password", "adream" }
-        }
-            };
-            IObjectState newState = new MutableObjectState
-            {
-                ServerData = new Dictionary<string, object>() {
-          { "Alliance", "rekt" }
-        }
-            };
-            ParseUser user = ParseObjectExtensions.FromState<ParseUser>(state, "_User");
-            Mock<IParseObjectController> mockObjectController = new Mock<IParseObjectController>();
-            mockObjectController.Setup(obj => obj.FetchAsync(It.IsAny<IObjectState>(),
-                It.IsAny<string>(),
-                It.IsAny<CancellationToken>())).Returns(Task.FromResult(newState));
-            ParseCorePlugins.Instance = new ParseCorePlugins
-            {
-                ObjectController = mockObjectController.Object,
-                CurrentUserController = new Mock<IParseCurrentUserController>().Object
-            };
-            ParseObject.RegisterSubclass<ParseUser>();
-            ParseObject.RegisterSubclass<ParseSession>();
-            user["Alliance"] = "rekt";
-
-            return user.FetchAsync().ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockObjectController.Verify(obj => obj.FetchAsync(It.IsAny<IObjectState>(),
-                  It.IsAny<string>(),
-                  It.IsAny<CancellationToken>()), Times.Exactly(1));
-                Assert.IsTrue(user.IsDirty);
-                Assert.AreEqual("ihave", user.Username);
-                Assert.IsTrue(user.GetState().ContainsKey("password"));
-                Assert.AreEqual("some0neTol4v4", user.ObjectId);
-                Assert.AreEqual("rekt", user["Alliance"]);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(UserTests))]
-        public Task TestLink()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ObjectId = "some0neTol4v4",
-                ServerData = new Dictionary<string, object>() {
-          { "sessionToken", "llaKcolnu" }
-        }
-            };
-            IObjectState newState = new MutableObjectState
-            {
-                ServerData = new Dictionary<string, object>() {
-          { "garden", "ofWords" }
-        }
-            };
-            ParseUser user = ParseObjectExtensions.FromState<ParseUser>(state, "_User");
-            Mock<IParseObjectController> mockObjectController = new Mock<IParseObjectController>();
-            mockObjectController.Setup(obj => obj.SaveAsync(It.IsAny<IObjectState>(),
-                It.IsAny<IDictionary<string, IParseFieldOperation>>(),
-                It.IsAny<string>(),
-                It.IsAny<CancellationToken>())).Returns(Task.FromResult(newState));
-            ParseCorePlugins.Instance = new ParseCorePlugins
-            {
-                ObjectController = mockObjectController.Object,
-                CurrentUserController = new Mock<IParseCurrentUserController>().Object
-            };
-            ParseObject.RegisterSubclass<ParseUser>();
-            ParseObject.RegisterSubclass<ParseSession>();
-
-            return user.LinkWithAsync("parse", new Dictionary<string, object>(), CancellationToken.None).ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockObjectController.Verify(obj => obj.SaveAsync(It.IsAny<IObjectState>(),
-                  It.IsAny<IDictionary<string, IParseFieldOperation>>(),
-                  It.IsAny<string>(),
-                  It.IsAny<CancellationToken>()), Times.Exactly(1));
-                Assert.IsFalse(user.IsDirty);
-                Assert.IsNotNull(user.GetAuthData());
-                Assert.IsNotNull(user.GetAuthData()["parse"]);
-                Assert.AreEqual("some0neTol4v4", user.ObjectId);
-                Assert.AreEqual("ofWords", user["garden"]);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(UserTests))]
-        public Task TestUnlink()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ObjectId = "some0neTol4v4",
-                ServerData = new Dictionary<string, object>() {
-          { "sessionToken", "llaKcolnu" },
-          { "authData", new Dictionary<string, object> {
-            { "parse", new Dictionary<string, object>() }
-          }}
-        }
-            };
-            IObjectState newState = new MutableObjectState
-            {
-                ServerData = new Dictionary<string, object>() {
-          { "garden", "ofWords" }
-        }
-            };
-            ParseUser user = ParseObjectExtensions.FromState<ParseUser>(state, "_User");
-            Mock<IParseObjectController> mockObjectController = new Mock<IParseObjectController>();
-            mockObjectController.Setup(obj => obj.SaveAsync(It.IsAny<IObjectState>(),
-                It.IsAny<IDictionary<string, IParseFieldOperation>>(),
-                It.IsAny<string>(),
-                It.IsAny<CancellationToken>())).Returns(Task.FromResult(newState));
-            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController>();
-            mockCurrentUserController.Setup(obj => obj.IsCurrent(user)).Returns(true);
-            ParseCorePlugins.Instance = new ParseCorePlugins
-            {
-                ObjectController = mockObjectController.Object,
-                CurrentUserController = mockCurrentUserController.Object,
-            };
-            ParseObject.RegisterSubclass<ParseUser>();
-            ParseObject.RegisterSubclass<ParseSession>();
-
-            return user.UnlinkFromAsync("parse", CancellationToken.None).ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockObjectController.Verify(obj => obj.SaveAsync(It.IsAny<IObjectState>(),
-                  It.IsAny<IDictionary<string, IParseFieldOperation>>(),
-                  It.IsAny<string>(),
-                  It.IsAny<CancellationToken>()), Times.Exactly(1));
-                Assert.IsFalse(user.IsDirty);
-                Assert.IsNotNull(user.GetAuthData());
-                Assert.IsFalse(user.GetAuthData().ContainsKey("parse"));
-                Assert.AreEqual("some0neTol4v4", user.ObjectId);
-                Assert.AreEqual("ofWords", user["garden"]);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(UserTests))]
-        public Task TestUnlinkNonCurrentUser()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ObjectId = "some0neTol4v4",
-                ServerData = new Dictionary<string, object>() {
-          { "sessionToken", "llaKcolnu" },
-          { "authData", new Dictionary<string, object> {
-            { "parse", new Dictionary<string, object>() }
-          }}
-        }
-            };
-            IObjectState newState = new MutableObjectState
-            {
-                ServerData = new Dictionary<string, object>() {
-          { "garden", "ofWords" }
-        }
-            };
-            ParseUser user = ParseObjectExtensions.FromState<ParseUser>(state, "_User");
-            Mock<IParseObjectController> mockObjectController = new Mock<IParseObjectController>();
-            mockObjectController.Setup(obj => obj.SaveAsync(It.IsAny<IObjectState>(),
-                It.IsAny<IDictionary<string, IParseFieldOperation>>(),
-                It.IsAny<string>(),
-                It.IsAny<CancellationToken>())).Returns(Task.FromResult(newState));
-            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController>();
-            mockCurrentUserController.Setup(obj => obj.IsCurrent(user)).Returns(false);
-            ParseCorePlugins.Instance = new ParseCorePlugins
-            {
-                ObjectController = mockObjectController.Object,
-                CurrentUserController = mockCurrentUserController.Object,
-            };
-            ParseObject.RegisterSubclass<ParseUser>();
-            ParseObject.RegisterSubclass<ParseSession>();
-
-            return user.UnlinkFromAsync("parse", CancellationToken.None).ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockObjectController.Verify(obj => obj.SaveAsync(It.IsAny<IObjectState>(),
-                  It.IsAny<IDictionary<string, IParseFieldOperation>>(),
-                  It.IsAny<string>(),
-                  It.IsAny<CancellationToken>()), Times.Exactly(1));
-                Assert.IsFalse(user.IsDirty);
-                Assert.IsNotNull(user.GetAuthData());
-                Assert.IsTrue(user.GetAuthData().ContainsKey("parse"));
-                Assert.IsNull(user.GetAuthData()["parse"]);
-                Assert.AreEqual("some0neTol4v4", user.ObjectId);
-                Assert.AreEqual("ofWords", user["garden"]);
-            });
-        }
-
-        [TestMethod]
-        [AsyncStateMachine(typeof(UserTests))]
-        public Task TestLogInWith()
-        {
-            IObjectState state = new MutableObjectState
-            {
-                ObjectId = "some0neTol4v4",
-                ServerData = new Dictionary<string, object>() {
-          { "sessionToken", "llaKcolnu" }
-        }
-            };
-            Mock<IParseUserController> mockController = new Mock<IParseUserController>();
-            mockController.Setup(obj => obj.LogInAsync("parse",
-                It.IsAny<IDictionary<string, object>>(),
-                It.IsAny<CancellationToken>())).Returns(Task.FromResult(state));
-
-            ParseCorePlugins.Instance = new ParseCorePlugins
-            {
-                UserController = mockController.Object
-            };
-            ParseObject.RegisterSubclass<ParseUser>();
-            ParseObject.RegisterSubclass<ParseSession>();
-
-            return ParseUserExtensions.LogInWithAsync("parse", new Dictionary<string, object>(), CancellationToken.None).ContinueWith(t =>
-            {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockController.Verify(obj => obj.LogInAsync("parse",
-                  It.IsAny<IDictionary<string, object>>(),
-                  It.IsAny<CancellationToken>()), Times.Exactly(1));
-
-                ParseUser user = t.Result;
-                Assert.IsNotNull(user.GetAuthData());
-                Assert.IsNotNull(user.GetAuthData()["parse"]);
-                Assert.AreEqual("some0neTol4v4", user.ObjectId);
-            });
-        }
-
-        [TestMethod]
-        public void TestImmutableKeys()
-        {
-            ParseUser user = new ParseUser();
-            string[] immutableKeys = new string[] {
-        "sessionToken", "isNew"
-      };
-
-            foreach (string key in immutableKeys)
-            {
-                Assert.ThrowsException<InvalidOperationException>(() =>
-                  user[key] = "1234567890"
-                );
-
-                Assert.ThrowsException<InvalidOperationException>(() =>
-                  user.Add(key, "1234567890")
-                );
-
-                Assert.ThrowsException<InvalidOperationException>(() =>
-                  user.AddRangeUniqueToList(key, new string[] { "1234567890" })
-                );
-
-                Assert.ThrowsException<InvalidOperationException>(() =>
-                  user.Remove(key)
-                );
-
-                Assert.ThrowsException<InvalidOperationException>(() =>
-                  user.RemoveAllFromList(key, new string[] { "1234567890" })
-                );
-            }
-
-            // Other special keys should be good
-            user["username"] = "username";
-            user["password"] = "password";
-        }
-    }
-}
diff --git a/Parse.Test/ACLTests.cs b/Parse.Tests/ACLTests.cs
similarity index 74%
rename from Parse.Test/ACLTests.cs
rename to Parse.Tests/ACLTests.cs
index 0524e558..b6e01fec 100644
--- a/Parse.Test/ACLTests.cs
+++ b/Parse.Tests/ACLTests.cs
@@ -1,26 +1,24 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Moq;
-using Parse.Core.Internal;
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Parse.Infrastructure;
+using Parse.Platform.Objects;
 
-namespace Parse.Test
+namespace Parse.Tests
 {
     [TestClass]
     public class ACLTests
     {
+        ParseClient Client { get; set; } = new ParseClient(new ServerConnectionData { Test = true });
+
         [TestInitialize]
-        public void SetUp()
+        public void Initialize()
         {
-            ParseObject.RegisterSubclass<ParseUser>();
-            ParseObject.RegisterSubclass<ParseSession>();
+            Client.AddValidClass<ParseUser>();
+            Client.AddValidClass<ParseSession>();
         }
 
         [TestCleanup]
-        public void TearDown() => ParseCorePlugins.Instance = null;
+        public void Clean() => (Client.Services as ServiceHub).Reset();
 
         [TestMethod]
         public void TestCheckPermissionsWithParseUserConstructor()
@@ -53,8 +51,8 @@ public void TestReadWriteMutationWithParseUserConstructor()
         }
 
         [TestMethod]
-        public void TestParseACLCreationWithNullObjectIdParseUser() => Assert.ThrowsException<ArgumentException>(() => new ParseACL(GenerateUser(null)));
+        public void TestParseACLCreationWithNullObjectIdParseUser() => Assert.ThrowsException<ArgumentException>(() => new ParseACL(GenerateUser(default)));
 
-        ParseUser GenerateUser(string objectID) => ParseObjectExtensions.FromState<ParseUser>(new MutableObjectState { ObjectId = objectID }, "_User");
+        ParseUser GenerateUser(string objectID) => Client.GenerateObjectFromState<ParseUser>(new MutableObjectState { ObjectId = objectID }, "_User");
     }
 }
diff --git a/Parse.Test/AnalyticsControllerTests.cs b/Parse.Tests/AnalyticsControllerTests.cs
similarity index 51%
rename from Parse.Test/AnalyticsControllerTests.cs
rename to Parse.Tests/AnalyticsControllerTests.cs
index f92a6f96..07a63b77 100644
--- a/Parse.Test/AnalyticsControllerTests.cs
+++ b/Parse.Tests/AnalyticsControllerTests.cs
@@ -1,23 +1,26 @@
-using Moq;
-using Parse;
-using Parse.Analytics.Internal;
-using Parse.Core.Internal;
 using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Parse.Infrastructure;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Abstractions.Infrastructure;
+using Parse.Platform.Analytics;
+using Parse.Infrastructure.Execution;
 
-namespace Parse.Test
+namespace Parse.Tests
 {
     [TestClass]
     public class AnalyticsControllerTests
     {
+        ParseClient Client { get; set; }
+
         [TestInitialize]
-        public void SetUp() => ParseClient.Initialize(new ParseClient.Configuration { ApplicationID = "", Key = "" });
+        public void SetUp() => Client = new ParseClient(new ServerConnectionData { ApplicationID = "", Key = "", Test = true });
 
         [TestMethod]
         [AsyncStateMachine(typeof(AnalyticsControllerTests))]
@@ -25,11 +28,12 @@ public Task TestTrackEventWithEmptyDimensions()
         {
             Mock<IParseCommandRunner> mockRunner = CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, new Dictionary<string, object> { }));
 
-            return new ParseAnalyticsController(mockRunner.Object).TrackEventAsync("SomeEvent", dimensions: null, sessionToken: null, cancellationToken: CancellationToken.None).ContinueWith(t =>
+            return new ParseAnalyticsController(mockRunner.Object).TrackEventAsync("SomeEvent", dimensions: default, sessionToken: default, serviceHub: Client, cancellationToken: CancellationToken.None).ContinueWith(task =>
             {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Uri.AbsolutePath == "/1/events/SomeEvent"), It.IsAny<IProgress<ParseUploadProgressEventArgs>>(), It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Path == "events/SomeEvent"), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
             });
         }
 
@@ -39,13 +43,12 @@ public Task TestTrackEventWithNonEmptyDimensions()
         {
             Mock<IParseCommandRunner> mockRunner = CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, new Dictionary<string, object> { }));
 
-            Dictionary<string, string> dimensions = new Dictionary<string, string> { ["njwerjk12"] = "5523dd" };
-
-            return new ParseAnalyticsController(mockRunner.Object).TrackEventAsync("SomeEvent", dimensions: dimensions, sessionToken: null, cancellationToken: CancellationToken.None).ContinueWith(t =>
+            return new ParseAnalyticsController(mockRunner.Object).TrackEventAsync("SomeEvent", dimensions: new Dictionary<string, string> { ["njwerjk12"] = "5523dd" }, sessionToken: default, serviceHub: Client, cancellationToken: CancellationToken.None).ContinueWith(task =>
             {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Uri.AbsolutePath.Contains("/1/events/SomeEvent")), It.IsAny<IProgress<ParseUploadProgressEventArgs>>(), It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Path.Contains("events/SomeEvent")), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
             });
         }
 
@@ -53,13 +56,14 @@ public Task TestTrackEventWithNonEmptyDimensions()
         [AsyncStateMachine(typeof(AnalyticsControllerTests))]
         public Task TestTrackAppOpenedWithEmptyPushHash()
         {
-            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, new Dictionary<string, object>()));
+            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, new Dictionary<string, object> { }));
 
-            return new ParseAnalyticsController(mockRunner.Object).TrackAppOpenedAsync(null, sessionToken: null, cancellationToken: CancellationToken.None).ContinueWith(t =>
+            return new ParseAnalyticsController(mockRunner.Object).TrackAppOpenedAsync(default, sessionToken: default, serviceHub: Client, cancellationToken: CancellationToken.None).ContinueWith(task =>
             {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Uri.AbsolutePath == "/1/events/AppOpened"), It.IsAny<IProgress<ParseUploadProgressEventArgs>>(), It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Path == "events/AppOpened"), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
             });
         }
 
@@ -69,20 +73,19 @@ public Task TestTrackAppOpenedWithNonEmptyPushHash()
         {
             Mock<IParseCommandRunner> mockRunner = CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, new Dictionary<string, object>()));
 
-            string pushHash = "32j4hll12lkk";
-
-            return new ParseAnalyticsController(mockRunner.Object).TrackAppOpenedAsync(pushHash, sessionToken: null, cancellationToken: CancellationToken.None).ContinueWith(t =>
+            return new ParseAnalyticsController(mockRunner.Object).TrackAppOpenedAsync("32j4hll12lkk", sessionToken: default, serviceHub: Client, cancellationToken: CancellationToken.None).ContinueWith(task =>
             {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.IsAny<ParseCommand>(), It.IsAny<IProgress<ParseUploadProgressEventArgs>>(), It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+                
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.IsAny<ParseCommand>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
             });
         }
 
         Mock<IParseCommandRunner> CreateMockRunner(Tuple<HttpStatusCode, IDictionary<string, object>> response)
         {
             Mock<IParseCommandRunner> mockRunner = new Mock<IParseCommandRunner>();
-            mockRunner.Setup(obj => obj.RunCommandAsync(It.IsAny<ParseCommand>(), It.IsAny<IProgress<ParseUploadProgressEventArgs>>(), It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response));
+            mockRunner.Setup(obj => obj.RunCommandAsync(It.IsAny<ParseCommand>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response));
 
             return mockRunner;
         }
diff --git a/Parse.Tests/AnalyticsTests.cs b/Parse.Tests/AnalyticsTests.cs
new file mode 100644
index 00000000..c5efee08
--- /dev/null
+++ b/Parse.Tests/AnalyticsTests.cs
@@ -0,0 +1,93 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Infrastructure;
+using Parse.Abstractions.Platform.Analytics;
+using Parse.Abstractions.Platform.Users;
+
+namespace Parse.Tests
+{
+    [TestClass]
+    public class AnalyticsTests
+    {
+#warning Skipped post-test-evaluation cleaning method may be needed.
+
+        // [TestCleanup]
+        // public void TearDown() => (Client.Services as ServiceHub).Reset();
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(AnalyticsTests))]
+        public Task TestTrackEvent()
+        {
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            Mock<IParseAnalyticsController> mockController = new Mock<IParseAnalyticsController> { };
+            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController> { };
+
+            mockCurrentUserController.Setup(controller => controller.GetCurrentSessionTokenAsync(It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult("sessionToken"));
+
+            hub.AnalyticsController = mockController.Object;
+            hub.CurrentUserController = mockCurrentUserController.Object;
+
+            return client.TrackAnalyticsEventAsync("SomeEvent").ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockController.Verify(obj => obj.TrackEventAsync(It.Is<string>(eventName => eventName == "SomeEvent"), It.Is<IDictionary<string, string>>(dict => dict == null), It.IsAny<string>(), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(AnalyticsTests))]
+        public Task TestTrackEventWithDimension()
+        {
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            Mock<IParseAnalyticsController> mockController = new Mock<IParseAnalyticsController> { };
+            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController> { };
+
+            mockCurrentUserController.Setup(controller => controller.GetCurrentSessionTokenAsync(It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult("sessionToken"));
+
+            hub.AnalyticsController = mockController.Object;
+            hub.CurrentUserController = mockCurrentUserController.Object;
+
+            return client.TrackAnalyticsEventAsync("SomeEvent", new Dictionary<string, string> { ["facebook"] = "hq" }).ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+                mockController.Verify(obj => obj.TrackEventAsync(It.Is<string>(eventName => eventName == "SomeEvent"), It.Is<IDictionary<string, string>>(dict => dict != null && dict.Count == 1), It.IsAny<string>(), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(AnalyticsTests))]
+        public Task TestTrackAppOpened()
+        {
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            Mock<IParseAnalyticsController> mockController = new Mock<IParseAnalyticsController> { };
+            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController> { };
+
+            mockCurrentUserController.Setup(controller => controller.GetCurrentSessionTokenAsync(It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult("sessionToken"));
+
+            hub.AnalyticsController = mockController.Object;
+            hub.CurrentUserController = mockCurrentUserController.Object;
+
+            return client.TrackLaunchAsync().ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockController.Verify(obj => obj.TrackAppOpenedAsync(It.Is<string>(pushHash => pushHash == null), It.IsAny<string>(), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+            });
+        }
+    }
+}
diff --git a/Parse.Tests/CloudControllerTests.cs b/Parse.Tests/CloudControllerTests.cs
new file mode 100644
index 00000000..81de1986
--- /dev/null
+++ b/Parse.Tests/CloudControllerTests.cs
@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Infrastructure;
+using Parse.Infrastructure.Execution;
+using Parse.Platform.Cloud;
+
+namespace Parse.Tests
+{
+#warning Class refactoring requires completion.
+
+    [TestClass]
+    public class CloudControllerTests
+    {
+        ParseClient Client { get; set; }
+
+        [TestInitialize]
+        public void SetUp() => Client = new ParseClient(new ServerConnectionData { ApplicationID = "", Key = "", Test = true });
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(CloudControllerTests))]
+        public Task TestEmptyCallFunction() => new ParseCloudCodeController(CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, default)).Object, Client.Decoder).CallFunctionAsync<string>("someFunction", default, default, Client, CancellationToken.None).ContinueWith(task =>
+        {
+            Assert.IsTrue(task.IsFaulted);
+            Assert.IsFalse(task.IsCanceled);
+        });
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(CloudControllerTests))]
+        public Task TestCallFunction()
+        {
+            Dictionary<string, object> responseDict = new Dictionary<string, object> { ["result"] = "gogo" };
+            Tuple<HttpStatusCode, IDictionary<string, object>> response = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, responseDict);
+            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(response);
+
+            return new ParseCloudCodeController(mockRunner.Object, Client.Decoder).CallFunctionAsync<string>("someFunction", default, default, Client, CancellationToken.None).ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+                Assert.AreEqual("gogo", task.Result);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(CloudControllerTests))]
+        public Task TestCallFunctionWithComplexType() => new ParseCloudCodeController(CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, new Dictionary<string, object> { { "result", new Dictionary<string, object> { { "fosco", "ben" }, { "list", new List<object> { 1, 2, 3 } } } } })).Object, Client.Decoder).CallFunctionAsync<IDictionary<string, object>>("someFunction", default, default, Client, CancellationToken.None).ContinueWith(task =>
+        {
+            Assert.IsFalse(task.IsFaulted);
+            Assert.IsFalse(task.IsCanceled);
+            Assert.IsInstanceOfType(task.Result, typeof(IDictionary<string, object>));
+            Assert.AreEqual("ben", task.Result["fosco"]);
+            Assert.IsInstanceOfType(task.Result["list"], typeof(IList<object>));
+        });
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(CloudControllerTests))]
+        public Task TestCallFunctionWithWrongType() => new ParseCloudCodeController(CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, new Dictionary<string, object>() { { "result", "gogo" } })).Object, Client.Decoder).CallFunctionAsync<int>("someFunction", default, default, Client, CancellationToken.None).ContinueWith(task =>
+        {
+            Assert.IsTrue(task.IsFaulted);
+            Assert.IsFalse(task.IsCanceled);
+        });
+
+        private Mock<IParseCommandRunner> CreateMockRunner(Tuple<HttpStatusCode, IDictionary<string, object>> response)
+        {
+            Mock<IParseCommandRunner> mockRunner = new Mock<IParseCommandRunner> { };
+            mockRunner.Setup(obj => obj.RunCommandAsync(It.IsAny<ParseCommand>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response));
+
+            return mockRunner;
+        }
+    }
+}
diff --git a/Parse.Tests/CloudTests.cs b/Parse.Tests/CloudTests.cs
new file mode 100644
index 00000000..dd1a6878
--- /dev/null
+++ b/Parse.Tests/CloudTests.cs
@@ -0,0 +1,45 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Cloud;
+using Parse.Abstractions.Platform.Users;
+using Parse.Infrastructure;
+
+namespace Parse.Tests
+{
+    [TestClass]
+    public class CloudTests
+    {
+#warning Skipped post-test-evaluation cleaning method may be needed.
+
+        // [TestCleanup]
+        // public void TearDown() => ParseCorePlugins.Instance.Reset();
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(CloudTests))]
+        public Task TestCloudFunctions()
+        {
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            Mock<IParseCloudCodeController> mockController = new Mock<IParseCloudCodeController>();
+            mockController.Setup(obj => obj.CallFunctionAsync<IDictionary<string, object>>(It.IsAny<string>(), It.IsAny<IDictionary<string, object>>(), It.IsAny<string>(), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult<IDictionary<string, object>>(new Dictionary<string, object> { ["fosco"] = "ben", ["list"] = new List<object> { 1, 2, 3 } }));
+
+            hub.CloudCodeController = mockController.Object;
+            hub.CurrentUserController = new Mock<IParseCurrentUserController> { }.Object;
+
+            return client.CallCloudCodeFunctionAsync<IDictionary<string, object>>("someFunction", null, CancellationToken.None).ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+                Assert.IsInstanceOfType(task.Result, typeof(IDictionary<string, object>));
+                Assert.AreEqual("ben", task.Result["fosco"]);
+                Assert.IsInstanceOfType(task.Result["list"], typeof(IList<object>));
+            });
+        }
+    }
+}
diff --git a/Parse.Tests/CommandTests.cs b/Parse.Tests/CommandTests.cs
new file mode 100644
index 00000000..8091b75c
--- /dev/null
+++ b/Parse.Tests/CommandTests.cs
@@ -0,0 +1,143 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Parse.Infrastructure;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Installations;
+using Parse.Abstractions.Platform.Users;
+using Parse.Infrastructure.Execution;
+using Parse.Abstractions.Infrastructure.Execution;
+
+namespace Parse.Tests
+{
+#warning Initialization and cleaning steps may be redundant for each test method. It may be possible to simply reset the required services before each run.
+#warning Class refactoring requires completion.
+
+    [TestClass]
+    public class CommandTests
+    {
+        ParseClient Client { get; set; }
+
+        [TestInitialize]
+        public void Initialize() => Client = new ParseClient(new ServerConnectionData { ApplicationID = "", Key = "", Test = true });
+
+        [TestCleanup]
+        public void Clean() => (Client.Services as ServiceHub).Reset();
+
+        [TestMethod]
+        public void TestMakeCommand()
+        {
+            ParseCommand command = new ParseCommand("endpoint", method: "GET", sessionToken: "abcd", headers: default, data: default);
+
+            Assert.AreEqual("endpoint", command.Path);
+            Assert.AreEqual("GET", command.Method);
+            Assert.IsTrue(command.Headers.Any(pair => pair.Key == "X-Parse-Session-Token" && pair.Value == "abcd"));
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(CommandTests))]
+        public Task TestRunCommand()
+        {
+            Mock<IWebClient> mockHttpClient = new Mock<IWebClient>();
+            Mock<IParseInstallationController> mockInstallationController = new Mock<IParseInstallationController>();
+            Task<Tuple<HttpStatusCode, string>> fakeResponse = Task.FromResult(new Tuple<HttpStatusCode, string>(HttpStatusCode.OK, "{}"));
+            mockHttpClient.Setup(obj => obj.ExecuteAsync(It.IsAny<Infrastructure.Execution.WebRequest>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>())).Returns(fakeResponse);
+
+            mockInstallationController.Setup(installation => installation.GetAsync()).Returns(Task.FromResult<Guid?>(default));
+
+            return new ParseCommandRunner(mockHttpClient.Object, mockInstallationController.Object, Client.MetadataController, Client.ServerConnectionData, new Lazy<IParseUserController>(() => Client.UserController)).RunCommandAsync(new ParseCommand("endpoint", method: "GET", data: default)).ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+                Assert.IsInstanceOfType(task.Result.Item2, typeof(IDictionary<string, object>));
+                Assert.AreEqual(0, task.Result.Item2.Count);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(CommandTests))]
+        public Task TestRunCommandWithArrayResult()
+        {
+            Mock<IWebClient> mockHttpClient = new Mock<IWebClient>();
+            Mock<IParseInstallationController> mockInstallationController = new Mock<IParseInstallationController>();
+            mockHttpClient.Setup(obj => obj.ExecuteAsync(It.IsAny<Infrastructure.Execution.WebRequest>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(new Tuple<HttpStatusCode, string>(HttpStatusCode.OK, "[]")));
+
+            mockInstallationController.Setup(installation => installation.GetAsync()).Returns(Task.FromResult<Guid?>(default));
+
+            return new ParseCommandRunner(mockHttpClient.Object, mockInstallationController.Object, Client.MetadataController, Client.ServerConnectionData, new Lazy<IParseUserController>(() => Client.UserController)).RunCommandAsync(new ParseCommand("endpoint", method: "GET", data: default)).ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+                Assert.IsInstanceOfType(task.Result.Item2, typeof(IDictionary<string, object>));
+                Assert.AreEqual(1, task.Result.Item2.Count);
+                Assert.IsTrue(task.Result.Item2.ContainsKey("results"));
+                Assert.IsInstanceOfType(task.Result.Item2["results"], typeof(IList<object>));
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(CommandTests))]
+        public Task TestRunCommandWithInvalidString()
+        {
+            Mock<IWebClient> mockHttpClient = new Mock<IWebClient>();
+            Mock<IParseInstallationController> mockInstallationController = new Mock<IParseInstallationController>();
+            mockHttpClient.Setup(obj => obj.ExecuteAsync(It.IsAny<Infrastructure.Execution.WebRequest>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(new Tuple<HttpStatusCode, string>(HttpStatusCode.OK, "invalid")));
+
+            mockInstallationController.Setup(controller => controller.GetAsync()).Returns(Task.FromResult<Guid?>(default));
+
+            return new ParseCommandRunner(mockHttpClient.Object, mockInstallationController.Object, Client.MetadataController, Client.ServerConnectionData, new Lazy<IParseUserController>(() => Client.UserController)).RunCommandAsync(new ParseCommand("endpoint", method: "GET", data: default)).ContinueWith(task =>
+            {
+                Assert.IsTrue(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+                Assert.IsInstanceOfType(task.Exception.InnerException, typeof(ParseFailureException));
+                Assert.AreEqual(ParseFailureException.ErrorCode.OtherCause, (task.Exception.InnerException as ParseFailureException).Code);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(CommandTests))]
+        public Task TestRunCommandWithErrorCode()
+        {
+            Mock<IWebClient> mockHttpClient = new Mock<IWebClient>();
+            Mock<IParseInstallationController> mockInstallationController = new Mock<IParseInstallationController>();
+            mockHttpClient.Setup(obj => obj.ExecuteAsync(It.IsAny<Infrastructure.Execution.WebRequest>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(new Tuple<HttpStatusCode, string>(HttpStatusCode.NotFound, "{ \"code\": 101, \"error\": \"Object not found.\" }")));
+
+            mockInstallationController.Setup(controller => controller.GetAsync()).Returns(Task.FromResult<Guid?>(default));
+
+            return new ParseCommandRunner(mockHttpClient.Object, mockInstallationController.Object, Client.MetadataController, Client.ServerConnectionData, new Lazy<IParseUserController>(() => Client.UserController)).RunCommandAsync(new ParseCommand("endpoint", method: "GET", data: default)).ContinueWith(task =>
+            {
+                Assert.IsTrue(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+                Assert.IsInstanceOfType(task.Exception.InnerException, typeof(ParseFailureException));
+                ParseFailureException parseException = task.Exception.InnerException as ParseFailureException;
+                Assert.AreEqual(ParseFailureException.ErrorCode.ObjectNotFound, parseException.Code);
+                Assert.AreEqual("Object not found.", parseException.Message);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(CommandTests))]
+        public Task TestRunCommandWithInternalServerError()
+        {
+            Mock<IWebClient> mockHttpClient = new Mock<IWebClient>();
+            Mock<IParseInstallationController> mockInstallationController = new Mock<IParseInstallationController>();
+            
+            mockHttpClient.Setup(client => client.ExecuteAsync(It.IsAny<Infrastructure.Execution.WebRequest>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(new Tuple<HttpStatusCode, string>(HttpStatusCode.InternalServerError, default)));
+            mockInstallationController.Setup(installationController => installationController.GetAsync()).Returns(Task.FromResult<Guid?>(default));
+
+            return new ParseCommandRunner(mockHttpClient.Object, mockInstallationController.Object, Client.MetadataController, Client.ServerConnectionData, new Lazy<IParseUserController>(() => Client.UserController)).RunCommandAsync(new ParseCommand("endpoint", method: "GET", data: default)).ContinueWith(task =>
+            {
+                Assert.IsTrue(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+                Assert.IsInstanceOfType(task.Exception.InnerException, typeof(ParseFailureException));
+                Assert.AreEqual(ParseFailureException.ErrorCode.InternalServerError, (task.Exception.InnerException as ParseFailureException).Code);
+            });
+        }
+    }
+}
diff --git a/Parse.Tests/ConfigTests.cs b/Parse.Tests/ConfigTests.cs
new file mode 100644
index 00000000..a6c45f3c
--- /dev/null
+++ b/Parse.Tests/ConfigTests.cs
@@ -0,0 +1,85 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Newtonsoft.Json;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Configuration;
+using Parse.Abstractions.Platform.Users;
+using Parse.Infrastructure;
+using Parse.Platform.Configuration;
+
+namespace Parse.Tests
+{
+    [TestClass]
+    public class ConfigTests
+    {
+        ParseClient Client { get; } = new ParseClient(new ServerConnectionData { Test = true }, new MutableServiceHub { });
+
+        IParseConfigurationController MockedConfigController
+        {
+            get
+            {
+                Mock<IParseConfigurationController> mockedConfigController = new Mock<IParseConfigurationController>();
+                Mock<IParseCurrentConfigurationController> mockedCurrentConfigController = new Mock<IParseCurrentConfigurationController>();
+
+                ParseConfiguration theConfig = Client.BuildConfiguration(new Dictionary<string, object> { ["params"] = new Dictionary<string, object> { ["testKey"] = "testValue" } });
+
+                mockedCurrentConfigController.Setup(obj => obj.GetCurrentConfigAsync(Client)).Returns(Task.FromResult(theConfig));
+
+                mockedConfigController.Setup(obj => obj.CurrentConfigurationController).Returns(mockedCurrentConfigController.Object);
+
+                TaskCompletionSource<ParseConfiguration> tcs = new TaskCompletionSource<ParseConfiguration>();
+                tcs.TrySetCanceled();
+
+                mockedConfigController.Setup(obj => obj.FetchConfigAsync(It.IsAny<string>(), It.IsAny<IServiceHub>(), It.Is<CancellationToken>(ct => ct.IsCancellationRequested))).Returns(tcs.Task);
+
+                mockedConfigController.Setup(obj => obj.FetchConfigAsync(It.IsAny<string>(), It.IsAny<IServiceHub>(), It.Is<CancellationToken>(ct => !ct.IsCancellationRequested))).Returns(Task.FromResult(theConfig));
+
+                return mockedConfigController.Object;
+            }
+        }
+
+        [TestInitialize]
+        public void SetUp() => (Client.Services as OrchestrationServiceHub).Custom = new MutableServiceHub { ConfigurationController = MockedConfigController, CurrentUserController = new Mock<IParseCurrentUserController>().Object };
+
+        [TestCleanup]
+        public void TearDown() => ((Client.Services as OrchestrationServiceHub).Default as ServiceHub).Reset();
+
+        [TestMethod]
+        public void TestCurrentConfig()
+        {
+            ParseConfiguration config = Client.GetCurrentConfiguration();
+
+            Assert.AreEqual("testValue", config["testKey"]);
+            Assert.AreEqual("testValue", config.Get<string>("testKey"));
+        }
+
+        [TestMethod]
+        public void TestToJSON()
+        {
+            IDictionary<string, object> expectedJson = new Dictionary<string, object> { { "params", new Dictionary<string, object> { { "testKey", "testValue" } } } };
+            Assert.AreEqual(JsonConvert.SerializeObject((Client.GetCurrentConfiguration() as IJsonConvertible).ConvertToJSON()), JsonConvert.SerializeObject(expectedJson));
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(ConfigTests))]
+        public Task TestGetConfig() => Client.GetConfigurationAsync().ContinueWith(task =>
+        {
+            Assert.AreEqual("testValue", task.Result["testKey"]);
+            Assert.AreEqual("testValue", task.Result.Get<string>("testKey"));
+        });
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(ConfigTests))]
+        public Task TestGetConfigCancel()
+        {
+            CancellationTokenSource tokenSource = new CancellationTokenSource { };
+            tokenSource.Cancel();
+
+            return Client.GetConfigurationAsync(tokenSource.Token).ContinueWith(task => Assert.IsTrue(task.IsCanceled));
+        }
+    }
+}
diff --git a/Parse.Test/ConversionTests.cs b/Parse.Tests/ConversionTests.cs
similarity index 84%
rename from Parse.Test/ConversionTests.cs
rename to Parse.Tests/ConversionTests.cs
index 053a3556..2bd27fdc 100644
--- a/Parse.Test/ConversionTests.cs
+++ b/Parse.Tests/ConversionTests.cs
@@ -1,10 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Parse.Utilities;
+using Parse.Infrastructure.Utilities;
 
-namespace Parse.Test
+namespace Parse.Tests
 {
     [TestClass]
     public class ConversionTests
@@ -27,7 +25,7 @@ public void TestConvertToFloatUsingNonInvariantNumberFormat()
             try
             {
                 float inputValue = 1234.56f;
-                string jsonEncoded = Common.Internal.Json.Encode(inputValue);
+                string jsonEncoded = JsonUtilities.Encode(inputValue);
                 float convertedValue = (float) Conversion.ConvertTo<float>(jsonEncoded);
                 Assert.IsTrue(inputValue == convertedValue);
             }
diff --git a/Parse.Test/CurrentUserControllerTests.cs b/Parse.Tests/CurrentUserControllerTests.cs
similarity index 50%
rename from Parse.Test/CurrentUserControllerTests.cs
rename to Parse.Tests/CurrentUserControllerTests.cs
index 8e37c946..5de620d8 100644
--- a/Parse.Test/CurrentUserControllerTests.cs
+++ b/Parse.Tests/CurrentUserControllerTests.cs
@@ -1,39 +1,46 @@
-using Moq;
-using Parse;
-using Parse.Common.Internal;
-using Parse.Core.Internal;
 using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Parse.Infrastructure;
+using Parse.Abstractions.Infrastructure;
+using Parse.Infrastructure.Utilities;
+using Parse.Platform.Objects;
+using Parse.Platform.Users;
 
-namespace Parse.Test
+namespace Parse.Tests
 {
     [TestClass]
     public class CurrentUserControllerTests
     {
+        ParseClient Client { get; } = new ParseClient(new ServerConnectionData { Test = true });
+
         [TestInitialize]
-        public void SetUp() => ParseObject.RegisterSubclass<ParseUser>();
+        public void SetUp() => Client.AddValidClass<ParseUser>();
 
         [TestCleanup]
-        public void TearDown() => ParseCorePlugins.Instance.Reset();
+        public void TearDown() => (Client.Services as ServiceHub).Reset();
 
         [TestMethod]
-        public void TestConstructor() => Assert.IsNull(new ParseCurrentUserController(new Mock<IStorageController>().Object).CurrentUser);
+        public void TestConstructor() => Assert.IsNull(new ParseCurrentUserController(new Mock<ICacheController> { }.Object, Client.ClassController, Client.Decoder).CurrentUser);
 
         [TestMethod]
         [AsyncStateMachine(typeof(CurrentUserControllerTests))]
         public Task TestGetSetAsync()
         {
-            Mock<IStorageController> storageController = new Mock<IStorageController>(MockBehavior.Strict);
-            Mock<IStorageDictionary<string, object>> mockedStorage = new Mock<IStorageDictionary<string, object>>();
-            ParseCurrentUserController controller = new ParseCurrentUserController(storageController.Object);
-            ParseUser user = new ParseUser();
+#warning This method may need a fully custom ParseClient setup.
+
+            Mock<ICacheController> storageController = new Mock<ICacheController>(MockBehavior.Strict);
+            Mock<IDataCache<string, object>> mockedStorage = new Mock<IDataCache<string, object>>();
+
+            ParseCurrentUserController controller = new ParseCurrentUserController(storageController.Object, Client.ClassController, Client.Decoder);
 
-            storageController.Setup(s => s.LoadAsync()).Returns(Task.FromResult(mockedStorage.Object));
+            ParseUser user = new ParseUser { }.Bind(Client) as ParseUser;
+
+            storageController.Setup(storage => storage.LoadAsync()).Returns(Task.FromResult(mockedStorage.Object));
 
             return controller.SetAsync(user, CancellationToken.None).OnSuccess(_ =>
             {
@@ -48,21 +55,19 @@ public Task TestGetSetAsync()
                 };
 #pragma warning restore IDE0039 // Use local function
 
-                mockedStorage.Verify(s => s.AddAsync("CurrentUser", Match.Create(predicate)));
-                mockedStorage.Setup(s => s.TryGetValue("CurrentUser", out jsonObject)).Returns(true);
+                mockedStorage.Verify(storage => storage.AddAsync("CurrentUser", Match.Create(predicate)));
+                mockedStorage.Setup(storage => storage.TryGetValue("CurrentUser", out jsonObject)).Returns(true);
 
-                return controller.GetAsync(CancellationToken.None);
-            }).Unwrap()
-            .OnSuccess(t =>
+                return controller.GetAsync(Client, CancellationToken.None);
+            }).Unwrap().OnSuccess(task =>
             {
                 Assert.AreEqual(user, controller.CurrentUser);
 
                 controller.ClearFromMemory();
                 Assert.AreNotEqual(user, controller.CurrentUser);
 
-                return controller.GetAsync(CancellationToken.None);
-            }).Unwrap()
-            .OnSuccess(t =>
+                return controller.GetAsync(Client, CancellationToken.None);
+            }).Unwrap().OnSuccess(task =>
             {
                 Assert.AreNotSame(user, controller.CurrentUser);
                 Assert.IsNotNull(controller.CurrentUser);
@@ -73,43 +78,40 @@ public Task TestGetSetAsync()
         [AsyncStateMachine(typeof(CurrentUserControllerTests))]
         public Task TestExistsAsync()
         {
-            Mock<IStorageController> storageController = new Mock<IStorageController>();
-            Mock<IStorageDictionary<string, object>> mockedStorage = new Mock<IStorageDictionary<string, object>>();
-            ParseCurrentUserController controller = new ParseCurrentUserController(storageController.Object);
-            ParseUser user = new ParseUser();
+            Mock<ICacheController> storageController = new Mock<ICacheController>();
+            Mock<IDataCache<string, object>> mockedStorage = new Mock<IDataCache<string, object>>();
+            ParseCurrentUserController controller = new ParseCurrentUserController(storageController.Object, Client.ClassController, Client.Decoder);
+            ParseUser user = new ParseUser { }.Bind(Client) as ParseUser;
 
             storageController.Setup(c => c.LoadAsync()).Returns(Task.FromResult(mockedStorage.Object));
 
             bool contains = false;
-            mockedStorage.Setup(s => s.AddAsync("CurrentUser", It.IsAny<object>())).Callback(() => contains = true).Returns(Task.FromResult<object>(null)).Verifiable();
+            mockedStorage.Setup(storage => storage.AddAsync("CurrentUser", It.IsAny<object>())).Callback(() => contains = true).Returns(Task.FromResult<object>(null)).Verifiable();
 
-            mockedStorage.Setup(s => s.RemoveAsync("CurrentUser")).Callback(() => contains = false).Returns(Task.FromResult<object>(null)).Verifiable();
+            mockedStorage.Setup(storage => storage.RemoveAsync("CurrentUser")).Callback(() => contains = false).Returns(Task.FromResult<object>(null)).Verifiable();
 
-            mockedStorage.Setup(s => s.ContainsKey("CurrentUser")).Returns(() => contains);
+            mockedStorage.Setup(storage => storage.ContainsKey("CurrentUser")).Returns(() => contains);
 
             return controller.SetAsync(user, CancellationToken.None).OnSuccess(_ =>
             {
                 Assert.AreEqual(user, controller.CurrentUser);
 
                 return controller.ExistsAsync(CancellationToken.None);
-            }).Unwrap()
-            .OnSuccess(t =>
+            }).Unwrap().OnSuccess(task =>
             {
-                Assert.IsTrue(t.Result);
+                Assert.IsTrue(task.Result);
 
                 controller.ClearFromMemory();
                 return controller.ExistsAsync(CancellationToken.None);
-            }).Unwrap()
-            .OnSuccess(t =>
+            }).Unwrap().OnSuccess(task =>
             {
-                Assert.IsTrue(t.Result);
+                Assert.IsTrue(task.Result);
 
                 controller.ClearFromDisk();
                 return controller.ExistsAsync(CancellationToken.None);
-            }).Unwrap()
-            .OnSuccess(t =>
+            }).Unwrap().OnSuccess(task =>
             {
-                Assert.IsFalse(t.Result);
+                Assert.IsFalse(task.Result);
                 mockedStorage.Verify();
             });
         }
@@ -118,14 +120,15 @@ public Task TestExistsAsync()
         [AsyncStateMachine(typeof(CurrentUserControllerTests))]
         public Task TestIsCurrent()
         {
-            Mock<IStorageController> storageController = new Mock<IStorageController>(MockBehavior.Strict);
-            ParseCurrentUserController controller = new ParseCurrentUserController(storageController.Object);
-            ParseUser user = new ParseUser();
-            ParseUser user2 = new ParseUser();
+            Mock<ICacheController> storageController = new Mock<ICacheController>(MockBehavior.Strict);
+            ParseCurrentUserController controller = new ParseCurrentUserController(storageController.Object, Client.ClassController, Client.Decoder);
+
+            ParseUser user = new ParseUser { }.Bind(Client) as ParseUser;
+            ParseUser user2 = new ParseUser { }.Bind(Client) as ParseUser;
 
-            storageController.Setup(s => s.LoadAsync()).Returns(Task.FromResult(new Mock<IStorageDictionary<string, object>>().Object));
+            storageController.Setup(storage => storage.LoadAsync()).Returns(Task.FromResult(new Mock<IDataCache<string, object>>().Object));
 
-            return controller.SetAsync(user, CancellationToken.None).OnSuccess(t =>
+            return controller.SetAsync(user, CancellationToken.None).OnSuccess(task =>
             {
                 Assert.IsTrue(controller.IsCurrent(user));
                 Assert.IsFalse(controller.IsCurrent(user2));
@@ -135,8 +138,7 @@ public Task TestIsCurrent()
                 Assert.IsFalse(controller.IsCurrent(user));
 
                 return controller.SetAsync(user, CancellationToken.None);
-            }).Unwrap()
-            .OnSuccess(t =>
+            }).Unwrap().OnSuccess(task =>
             {
                 Assert.IsTrue(controller.IsCurrent(user));
                 Assert.IsFalse(controller.IsCurrent(user2));
@@ -146,8 +148,7 @@ public Task TestIsCurrent()
                 Assert.IsFalse(controller.IsCurrent(user));
 
                 return controller.SetAsync(user2, CancellationToken.None);
-            }).Unwrap()
-            .OnSuccess(t =>
+            }).Unwrap().OnSuccess(task =>
             {
                 Assert.IsFalse(controller.IsCurrent(user));
                 Assert.IsTrue(controller.IsCurrent(user2));
@@ -158,49 +159,43 @@ public Task TestIsCurrent()
         [AsyncStateMachine(typeof(CurrentUserControllerTests))]
         public Task TestCurrentSessionToken()
         {
-            Mock<IStorageController> storageController = new Mock<IStorageController>();
-            Mock<IStorageDictionary<string, object>> mockedStorage = new Mock<IStorageDictionary<string, object>>();
-            ParseCurrentUserController controller = new ParseCurrentUserController(storageController.Object);
+            Mock<ICacheController> storageController = new Mock<ICacheController>();
+            Mock<IDataCache<string, object>> mockedStorage = new Mock<IDataCache<string, object>>();
+            ParseCurrentUserController controller = new ParseCurrentUserController(storageController.Object, Client.ClassController, Client.Decoder);
 
             storageController.Setup(c => c.LoadAsync()).Returns(Task.FromResult(mockedStorage.Object));
 
-            return controller.GetCurrentSessionTokenAsync(CancellationToken.None).OnSuccess(t =>
+            return controller.GetCurrentSessionTokenAsync(Client, CancellationToken.None).OnSuccess(task =>
             {
-                Assert.IsNull(t.Result);
+                Assert.IsNull(task.Result);
 
                 // We should probably mock this.
-                ParseUser user = ParseObject.CreateWithoutData<ParseUser>(null);
+
+                ParseUser user = Client.CreateObjectWithoutData<ParseUser>(default);
                 user.HandleFetchResult(new MutableObjectState { ServerData = new Dictionary<string, object> { ["sessionToken"] = "randomString" } });
 
                 return controller.SetAsync(user, CancellationToken.None);
-            }).Unwrap()
-            .OnSuccess(_ => controller.GetCurrentSessionTokenAsync(CancellationToken.None)).Unwrap()
-            .OnSuccess(t => Assert.AreEqual("randomString", t.Result));
+            }).Unwrap().OnSuccess(_ => controller.GetCurrentSessionTokenAsync(Client, CancellationToken.None)).Unwrap().OnSuccess(task => Assert.AreEqual("randomString", task.Result));
         }
 
         public Task TestLogOut()
         {
-            ParseCurrentUserController controller = new ParseCurrentUserController(new Mock<IStorageController>(MockBehavior.Strict).Object);
-            ParseUser user = new ParseUser();
+            ParseCurrentUserController controller = new ParseCurrentUserController(new Mock<ICacheController>(MockBehavior.Strict).Object, Client.ClassController, Client.Decoder);
+            ParseUser user = new ParseUser { }.Bind(Client) as ParseUser;
 
             return controller.SetAsync(user, CancellationToken.None).OnSuccess(_ =>
             {
                 Assert.AreEqual(user, controller.CurrentUser);
                 return controller.ExistsAsync(CancellationToken.None);
-            }).Unwrap()
-            .OnSuccess(t =>
+            }).Unwrap().OnSuccess(task =>
             {
-                Assert.IsTrue(t.Result);
-
-                return controller.LogOutAsync(CancellationToken.None);
-            }).Unwrap().OnSuccess(_ => controller.GetAsync(CancellationToken.None)).Unwrap()
-            .OnSuccess(t =>
+                Assert.IsTrue(task.Result);
+                return controller.LogOutAsync(Client, CancellationToken.None);
+            }).Unwrap().OnSuccess(_ => controller.GetAsync(Client, CancellationToken.None)).Unwrap().OnSuccess(task =>
             {
-                Assert.IsNull(t.Result);
-
+                Assert.IsNull(task.Result);
                 return controller.ExistsAsync(CancellationToken.None);
-            }).Unwrap()
-            .OnSuccess(t => Assert.IsFalse(t.Result));
+            }).Unwrap().OnSuccess(t => Assert.IsFalse(t.Result));
         }
     }
 }
diff --git a/Parse.Test/DecoderTests.cs b/Parse.Tests/DecoderTests.cs
similarity index 67%
rename from Parse.Test/DecoderTests.cs
rename to Parse.Tests/DecoderTests.cs
index ebff90d1..c074cb83 100644
--- a/Parse.Test/DecoderTests.cs
+++ b/Parse.Tests/DecoderTests.cs
@@ -1,19 +1,22 @@
-using Parse;
-using Parse.Core.Internal;
 using System;
 using System.Collections.Generic;
-
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Parse.Abstractions.Internal;
+using Parse.Infrastructure;
+using Parse.Infrastructure.Data;
 
-namespace Parse.Test
+namespace Parse.Tests
 {
     [TestClass]
     public class DecoderTests
     {
+        ParseClient Client { get; } = new ParseClient(new ServerConnectionData { Test = true });
+
         [TestMethod]
         public void TestParseDate()
         {
-            DateTime dateTime = (DateTime) ParseDecoder.Instance.Decode(ParseDecoder.ParseDate("1990-08-30T12:03:59.000Z"));
+            DateTime dateTime = (DateTime) Client.Decoder.Decode(ParseDataDecoder.ParseDate("1990-08-30T12:03:59.000Z"), Client);
+
             Assert.AreEqual(1990, dateTime.Year);
             Assert.AreEqual(8, dateTime.Month);
             Assert.AreEqual(30, dateTime.Day);
@@ -26,21 +29,22 @@ public void TestParseDate()
         [TestMethod]
         public void TestDecodePrimitives()
         {
-            Assert.AreEqual(1, ParseDecoder.Instance.Decode(1));
-            Assert.AreEqual(0.3, ParseDecoder.Instance.Decode(0.3));
-            Assert.AreEqual("halyosy", ParseDecoder.Instance.Decode("halyosy"));
+            Assert.AreEqual(1, Client.Decoder.Decode(1, Client));
+            Assert.AreEqual(0.3, Client.Decoder.Decode(0.3, Client));
+            Assert.AreEqual("halyosy", Client.Decoder.Decode("halyosy", Client));
 
-            Assert.IsNull(ParseDecoder.Instance.Decode(null));
+            Assert.IsNull(Client.Decoder.Decode(default, Client));
         }
 
         [TestMethod]
         // Decoding ParseFieldOperation is not supported on .NET now. We only need this for LDS.
-        public void TestDecodeFieldOperation() => Assert.ThrowsException<NotImplementedException>(() => ParseDecoder.Instance.Decode(new Dictionary<string, object>() { { "__op", "Increment" }, { "amount", "322" } }));
+        public void TestDecodeFieldOperation() => Assert.ThrowsException<NotImplementedException>(() => Client.Decoder.Decode(new Dictionary<string, object> { { "__op", "Increment" }, { "amount", "322" } }, Client));
 
         [TestMethod]
         public void TestDecodeDate()
         {
-            DateTime dateTime = (DateTime) ParseDecoder.Instance.Decode(new Dictionary<string, object>() { { "__type", "Date" }, { "iso", "1990-08-30T12:03:59.000Z" } });
+            DateTime dateTime = (DateTime) Client.Decoder.Decode(new Dictionary<string, object> { { "__type", "Date" }, { "iso", "1990-08-30T12:03:59.000Z" } }, Client);
+
             Assert.AreEqual(1990, dateTime.Year);
             Assert.AreEqual(8, dateTime.Month);
             Assert.AreEqual(30, dateTime.Day);
@@ -57,7 +61,8 @@ public void TestDecodeImproperDate()
 
             for (int i = 0; i < 2; i++, value["iso"] = (value["iso"] as string).Substring(0, (value["iso"] as string).Length - 1) + "0Z")
             {
-                DateTime dateTime = (DateTime) ParseDecoder.Instance.Decode(value);
+                DateTime dateTime = (DateTime) Client.Decoder.Decode(value, Client);
+
                 Assert.AreEqual(1990, dateTime.Year);
                 Assert.AreEqual(8, dateTime.Month);
                 Assert.AreEqual(30, dateTime.Day);
@@ -69,12 +74,13 @@ public void TestDecodeImproperDate()
         }
 
         [TestMethod]
-        public void TestDecodeBytes() => Assert.AreEqual("This is an encoded string", System.Text.Encoding.UTF8.GetString(ParseDecoder.Instance.Decode(new Dictionary<string, object>() { { "__type", "Bytes" }, { "base64", "VGhpcyBpcyBhbiBlbmNvZGVkIHN0cmluZw==" } }) as byte[]));
+        public void TestDecodeBytes() => Assert.AreEqual("This is an encoded string", System.Text.Encoding.UTF8.GetString(Client.Decoder.Decode(new Dictionary<string, object> { { "__type", "Bytes" }, { "base64", "VGhpcyBpcyBhbiBlbmNvZGVkIHN0cmluZw==" } }, Client) as byte[]));
 
         [TestMethod]
         public void TestDecodePointer()
         {
-            ParseObject obj = ParseDecoder.Instance.Decode(new Dictionary<string, object> { ["__type"] = "Pointer", ["className"] = "Corgi", ["objectId"] = "lLaKcolnu" }) as ParseObject;
+            ParseObject obj = Client.Decoder.Decode(new Dictionary<string, object> { ["__type"] = "Pointer", ["className"] = "Corgi", ["objectId"] = "lLaKcolnu" }, Client) as ParseObject;
+
             Assert.IsFalse(obj.IsDataAvailable);
             Assert.AreEqual("Corgi", obj.ClassName);
             Assert.AreEqual("lLaKcolnu", obj.ObjectId);
@@ -84,23 +90,25 @@ public void TestDecodePointer()
         public void TestDecodeFile()
         {
 
-            ParseFile file1 = ParseDecoder.Instance.Decode(new Dictionary<string, object> { ["__type"] = "File", ["name"] = "Corgi.png", ["url"] = "http://corgi.xyz/gogo.png" }) as ParseFile;
+            ParseFile file1 = Client.Decoder.Decode(new Dictionary<string, object> { ["__type"] = "File", ["name"] = "Corgi.png", ["url"] = "http://corgi.xyz/gogo.png" }, Client) as ParseFile;
+
             Assert.AreEqual("Corgi.png", file1.Name);
             Assert.AreEqual("http://corgi.xyz/gogo.png", file1.Url.AbsoluteUri);
             Assert.IsFalse(file1.IsDirty);
 
-            Assert.ThrowsException<KeyNotFoundException>(() => ParseDecoder.Instance.Decode(new Dictionary<string, object> { ["__type"] = "File", ["name"] = "Corgi.png" }));
+            Assert.ThrowsException<KeyNotFoundException>(() => Client.Decoder.Decode(new Dictionary<string, object> { ["__type"] = "File", ["name"] = "Corgi.png" }, Client));
         }
 
         [TestMethod]
         public void TestDecodeGeoPoint()
         {
-            ParseGeoPoint point1 = (ParseGeoPoint) ParseDecoder.Instance.Decode(new Dictionary<string, object> { ["__type"] = "GeoPoint", ["latitude"] = 0.9, ["longitude"] = 0.3 });
+            ParseGeoPoint point1 = (ParseGeoPoint) Client.Decoder.Decode(new Dictionary<string, object> { ["__type"] = "GeoPoint", ["latitude"] = 0.9, ["longitude"] = 0.3 }, Client);
+
             Assert.IsNotNull(point1);
             Assert.AreEqual(0.9, point1.Latitude);
             Assert.AreEqual(0.3, point1.Longitude);
 
-            Assert.ThrowsException<KeyNotFoundException>(() => ParseDecoder.Instance.Decode(new Dictionary<string, object> { ["__type"] = "GeoPoint", ["latitude"] = 0.9 }));
+            Assert.ThrowsException<KeyNotFoundException>(() => Client.Decoder.Decode(new Dictionary<string, object> { ["__type"] = "GeoPoint", ["latitude"] = 0.9 }, Client));
         }
 
         [TestMethod]
@@ -115,7 +123,8 @@ public void TestDecodeObject()
                 ["updatedAt"] = "2015-06-22T22:06:41.733Z"
             };
 
-            ParseObject obj = ParseDecoder.Instance.Decode(value) as ParseObject;
+            ParseObject obj = Client.Decoder.Decode(value, Client) as ParseObject;
+
             Assert.IsTrue(obj.IsDataAvailable);
             Assert.AreEqual("Corgi", obj.ClassName);
             Assert.AreEqual("lLaKcolnu", obj.ObjectId);
@@ -133,7 +142,8 @@ public void TestDecodeRelation()
                 ["objectId"] = "lLaKcolnu"
             };
 
-            ParseRelation<ParseObject> relation = ParseDecoder.Instance.Decode(value) as ParseRelation<ParseObject>;
+            ParseRelation<ParseObject> relation = Client.Decoder.Decode(value, Client) as ParseRelation<ParseObject>;
+
             Assert.IsNotNull(relation);
             Assert.AreEqual("Corgi", relation.GetTargetClassName());
         }
@@ -162,7 +172,8 @@ public void TestDecodeDictionary()
                 }
             };
 
-            IDictionary<string, object> dict = ParseDecoder.Instance.Decode(value) as IDictionary<string, object>;
+            IDictionary<string, object> dict = Client.Decoder.Decode(value, Client) as IDictionary<string, object>;
+
             Assert.AreEqual("luka", dict["megurine"]);
             Assert.IsTrue(dict["hatsune"] is ParseObject);
             Assert.IsTrue(dict["decodedGeoPoint"] is ParseGeoPoint);
@@ -173,10 +184,11 @@ public void TestDecodeDictionary()
             IDictionary<object, string> randomValue = new Dictionary<object, string>()
             {
                 ["ultimate"] = "elements",
-                [new ParseACL()] = "lLaKcolnu"
+                [new ParseACL { }] = "lLaKcolnu"
             };
 
-            IDictionary<object, string> randomDict = ParseDecoder.Instance.Decode(randomValue) as IDictionary<object, string>;
+            IDictionary<object, string> randomDict = Client.Decoder.Decode(randomValue, Client) as IDictionary<object, string>;
+
             Assert.AreEqual("elements", randomDict["ultimate"]);
             Assert.AreEqual(2, randomDict.Keys.Count);
         }
@@ -184,18 +196,18 @@ [new ParseACL()] = "lLaKcolnu"
         [TestMethod]
         public void TestDecodeList()
         {
-            IList<object> value = new List<object>()
+            IList<object> value = new List<object>
             {
-                1, new ParseACL(), "wiz",
-                new Dictionary<string, object>()
+                1, new ParseACL { }, "wiz",
+                new Dictionary<string, object>
                 {
                     ["__type"] = "GeoPoint",
                     ["latitude"] = 0.9,
                     ["longitude"] = 0.3
                 },
-                new List<object>()
+                new List<object>
                 {
-                    new Dictionary<string, object>()
+                    new Dictionary<string, object>
                     {
                         ["__type"] = "GeoPoint",
                         ["latitude"] =  0.9,
@@ -204,7 +216,8 @@ public void TestDecodeList()
                 }
             };
 
-            IList<object> list = ParseDecoder.Instance.Decode(value) as IList<object>;
+            IList<object> list = Client.Decoder.Decode(value, Client) as IList<object>;
+
             Assert.AreEqual(1, list[0]);
             Assert.IsTrue(list[1] is ParseACL);
             Assert.AreEqual("wiz", list[2]);
@@ -217,9 +230,8 @@ public void TestDecodeList()
         [TestMethod]
         public void TestDecodeArray()
         {
-            int[] value = new int[] { 1, 2, 3, 4 };
+            int[] value = new int[] { 1, 2, 3, 4 }, array = Client.Decoder.Decode(value, Client) as int[];
 
-            int[] array = ParseDecoder.Instance.Decode(value) as int[];
             Assert.AreEqual(4, array.Length);
             Assert.AreEqual(1, array[0]);
             Assert.AreEqual(2, array[1]);
diff --git a/Parse.Test/EncoderTests.cs b/Parse.Tests/EncoderTests.cs
similarity index 72%
rename from Parse.Test/EncoderTests.cs
rename to Parse.Tests/EncoderTests.cs
index e6b3624c..505938de 100644
--- a/Parse.Test/EncoderTests.cs
+++ b/Parse.Tests/EncoderTests.cs
@@ -1,61 +1,65 @@
-using Parse;
-using Parse.Core.Internal;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
-
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Parse.Abstractions.Internal;
+using Parse.Infrastructure;
+using Parse.Infrastructure.Control;
+using Parse.Infrastructure.Data;
 
 // TODO (hallucinogen): mock ParseACL, ParseObject, ParseUser once we have their Interfaces
-namespace Parse.Test
+namespace Parse.Tests
 {
     [TestClass]
     public class EncoderTests
     {
+        ParseClient Client { get; } = new ParseClient(new ServerConnectionData { Test = true });
+
         /// <summary>
-        /// A <see cref="ParseEncoder"/> that's used only for testing. This class is used to test
-        /// <see cref="ParseEncoder"/>'s base methods.
+        /// A <see cref="ParseDataEncoder"/> that's used only for testing. This class is used to test
+        /// <see cref="ParseDataEncoder"/>'s base methods.
         /// </summary>
-        private class ParseEncoderTestClass : ParseEncoder
+        class ParseEncoderTestClass : ParseDataEncoder
         {
-            private static readonly ParseEncoderTestClass instance = new ParseEncoderTestClass();
-            public static ParseEncoderTestClass Instance => instance;
+            public static ParseEncoderTestClass Instance { get; } = new ParseEncoderTestClass { };
 
-            protected override IDictionary<string, object> EncodeParseObject(ParseObject value) => null;
+            protected override IDictionary<string, object> EncodeObject(ParseObject value) => null;
         }
 
         [TestMethod]
         public void TestIsValidType()
         {
             ParseObject corgi = new ParseObject("Corgi");
-            ParseRelation<ParseObject> corgiRelation = corgi.GetRelation<ParseObject>("corgi");
-
-            Assert.IsTrue(ParseEncoder.IsValidType(322));
-            Assert.IsTrue(ParseEncoder.IsValidType(0.3f));
-            Assert.IsTrue(ParseEncoder.IsValidType(new byte[] { 1, 2, 3, 4 }));
-            Assert.IsTrue(ParseEncoder.IsValidType("corgi"));
-            Assert.IsTrue(ParseEncoder.IsValidType(corgi));
-            Assert.IsTrue(ParseEncoder.IsValidType(new ParseACL()));
-            Assert.IsTrue(ParseEncoder.IsValidType(new ParseFile("Corgi", new byte[0])));
-            Assert.IsTrue(ParseEncoder.IsValidType(new ParseGeoPoint(1, 2)));
-            Assert.IsTrue(ParseEncoder.IsValidType(corgiRelation));
-            Assert.IsTrue(ParseEncoder.IsValidType(new DateTime()));
-            Assert.IsTrue(ParseEncoder.IsValidType(new List<object>()));
-            Assert.IsTrue(ParseEncoder.IsValidType(new Dictionary<string, string>()));
-            Assert.IsTrue(ParseEncoder.IsValidType(new Dictionary<string, object>()));
-
-            Assert.IsFalse(ParseEncoder.IsValidType(new ParseAddOperation(new List<object>())));
-            Assert.IsFalse(ParseEncoder.IsValidType(Task.FromResult(new ParseObject("Corgi"))));
-            Assert.ThrowsException<MissingMethodException>(() => ParseEncoder.IsValidType(new Dictionary<object, object>()));
-            Assert.ThrowsException<MissingMethodException>(() => ParseEncoder.IsValidType(new Dictionary<object, string>()));
+            ParseRelation<ParseObject> corgiRelation = corgi.GetRelation<ParseObject>(nameof(corgi));
+
+            Assert.IsTrue(ParseDataEncoder.Validate(322));
+            Assert.IsTrue(ParseDataEncoder.Validate(0.3f));
+            Assert.IsTrue(ParseDataEncoder.Validate(new byte[] { 1, 2, 3, 4 }));
+            Assert.IsTrue(ParseDataEncoder.Validate(nameof(corgi)));
+            Assert.IsTrue(ParseDataEncoder.Validate(corgi));
+            Assert.IsTrue(ParseDataEncoder.Validate(new ParseACL { }));
+            Assert.IsTrue(ParseDataEncoder.Validate(new ParseFile("Corgi", new byte[0])));
+            Assert.IsTrue(ParseDataEncoder.Validate(new ParseGeoPoint(1, 2)));
+            Assert.IsTrue(ParseDataEncoder.Validate(corgiRelation));
+            Assert.IsTrue(ParseDataEncoder.Validate(new DateTime { }));
+            Assert.IsTrue(ParseDataEncoder.Validate(new List<object> { }));
+            Assert.IsTrue(ParseDataEncoder.Validate(new Dictionary<string, string> { }));
+            Assert.IsTrue(ParseDataEncoder.Validate(new Dictionary<string, object> { }));
+
+            Assert.IsFalse(ParseDataEncoder.Validate(new ParseAddOperation(new List<object> { })));
+            Assert.IsFalse(ParseDataEncoder.Validate(Task.FromResult(new ParseObject("Corgi"))));
+            Assert.ThrowsException<MissingMethodException>(() => ParseDataEncoder.Validate(new Dictionary<object, object> { }));
+            Assert.ThrowsException<MissingMethodException>(() => ParseDataEncoder.Validate(new Dictionary<object, string> { }));
         }
 
         [TestMethod]
         public void TestEncodeDate()
         {
             DateTime dateTime = new DateTime(1990, 8, 30, 12, 3, 59);
-            IDictionary<string, object> value = ParseEncoderTestClass.Instance.Encode(dateTime) as IDictionary<string, object>;
+
+            IDictionary<string, object> value = ParseEncoderTestClass.Instance.Encode(dateTime, Client) as IDictionary<string, object>;
+
             Assert.AreEqual("Date", value["__type"]);
             Assert.AreEqual("1990-08-30T12:03:59.000Z", value["iso"]);
         }
@@ -64,7 +68,9 @@ public void TestEncodeDate()
         public void TestEncodeBytes()
         {
             byte[] bytes = new byte[] { 1, 2, 3, 4 };
-            IDictionary<string, object> value = ParseEncoderTestClass.Instance.Encode(bytes) as IDictionary<string, object>;
+
+            IDictionary<string, object> value = ParseEncoderTestClass.Instance.Encode(bytes, Client) as IDictionary<string, object>;
+
             Assert.AreEqual("Bytes", value["__type"]);
             Assert.AreEqual(Convert.ToBase64String(new byte[] { 1, 2, 3, 4 }), value["base64"]);
         }
@@ -73,7 +79,8 @@ public void TestEncodeBytes()
         public void TestEncodeParseObjectWithNoObjectsEncoder()
         {
             ParseObject obj = new ParseObject("Corgi");
-            Assert.ThrowsException<ArgumentException>(() => NoObjectsEncoder.Instance.Encode(obj));
+
+            Assert.ThrowsException<ArgumentException>(() => NoObjectsEncoder.Instance.Encode(obj, Client));
         }
 
         [TestMethod]
@@ -86,20 +93,25 @@ public void TestEncodeParseObjectWithPointerOrLocalIdEncoder()
         public void TestEncodeParseFile()
         {
             ParseFile file1 = ParseFileExtensions.Create("Corgi.png", new Uri("http://corgi.xyz/gogo.png"));
-            IDictionary<string, object> value = ParseEncoderTestClass.Instance.Encode(file1) as IDictionary<string, object>;
+
+            IDictionary<string, object> value = ParseEncoderTestClass.Instance.Encode(file1, Client) as IDictionary<string, object>;
+
             Assert.AreEqual("File", value["__type"]);
             Assert.AreEqual("Corgi.png", value["name"]);
             Assert.AreEqual("http://corgi.xyz/gogo.png", value["url"]);
 
             ParseFile file2 = new ParseFile(null, new MemoryStream(new byte[] { 1, 2, 3, 4 }));
-            Assert.ThrowsException<InvalidOperationException>(() => ParseEncoderTestClass.Instance.Encode(file2));
+
+            Assert.ThrowsException<InvalidOperationException>(() => ParseEncoderTestClass.Instance.Encode(file2, Client));
         }
 
         [TestMethod]
         public void TestEncodeParseGeoPoint()
         {
             ParseGeoPoint point = new ParseGeoPoint(3.22, 32.2);
-            IDictionary<string, object> value = ParseEncoderTestClass.Instance.Encode(point) as IDictionary<string, object>;
+
+            IDictionary<string, object> value = ParseEncoderTestClass.Instance.Encode(point, Client) as IDictionary<string, object>;
+
             Assert.AreEqual("GeoPoint", value["__type"]);
             Assert.AreEqual(3.22, value["latitude"]);
             Assert.AreEqual(32.2, value["longitude"]);
@@ -109,7 +121,9 @@ public void TestEncodeParseGeoPoint()
         public void TestEncodeACL()
         {
             ParseACL acl1 = new ParseACL();
-            IDictionary<string, object> value1 = ParseEncoderTestClass.Instance.Encode(acl1) as IDictionary<string, object>;
+
+            IDictionary<string, object> value1 = ParseEncoderTestClass.Instance.Encode(acl1, Client) as IDictionary<string, object>;
+
             Assert.IsNotNull(value1);
             Assert.AreEqual(0, value1.Keys.Count);
 
@@ -118,7 +132,9 @@ public void TestEncodeACL()
                 PublicReadAccess = true,
                 PublicWriteAccess = true
             };
-            IDictionary<string, object> value2 = ParseEncoderTestClass.Instance.Encode(acl2) as IDictionary<string, object>;
+
+            IDictionary<string, object> value2 = ParseEncoderTestClass.Instance.Encode(acl2, Client) as IDictionary<string, object>;
+
             Assert.AreEqual(1, value2.Keys.Count);
             IDictionary<string, object> publicAccess = value2["*"] as IDictionary<string, object>;
             Assert.AreEqual(2, publicAccess.Keys.Count);
@@ -133,7 +149,9 @@ public void TestEncodeParseRelation()
         {
             ParseObject obj = new ParseObject("Corgi");
             ParseRelation<ParseObject> relation = ParseRelationExtensions.Create<ParseObject>(obj, "nano", "Husky");
-            IDictionary<string, object> value = ParseEncoderTestClass.Instance.Encode(relation) as IDictionary<string, object>;
+
+            IDictionary<string, object> value = ParseEncoderTestClass.Instance.Encode(relation, Client) as IDictionary<string, object>;
+
             Assert.AreEqual("Relation", value["__type"]);
             Assert.AreEqual("Husky", value["className"]);
         }
@@ -142,10 +160,13 @@ public void TestEncodeParseRelation()
         public void TestEncodeParseFieldOperation()
         {
             ParseIncrementOperation incOps = new ParseIncrementOperation(1);
-            IDictionary<string, object> value = ParseEncoderTestClass.Instance.Encode(incOps) as IDictionary<string, object>;
+
+            IDictionary<string, object> value = ParseEncoderTestClass.Instance.Encode(incOps, Client) as IDictionary<string, object>;
+
             Assert.AreEqual("Increment", value["__op"]);
             Assert.AreEqual(1, value["amount"]);
-            // Other operations are tested in FieldOperationTests
+
+            // Other operations are tested in FieldOperationTests.
         }
 
         [TestMethod]
@@ -165,7 +186,8 @@ public void TestEncodeList()
                 }
             };
 
-            IList<object> value = ParseEncoderTestClass.Instance.Encode(list) as IList<object>;
+            IList<object> value = ParseEncoderTestClass.Instance.Encode(list, Client) as IList<object>;
+
             IDictionary<string, object> item0 = value[0] as IDictionary<string, object>;
             Assert.AreEqual("GeoPoint", item0["__type"]);
             Assert.AreEqual(0.0, item0["latitude"]);
@@ -193,22 +215,23 @@ public void TestEncodeDictionary()
             IDictionary<string, object> dict = new Dictionary<string, object>()
             {
                 ["item"] = "random",
-                ["list"] = new List<object>() { "vesperia", "abyss", "legendia" },
+                ["list"] = new List<object> { "vesperia", "abyss", "legendia" },
                 ["array"] = new int[] { 1, 2, 3 },
                 ["geo"] = new ParseGeoPoint(0, 0),
                 ["validDict"] = new Dictionary<string, object> { ["phantasia"] = "jbf" }
             };
 
-            IDictionary<string, object> value = ParseEncoderTestClass.Instance.Encode(dict) as IDictionary<string, object>;
+            IDictionary<string, object> value = ParseEncoderTestClass.Instance.Encode(dict, Client) as IDictionary<string, object>;
+
             Assert.AreEqual("random", value["item"]);
             Assert.IsTrue(value["list"] is IList<object>);
             Assert.IsTrue(value["array"] is IList<object>);
             Assert.IsTrue(value["geo"] is IDictionary<string, object>);
             Assert.IsTrue(value["validDict"] is IDictionary<string, object>);
 
-            Assert.ThrowsException<MissingMethodException>(() => ParseEncoderTestClass.Instance.Encode(new Dictionary<object, string> { }));
+            Assert.ThrowsException<MissingMethodException>(() => ParseEncoderTestClass.Instance.Encode(new Dictionary<object, string> { }, Client));
 
-            Assert.ThrowsException<MissingMethodException>(() => ParseEncoderTestClass.Instance.Encode(new Dictionary<string, object> { ["validDict"] = new Dictionary<object, string> { [new ParseACL()] = "jbf" } }));
+            Assert.ThrowsException<MissingMethodException>(() => ParseEncoderTestClass.Instance.Encode(new Dictionary<string, object> { ["validDict"] = new Dictionary<object, string> { [new ParseACL()] = "jbf" } }, Client));
         }
     }
 }
diff --git a/Parse.Test/FileControllerTests.cs b/Parse.Tests/FileControllerTests.cs
similarity index 82%
rename from Parse.Test/FileControllerTests.cs
rename to Parse.Tests/FileControllerTests.cs
index 2d1ac926..8d8ddbd3 100644
--- a/Parse.Test/FileControllerTests.cs
+++ b/Parse.Tests/FileControllerTests.cs
@@ -1,6 +1,3 @@
-using Moq;
-using Parse;
-using Parse.Core.Internal;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -8,16 +5,22 @@
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Infrastructure.Execution;
+using Parse.Platform.Files;
 
-namespace Parse.Test
+namespace Parse.Tests
 {
+#warning Refactor this class.
+#warning Skipped initialization step may be needed.
+
     [TestClass]
     public class FileControllerTests
     {
-        [TestInitialize]
-        public void SetUp() => ParseClient.Initialize(new ParseClient.Configuration { ApplicationID = "", Key = "" });
+        // public void SetUp() => Client = new ParseClient(new ServerConnectionData { ApplicationID = "", Key = "", Test = true });
 
         [TestMethod]
         [AsyncStateMachine(typeof(FileControllerTests))]
@@ -28,7 +31,7 @@ public Task TestFileControllerSaveWithInvalidResult()
             FileState state = new FileState
             {
                 Name = "bekti.png",
-                MimeType = "image/png"
+                MediaType = "image/png"
             };
 
             ParseFileController controller = new ParseFileController(mockRunner.Object);
@@ -44,7 +47,7 @@ public Task TestFileControllerSaveWithEmptyResult()
             FileState state = new FileState
             {
                 Name = "bekti.png",
-                MimeType = "image/png"
+                MediaType = "image/png"
             };
 
             ParseFileController controller = new ParseFileController(mockRunner.Object);
@@ -60,7 +63,7 @@ public Task TestFileControllerSaveWithIncompleteResult()
             FileState state = new FileState
             {
                 Name = "bekti.png",
-                MimeType = "image/png"
+                MediaType = "image/png"
             };
 
             ParseFileController controller = new ParseFileController(mockRunner.Object);
@@ -74,7 +77,7 @@ public Task TestFileControllerSave()
             FileState state = new FileState
             {
                 Name = "bekti.png",
-                MimeType = "image/png"
+                MediaType = "image/png"
             };
 
             return new ParseFileController(CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, new Dictionary<string, object> { ["name"] = "newBekti.png", ["url"] = "https://www.parse.com/newBekti.png" })).Object).SaveAsync(state, dataStream: new MemoryStream(), sessionToken: null, progress: null).ContinueWith(t =>
@@ -82,16 +85,16 @@ public Task TestFileControllerSave()
                 Assert.IsFalse(t.IsFaulted);
                 FileState newState = t.Result;
 
-                Assert.AreEqual(state.MimeType, newState.MimeType);
+                Assert.AreEqual(state.MediaType, newState.MediaType);
                 Assert.AreEqual("newBekti.png", newState.Name);
-                Assert.AreEqual("https://www.parse.com/newBekti.png", newState.Url.AbsoluteUri);
+                Assert.AreEqual("https://www.parse.com/newBekti.png", newState.Location.AbsoluteUri);
             });
         }
 
         private Mock<IParseCommandRunner> CreateMockRunner(Tuple<HttpStatusCode, IDictionary<string, object>> response)
         {
             Mock<IParseCommandRunner> mockRunner = new Mock<IParseCommandRunner>();
-            mockRunner.Setup(obj => obj.RunCommandAsync(It.IsAny<ParseCommand>(), It.IsAny<IProgress<ParseUploadProgressEventArgs>>(), It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response));
+            mockRunner.Setup(obj => obj.RunCommandAsync(It.IsAny<ParseCommand>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response));
 
             return mockRunner;
         }
diff --git a/Parse.Test/FileStateTests.cs b/Parse.Tests/FileStateTests.cs
similarity index 58%
rename from Parse.Test/FileStateTests.cs
rename to Parse.Tests/FileStateTests.cs
index 7b378d11..e624a7da 100644
--- a/Parse.Test/FileStateTests.cs
+++ b/Parse.Tests/FileStateTests.cs
@@ -1,9 +1,8 @@
-using Parse.Core.Internal;
 using System;
-
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Parse.Platform.Files;
 
-namespace Parse.Test
+namespace Parse.Tests
 {
     [TestClass]
     public class FileStateTests
@@ -18,25 +17,25 @@ public void TestSecureUrl()
             FileState state = new FileState
             {
                 Name = "A",
-                Url = unsecureUri,
-                MimeType = null
+                Location = unsecureUri,
+                MediaType = null
             };
 
-            Assert.AreEqual(unsecureUri, state.Url);
-            Assert.AreEqual(secureUri, state.SecureUrl);
+            Assert.AreEqual(unsecureUri, state.Location);
+            Assert.AreEqual(secureUri, state.SecureLocation);
 
             // Make sure the proper port was given back.
-            Assert.AreEqual(443, state.SecureUrl.Port);
+            Assert.AreEqual(443, state.SecureLocation.Port);
 
             state = new FileState
             {
                 Name = "B",
-                Url = randomUri,
-                MimeType = null
+                Location = randomUri,
+                MediaType = null
             };
 
-            Assert.AreEqual(randomUri, state.Url);
-            Assert.AreEqual(randomUri, state.Url);
+            Assert.AreEqual(randomUri, state.Location);
+            Assert.AreEqual(randomUri, state.Location);
         }
     }
 }
diff --git a/Parse.Test/FileTests.cs b/Parse.Tests/FileTests.cs
similarity index 70%
rename from Parse.Test/FileTests.cs
rename to Parse.Tests/FileTests.cs
index 6e287cde..86b1745c 100644
--- a/Parse.Test/FileTests.cs
+++ b/Parse.Tests/FileTests.cs
@@ -1,39 +1,41 @@
-using Moq;
-using Parse;
-using Parse.Core.Internal;
 using System;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Parse.Test
+using Moq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Internal;
+using Parse.Abstractions.Platform.Files;
+using Parse.Abstractions.Platform.Users;
+using Parse.Infrastructure;
+using Parse.Platform.Files;
+
+namespace Parse.Tests
 {
     [TestClass]
     public class FileTests
     {
-        [TestCleanup]
-        public void TearDown() => ParseCorePlugins.Instance = null;
-
         [TestMethod]
         [AsyncStateMachine(typeof(FileTests))]
         public Task TestFileSave()
         {
             Mock<IParseFileController> mockController = new Mock<IParseFileController>();
-            mockController.Setup(obj => obj.SaveAsync(It.IsAny<FileState>(), It.IsAny<Stream>(), It.IsAny<string>(), It.IsAny<IProgress<ParseUploadProgressEventArgs>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(new FileState { Name = "newBekti.png", Url = new Uri("https://www.parse.com/newBekti.png"), MimeType = "image/png" }));
+            mockController.Setup(obj => obj.SaveAsync(It.IsAny<FileState>(), It.IsAny<Stream>(), It.IsAny<string>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(new FileState { Name = "newBekti.png", Location = new Uri("https://www.parse.com/newBekti.png"), MediaType = "image/png" }));
             Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController>();
-            ParseCorePlugins.Instance = new ParseCorePlugins { FileController = mockController.Object, CurrentUserController = mockCurrentUserController.Object };
 
-            ParseFile file = new ParseFile("bekti.jpeg", new MemoryStream(), "image/jpeg");
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, new MutableServiceHub { FileController = mockController.Object, CurrentUserController = mockCurrentUserController.Object });
+
+            ParseFile file = new ParseFile("bekti.jpeg", new MemoryStream { }, "image/jpeg");
+
             Assert.AreEqual("bekti.jpeg", file.Name);
             Assert.AreEqual("image/jpeg", file.MimeType);
             Assert.IsTrue(file.IsDirty);
 
-            return file.SaveAsync().ContinueWith(t =>
+            return file.SaveAsync(client).ContinueWith(task =>
             {
-                Assert.IsFalse(t.IsFaulted);
+                Assert.IsFalse(task.IsFaulted);
                 Assert.AreEqual("newBekti.png", file.Name);
                 Assert.AreEqual("image/png", file.MimeType);
                 Assert.AreEqual("https://www.parse.com/newBekti.png", file.Url.AbsoluteUri);
diff --git a/Parse.Test/GeoPointTests.cs b/Parse.Tests/GeoPointTests.cs
similarity index 83%
rename from Parse.Test/GeoPointTests.cs
rename to Parse.Tests/GeoPointTests.cs
index fef1b8df..a9611042 100644
--- a/Parse.Test/GeoPointTests.cs
+++ b/Parse.Tests/GeoPointTests.cs
@@ -1,32 +1,37 @@
-using Parse;
-using Parse.Common.Internal;
-using Parse.Core.Internal;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Threading;
-
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Parse.Infrastructure;
+using Parse.Infrastructure.Data;
+using Parse.Infrastructure.Utilities;
 
-namespace Parse.Test
+namespace Parse.Tests
 {
     [TestClass]
     public class GeoPointTests
     {
+        ParseClient Client { get; } = new ParseClient(new ServerConnectionData { Test = true });
+
         [TestMethod]
         public void TestGeoPointCultureInvariantParsing()
         {
-            CultureInfo originalCulture = Thread.CurrentThread.CurrentCulture;
-            foreach (CultureInfo c in CultureInfo.GetCultures(CultureTypes.AllCultures))
+            CultureInfo initialCulture = Thread.CurrentThread.CurrentCulture;
+
+            foreach (CultureInfo culture in CultureInfo.GetCultures(CultureTypes.AllCultures))
             {
-                Thread.CurrentThread.CurrentCulture = c;
+                Thread.CurrentThread.CurrentCulture = culture;
+
                 ParseGeoPoint point = new ParseGeoPoint(1.234, 1.234);
-                string serialized = Json.Encode(new Dictionary<string, object> { { "point", NoObjectsEncoder.Instance.Encode(point) } });
-                IDictionary<string, object> deserialized = ParseDecoder.Instance.Decode(Json.Parse(serialized)) as IDictionary<string, object>;
-                ParseGeoPoint pointAgain = (ParseGeoPoint) deserialized["point"];
+                IDictionary<string, object> deserialized = Client.Decoder.Decode(JsonUtilities.Parse(JsonUtilities.Encode(new Dictionary<string, object> { [nameof(point)] = NoObjectsEncoder.Instance.Encode(point, Client) })), Client) as IDictionary<string, object>;
+                ParseGeoPoint pointAgain = (ParseGeoPoint) deserialized[nameof(point)];
+
                 Assert.AreEqual(1.234, pointAgain.Latitude);
                 Assert.AreEqual(1.234, pointAgain.Longitude);
             }
+
+            Thread.CurrentThread.CurrentCulture = initialCulture;
         }
 
         [TestMethod]
@@ -37,11 +42,13 @@ public void TestGeoPointConstructor()
             Assert.AreEqual(0.0, point.Longitude);
 
             point = new ParseGeoPoint(42, 36);
+
             Assert.AreEqual(42.0, point.Latitude);
             Assert.AreEqual(36.0, point.Longitude);
 
             point.Latitude = 12;
             point.Longitude = 24;
+
             Assert.AreEqual(12.0, point.Latitude);
             Assert.AreEqual(24.0, point.Longitude);
         }
diff --git a/Parse.Test/InstallationIdControllerTests.cs b/Parse.Tests/InstallationIdControllerTests.cs
similarity index 79%
rename from Parse.Test/InstallationIdControllerTests.cs
rename to Parse.Tests/InstallationIdControllerTests.cs
index e467486e..99dc0d66 100644
--- a/Parse.Test/InstallationIdControllerTests.cs
+++ b/Parse.Tests/InstallationIdControllerTests.cs
@@ -1,27 +1,32 @@
-using Moq;
-using Parse.Common.Internal;
-using Parse.Core.Internal;
 using System;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
-
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Parse.Infrastructure;
+using Parse.Abstractions.Infrastructure;
+using Parse.Platform.Installations;
 
-namespace Parse.Test
+namespace Parse.Tests
 {
+#warning Class refactoring may be required.
+
     [TestClass]
     public class InstallationIdControllerTests
     {
+        ParseClient Client { get; } = new ParseClient(new ServerConnectionData { Test = true });
+
         [TestCleanup]
-        public void TearDown() => ParseCorePlugins.Instance = null;
+        public void TearDown() => (Client.Services as ServiceHub).Reset();
 
         [TestMethod]
         public void TestConstructor()
         {
-            Mock<IStorageController> storageMock = new Mock<IStorageController>(MockBehavior.Strict);
-            InstallationIdController controller = new InstallationIdController(storageMock.Object);
+            Mock<ICacheController> storageMock = new Mock<ICacheController>(MockBehavior.Strict);
+            ParseInstallationController controller = new ParseInstallationController(storageMock.Object);
 
             // Make sure it didn't touch storageMock.
+
             storageMock.Verify();
         }
 
@@ -29,12 +34,12 @@ public void TestConstructor()
         [AsyncStateMachine(typeof(InstallationIdControllerTests))]
         public Task TestGet()
         {
-            Mock<IStorageController> storageMock = new Mock<IStorageController>(MockBehavior.Strict);
-            Mock<IStorageDictionary<string, object>> storageDictionary = new Mock<IStorageDictionary<string, object>>();
+            Mock<ICacheController> storageMock = new Mock<ICacheController>(MockBehavior.Strict);
+            Mock<IDataCache<string, object>> storageDictionary = new Mock<IDataCache<string, object>>();
 
             storageMock.Setup(s => s.LoadAsync()).Returns(Task.FromResult(storageDictionary.Object));
 
-            InstallationIdController controller = new InstallationIdController(storageMock.Object);
+            ParseInstallationController controller = new ParseInstallationController(storageMock.Object);
             return controller.GetAsync().ContinueWith(installationIdTask =>
             {
                 Assert.IsFalse(installationIdTask.IsFaulted);
@@ -76,12 +81,12 @@ public Task TestGet()
         [AsyncStateMachine(typeof(InstallationIdControllerTests))]
         public Task TestSet()
         {
-            Mock<IStorageController> storageMock = new Mock<IStorageController>(MockBehavior.Strict);
-            Mock<IStorageDictionary<string, object>> storageDictionary = new Mock<IStorageDictionary<string, object>>();
+            Mock<ICacheController> storageMock = new Mock<ICacheController>(MockBehavior.Strict);
+            Mock<IDataCache<string, object>> storageDictionary = new Mock<IDataCache<string, object>>();
 
             storageMock.Setup(s => s.LoadAsync()).Returns(Task.FromResult(storageDictionary.Object));
 
-            InstallationIdController controller = new InstallationIdController(storageMock.Object);
+            ParseInstallationController controller = new ParseInstallationController(storageMock.Object);
 
             return controller.GetAsync().ContinueWith(installationIdTask =>
             {
diff --git a/Parse.Test/InstallationTests.cs b/Parse.Tests/InstallationTests.cs
similarity index 55%
rename from Parse.Test/InstallationTests.cs
rename to Parse.Tests/InstallationTests.cs
index 9ef3c89a..88516ec5 100644
--- a/Parse.Test/InstallationTests.cs
+++ b/Parse.Tests/InstallationTests.cs
@@ -1,38 +1,42 @@
-using Moq;
-using Parse;
-using Parse.Core.Internal;
-using Parse.Push.Internal;
 using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Installations;
+using Parse.Infrastructure;
+using Parse.Platform.Objects;
 
-namespace Parse.Test
+namespace Parse.Tests
 {
     [TestClass]
     public class InstallationTests
     {
+        ParseClient Client { get; } = new ParseClient(new ServerConnectionData { Test = true });
+
         [TestInitialize]
-        public void SetUp() => ParseObject.RegisterSubclass<ParseInstallation>();
+        public void SetUp() => Client.AddValidClass<ParseInstallation>();
 
         [TestCleanup]
-        public void TearDown() => ParseCorePlugins.Instance = null;
+        public void TearDown() => (Client.Services as ServiceHub).Reset();
 
         [TestMethod]
-        public void TestGetInstallationQuery() => Assert.IsInstanceOfType(ParseInstallation.Query, typeof(ParseQuery<ParseInstallation>));
+        public void TestGetInstallationQuery() => Assert.IsInstanceOfType(Client.GetInstallationQuery(), typeof(ParseQuery<ParseInstallation>));
 
         [TestMethod]
         public void TestInstallationIdGetterSetter()
         {
             Guid guid = Guid.NewGuid();
-            ParseInstallation installation = ParseObjectExtensions.FromState<ParseInstallation>(new MutableObjectState { ServerData = new Dictionary<string, object> { ["installationId"] = guid.ToString() } }, "_Installation");
+            ParseInstallation installation = Client.GenerateObjectFromState<ParseInstallation>(new MutableObjectState { ServerData = new Dictionary<string, object> { ["installationId"] = guid.ToString() } }, "_Installation");
+
             Assert.IsNotNull(installation);
             Assert.AreEqual(guid, installation.InstallationId);
 
             Guid newGuid = Guid.NewGuid();
             Assert.ThrowsException<InvalidOperationException>(() => installation["installationId"] = newGuid);
+
             installation.SetIfDifferent("installationId", newGuid.ToString());
             Assert.AreEqual(newGuid, installation.InstallationId);
         }
@@ -40,11 +44,13 @@ public void TestInstallationIdGetterSetter()
         [TestMethod]
         public void TestDeviceTypeGetterSetter()
         {
-            ParseInstallation installation = ParseObjectExtensions.FromState<ParseInstallation>(new MutableObjectState { ServerData = new Dictionary<string, object> { ["deviceType"] = "parseOS" } }, "_Installation");
+            ParseInstallation installation = Client.GenerateObjectFromState<ParseInstallation>(new MutableObjectState { ServerData = new Dictionary<string, object> { ["deviceType"] = "parseOS" } }, "_Installation");
+
             Assert.IsNotNull(installation);
             Assert.AreEqual("parseOS", installation.DeviceType);
 
             Assert.ThrowsException<InvalidOperationException>(() => installation["deviceType"] = "gogoOS");
+
             installation.SetIfDifferent("deviceType", "gogoOS");
             Assert.AreEqual("gogoOS", installation.DeviceType);
         }
@@ -52,11 +58,13 @@ public void TestDeviceTypeGetterSetter()
         [TestMethod]
         public void TestAppNameGetterSetter()
         {
-            ParseInstallation installation = ParseObjectExtensions.FromState<ParseInstallation>(new MutableObjectState { ServerData = new Dictionary<string, object> { ["appName"] = "parseApp" } }, "_Installation");
+            ParseInstallation installation = Client.GenerateObjectFromState<ParseInstallation>(new MutableObjectState { ServerData = new Dictionary<string, object> { ["appName"] = "parseApp" } }, "_Installation");
+
             Assert.IsNotNull(installation);
             Assert.AreEqual("parseApp", installation.AppName);
 
             Assert.ThrowsException<InvalidOperationException>(() => installation["appName"] = "gogoApp");
+
             installation.SetIfDifferent("appName", "gogoApp");
             Assert.AreEqual("gogoApp", installation.AppName);
         }
@@ -64,11 +72,13 @@ public void TestAppNameGetterSetter()
         [TestMethod]
         public void TestAppVersionGetterSetter()
         {
-            ParseInstallation installation = ParseObjectExtensions.FromState<ParseInstallation>(new MutableObjectState { ServerData = new Dictionary<string, object> { ["appVersion"] = "1.2.3" } }, "_Installation");
+            ParseInstallation installation = Client.GenerateObjectFromState<ParseInstallation>(new MutableObjectState { ServerData = new Dictionary<string, object> { ["appVersion"] = "1.2.3" } }, "_Installation");
+
             Assert.IsNotNull(installation);
             Assert.AreEqual("1.2.3", installation.AppVersion);
 
             Assert.ThrowsException<InvalidOperationException>(() => installation["appVersion"] = "1.2.4");
+
             installation.SetIfDifferent("appVersion", "1.2.4");
             Assert.AreEqual("1.2.4", installation.AppVersion);
         }
@@ -76,11 +86,13 @@ public void TestAppVersionGetterSetter()
         [TestMethod]
         public void TestAppIdentifierGetterSetter()
         {
-            ParseInstallation installation = ParseObjectExtensions.FromState<ParseInstallation>(new MutableObjectState { ServerData = new Dictionary<string, object> { ["appIdentifier"] = "com.parse.app" } }, "_Installation");
+            ParseInstallation installation = Client.GenerateObjectFromState<ParseInstallation>(new MutableObjectState { ServerData = new Dictionary<string, object> { ["appIdentifier"] = "com.parse.app" } }, "_Installation");
+
             Assert.IsNotNull(installation);
             Assert.AreEqual("com.parse.app", installation.AppIdentifier);
 
             Assert.ThrowsException<InvalidOperationException>(() => installation["appIdentifier"] = "com.parse.newapp");
+
             installation.SetIfDifferent("appIdentifier", "com.parse.newapp");
             Assert.AreEqual("com.parse.newapp", installation.AppIdentifier);
         }
@@ -88,7 +100,8 @@ public void TestAppIdentifierGetterSetter()
         [TestMethod]
         public void TestTimeZoneGetter()
         {
-            ParseInstallation installation = ParseObjectExtensions.FromState<ParseInstallation>(new MutableObjectState { ServerData = new Dictionary<string, object> { ["timeZone"] = "America/Los_Angeles" } }, "_Installation");
+            ParseInstallation installation = Client.GenerateObjectFromState<ParseInstallation>(new MutableObjectState { ServerData = new Dictionary<string, object> { ["timeZone"] = "America/Los_Angeles" } }, "_Installation");
+
             Assert.IsNotNull(installation);
             Assert.AreEqual("America/Los_Angeles", installation.TimeZone);
         }
@@ -96,7 +109,8 @@ public void TestTimeZoneGetter()
         [TestMethod]
         public void TestLocaleIdentifierGetter()
         {
-            ParseInstallation installation = ParseObjectExtensions.FromState<ParseInstallation>(new MutableObjectState { ServerData = new Dictionary<string, object> { ["localeIdentifier"] = "en-US" } }, "_Installation");
+            ParseInstallation installation = Client.GenerateObjectFromState<ParseInstallation>(new MutableObjectState { ServerData = new Dictionary<string, object> { ["localeIdentifier"] = "en-US" } }, "_Installation");
+
             Assert.IsNotNull(installation);
             Assert.AreEqual("en-US", installation.LocaleIdentifier);
         }
@@ -104,12 +118,14 @@ public void TestLocaleIdentifierGetter()
         [TestMethod]
         public void TestChannelGetterSetter()
         {
-            ParseInstallation installation = ParseObjectExtensions.FromState<ParseInstallation>(new MutableObjectState { ServerData = new Dictionary<string, object> { ["channels"] = new List<string> { "the", "richard" } } }, "_Installation");
+            ParseInstallation installation = Client.GenerateObjectFromState<ParseInstallation>(new MutableObjectState { ServerData = new Dictionary<string, object> { ["channels"] = new List<string> { "the", "richard" } } }, "_Installation");
+
             Assert.IsNotNull(installation);
             Assert.AreEqual("the", installation.Channels[0]);
             Assert.AreEqual("richard", installation.Channels[1]);
 
-            installation.Channels = new List<string>() { "mr", "kevin" };
+            installation.Channels = new List<string> { "mr", "kevin" };
+
             Assert.AreEqual("mr", installation.Channels[0]);
             Assert.AreEqual("kevin", installation.Channels[1]);
         }
@@ -117,14 +133,20 @@ public void TestChannelGetterSetter()
         [TestMethod]
         public void TestGetCurrentInstallation()
         {
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
             Guid guid = Guid.NewGuid();
-            ParseInstallation installation = ParseObjectExtensions.FromState<ParseInstallation>(new MutableObjectState { ServerData = new Dictionary<string, object> { ["installationId"] = guid.ToString() } }, "_Installation");
+
+            ParseInstallation installation = client.GenerateObjectFromState<ParseInstallation>(new MutableObjectState { ServerData = new Dictionary<string, object> { ["installationId"] = guid.ToString() } }, "_Installation");
+
             Mock<IParseCurrentInstallationController> mockController = new Mock<IParseCurrentInstallationController>();
-            mockController.Setup(obj => obj.GetAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(installation));
+            mockController.Setup(obj => obj.GetAsync(It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(installation));
+
+            hub.CurrentInstallationController = mockController.Object;
 
-            ParsePushPlugins.Instance = new ParsePushPlugins { CurrentInstallationController = mockController.Object };
+            ParseInstallation currentInstallation = client.GetCurrentInstallation();
 
-            ParseInstallation currentInstallation = ParseInstallation.CurrentInstallation;
             Assert.IsNotNull(currentInstallation);
             Assert.AreEqual(guid, currentInstallation.InstallationId);
         }
diff --git a/Parse.Test/JsonTests.cs b/Parse.Tests/JsonTests.cs
similarity index 65%
rename from Parse.Test/JsonTests.cs
rename to Parse.Tests/JsonTests.cs
index 1105a7f5..ef67f6e8 100644
--- a/Parse.Test/JsonTests.cs
+++ b/Parse.Tests/JsonTests.cs
@@ -1,89 +1,88 @@
-using Parse.Common.Internal;
 using System;
 using System.Collections;
 using System.Collections.Generic;
-
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Parse.Infrastructure.Utilities;
 
-namespace Parse.Test
+namespace Parse.Tests
 {
     [TestClass]
     public class JsonTests
     {
         [TestMethod]
-        public void TestEmptyJsonStringFail() => Assert.ThrowsException<ArgumentException>(() => Json.Parse(""));
+        public void TestEmptyJsonStringFail() => Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse(""));
 
         [TestMethod]
         public void TestInvalidJsonStringAsRootFail()
         {
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("\n"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("a"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("abc"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("\u1234"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("\t"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("\t\n\r"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("   "));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("1234"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("1,3"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("{1"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("3}"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("}"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("\n"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("a"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("abc"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("\u1234"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("\t"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("\t\n\r"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("   "));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("1234"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("1,3"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("{1"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("3}"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("}"));
         }
 
         [TestMethod]
-        public void TestEmptyJsonObject() => Assert.IsTrue(Json.Parse("{}") is IDictionary);
+        public void TestEmptyJsonObject() => Assert.IsTrue(JsonUtilities.Parse("{}") is IDictionary);
 
         [TestMethod]
-        public void TestEmptyJsonArray() => Assert.IsTrue(Json.Parse("[]") is IList);
+        public void TestEmptyJsonArray() => Assert.IsTrue(JsonUtilities.Parse("[]") is IList);
 
         [TestMethod]
         public void TestOneJsonObject()
         {
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("{ 1 }"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("{ 1 : 1 }"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("{ 1 : \"abc\" }"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("{ 1 }"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("{ 1 : 1 }"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("{ 1 : \"abc\" }"));
 
-            object parsed = Json.Parse("{\"abc\" : \"def\"}");
+            object parsed = JsonUtilities.Parse("{\"abc\" : \"def\"}");
             Assert.IsTrue(parsed is IDictionary);
             IDictionary parsedDict = parsed as IDictionary;
             Assert.AreEqual("def", parsedDict["abc"]);
 
-            parsed = Json.Parse("{\"abc\" : {} }");
+            parsed = JsonUtilities.Parse("{\"abc\" : {} }");
             Assert.IsTrue(parsed is IDictionary);
             parsedDict = parsed as IDictionary;
             Assert.IsTrue(parsedDict["abc"] is IDictionary);
 
-            parsed = Json.Parse("{\"abc\" : \"6060\"}");
+            parsed = JsonUtilities.Parse("{\"abc\" : \"6060\"}");
             Assert.IsTrue(parsed is IDictionary);
             parsedDict = parsed as IDictionary;
             Assert.AreEqual("6060", parsedDict["abc"]);
 
-            parsed = Json.Parse("{\"\" : \"\"}");
+            parsed = JsonUtilities.Parse("{\"\" : \"\"}");
             Assert.IsTrue(parsed is IDictionary);
             parsedDict = parsed as IDictionary;
             Assert.AreEqual("", parsedDict[""]);
 
-            parsed = Json.Parse("{\" abc\" : \"def \"}");
+            parsed = JsonUtilities.Parse("{\" abc\" : \"def \"}");
             Assert.IsTrue(parsed is IDictionary);
             parsedDict = parsed as IDictionary;
             Assert.AreEqual("def ", parsedDict[" abc"]);
 
-            parsed = Json.Parse("{\"1\" : 6060}");
+            parsed = JsonUtilities.Parse("{\"1\" : 6060}");
             Assert.IsTrue(parsed is IDictionary);
             parsedDict = parsed as IDictionary;
             Assert.AreEqual((long) 6060, parsedDict["1"]);
 
-            parsed = Json.Parse("{\"1\" : null}");
+            parsed = JsonUtilities.Parse("{\"1\" : null}");
             Assert.IsTrue(parsed is IDictionary);
             parsedDict = parsed as IDictionary;
             Assert.IsNull(parsedDict["1"]);
 
-            parsed = Json.Parse("{\"1\" : true}");
+            parsed = JsonUtilities.Parse("{\"1\" : true}");
             Assert.IsTrue(parsed is IDictionary);
             parsedDict = parsed as IDictionary;
             Assert.IsTrue((bool) parsedDict["1"]);
 
-            parsed = Json.Parse("{\"1\" : false}");
+            parsed = JsonUtilities.Parse("{\"1\" : false}");
             Assert.IsTrue(parsed is IDictionary);
             parsedDict = parsed as IDictionary;
             Assert.IsFalse((bool) parsedDict["1"]);
@@ -92,37 +91,37 @@ public void TestOneJsonObject()
         [TestMethod]
         public void TestMultipleJsonObjectAsRootFail()
         {
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("{},"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("{\"abc\" : \"def\"},"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("{\"abc\" : \"def\" \"def\"}"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("{}, {}"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("{},\n{}"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("{},"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("{\"abc\" : \"def\"},"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("{\"abc\" : \"def\" \"def\"}"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("{}, {}"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("{},\n{}"));
         }
 
         [TestMethod]
         public void TestOneJsonArray()
         {
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("[ 1 : 1 ]"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("[ 1 1 ]"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("[ 1 : \"1\" ]"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("[ \"1\" : \"1\" ]"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("[ 1 : 1 ]"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("[ 1 1 ]"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("[ 1 : \"1\" ]"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("[ \"1\" : \"1\" ]"));
 
-            object parsed = Json.Parse("[ 1 ]");
+            object parsed = JsonUtilities.Parse("[ 1 ]");
             Assert.IsTrue(parsed is IList);
             IList parsedList = parsed as IList;
             Assert.AreEqual((long) 1, parsedList[0]);
 
-            parsed = Json.Parse("[ \n ]");
+            parsed = JsonUtilities.Parse("[ \n ]");
             Assert.IsTrue(parsed is IList);
             parsedList = parsed as IList;
             Assert.AreEqual(0, parsedList.Count);
 
-            parsed = Json.Parse("[ \"asdf\" ]");
+            parsed = JsonUtilities.Parse("[ \"asdf\" ]");
             Assert.IsTrue(parsed is IList);
             parsedList = parsed as IList;
             Assert.AreEqual("asdf", parsedList[0]);
 
-            parsed = Json.Parse("[ \"\u849c\" ]");
+            parsed = JsonUtilities.Parse("[ \"\u849c\" ]");
             Assert.IsTrue(parsed is IList);
             parsedList = parsed as IList;
             Assert.AreEqual("\u849c", parsedList[0]);
@@ -131,25 +130,25 @@ public void TestOneJsonArray()
         [TestMethod]
         public void TestMultipleJsonArrayAsRootFail()
         {
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("[],"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("[\"abc\" : \"def\"],"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("[], []"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("[],\n[]"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("[],"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("[\"abc\" : \"def\"],"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("[], []"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("[],\n[]"));
         }
 
         [TestMethod]
         public void TestJsonArrayInsideJsonObject()
         {
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("{ [] }"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("{ [], [] }"));
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("{ \"abc\": [], [] }"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("{ [] }"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("{ [], [] }"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("{ \"abc\": [], [] }"));
 
-            object parsed = Json.Parse("{ \"abc\": [] }");
+            object parsed = JsonUtilities.Parse("{ \"abc\": [] }");
             Assert.IsTrue(parsed is IDictionary);
             IDictionary parsedDict = parsed as IDictionary;
             Assert.IsTrue(parsedDict["abc"] is IList);
 
-            parsed = Json.Parse("{ \"6060\" :\n[ 6060 ]\t}");
+            parsed = JsonUtilities.Parse("{ \"6060\" :\n[ 6060 ]\t}");
             Assert.IsTrue(parsed is IDictionary);
             parsedDict = parsed as IDictionary;
             Assert.IsTrue(parsedDict["6060"] is IList);
@@ -160,15 +159,15 @@ public void TestJsonArrayInsideJsonObject()
         [TestMethod]
         public void TestJsonObjectInsideJsonArray()
         {
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("[ {} : {} ]"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("[ {} : {} ]"));
 
             // whitespace test
-            object parsed = Json.Parse("[\t\n{}\r\t]");
+            object parsed = JsonUtilities.Parse("[\t\n{}\r\t]");
             Assert.IsTrue(parsed is IList);
             IList parsedList = parsed as IList;
             Assert.IsTrue(parsedList[0] is IDictionary);
 
-            parsed = Json.Parse("[ {}, { \"final\" : \"fantasy\"} ]");
+            parsed = JsonUtilities.Parse("[ {}, { \"final\" : \"fantasy\"} ]");
             Assert.IsTrue(parsed is IList);
             parsedList = parsed as IList;
             Assert.IsTrue(parsedList[0] is IDictionary);
@@ -182,11 +181,11 @@ public void TestJsonObjectWithElements()
         {
             // Just make sure they don't throw exception as we already check their content correctness
             // in other unit tests.
-            Json.Parse("{ \"mura\": \"masa\" }");
-            Json.Parse("{ \"mura\": 1234 }");
-            Json.Parse("{ \"mura\": { \"masa\": 1234 } }");
-            Json.Parse("{ \"mura\": { \"masa\": [ 1234 ] } }");
-            Json.Parse("{ \"mura\": { \"masa\": [ 1234 ] }, \"arr\": [] }");
+            JsonUtilities.Parse("{ \"mura\": \"masa\" }");
+            JsonUtilities.Parse("{ \"mura\": 1234 }");
+            JsonUtilities.Parse("{ \"mura\": { \"masa\": 1234 } }");
+            JsonUtilities.Parse("{ \"mura\": { \"masa\": [ 1234 ] } }");
+            JsonUtilities.Parse("{ \"mura\": { \"masa\": [ 1234 ] }, \"arr\": [] }");
         }
 
         [TestMethod]
@@ -194,59 +193,62 @@ public void TestJsonArrayWithElements()
         {
             // Just make sure they don't throw exception as we already check their content correctness
             // in other unit tests.
-            Json.Parse("[ \"mura\" ]");
-            Json.Parse("[ \"\u1234\" ]");
-            Json.Parse("[ \"\u1234ff\", \"\u1234\" ]");
-            Json.Parse("[ [], [], [], [] ]");
-            Json.Parse("[ [], [ {}, {} ], [ {} ], [] ]");
+            JsonUtilities.Parse("[ \"mura\" ]");
+            JsonUtilities.Parse("[ \"\u1234\" ]");
+            JsonUtilities.Parse("[ \"\u1234ff\", \"\u1234\" ]");
+            JsonUtilities.Parse("[ [], [], [], [] ]");
+            JsonUtilities.Parse("[ [], [ {}, {} ], [ {} ], [] ]");
         }
 
         [TestMethod]
         public void TestEncodeJson()
         {
             Dictionary<string, object> dict = new Dictionary<string, object>();
-            string encoded = Json.Encode(dict);
+            string encoded = JsonUtilities.Encode(dict);
             Assert.AreEqual("{}", encoded);
 
             List<object> list = new List<object>();
-            encoded = Json.Encode(list);
+            encoded = JsonUtilities.Encode(list);
             Assert.AreEqual("[]", encoded);
 
             Dictionary<string, object> dictChild = new Dictionary<string, object>();
             list.Add(dictChild);
-            encoded = Json.Encode(list);
+            encoded = JsonUtilities.Encode(list);
             Assert.AreEqual("[{}]", encoded);
 
             list.Add("1234          a\t\r\n");
             list.Add(1234);
             list.Add(12.34);
             list.Add(1.23456789123456789);
-            encoded = Json.Encode(list);
-            Assert.AreEqual("[{},\"1234          a\\t\\r\\n\",1234,12.34,1.23456789123457]", encoded);
+            encoded = JsonUtilities.Encode(list);
+
+            // This string should be [{},\"1234          a\\t\\r\\n\",1234,12.34,1.23456789123457] for .NET Framework (https://github.com/dotnet/runtime/issues/31483).
+
+            Assert.AreEqual("[{},\"1234          a\\t\\r\\n\",1234,12.34,1.234567891234568]", encoded);
 
             dict["arr"] = new List<object>();
-            encoded = Json.Encode(dict);
+            encoded = JsonUtilities.Encode(dict);
             Assert.AreEqual("{\"arr\":[]}", encoded);
 
             dict["\u1234"] = "\u1234";
-            encoded = Json.Encode(dict);
+            encoded = JsonUtilities.Encode(dict);
             Assert.AreEqual("{\"arr\":[],\"\u1234\":\"\u1234\"}", encoded);
 
-            encoded = Json.Encode(new List<object> { true, false, null });
+            encoded = JsonUtilities.Encode(new List<object> { true, false, null });
             Assert.AreEqual("[true,false,null]", encoded);
         }
 
         [TestMethod]
         public void TestSpecialJsonNumbersAndModifiers()
         {
-            Assert.ThrowsException<ArgumentException>(() => Json.Parse("+123456789"));
+            Assert.ThrowsException<ArgumentException>(() => JsonUtilities.Parse("+123456789"));
 
-            Json.Parse("{ \"mura\": -123456789123456789 }");
-            Json.Parse("{ \"mura\": 1.1234567891234567E308 }");
-            Json.Parse("{ \"PI\": 3.141e-10 }");
-            Json.Parse("{ \"PI\": 3.141E-10 }");
+            JsonUtilities.Parse("{ \"mura\": -123456789123456789 }");
+            JsonUtilities.Parse("{ \"mura\": 1.1234567891234567E308 }");
+            JsonUtilities.Parse("{ \"PI\": 3.141e-10 }");
+            JsonUtilities.Parse("{ \"PI\": 3.141E-10 }");
 
-            Assert.AreEqual(123456789123456789, (Json.Parse("{ \"mura\": 123456789123456789 }") as IDictionary)["mura"]);
+            Assert.AreEqual(123456789123456789, (JsonUtilities.Parse("{ \"mura\": 123456789123456789 }") as IDictionary)["mura"]);
         }
     }
 }
diff --git a/Parse.Tests/LateInitializerTests.cs b/Parse.Tests/LateInitializerTests.cs
new file mode 100644
index 00000000..e4e51436
--- /dev/null
+++ b/Parse.Tests/LateInitializerTests.cs
@@ -0,0 +1,40 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse.Tests
+{
+    // TODO: Add more tests.
+
+    [TestClass]
+    public class LateInitializerTests
+    {
+        LateInitializer LateInitializer { get; } = new LateInitializer { };
+
+        [TestInitialize]
+        public void Clear() => LateInitializer.Reset();
+
+        [DataTestMethod, DataRow("Bruh", "Hello"), DataRow("Cheese", ""), DataRow("", "Waffle"), DataRow("Toaster", "Toad"), DataRow(default, "Duck"), DataRow("Dork", default)]
+        public void TestAlteredValueGetValuePostGenerationCall(string initialValue, string finalValue)
+        {
+            string GetValue() => LateInitializer.GetValue(() => initialValue);
+            bool SetValue() => LateInitializer.SetValue(finalValue);
+
+            Assert.AreEqual(initialValue, GetValue());
+
+            Assert.IsTrue(SetValue());
+            Assert.AreNotEqual(initialValue, GetValue());
+            Assert.AreEqual(finalValue, GetValue());
+        }
+
+        [DataTestMethod, DataRow("Bruh", "Hello"), DataRow("Cheese", ""), DataRow("", "Waffle"), DataRow("Toaster", "Toad"), DataRow(default, "Duck"), DataRow("Dork", default)]
+        public void TestInitialGetValueCallPostSetValueCall(string initialValue, string finalValue)
+        {
+            string GetValue() => LateInitializer.GetValue(() => finalValue);
+            bool SetValue() => LateInitializer.SetValue(initialValue);
+
+            Assert.IsTrue(SetValue());
+            Assert.AreNotEqual(finalValue, GetValue());
+            Assert.AreEqual(initialValue, GetValue());
+        }
+    }
+}
diff --git a/Parse.Test/MoqExtensions.cs b/Parse.Tests/MoqExtensions.cs
similarity index 94%
rename from Parse.Test/MoqExtensions.cs
rename to Parse.Tests/MoqExtensions.cs
index f9569e79..abd9a606 100644
--- a/Parse.Test/MoqExtensions.cs
+++ b/Parse.Tests/MoqExtensions.cs
@@ -1,8 +1,8 @@
-using Moq.Language;
+using System.Reflection;
+using Moq.Language;
 using Moq.Language.Flow;
-using System.Reflection;
 
-namespace Parse.Test
+namespace Parse.Tests
 {
     // MIT licensed, w/ attribution:
     // http://stackoverflow.com/a/19598345/427309
diff --git a/Parse.Test/ObjectCoderTests.cs b/Parse.Tests/ObjectCoderTests.cs
similarity index 82%
rename from Parse.Test/ObjectCoderTests.cs
rename to Parse.Tests/ObjectCoderTests.cs
index 488f8216..fb2d0e45 100644
--- a/Parse.Test/ObjectCoderTests.cs
+++ b/Parse.Tests/ObjectCoderTests.cs
@@ -1,16 +1,10 @@
-using System.Xml.XPath;
-using System.Linq;
-using System.Diagnostics;
-using Castle.DynamicProxy.Generators.Emitters;
-using Parse.Core.Internal;
-using System;
 using System.Collections.Generic;
-using System.Text;
-using Parse;
-
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Parse.Infrastructure;
+using Parse.Infrastructure.Data;
+using Parse.Platform.Objects;
 
-namespace Parse.Test
+namespace Parse.Tests
 {
     [TestClass]
     public class ObjectCoderTests
@@ -29,9 +23,10 @@ public void TestACLCoding()
                     },
                     ["*"] = new Dictionary<string, object> { ["read"] = true }
                 }
-            }, null);
+            }, default, new ServiceHub { });
+
+            ParseACL resultACL = default;
 
-            ParseACL resultACL = null;
             Assert.IsTrue(state.ContainsKey("ACL"));
             Assert.IsTrue((resultACL = state.ServerData["ACL"] as ParseACL) is ParseACL);
             Assert.IsTrue(resultACL.PublicReadAccess);
diff --git a/Parse.Test/ObjectControllerTests.cs b/Parse.Tests/ObjectControllerTests.cs
similarity index 69%
rename from Parse.Test/ObjectControllerTests.cs
rename to Parse.Tests/ObjectControllerTests.cs
index 3ed4f4b9..d56da4da 100644
--- a/Parse.Test/ObjectControllerTests.cs
+++ b/Parse.Tests/ObjectControllerTests.cs
@@ -1,6 +1,3 @@
-using Moq;
-using Parse;
-using Parse.Core.Internal;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,16 +5,27 @@
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Parse.Test
+using Moq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Control;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Infrastructure;
+using Parse.Infrastructure.Execution;
+using Parse.Platform.Objects;
+
+namespace Parse.Tests
 {
+#warning Finish refactoring.
+
     [TestClass]
     public class ObjectControllerTests
     {
+        ParseClient Client { get; set; }
+
         [TestInitialize]
-        public void SetUp() => ParseClient.Initialize(new ParseClient.Configuration { ApplicationID = "", Key = "" });
+        public void SetUp() => Client = new ParseClient(new ServerConnectionData { ApplicationID = "", Key = "", Test = true });
 
         [TestMethod]
         [AsyncStateMachine(typeof(ObjectControllerTests))]
@@ -25,14 +33,14 @@ public Task TestFetch()
         {
             Mock<IParseCommandRunner> mockRunner = CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, new Dictionary<string, object> { ["__type"] = "Object", ["className"] = "Corgi", ["objectId"] = "st4nl3yW", ["doge"] = "isShibaInu", ["createdAt"] = "2015-09-18T18:11:28.943Z" }));
 
-            return new ParseObjectController(mockRunner.Object).FetchAsync(new MutableObjectState { ClassName = "Corgi", ObjectId = "st4nl3yW", ServerData = new Dictionary<string, object> { ["corgi"] = "isNotDoge" } }, null, CancellationToken.None).ContinueWith(t =>
+            return new ParseObjectController(mockRunner.Object, Client.Decoder, Client.ServerConnectionData).FetchAsync(new MutableObjectState { ClassName = "Corgi", ObjectId = "st4nl3yW", ServerData = new Dictionary<string, object> { ["corgi"] = "isNotDoge" } }, default, Client, CancellationToken.None).ContinueWith(task =>
             {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
 
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Uri.AbsolutePath == "/1/classes/Corgi/st4nl3yW"), It.IsAny<IProgress<ParseUploadProgressEventArgs>>(), It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Path == "classes/Corgi/st4nl3yW"), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
 
-                IObjectState newState = t.Result;
+                IObjectState newState = task.Result;
                 Assert.AreEqual("isShibaInu", newState["doge"]);
                 Assert.IsFalse(newState.ContainsKey("corgi"));
                 Assert.IsNotNull(newState.CreatedAt);
@@ -46,14 +54,14 @@ public Task TestSave()
         {
             Mock<IParseCommandRunner> mockRunner = CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, new Dictionary<string, object> { ["__type"] = "Object", ["className"] = "Corgi", ["objectId"] = "st4nl3yW", ["doge"] = "isShibaInu", ["createdAt"] = "2015-09-18T18:11:28.943Z" }));
 
-            return new ParseObjectController(mockRunner.Object).SaveAsync(new MutableObjectState { ClassName = "Corgi", ObjectId = "st4nl3yW", ServerData = new Dictionary<string, object> { ["corgi"] = "isNotDoge" } }, new Dictionary<string, IParseFieldOperation> { ["gogo"] = new Mock<IParseFieldOperation> { }.Object }, null, CancellationToken.None).ContinueWith(t =>
+            return new ParseObjectController(mockRunner.Object, Client.Decoder, Client.ServerConnectionData).SaveAsync(new MutableObjectState { ClassName = "Corgi", ObjectId = "st4nl3yW", ServerData = new Dictionary<string, object> { ["corgi"] = "isNotDoge" } }, new Dictionary<string, IParseFieldOperation> { ["gogo"] = new Mock<IParseFieldOperation> { }.Object }, default, Client, CancellationToken.None).ContinueWith(task =>
             {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
 
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Uri.AbsolutePath == "/1/classes/Corgi/st4nl3yW"), It.IsAny<IProgress<ParseUploadProgressEventArgs>>(), It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Path == "classes/Corgi/st4nl3yW"), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
 
-                IObjectState newState = t.Result;
+                IObjectState newState = task.Result;
                 Assert.AreEqual("isShibaInu", newState["doge"]);
                 Assert.IsFalse(newState.ContainsKey("corgi"));
                 Assert.IsFalse(newState.ContainsKey("gogo"));
@@ -84,18 +92,15 @@ public Task TestSaveNewObject()
             Tuple<HttpStatusCode, IDictionary<string, object>> response = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Created, responseDict);
             Mock<IParseCommandRunner> mockRunner = CreateMockRunner(response);
 
-            ParseObjectController controller = new ParseObjectController(mockRunner.Object);
-            return controller.SaveAsync(state, operations, null, CancellationToken.None).ContinueWith(t =>
+            ParseObjectController controller = new ParseObjectController(mockRunner.Object, Client.Decoder, Client.ServerConnectionData);
+            return controller.SaveAsync(state, operations, default, Client, CancellationToken.None).ContinueWith(task =>
             {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
 
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Uri.AbsolutePath == "/1/classes/Corgi"),
-                    It.IsAny<IProgress<ParseUploadProgressEventArgs>>(),
-                    It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(),
-                    It.IsAny<CancellationToken>()), Times.Exactly(1));
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Path == "classes/Corgi"), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
 
-                IObjectState newState = t.Result;
+                IObjectState newState = task.Result;
                 Assert.AreEqual("isShibaInu", newState["doge"]);
                 Assert.IsFalse(newState.ContainsKey("corgi"));
                 Assert.IsFalse(newState.ContainsKey("gogo"));
@@ -111,20 +116,26 @@ public Task TestSaveNewObject()
         public Task TestSaveAll()
         {
             List<IObjectState> states = new List<IObjectState>();
+
             for (int i = 0; i < 30; ++i)
             {
                 states.Add(new MutableObjectState
                 {
                     ClassName = "Corgi",
-                    ObjectId = ((i % 2 == 0) ? null : "st4nl3yW" + i),
+                    ObjectId = (i % 2 == 0) ? null : "st4nl3yW" + i,
                     ServerData = new Dictionary<string, object> { ["corgi"] = "isNotDoge" }
                 });
             }
+
             List<IDictionary<string, IParseFieldOperation>> operationsList = new List<IDictionary<string, IParseFieldOperation>>();
+
             for (int i = 0; i < 30; ++i)
+            {
                 operationsList.Add(new Dictionary<string, IParseFieldOperation> { ["gogo"] = new Mock<IParseFieldOperation> { }.Object });
+            }
 
             List<IDictionary<string, object>> results = new List<IDictionary<string, object>>();
+
             for (int i = 0; i < 30; ++i)
             {
                 results.Add(new Dictionary<string, object>
@@ -139,13 +150,14 @@ public Task TestSaveAll()
                     }
                 });
             }
-            Dictionary<string, object> responseDict = new Dictionary<string, object> { ["results"] = results };
+
+            Dictionary<string, object> responseDict = new Dictionary<string, object> { [nameof(results)] = results };
 
             Tuple<HttpStatusCode, IDictionary<string, object>> response = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.OK, responseDict);
             Mock<IParseCommandRunner> mockRunner = CreateMockRunner(response);
 
-            ParseObjectController controller = new ParseObjectController(mockRunner.Object);
-            IList<Task<IObjectState>> tasks = controller.SaveAllAsync(states, operationsList, null, CancellationToken.None);
+            ParseObjectController controller = new ParseObjectController(mockRunner.Object, Client.Decoder, Client.ServerConnectionData);
+            IList<Task<IObjectState>> tasks = controller.SaveAllAsync(states, operationsList, default, Client, CancellationToken.None);
 
             return Task.WhenAll(tasks).ContinueWith(_ =>
             {
@@ -162,10 +174,7 @@ public Task TestSaveAll()
                     Assert.IsNotNull(serverState.UpdatedAt);
                 }
 
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Uri.AbsolutePath == "/1/batch"),
-                    It.IsAny<IProgress<ParseUploadProgressEventArgs>>(),
-                    It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(),
-                    It.IsAny<CancellationToken>()), Times.Exactly(1));
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Path == "batch"), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
             });
         }
 
@@ -180,7 +189,10 @@ public Task TestSaveAllManyObjects()
                 {
                     ClassName = "Corgi",
                     ObjectId = "st4nl3yW" + i,
-                    ServerData = new Dictionary<string, object> { ["corgi"] = "isNotDoge" }
+                    ServerData = new Dictionary<string, object>
+                    {
+                        ["corgi"] = "isNotDoge"
+                    }
                 });
             }
             List<IDictionary<string, IParseFieldOperation>> operationsList = new List<IDictionary<string, IParseFieldOperation>>();
@@ -204,7 +216,7 @@ public Task TestSaveAllManyObjects()
                     }
                 });
             }
-            Dictionary<string, object> responseDict = new Dictionary<string, object> { ["results"] = results };
+            Dictionary<string, object> responseDict = new Dictionary<string, object> { [nameof(results)] = results };
             Tuple<HttpStatusCode, IDictionary<string, object>> response = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.OK, responseDict);
 
             List<IDictionary<string, object>> results2 = new List<IDictionary<string, object>>();
@@ -222,14 +234,14 @@ public Task TestSaveAllManyObjects()
                     }
                 });
             }
-            Dictionary<string, object> responseDict2 = new Dictionary<string, object> { ["results"] = results2 };
+            Dictionary<string, object> responseDict2 = new Dictionary<string, object> { [nameof(results)] = results2 };
             Tuple<HttpStatusCode, IDictionary<string, object>> response2 = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.OK, responseDict2);
 
             Mock<IParseCommandRunner> mockRunner = new Mock<IParseCommandRunner> { };
-            mockRunner.SetupSequence(obj => obj.RunCommandAsync(It.IsAny<ParseCommand>(), It.IsAny<IProgress<ParseUploadProgressEventArgs>>(), It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response)).Returns(Task.FromResult(response)).Returns(Task.FromResult(response2));
+            mockRunner.SetupSequence(obj => obj.RunCommandAsync(It.IsAny<ParseCommand>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response)).Returns(Task.FromResult(response)).Returns(Task.FromResult(response2));
 
-            ParseObjectController controller = new ParseObjectController(mockRunner.Object);
-            IList<Task<IObjectState>> tasks = controller.SaveAllAsync(states, operationsList, null, CancellationToken.None);
+            ParseObjectController controller = new ParseObjectController(mockRunner.Object, Client.Decoder, Client.ServerConnectionData);
+            IList<Task<IObjectState>> tasks = controller.SaveAllAsync(states, operationsList, default, Client, CancellationToken.None);
 
             return Task.WhenAll(tasks).ContinueWith(_ =>
             {
@@ -238,7 +250,7 @@ public Task TestSaveAllManyObjects()
                 for (int i = 0; i < 102; ++i)
                 {
                     IObjectState serverState = tasks[i].Result;
-                    Assert.AreEqual("st4nl3yW" + (i % 50), serverState.ObjectId);
+                    Assert.AreEqual("st4nl3yW" + i % 50, serverState.ObjectId);
                     Assert.IsFalse(serverState.ContainsKey("gogo"));
                     Assert.IsFalse(serverState.ContainsKey("corgi"));
                     Assert.AreEqual("isShibaInu", serverState["doge"]);
@@ -246,7 +258,7 @@ public Task TestSaveAllManyObjects()
                     Assert.IsNotNull(serverState.UpdatedAt);
                 }
 
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Uri.AbsolutePath == "/1/batch"), It.IsAny<IProgress<ParseUploadProgressEventArgs>>(), It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(), It.IsAny<CancellationToken>()), Times.Exactly(3));
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Path == "batch"), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(3));
             });
         }
 
@@ -261,19 +273,14 @@ public Task TestDelete()
                 ServerData = new Dictionary<string, object> { ["corgi"] = "isNotDoge" }
             };
 
-            Tuple<HttpStatusCode, IDictionary<string, object>> response = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.OK, new Dictionary<string, object>());
-            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(response);
+            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.OK, new Dictionary<string, object> { }));
 
-            ParseObjectController controller = new ParseObjectController(mockRunner.Object);
-            return controller.DeleteAsync(state, null, CancellationToken.None).ContinueWith(t =>
+            return new ParseObjectController(mockRunner.Object, Client.Decoder, Client.ServerConnectionData).DeleteAsync(state, default, CancellationToken.None).ContinueWith(task =>
             {
-                Assert.IsFalse(t.IsFaulted);
-                Assert.IsFalse(t.IsCanceled);
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
 
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Uri.AbsolutePath == "/1/classes/Corgi/st4nl3yW"),
-                    It.IsAny<IProgress<ParseUploadProgressEventArgs>>(),
-                    It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(),
-                    It.IsAny<CancellationToken>()), Times.Exactly(1));
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Path == "classes/Corgi/st4nl3yW"), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
             });
         }
 
@@ -295,21 +302,23 @@ public Task TestDeleteAll()
             List<IDictionary<string, object>> results = new List<IDictionary<string, object>>();
 
             for (int i = 0; i < 30; ++i)
+            {
                 results.Add(new Dictionary<string, object> { ["success"] = null });
+            }
 
-            Dictionary<string, object> responseDict = new Dictionary<string, object> { ["results"] = results };
+            Dictionary<string, object> responseDict = new Dictionary<string, object> { [nameof(results)] = results };
 
             Tuple<HttpStatusCode, IDictionary<string, object>> response = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.OK, responseDict);
             Mock<IParseCommandRunner> mockRunner = CreateMockRunner(response);
 
-            ParseObjectController controller = new ParseObjectController(mockRunner.Object);
-            IList<Task> tasks = controller.DeleteAllAsync(states, null, CancellationToken.None);
+            ParseObjectController controller = new ParseObjectController(mockRunner.Object, Client.Decoder, Client.ServerConnectionData);
+            IList<Task> tasks = controller.DeleteAllAsync(states, default, CancellationToken.None);
 
             return Task.WhenAll(tasks).ContinueWith(_ =>
             {
                 Assert.IsTrue(tasks.All(task => task.IsCompleted && !task.IsCanceled && !task.IsFaulted));
 
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Uri.AbsolutePath == "/1/batch"), It.IsAny<IProgress<ParseUploadProgressEventArgs>>(), It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Path == "batch"), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
             });
         }
 
@@ -328,34 +337,39 @@ public Task TestDeleteAllManyObjects()
                 });
             }
 
-            // Make multiple response since the batch will be splitted.
+            // Make multiple response since the batch will be split.
+
             List<IDictionary<string, object>> results = new List<IDictionary<string, object>>();
 
             for (int i = 0; i < 50; ++i)
-                results.Add(new Dictionary<string, object> { ["success"] = null });
+            {
+                results.Add(new Dictionary<string, object> { ["success"] = default });
+            }
 
-            Dictionary<string, object> responseDict = new Dictionary<string, object> { ["results"] = results };
+            Dictionary<string, object> responseDict = new Dictionary<string, object> { [nameof(results)] = results };
             Tuple<HttpStatusCode, IDictionary<string, object>> response = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.OK, responseDict);
 
             List<IDictionary<string, object>> results2 = new List<IDictionary<string, object>>();
 
             for (int i = 0; i < 2; ++i)
-                results2.Add(new Dictionary<string, object> { ["success"] = null });
+            {
+                results2.Add(new Dictionary<string, object> { ["success"] = default });
+            }
 
-            Dictionary<string, object> responseDict2 = new Dictionary<string, object> { ["results"] = results2 };
+            Dictionary<string, object> responseDict2 = new Dictionary<string, object> { [nameof(results)] = results2 };
             Tuple<HttpStatusCode, IDictionary<string, object>> response2 = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.OK, responseDict2);
 
             Mock<IParseCommandRunner> mockRunner = new Mock<IParseCommandRunner>();
-            mockRunner.SetupSequence(obj => obj.RunCommandAsync(It.IsAny<ParseCommand>(), It.IsAny<IProgress<ParseUploadProgressEventArgs>>(), It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response)).Returns(Task.FromResult(response)).Returns(Task.FromResult(response2));
+            mockRunner.SetupSequence(obj => obj.RunCommandAsync(It.IsAny<ParseCommand>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response)).Returns(Task.FromResult(response)).Returns(Task.FromResult(response2));
 
-            ParseObjectController controller = new ParseObjectController(mockRunner.Object);
+            ParseObjectController controller = new ParseObjectController(mockRunner.Object, Client.Decoder, Client.ServerConnectionData);
             IList<Task> tasks = controller.DeleteAllAsync(states, null, CancellationToken.None);
 
             return Task.WhenAll(tasks).ContinueWith(_ =>
             {
                 Assert.IsTrue(tasks.All(task => task.IsCompleted && !task.IsCanceled && !task.IsFaulted));
 
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Uri.AbsolutePath == "/1/batch"), It.IsAny<IProgress<ParseUploadProgressEventArgs>>(), It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(), It.IsAny<CancellationToken>()), Times.Exactly(3));
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Path == "batch"), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(3));
             });
         }
 
@@ -363,18 +377,19 @@ public Task TestDeleteAllManyObjects()
         [AsyncStateMachine(typeof(ObjectControllerTests))]
         public Task TestDeleteAllFailSome()
         {
-            List<IObjectState> states = new List<IObjectState>();
+            List<IObjectState> states = new List<IObjectState> { };
+
             for (int i = 0; i < 30; ++i)
             {
                 states.Add(new MutableObjectState
                 {
                     ClassName = "Corgi",
-                    ObjectId = ((i % 2 == 0) ? null : "st4nl3yW" + i),
+                    ObjectId = (i % 2 == 0) ? null : "st4nl3yW" + i,
                     ServerData = new Dictionary<string, object> { ["corgi"] = "isNotDoge" }
                 });
             }
 
-            List<IDictionary<string, object>> results = new List<IDictionary<string, object>>();
+            List<IDictionary<string, object>> results = new List<IDictionary<string, object>> { };
 
             for (int i = 0; i < 15; ++i)
             {
@@ -384,20 +399,21 @@ public Task TestDeleteAllFailSome()
                     {
                         ["error"] = new Dictionary<string, object>
                         {
-                            ["code"] = (long) ParseException.ErrorCode.ObjectNotFound,
+                            ["code"] = (long) ParseFailureException.ErrorCode.ObjectNotFound,
                             ["error"] = "Object not found."
                         }
                     });
                 }
-                else results.Add(new Dictionary<string, object> { ["success"] = null });
+                else
+                {
+                    results.Add(new Dictionary<string, object> { ["success"] = default });
+                }
             }
 
-            Dictionary<string, object> responseDict = new Dictionary<string, object> { ["results"] = results };
 
-            Tuple<HttpStatusCode, IDictionary<string, object>> response = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.OK, responseDict);
-            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(response);
+            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.OK, new Dictionary<string, object> { [nameof(results)] = results }));
 
-            ParseObjectController controller = new ParseObjectController(mockRunner.Object);
+            ParseObjectController controller = new ParseObjectController(mockRunner.Object, Client.Decoder, Client.ServerConnectionData);
             IList<Task> tasks = controller.DeleteAllAsync(states, null, CancellationToken.None);
 
             return Task.WhenAll(tasks).ContinueWith(_ =>
@@ -407,9 +423,9 @@ public Task TestDeleteAllFailSome()
                     if (i % 2 == 0)
                     {
                         Assert.IsTrue(tasks[i].IsFaulted);
-                        Assert.IsInstanceOfType(tasks[i].Exception.InnerException, typeof(ParseException));
-                        ParseException exception = tasks[i].Exception.InnerException as ParseException;
-                        Assert.AreEqual(ParseException.ErrorCode.ObjectNotFound, exception.Code);
+                        Assert.IsInstanceOfType(tasks[i].Exception.InnerException, typeof(ParseFailureException));
+                        ParseFailureException exception = tasks[i].Exception.InnerException as ParseFailureException;
+                        Assert.AreEqual(ParseFailureException.ErrorCode.ObjectNotFound, exception.Code);
                     }
                     else
                     {
@@ -418,10 +434,7 @@ public Task TestDeleteAllFailSome()
                     }
                 }
 
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Uri.AbsolutePath == "/1/batch"),
-                    It.IsAny<IProgress<ParseUploadProgressEventArgs>>(),
-                    It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(),
-                    It.IsAny<CancellationToken>()), Times.Exactly(1));
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Path == "batch"), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
             });
         }
 
@@ -429,34 +442,31 @@ public Task TestDeleteAllFailSome()
         [AsyncStateMachine(typeof(ObjectControllerTests))]
         public Task TestDeleteAllInconsistent()
         {
-            List<IObjectState> states = new List<IObjectState>();
+            List<IObjectState> states = new List<IObjectState> { };
+
             for (int i = 0; i < 30; ++i)
             {
                 states.Add(new MutableObjectState
                 {
                     ClassName = "Corgi",
                     ObjectId = "st4nl3yW" + i,
-                    ServerData = new Dictionary<string, object>() {
-            { "corgi", "isNotDoge" },
-          }
+                    ServerData = new Dictionary<string, object>
+                    {
+                        ["corgi"] = "isNotDoge"
+                    }
                 });
             }
 
-            List<IDictionary<string, object>> results = new List<IDictionary<string, object>>();
+            List<IDictionary<string, object>> results = new List<IDictionary<string, object>> { };
+
             for (int i = 0; i < 36; ++i)
             {
-                results.Add(new Dictionary<string, object>() {
-          { "success", null }
-        });
+                results.Add(new Dictionary<string, object> { ["success"] = default });
             }
-            Dictionary<string, object> responseDict = new Dictionary<string, object>() {
-        { "results", results }
-      };
 
-            Tuple<HttpStatusCode, IDictionary<string, object>> response = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.OK, responseDict);
-            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(response);
+            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.OK, new Dictionary<string, object> { [nameof(results)] = results }));
 
-            ParseObjectController controller = new ParseObjectController(mockRunner.Object);
+            ParseObjectController controller = new ParseObjectController(mockRunner.Object, Client.Decoder, Client.ServerConnectionData);
             IList<Task> tasks = controller.DeleteAllAsync(states, null, CancellationToken.None);
 
             return Task.WhenAll(tasks).ContinueWith(_ =>
@@ -464,21 +474,14 @@ public Task TestDeleteAllInconsistent()
                 Assert.IsTrue(tasks.All(task => task.IsFaulted));
                 Assert.IsInstanceOfType(tasks[0].Exception.InnerException, typeof(InvalidOperationException));
 
-                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Uri.AbsolutePath == "/1/batch"),
-                    It.IsAny<IProgress<ParseUploadProgressEventArgs>>(),
-                    It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(),
-                    It.IsAny<CancellationToken>()), Times.Exactly(1));
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Path == "batch"), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
             });
         }
 
         private Mock<IParseCommandRunner> CreateMockRunner(Tuple<HttpStatusCode, IDictionary<string, object>> response)
         {
             Mock<IParseCommandRunner> mockRunner = new Mock<IParseCommandRunner>();
-            mockRunner.Setup(obj => obj.RunCommandAsync(It.IsAny<ParseCommand>(),
-                It.IsAny<IProgress<ParseUploadProgressEventArgs>>(),
-                It.IsAny<IProgress<ParseDownloadProgressEventArgs>>(),
-                It.IsAny<CancellationToken>()))
-                .Returns(Task.FromResult(response));
+            mockRunner.Setup(obj => obj.RunCommandAsync(It.IsAny<ParseCommand>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response));
 
             return mockRunner;
         }
diff --git a/Parse.Test/ObjectStateTests.cs b/Parse.Tests/ObjectStateTests.cs
similarity index 93%
rename from Parse.Test/ObjectStateTests.cs
rename to Parse.Tests/ObjectStateTests.cs
index 65d5cbb3..250ce4ba 100644
--- a/Parse.Test/ObjectStateTests.cs
+++ b/Parse.Tests/ObjectStateTests.cs
@@ -1,11 +1,13 @@
-using Parse.Core.Internal;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Parse.Abstractions.Infrastructure.Control;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Infrastructure.Control;
+using Parse.Platform.Objects;
 
-namespace Parse.Test
+namespace Parse.Tests
 {
     [TestClass]
     public class ObjectStateTests
@@ -92,10 +94,7 @@ public void TestApplyOperation()
             Assert.AreEqual(2, state["exist"]);
             Assert.AreEqual("teletubies", state["change"]);
 
-            state = state.MutatedClone(mutableClone =>
-            {
-                mutableClone.Apply(operations);
-            });
+            state = state.MutatedClone(mutableClone => mutableClone.Apply(operations));
 
             Assert.AreEqual(3, state.Count());
             Assert.AreEqual(9, state["exist"]);
@@ -128,10 +127,7 @@ public void TestApplyState()
         }
             };
 
-            state = state.MutatedClone(mutableClone =>
-            {
-                mutableClone.Apply(appliedState);
-            });
+            state = state.MutatedClone(mutableClone => mutableClone.Apply(appliedState));
 
             Assert.AreEqual("Corgi", state.ClassName);
             Assert.AreEqual("1234", state.ObjectId);
diff --git a/Parse.Test/ObjectTests.cs b/Parse.Tests/ObjectTests.cs
similarity index 63%
rename from Parse.Test/ObjectTests.cs
rename to Parse.Tests/ObjectTests.cs
index ac51ad45..e3aef397 100644
--- a/Parse.Test/ObjectTests.cs
+++ b/Parse.Tests/ObjectTests.cs
@@ -1,26 +1,29 @@
-using Parse;
-using Parse.Core.Internal;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
-
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Parse.Abstractions.Internal;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Infrastructure;
+using Parse.Platform.Objects;
 
-namespace Parse.Test
+namespace Parse.Tests
 {
     [TestClass]
     public class ObjectTests
     {
-        [ParseClassName("SubClass")]
-        private class SubClass : ParseObject { }
+        [ParseClassName(nameof(SubClass))]
+        class SubClass : ParseObject { }
+
+        [ParseClassName(nameof(UnregisteredSubClass))]
+        class UnregisteredSubClass : ParseObject { }
 
-        [ParseClassName("UnregisteredSubClass")]
-        private class UnregisteredSubClass : ParseObject { }
+        ParseClient Client { get; } = new ParseClient(new ServerConnectionData { Test = true });
 
         [TestCleanup]
-        public void TearDown() => ParseCorePlugins.Instance.Reset();
+        public void TearDown() => (Client.Services as ServiceHub).Reset();
 
         [TestMethod]
         public void TestParseObjectConstructor()
@@ -35,13 +38,13 @@ public void TestParseObjectConstructor()
         [TestMethod]
         public void TestParseObjectCreate()
         {
-            ParseObject obj = ParseObject.Create("Corgi");
+            ParseObject obj = Client.CreateObject("Corgi");
             Assert.AreEqual("Corgi", obj.ClassName);
             Assert.IsNull(obj.CreatedAt);
             Assert.IsTrue(obj.IsDataAvailable);
             Assert.IsTrue(obj.IsDirty);
 
-            ParseObject obj2 = ParseObject.CreateWithoutData("Corgi", "waGiManPutr4Pet1r");
+            ParseObject obj2 = Client.CreateObjectWithoutData("Corgi", "waGiManPutr4Pet1r");
             Assert.AreEqual("Corgi", obj2.ClassName);
             Assert.AreEqual("waGiManPutr4Pet1r", obj2.ObjectId);
             Assert.IsNull(obj2.CreatedAt);
@@ -52,16 +55,16 @@ public void TestParseObjectCreate()
         [TestMethod]
         public void TestParseObjectCreateWithGeneric()
         {
-            ParseObject.RegisterSubclass<SubClass>();
+            Client.AddValidClass<SubClass>();
 
-            ParseObject obj = ParseObject.Create<SubClass>();
-            Assert.AreEqual("SubClass", obj.ClassName);
+            ParseObject obj = Client.CreateObject<SubClass>();
+            Assert.AreEqual(nameof(SubClass), obj.ClassName);
             Assert.IsNull(obj.CreatedAt);
             Assert.IsTrue(obj.IsDataAvailable);
             Assert.IsTrue(obj.IsDirty);
 
-            ParseObject obj2 = ParseObject.CreateWithoutData<SubClass>("waGiManPutr4Pet1r");
-            Assert.AreEqual("SubClass", obj2.ClassName);
+            ParseObject obj2 = Client.CreateObjectWithoutData<SubClass>("waGiManPutr4Pet1r");
+            Assert.AreEqual(nameof(SubClass), obj2.ClassName);
             Assert.AreEqual("waGiManPutr4Pet1r", obj2.ObjectId);
             Assert.IsNull(obj2.CreatedAt);
             Assert.IsFalse(obj2.IsDataAvailable);
@@ -69,7 +72,7 @@ public void TestParseObjectCreateWithGeneric()
         }
 
         [TestMethod]
-        public void TestParseObjectCreateWithGenericFailWithoutSubclass() => Assert.ThrowsException<InvalidCastException>(() => ParseObject.Create<SubClass>());
+        public void TestParseObjectCreateWithGenericFailWithoutSubclass() => Assert.ThrowsException<InvalidCastException>(() => Client.CreateObject<SubClass>());
 
         [TestMethod]
         public void TestFromState()
@@ -78,13 +81,15 @@ public void TestFromState()
             {
                 ObjectId = "waGiManPutr4Pet1r",
                 ClassName = "Pagi",
-                CreatedAt = new DateTime(),
-                ServerData = new Dictionary<string, object>() {
-          { "username", "kevin" },
-          { "sessionToken", "se551onT0k3n" }
-        }
+                CreatedAt = new DateTime { },
+                ServerData = new Dictionary<string, object>
+                {
+                    ["username"] = "kevin",
+                    ["sessionToken"] = "se551onT0k3n"
+                }
             };
-            ParseObject obj = ParseObjectExtensions.FromState<ParseObject>(state, "Omitted");
+
+            ParseObject obj = Client.GenerateObjectFromState<ParseObject>(state, "Omitted");
 
             Assert.AreEqual("waGiManPutr4Pet1r", obj.ObjectId);
             Assert.AreEqual("Pagi", obj.ClassName);
@@ -97,65 +102,70 @@ public void TestFromState()
         [TestMethod]
         public void TestRegisterSubclass()
         {
-            Assert.ThrowsException<InvalidCastException>(() => ParseObject.Create<SubClass>());
+            Assert.ThrowsException<InvalidCastException>(() => Client.CreateObject<SubClass>());
 
             try
             {
-                ParseObject.RegisterSubclass<SubClass>();
-                ParseObject.Create<SubClass>();
+                Client.AddValidClass<SubClass>();
+                Client.CreateObject<SubClass>();
 
-                ParseCorePlugins.Instance.SubclassingController.UnregisterSubclass(typeof(UnregisteredSubClass));
-                ParseObject.Create<SubClass>();
+                Client.ClassController.RemoveClass(typeof(UnregisteredSubClass));
+                Client.CreateObject<SubClass>();
             }
             catch { Assert.Fail(); }
 
-            ParseCorePlugins.Instance.SubclassingController.UnregisterSubclass(typeof(SubClass));
-            Assert.ThrowsException<InvalidCastException>(() => ParseObject.Create<SubClass>());
+            Client.ClassController.RemoveClass(typeof(SubClass));
+            Assert.ThrowsException<InvalidCastException>(() => Client.CreateObject<SubClass>());
         }
 
         [TestMethod]
         public void TestRevert()
         {
-            ParseObject obj = ParseObject.Create("Corgi");
+            ParseObject obj = Client.CreateObject("Corgi");
             obj["gogo"] = true;
 
             Assert.IsTrue(obj.IsDirty);
-            Assert.AreEqual(1, obj.GetCurrentOperations().Count);
+            Assert.AreEqual(1, obj.CurrentOperations.Count);
             Assert.IsTrue(obj.ContainsKey("gogo"));
 
             obj.Revert();
 
             Assert.IsTrue(obj.IsDirty);
-            Assert.AreEqual(0, obj.GetCurrentOperations().Count);
+            Assert.AreEqual(0, obj.CurrentOperations.Count);
             Assert.IsFalse(obj.ContainsKey("gogo"));
         }
 
         [TestMethod]
         public void TestDeepTraversal()
         {
-            ParseObject obj = ParseObject.Create("Corgi");
-            IDictionary<string, object> someDict = new Dictionary<string, object>() {
-        { "someList", new List<object>() }
-      };
-            obj["obj"] = ParseObject.Create("Pug");
-            obj["obj2"] = ParseObject.Create("Pug");
+            ParseObject obj = Client.CreateObject("Corgi");
+
+            IDictionary<string, object> someDict = new Dictionary<string, object>
+            {
+                ["someList"] = new List<object> { }
+            };
+
+            obj[nameof(obj)] = Client.CreateObject("Pug");
+            obj["obj2"] = Client.CreateObject("Pug");
             obj["list"] = new List<object>();
             obj["dict"] = someDict;
             obj["someBool"] = true;
             obj["someInt"] = 23;
 
-            IEnumerable<object> traverseResult = ParseObjectExtensions.DeepTraversal(obj, true, true);
+            IEnumerable<object> traverseResult = Client.TraverseObjectDeep(obj, true, true);
             Assert.AreEqual(8, traverseResult.Count());
 
-            // Don't traverse beyond the root (since root is ParseObject)
-            traverseResult = ParseObjectExtensions.DeepTraversal(obj, false, true);
+            // Don't traverse beyond the root (since root is ParseObject).
+
+            traverseResult = Client.TraverseObjectDeep(obj, false, true);
             Assert.AreEqual(1, traverseResult.Count());
 
-            traverseResult = ParseObjectExtensions.DeepTraversal(someDict, false, true);
+            traverseResult = Client.TraverseObjectDeep(someDict, false, true);
             Assert.AreEqual(2, traverseResult.Count());
 
-            // Should ignore root
-            traverseResult = ParseObjectExtensions.DeepTraversal(obj, true, false);
+            // Should ignore root.
+
+            traverseResult = Client.TraverseObjectDeep(obj, true, false);
             Assert.AreEqual(7, traverseResult.Count());
 
         }
@@ -163,7 +173,7 @@ public void TestDeepTraversal()
         [TestMethod]
         public void TestRemove()
         {
-            ParseObject obj = ParseObject.Create("Corgi");
+            ParseObject obj = Client.CreateObject("Corgi");
             obj["gogo"] = true;
             Assert.IsTrue(obj.ContainsKey("gogo"));
 
@@ -174,14 +184,15 @@ public void TestRemove()
             {
                 ObjectId = "waGiManPutr4Pet1r",
                 ClassName = "Pagi",
-                CreatedAt = new DateTime(),
-                ServerData = new Dictionary<string, object>() {
-          { "username", "kevin" },
-          { "sessionToken", "se551onT0k3n" }
-        }
+                CreatedAt = new DateTime { },
+                ServerData = new Dictionary<string, object>
+                {
+                    ["username"] = "kevin",
+                    ["sessionToken"] = "se551onT0k3n"
+                }
             };
 
-            obj = ParseObjectExtensions.FromState<ParseObject>(state, "Corgi");
+            obj = Client.GenerateObjectFromState<ParseObject>(state, "Corgi");
             Assert.IsTrue(obj.ContainsKey("username"));
             Assert.IsTrue(obj.ContainsKey("sessionToken"));
 
@@ -193,12 +204,12 @@ public void TestRemove()
         [TestMethod]
         public void TestIndexGetterSetter()
         {
-            ParseObject obj = ParseObject.Create("Corgi");
+            ParseObject obj = Client.CreateObject("Corgi");
             obj["gogo"] = true;
             obj["list"] = new List<string>();
             obj["dict"] = new Dictionary<string, object>();
             obj["fakeACL"] = new ParseACL();
-            obj["obj"] = new ParseObject("Corgi");
+            obj[nameof(obj)] = new ParseObject("Corgi");
 
             Assert.IsTrue(obj.ContainsKey("gogo"));
             Assert.IsInstanceOfType(obj["gogo"], typeof(bool));
@@ -212,8 +223,8 @@ public void TestIndexGetterSetter()
             Assert.IsTrue(obj.ContainsKey("fakeACL"));
             Assert.IsInstanceOfType(obj["fakeACL"], typeof(ParseACL));
 
-            Assert.IsTrue(obj.ContainsKey("obj"));
-            Assert.IsInstanceOfType(obj["obj"], typeof(ParseObject));
+            Assert.IsTrue(obj.ContainsKey(nameof(obj)));
+            Assert.IsInstanceOfType(obj[nameof(obj)], typeof(ParseObject));
 
             Assert.ThrowsException<KeyNotFoundException>(() => { object gogo = obj["missingItem"]; });
         }
@@ -221,18 +232,21 @@ public void TestIndexGetterSetter()
         [TestMethod]
         public void TestPropertiesGetterSetter()
         {
-            DateTime now = new DateTime();
+            DateTime now = new DateTime { };
+
             IObjectState state = new MutableObjectState
             {
                 ObjectId = "waGiManPutr4Pet1r",
                 ClassName = "Pagi",
                 CreatedAt = now,
-                ServerData = new Dictionary<string, object>() {
-          { "username", "kevin" },
-          { "sessionToken", "se551onT0k3n" }
-        }
+                ServerData = new Dictionary<string, object>
+                {
+                    ["username"] = "kevin",
+                    ["sessionToken"] = "se551onT0k3n"
+                }
             };
-            ParseObject obj = ParseObjectExtensions.FromState<ParseObject>(state, "Omitted");
+
+            ParseObject obj = Client.GenerateObjectFromState<ParseObject>(state, "Omitted");
 
             Assert.AreEqual("Pagi", obj.ClassName);
             Assert.AreEqual(now, obj.CreatedAt);
@@ -246,7 +260,8 @@ public void TestPropertiesGetterSetter()
         [TestMethod]
         public void TestAddToList()
         {
-            ParseObject obj = new ParseObject("Corgi");
+            ParseObject obj = new ParseObject("Corgi").Bind(Client);
+
             obj.AddToList("emptyList", "gogo");
             obj["existingList"] = new List<string>() { "rich" };
 
@@ -267,7 +282,8 @@ public void TestAddToList()
         [TestMethod]
         public void TestAddUniqueToList()
         {
-            ParseObject obj = new ParseObject("Corgi");
+            ParseObject obj = new ParseObject("Corgi").Bind(Client);
+
             obj.AddUniqueToList("emptyList", "gogo");
             obj["existingList"] = new List<string>() { "gogo" };
 
@@ -288,7 +304,7 @@ public void TestAddUniqueToList()
         [TestMethod]
         public void TestRemoveAllFromList()
         {
-            ParseObject obj = new ParseObject("Corgi") { ["existingList"] = new List<string>() { "gogo", "Queen of Pain" } };
+            ParseObject obj = new ParseObject("Corgi", Client) { ["existingList"] = new List<string> { "gogo", "Queen of Pain" } };
 
             obj.RemoveAllFromList("existingList", new List<string>() { "gogo", "missingItem" });
             Assert.AreEqual(1, obj.Get<List<object>>("existingList").Count);
@@ -307,13 +323,16 @@ public void TestTryGetValue()
             {
                 ObjectId = "waGiManPutr4Pet1r",
                 ClassName = "Pagi",
-                CreatedAt = new DateTime(),
-                ServerData = new Dictionary<string, object>() {
-          { "username", "kevin" },
-          { "sessionToken", "se551onT0k3n" }
-        }
+                CreatedAt = new DateTime { },
+                ServerData = new Dictionary<string, object>()
+                {
+                    ["username"] = "kevin",
+                    ["sessionToken"] = "se551onT0k3n"
+                }
             };
-            ParseObject obj = ParseObjectExtensions.FromState<ParseObject>(state, "Omitted");
+
+            ParseObject obj = Client.GenerateObjectFromState<ParseObject>(state, "Omitted");
+
             obj.TryGetValue("username", out string res);
             Assert.AreEqual("kevin", res);
 
@@ -331,18 +350,22 @@ public void TestGet()
             {
                 ObjectId = "waGiManPutr4Pet1r",
                 ClassName = "Pagi",
-                CreatedAt = new DateTime(),
-                ServerData = new Dictionary<string, object>() {
-          { "username", "kevin" },
-          { "sessionToken", "se551onT0k3n" }
-        }
+                CreatedAt = new DateTime { },
+                ServerData = new Dictionary<string, object>()
+                {
+                    ["username"] = "kevin",
+                    ["sessionToken"] = "se551onT0k3n"
+                }
             };
-            ParseObject obj = ParseObjectExtensions.FromState<ParseObject>(state, "Omitted");
+
+            ParseObject obj = Client.GenerateObjectFromState<ParseObject>(state, "Omitted");
             Assert.AreEqual("kevin", obj.Get<string>("username"));
             Assert.ThrowsException<InvalidCastException>(() => obj.Get<ParseObject>("username"));
             Assert.ThrowsException<KeyNotFoundException>(() => obj.Get<string>("missingItem"));
         }
 
+#warning Some tests are not implemented.
+
         [TestMethod]
         public void TestIsDataAvailable()
         {
@@ -362,13 +385,14 @@ public void TestKeys()
             {
                 ObjectId = "waGiManPutr4Pet1r",
                 ClassName = "Pagi",
-                CreatedAt = new DateTime(),
-                ServerData = new Dictionary<string, object>() {
-          { "username", "kevin" },
-          { "sessionToken", "se551onT0k3n" }
-        }
+                CreatedAt = new DateTime { },
+                ServerData = new Dictionary<string, object>()
+                {
+                    ["username"] = "kevin",
+                    ["sessionToken"] = "se551onT0k3n"
+                }
             };
-            ParseObject obj = ParseObjectExtensions.FromState<ParseObject>(state, "Omitted");
+            ParseObject obj = Client.GenerateObjectFromState<ParseObject>(state, "Omitted");
             Assert.AreEqual(2, obj.Keys.Count);
 
             obj["additional"] = true;
@@ -385,13 +409,14 @@ public void TestAdd()
             {
                 ObjectId = "waGiManPutr4Pet1r",
                 ClassName = "Pagi",
-                CreatedAt = new DateTime(),
-                ServerData = new Dictionary<string, object>() {
-          { "username", "kevin" },
-          { "sessionToken", "se551onT0k3n" }
-        }
+                CreatedAt = new DateTime { },
+                ServerData = new Dictionary<string, object>()
+                {
+                    ["username"] = "kevin",
+                    ["sessionToken"] = "se551onT0k3n"
+                }
             };
-            ParseObject obj = ParseObjectExtensions.FromState<ParseObject>(state, "Omitted");
+            ParseObject obj = Client.GenerateObjectFromState<ParseObject>(state, "Omitted");
             Assert.ThrowsException<ArgumentException>(() => obj.Add("username", "kevin"));
 
             obj.Add("zeus", "bewithyou");
@@ -405,43 +430,50 @@ public void TestEnumerator()
             {
                 ObjectId = "waGiManPutr4Pet1r",
                 ClassName = "Pagi",
-                CreatedAt = new DateTime(),
-                ServerData = new Dictionary<string, object>() {
-          { "username", "kevin" },
-          { "sessionToken", "se551onT0k3n" }
-        }
+                CreatedAt = new DateTime { },
+                ServerData = new Dictionary<string, object>()
+                {
+                    ["username"] = "kevin",
+                    ["sessionToken"] = "se551onT0k3n"
+                }
             };
-            ParseObject obj = ParseObjectExtensions.FromState<ParseObject>(state, "Omitted");
+            ParseObject obj = Client.GenerateObjectFromState<ParseObject>(state, "Omitted");
 
             int count = 0;
+
             foreach (KeyValuePair<string, object> key in obj)
             {
                 count++;
             }
+
             Assert.AreEqual(2, count);
 
             obj["newDirtyItem"] = "newItem";
             count = 0;
+
             foreach (KeyValuePair<string, object> key in obj)
             {
                 count++;
             }
+
             Assert.AreEqual(3, count);
         }
 
         [TestMethod]
         public void TestGetQuery()
         {
-            ParseObject.RegisterSubclass<SubClass>();
+            Client.AddValidClass<SubClass>();
 
-            ParseQuery<ParseObject> query = ParseObject.GetQuery("UnregisteredSubClass");
-            Assert.AreEqual("UnregisteredSubClass", query.GetClassName());
+            ParseQuery<ParseObject> query = Client.GetQuery(nameof(UnregisteredSubClass));
+            Assert.AreEqual(nameof(UnregisteredSubClass), query.GetClassName());
 
-            Assert.ThrowsException<ArgumentException>(() => ParseObject.GetQuery("SubClass"));
+            Assert.ThrowsException<ArgumentException>(() => Client.GetQuery(nameof(SubClass)));
 
-            ParseCorePlugins.Instance.SubclassingController.UnregisterSubclass(typeof(SubClass));
+            Client.ClassController.RemoveClass(typeof(SubClass));
         }
 
+#warning These tests are incomplete.
+
         [TestMethod]
         public void TestPropertyChanged()
         {
@@ -450,50 +482,38 @@ public void TestPropertyChanged()
 
         [TestMethod]
         [AsyncStateMachine(typeof(ObjectTests))]
-        public Task TestSave()
-        {
+        public Task TestSave() =>
             // TODO (hallucinogen): do this
-            return Task.FromResult(0);
-        }
+            Task.FromResult(0);
 
         [TestMethod]
         [AsyncStateMachine(typeof(ObjectTests))]
-        public Task TestSaveAll()
-        {
+        public Task TestSaveAll() =>
             // TODO (hallucinogen): do this
-            return Task.FromResult(0);
-        }
+            Task.FromResult(0);
 
         [TestMethod]
         [AsyncStateMachine(typeof(ObjectTests))]
-        public Task TestDelete()
-        {
+        public Task TestDelete() =>
             // TODO (hallucinogen): do this
-            return Task.FromResult(0);
-        }
+            Task.FromResult(0);
 
         [TestMethod]
         [AsyncStateMachine(typeof(ObjectTests))]
-        public Task TestDeleteAll()
-        {
+        public Task TestDeleteAll() =>
             // TODO (hallucinogen): do this
-            return Task.FromResult(0);
-        }
+            Task.FromResult(0);
 
         [TestMethod]
         [AsyncStateMachine(typeof(ObjectTests))]
-        public Task TestFetch()
-        {
+        public Task TestFetch() =>
             // TODO (hallucinogen): do this
-            return Task.FromResult(0);
-        }
+            Task.FromResult(0);
 
         [TestMethod]
         [AsyncStateMachine(typeof(ObjectTests))]
-        public Task TestFetchAll()
-        {
+        public Task TestFetchAll() =>
             // TODO (hallucinogen): do this
-            return Task.FromResult(0);
-        }
+            Task.FromResult(0);
     }
 }
diff --git a/Parse.Test/Parse.Test.csproj b/Parse.Tests/Parse.Tests.csproj
similarity index 92%
rename from Parse.Test/Parse.Test.csproj
rename to Parse.Tests/Parse.Tests.csproj
index b319c947..5ebd6543 100644
--- a/Parse.Test/Parse.Test.csproj
+++ b/Parse.Tests/Parse.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
diff --git a/Parse.Tests/ProgressTests.cs b/Parse.Tests/ProgressTests.cs
new file mode 100644
index 00000000..5268f646
--- /dev/null
+++ b/Parse.Tests/ProgressTests.cs
@@ -0,0 +1,68 @@
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Infrastructure;
+
+namespace Parse.Tests
+{
+#warning Refactor if possible.
+
+    [TestClass]
+    public class ProgressTests
+    {
+        [TestMethod]
+        public void TestDownloadProgressEventGetterSetter()
+        {
+            IDataTransferLevel downloadProgressEvent = new DataTransferLevel { Amount = 0.5f };
+            Assert.AreEqual(0.5f, downloadProgressEvent.Amount);
+
+            downloadProgressEvent.Amount = 1.0f;
+            Assert.AreEqual(1.0f, downloadProgressEvent.Amount);
+        }
+
+        [TestMethod]
+        public void TestUploadProgressEventGetterSetter()
+        {
+            IDataTransferLevel uploadProgressEvent = new DataTransferLevel { Amount = 0.5f };
+            Assert.AreEqual(0.5f, uploadProgressEvent.Amount);
+
+            uploadProgressEvent.Amount = 1.0f;
+            Assert.AreEqual(1.0f, uploadProgressEvent.Amount);
+        }
+
+        [TestMethod]
+        public void TestObservingDownloadProgress()
+        {
+            int called = 0;
+            Mock<IProgress<IDataTransferLevel>> mockProgress = new Mock<IProgress<IDataTransferLevel>>();
+            mockProgress.Setup(obj => obj.Report(It.IsAny<IDataTransferLevel>())).Callback(() => called++);
+            IProgress<IDataTransferLevel> progress = mockProgress.Object;
+
+            progress.Report(new DataTransferLevel { Amount = 0.2f });
+            progress.Report(new DataTransferLevel { Amount = 0.42f });
+            progress.Report(new DataTransferLevel { Amount = 0.53f });
+            progress.Report(new DataTransferLevel { Amount = 0.68f });
+            progress.Report(new DataTransferLevel { Amount = 0.88f });
+
+            Assert.AreEqual(5, called);
+        }
+
+        [TestMethod]
+        public void TestObservingUploadProgress()
+        {
+            int called = 0;
+            Mock<IProgress<IDataTransferLevel>> mockProgress = new Mock<IProgress<IDataTransferLevel>>();
+            mockProgress.Setup(obj => obj.Report(It.IsAny<IDataTransferLevel>())).Callback(() => called++);
+            IProgress<IDataTransferLevel> progress = mockProgress.Object;
+
+            progress.Report(new DataTransferLevel { Amount = 0.2f });
+            progress.Report(new DataTransferLevel { Amount = 0.42f });
+            progress.Report(new DataTransferLevel { Amount = 0.53f });
+            progress.Report(new DataTransferLevel { Amount = 0.68f });
+            progress.Report(new DataTransferLevel { Amount = 0.88f });
+
+            Assert.AreEqual(5, called);
+        }
+    }
+}
diff --git a/Parse.Test/PushEncoderTests.cs b/Parse.Tests/PushEncoderTests.cs
similarity index 57%
rename from Parse.Test/PushEncoderTests.cs
rename to Parse.Tests/PushEncoderTests.cs
index b8268099..0a2d583f 100644
--- a/Parse.Test/PushEncoderTests.cs
+++ b/Parse.Tests/PushEncoderTests.cs
@@ -1,12 +1,10 @@
-using Parse.Push.Internal;
 using System;
-using System.Linq;
 using System.Collections.Generic;
-
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Newtonsoft.Json;
+using Parse.Platform.Push;
 
-namespace Parse.Test
+namespace Parse.Tests
 {
     [TestClass]
     public class PushEncoderTests
@@ -20,7 +18,7 @@ public void TestEncodeEmpty()
             state.Alert = "alert";
 
             Assert.ThrowsException<InvalidOperationException>(() => ParsePushEncoder.Instance.Encode(state));
-            state.Channels = new List<string> { { "channel" } };
+            state.Channels = new List<string> { "channel" };
 
             ParsePushEncoder.Instance.Encode(state);
         }
@@ -30,28 +28,27 @@ public void TestEncode()
         {
             MutablePushState state = new MutablePushState
             {
-                Data = new Dictionary<string, object> {
-          { "alert", "Some Alert" }
-        },
-                Channels = new List<string> {
-          { "channel" }
-        }
+                Data = new Dictionary<string, object>
+                {
+                    ["alert"] = "Some Alert"
+                },
+                Channels = new List<string> { "channel" }
             };
 
-            IDictionary<string, object> expected = new Dictionary<string, object> {
-        {
-          "data", new Dictionary<string, object> {{
-            "alert", "Some Alert"
-          }}
-        },
-        {
-          "where", new Dictionary<string, object> {{
-            "channels", new Dictionary<string, object> {{
-              "$in", new List<string> {{ "channel" }}
-            }}
-          }}
-        }
-      };
+            IDictionary<string, object> expected = new Dictionary<string, object>
+            {
+                ["data"] = new Dictionary<string, object>
+                {
+                    ["alert"] = "Some Alert"
+                },
+                ["where"] = new Dictionary<string, object>
+                {
+                    ["channels"] = new Dictionary<string, object>
+                    {
+                        ["$in"] = new List<string> { "channel" }
+                    }
+                }
+            };
 
             Assert.AreEqual(JsonConvert.SerializeObject(expected), JsonConvert.SerializeObject(ParsePushEncoder.Instance.Encode(state)));
         }
diff --git a/Parse.Test/PushStateTests.cs b/Parse.Tests/PushStateTests.cs
similarity index 82%
rename from Parse.Test/PushStateTests.cs
rename to Parse.Tests/PushStateTests.cs
index 041d9ca3..bc08fb8a 100644
--- a/Parse.Test/PushStateTests.cs
+++ b/Parse.Tests/PushStateTests.cs
@@ -1,8 +1,8 @@
-using Parse.Push.Internal;
-
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Parse.Abstractions.Platform.Push;
+using Parse.Platform.Push;
 
-namespace Parse.Test
+namespace Parse.Tests
 {
     [TestClass]
     public class PushStateTests
@@ -12,10 +12,7 @@ public void TestMutatedClone()
         {
             MutablePushState state = new MutablePushState();
 
-            IPushState mutated = state.MutatedClone(s =>
-            {
-                s.Alert = "test";
-            });
+            IPushState mutated = state.MutatedClone(s => s.Alert = "test");
 
             Assert.AreEqual(null, state.Alert);
             Assert.AreEqual("test", mutated.Alert);
diff --git a/Parse.Tests/PushTests.cs b/Parse.Tests/PushTests.cs
new file mode 100644
index 00000000..6b5f609b
--- /dev/null
+++ b/Parse.Tests/PushTests.cs
@@ -0,0 +1,152 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Push;
+using Parse.Infrastructure.Utilities;
+using Parse.Infrastructure;
+using Parse.Platform.Push;
+
+namespace Parse.Tests
+{
+    [TestClass]
+    public class PushTests
+    {
+        ParseClient Client { get; } = new ParseClient(new ServerConnectionData { Test = true });
+
+        IParsePushController GetMockedPushController(IPushState expectedPushState)
+        {
+            Mock<IParsePushController> mockedController = new Mock<IParsePushController>(MockBehavior.Strict);
+            mockedController.Setup(obj => obj.SendPushNotificationAsync(It.Is<IPushState>(s => s.Equals(expectedPushState)), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
+
+            return mockedController.Object;
+        }
+
+        IParsePushChannelsController GetMockedPushChannelsController(IEnumerable<string> channels)
+        {
+            Mock<IParsePushChannelsController> mockedChannelsController = new Mock<IParsePushChannelsController>(MockBehavior.Strict);
+            mockedChannelsController.Setup(obj => obj.SubscribeAsync(It.Is<IEnumerable<string>>(it => it.CollectionsEqual(channels)), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
+            mockedChannelsController.Setup(obj => obj.UnsubscribeAsync(It.Is<IEnumerable<string>>(it => it.CollectionsEqual(channels)), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(false));
+
+            return mockedChannelsController.Object;
+        }
+
+        [TestCleanup]
+        public void TearDown() => (Client.Services as ServiceHub).Reset();
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(PushTests))]
+        public Task TestSendPush()
+        {
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            MutablePushState state = new MutablePushState
+            {
+                Query = Client.GetInstallationQuery()
+            };
+
+            ParsePush thePush = new ParsePush(client);
+
+            hub.PushController = GetMockedPushController(state);
+
+            thePush.Alert = "Alert";
+            state.Alert = "Alert";
+
+            return thePush.SendAsync().ContinueWith(task =>
+            {
+                Assert.IsTrue(task.IsCompleted);
+                Assert.IsFalse(task.IsFaulted);
+
+                thePush.Channels = new List<string> { { "channel" } };
+                state.Channels = new List<string> { { "channel" } };
+
+                return thePush.SendAsync();
+            }).Unwrap().ContinueWith(task =>
+            {
+                Assert.IsTrue(task.IsCompleted);
+                Assert.IsFalse(task.IsFaulted);
+
+                ParseQuery<ParseInstallation> query = new ParseQuery<ParseInstallation>(client, "aClass");
+
+                thePush.Query = query;
+                state.Query = query;
+
+                return thePush.SendAsync();
+            }).Unwrap().ContinueWith(task =>
+            {
+                Assert.IsTrue(task.IsCompleted);
+                Assert.IsFalse(task.IsFaulted);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(PushTests))]
+        public Task TestSubscribe()
+        {
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            List<string> channels = new List<string> { };
+
+            hub.PushChannelsController = GetMockedPushChannelsController(channels);
+
+            channels.Add("test");
+
+            return client.SubscribeToPushChannelAsync("test").ContinueWith(task =>
+            {
+                Assert.IsTrue(task.IsCompleted);
+                Assert.IsFalse(task.IsFaulted);
+
+                return client.SubscribeToPushChannelsAsync(new List<string> { "test" });
+            }).Unwrap().ContinueWith(task =>
+            {
+                Assert.IsTrue(task.IsCompleted);
+                Assert.IsFalse(task.IsFaulted);
+
+                CancellationTokenSource cancellationTokenSource = new CancellationTokenSource { };
+                return client.SubscribeToPushChannelsAsync(new List<string> { "test" }, cancellationTokenSource.Token);
+            }).Unwrap().ContinueWith(task =>
+            {
+                Assert.IsTrue(task.IsCompleted);
+                Assert.IsFalse(task.IsFaulted);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(PushTests))]
+        public Task TestUnsubscribe()
+        {
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            List<string> channels = new List<string> { };
+
+            hub.PushChannelsController = GetMockedPushChannelsController(channels);
+
+            channels.Add("test");
+
+            return client.UnsubscribeToPushChannelAsync("test").ContinueWith(task =>
+            {
+                Assert.IsTrue(task.IsCompleted);
+                Assert.IsFalse(task.IsFaulted);
+
+                return client.UnsubscribeToPushChannelsAsync(new List<string> { { "test" } });
+            }).ContinueWith(task =>
+            {
+                Assert.IsTrue(task.IsCompleted);
+                Assert.IsFalse(task.IsFaulted);
+
+                CancellationTokenSource cancellationTokenSource = new CancellationTokenSource { };
+                return client.UnsubscribeToPushChannelsAsync(new List<string> { { "test" } }, cancellationTokenSource.Token);
+            }).ContinueWith(task =>
+            {
+                Assert.IsTrue(task.IsCompleted);
+                Assert.IsFalse(task.IsFaulted);
+            });
+        }
+    }
+}
diff --git a/Parse.Test/RelationTests.cs b/Parse.Tests/RelationTests.cs
similarity index 81%
rename from Parse.Test/RelationTests.cs
rename to Parse.Tests/RelationTests.cs
index 9f4269d6..d0929b21 100644
--- a/Parse.Test/RelationTests.cs
+++ b/Parse.Tests/RelationTests.cs
@@ -1,10 +1,9 @@
-using Parse;
-using Parse.Core.Internal;
 using System.Collections.Generic;
-
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Parse.Abstractions.Internal;
+using Parse.Infrastructure;
 
-namespace Parse.Test
+namespace Parse.Tests
 {
     [TestClass]
     public class RelationTests
@@ -12,7 +11,7 @@ public class RelationTests
         [TestMethod]
         public void TestRelationQuery()
         {
-            ParseObject parent = ParseObject.CreateWithoutData("Foo", "abcxyz");
+            ParseObject parent = new ServiceHub { }.CreateObjectWithoutData("Foo", "abcxyz");
 
             ParseRelation<ParseObject> relation = parent.GetRelation<ParseObject>("child");
             ParseQuery<ParseObject> query = relation.Query;
diff --git a/Parse.Tests/SessionControllerTests.cs b/Parse.Tests/SessionControllerTests.cs
new file mode 100644
index 00000000..454ae0ac
--- /dev/null
+++ b/Parse.Tests/SessionControllerTests.cs
@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Abstractions.Platform.Sessions;
+using Parse.Infrastructure;
+using Parse.Infrastructure.Execution;
+using Parse.Platform.Sessions;
+
+namespace Parse.Tests
+{
+    [TestClass]
+    public class SessionControllerTests
+    {
+#warning Check if reinitializing the client for every test method is really necessary.
+
+        ParseClient Client { get; set; }
+
+        [TestInitialize]
+        public void SetUp() => Client = new ParseClient(new ServerConnectionData { ApplicationID = "", Key = "", Test = true });
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(SessionControllerTests))]
+        public Task TestGetSessionWithEmptyResult() => new ParseSessionController(CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, null)).Object, Client.Decoder).GetSessionAsync("S0m3Se551on", Client, CancellationToken.None).ContinueWith(task =>
+        {
+            Assert.IsTrue(task.IsFaulted);
+            Assert.IsFalse(task.IsCanceled);
+        });
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(SessionControllerTests))]
+        public Task TestGetSession()
+        {
+            Tuple<HttpStatusCode, IDictionary<string, object>> response = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, new Dictionary<string, object>
+            {
+                ["__type"] = "Object",
+                ["className"] = "Session",
+                ["sessionToken"] = "S0m3Se551on",
+                ["restricted"] = true
+            });
+
+            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(response);
+
+            return new ParseSessionController(mockRunner.Object, Client.Decoder).GetSessionAsync("S0m3Se551on", Client, CancellationToken.None).ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Path == "sessions/me"), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+
+                IObjectState session = task.Result;
+                Assert.AreEqual(2, session.Count());
+                Assert.IsTrue((bool) session["restricted"]);
+                Assert.AreEqual("S0m3Se551on", session["sessionToken"]);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(SessionControllerTests))]
+        public Task TestRevoke()
+        {
+            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, default));
+
+            return new ParseSessionController(mockRunner.Object, Client.Decoder).RevokeAsync("S0m3Se551on", CancellationToken.None).ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Path == "logout"), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(SessionControllerTests))]
+        public Task TestUpgradeToRevocableSession()
+        {
+            Tuple<HttpStatusCode, IDictionary<string, object>> response = new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted,
+                new Dictionary<string, object>
+                {
+                    ["__type"] = "Object",
+                    ["className"] = "Session",
+                    ["sessionToken"] = "S0m3Se551on",
+                    ["restricted"] = true
+                });
+
+            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(response);
+
+            return new ParseSessionController(mockRunner.Object, Client.Decoder).UpgradeToRevocableSessionAsync("S0m3Se551on", Client, CancellationToken.None).ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Path == "upgradeToRevocableSession"), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+
+                IObjectState session = task.Result;
+                Assert.AreEqual(2, session.Count());
+                Assert.IsTrue((bool) session["restricted"]);
+                Assert.AreEqual("S0m3Se551on", session["sessionToken"]);
+            });
+        }
+
+        [TestMethod]
+        public void TestIsRevocableSessionToken()
+        {
+            IParseSessionController sessionController = new ParseSessionController(Mock.Of<IParseCommandRunner>(), Client.Decoder);
+            Assert.IsTrue(sessionController.IsRevocableSessionToken("r:session"));
+            Assert.IsTrue(sessionController.IsRevocableSessionToken("r:session:r:"));
+            Assert.IsTrue(sessionController.IsRevocableSessionToken("session:r:"));
+            Assert.IsFalse(sessionController.IsRevocableSessionToken("session:s:d:r"));
+            Assert.IsFalse(sessionController.IsRevocableSessionToken("s:ession:s:d:r"));
+            Assert.IsFalse(sessionController.IsRevocableSessionToken(""));
+        }
+
+
+        private Mock<IParseCommandRunner> CreateMockRunner(Tuple<HttpStatusCode, IDictionary<string, object>> response)
+        {
+            Mock<IParseCommandRunner> mockRunner = new Mock<IParseCommandRunner>();
+            mockRunner.Setup(obj => obj.RunCommandAsync(It.IsAny<ParseCommand>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response));
+
+            return mockRunner;
+        }
+    }
+}
diff --git a/Parse.Tests/SessionTests.cs b/Parse.Tests/SessionTests.cs
new file mode 100644
index 00000000..2bff624e
--- /dev/null
+++ b/Parse.Tests/SessionTests.cs
@@ -0,0 +1,167 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Abstractions.Platform.Sessions;
+using Parse.Abstractions.Platform.Users;
+using Parse.Infrastructure;
+using Parse.Platform.Objects;
+
+namespace Parse.Tests
+{
+    [TestClass]
+    public class SessionTests
+    {
+        ParseClient Client { get; } = new ParseClient(new ServerConnectionData { Test = true });
+
+        [TestInitialize]
+        public void SetUp()
+        {
+            Client.AddValidClass<ParseSession>();
+            Client.AddValidClass<ParseUser>();
+        }
+
+        [TestCleanup]
+        public void TearDown() => (Client.Services as ServiceHub).Reset();
+
+        [TestMethod]
+        public void TestGetSessionQuery() => Assert.IsInstanceOfType(Client.GetSessionQuery(), typeof(ParseQuery<ParseSession>));
+
+        [TestMethod]
+        public void TestGetSessionToken()
+        {
+            ParseSession session = Client.GenerateObjectFromState<ParseSession>(new MutableObjectState { ServerData = new Dictionary<string, object>() { ["sessionToken"] = "llaKcolnu" } }, "_Session");
+
+            Assert.IsNotNull(session);
+            Assert.AreEqual("llaKcolnu", session.SessionToken);
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(SessionTests))]
+        public Task TestGetCurrentSession()
+        {
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            IObjectState sessionState = new MutableObjectState
+            {
+                ServerData = new Dictionary<string, object>
+                {
+                    ["sessionToken"] = "newllaKcolnu"
+                }
+            };
+
+            Mock<IParseSessionController> mockController = new Mock<IParseSessionController>();
+            mockController.Setup(obj => obj.GetSessionAsync(It.IsAny<string>(), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(sessionState));
+
+            IObjectState userState = new MutableObjectState
+            {
+                ServerData = new Dictionary<string, object>
+                {
+                    ["sessionToken"] = "llaKcolnu"
+                }
+            };
+
+            ParseUser user = client.GenerateObjectFromState<ParseUser>(userState, "_User");
+
+            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController>();
+            mockCurrentUserController.Setup(obj => obj.GetAsync(It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(user));
+
+            hub.SessionController = mockController.Object;
+            hub.CurrentUserController = mockCurrentUserController.Object;
+
+            return client.GetCurrentSessionAsync().ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockController.Verify(obj => obj.GetSessionAsync(It.Is<string>(sessionToken => sessionToken == "llaKcolnu"), It.IsAny<IServiceHub>(),It.IsAny<CancellationToken>()), Times.Exactly(1));
+
+                ParseSession session = task.Result;
+                Assert.AreEqual("newllaKcolnu", session.SessionToken);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(SessionTests))]
+        public Task TestGetCurrentSessionWithNoCurrentUser()
+        {
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            Mock<IParseSessionController> mockController = new Mock<IParseSessionController>();
+            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController>();
+
+            hub.SessionController = mockController.Object;
+            hub.CurrentUserController = mockCurrentUserController.Object;
+
+            return client.GetCurrentSessionAsync().ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+                Assert.IsNull(task.Result);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(SessionTests))]
+        public Task TestRevoke()
+        {
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            Mock<IParseSessionController> mockController = new Mock<IParseSessionController>();
+            mockController.Setup(sessionController => sessionController.IsRevocableSessionToken(It.IsAny<string>())).Returns(true);
+
+            hub.SessionController = mockController.Object;
+
+            CancellationTokenSource source = new CancellationTokenSource { };
+            return client.RevokeSessionAsync("r:someSession", source.Token).ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockController.Verify(obj => obj.RevokeAsync(It.Is<string>(sessionToken => sessionToken == "r:someSession"), source.Token), Times.Exactly(1));
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(SessionTests))]
+        public Task TestUpgradeToRevocableSession()
+        {
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            IObjectState state = new MutableObjectState
+            {
+                ServerData = new Dictionary<string, object>()
+                {
+                    ["sessionToken"] = "llaKcolnu"
+                }
+            };
+
+            Mock<IParseSessionController> mockController = new Mock<IParseSessionController>();
+            mockController.Setup(obj => obj.UpgradeToRevocableSessionAsync(It.IsAny<string>(), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(state));
+
+            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController>();
+
+            hub.SessionController = mockController.Object;
+            hub.CurrentUserController = mockCurrentUserController.Object;
+
+            CancellationTokenSource source = new CancellationTokenSource { };
+            return client.UpgradeToRevocableSessionAsync("someSession", source.Token).ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockController.Verify(obj => obj.UpgradeToRevocableSessionAsync(It.Is<string>(sessionToken => sessionToken == "someSession"), It.IsAny<IServiceHub>(), source.Token), Times.Exactly(1));
+
+                Assert.AreEqual("llaKcolnu", task.Result);
+            });
+        }
+    }
+}
diff --git a/Parse.Tests/UserControllerTests.cs b/Parse.Tests/UserControllerTests.cs
new file mode 100644
index 00000000..edb2ac12
--- /dev/null
+++ b/Parse.Tests/UserControllerTests.cs
@@ -0,0 +1,186 @@
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Control;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Infrastructure;
+using Parse.Infrastructure.Execution;
+using Parse.Platform.Objects;
+using Parse.Platform.Users;
+
+namespace Parse.Tests
+{
+    [TestClass]
+    public class UserControllerTests
+    {
+        ParseClient Client { get; set; }
+
+        [TestInitialize]
+        public void SetUp() => Client = new ParseClient(new ServerConnectionData { ApplicationID = "", Key = "", Test = true });
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(UserControllerTests))]
+        public Task TestSignUp()
+        {
+            MutableObjectState state = new MutableObjectState
+            {
+                ClassName = "_User",
+                ServerData = new Dictionary<string, object>
+                {
+                    ["username"] = "hallucinogen",
+                    ["password"] = "secret"
+                }
+            };
+
+            Dictionary<string, IParseFieldOperation> operations = new Dictionary<string, IParseFieldOperation>
+            {
+                ["gogo"] = new Mock<IParseFieldOperation>().Object
+            };
+
+            Dictionary<string, object> responseDict = new Dictionary<string, object>
+            {
+                ["__type"] = "Object",
+                ["className"] = "_User",
+                ["objectId"] = "d3ImSh3ki",
+                ["sessionToken"] = "s3ss10nt0k3n",
+                ["createdAt"] = "2015-09-18T18:11:28.943Z"
+            };
+
+            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, responseDict));
+
+            return new ParseUserController(mockRunner.Object, Client.Decoder).SignUpAsync(state, operations, Client, CancellationToken.None).ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Path == "classes/_User"), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+
+                IObjectState newState = task.Result;
+                Assert.AreEqual("s3ss10nt0k3n", newState["sessionToken"]);
+                Assert.AreEqual("d3ImSh3ki", newState.ObjectId);
+                Assert.IsNotNull(newState.CreatedAt);
+                Assert.IsNotNull(newState.UpdatedAt);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(UserControllerTests))]
+        public Task TestLogInWithUsernamePassword()
+        {
+            Dictionary<string, object> responseDict = new Dictionary<string, object>
+            {
+                ["__type"] = "Object",
+                ["className"] = "_User",
+                ["objectId"] = "d3ImSh3ki",
+                ["sessionToken"] = "s3ss10nt0k3n",
+                ["createdAt"] = "2015-09-18T18:11:28.943Z"
+            };
+
+            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, responseDict));
+
+            return new ParseUserController(mockRunner.Object, Client.Decoder).LogInAsync("grantland", "123grantland123", Client, CancellationToken.None).ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Path == "login?username=grantland&password=123grantland123"), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+
+                IObjectState newState = task.Result;
+                Assert.AreEqual("s3ss10nt0k3n", newState["sessionToken"]);
+                Assert.AreEqual("d3ImSh3ki", newState.ObjectId);
+                Assert.IsNotNull(newState.CreatedAt);
+                Assert.IsNotNull(newState.UpdatedAt);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(UserControllerTests))]
+        public Task TestLogInWithAuthData()
+        {
+            Dictionary<string, object> responseDict = new Dictionary<string, object>
+            {
+                ["__type"] = "Object" ,
+                ["className"] = "_User" ,
+                ["objectId"] = "d3ImSh3ki" ,
+                ["sessionToken"] = "s3ss10nt0k3n" ,
+                ["createdAt"] = "2015-09-18T18:11:28.943Z" 
+            };
+
+            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, responseDict));
+
+            return new ParseUserController(mockRunner.Object, Client.Decoder).LogInAsync("facebook", data: null, serviceHub: Client, cancellationToken: CancellationToken.None).ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Path == "users"), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+
+                IObjectState newState = task.Result;
+                Assert.AreEqual("s3ss10nt0k3n", newState["sessionToken"]);
+                Assert.AreEqual("d3ImSh3ki", newState.ObjectId);
+                Assert.IsNotNull(newState.CreatedAt);
+                Assert.IsNotNull(newState.UpdatedAt);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(UserControllerTests))]
+        public Task TestGetUserFromSessionToken()
+        {
+            Dictionary<string, object> responseDict = new Dictionary<string, object>
+            {
+                ["__type"] = "Object",
+                ["className"] = "_User",
+                ["objectId"] = "d3ImSh3ki",
+                ["sessionToken"] = "s3ss10nt0k3n",
+                ["createdAt"] = "2015-09-18T18:11:28.943Z"
+            };
+
+            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, responseDict));
+
+            return new ParseUserController(mockRunner.Object, Client.Decoder).GetUserAsync("s3ss10nt0k3n", Client, CancellationToken.None).ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Path == "users/me"), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+
+                IObjectState newState = task.Result;
+                Assert.AreEqual("s3ss10nt0k3n", newState["sessionToken"]);
+                Assert.AreEqual("d3ImSh3ki", newState.ObjectId);
+                Assert.IsNotNull(newState.CreatedAt);
+                Assert.IsNotNull(newState.UpdatedAt);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(UserControllerTests))]
+        public Task TestRequestPasswordReset()
+        {
+            Mock<IParseCommandRunner> mockRunner = CreateMockRunner(new Tuple<HttpStatusCode, IDictionary<string, object>>(HttpStatusCode.Accepted, new Dictionary<string, object> { }));
+
+            return new ParseUserController(mockRunner.Object, Client.Decoder).RequestPasswordResetAsync("gogo@parse.com", CancellationToken.None).ContinueWith(t =>
+            {
+                Assert.IsFalse(t.IsFaulted);
+                Assert.IsFalse(t.IsCanceled);
+
+                mockRunner.Verify(obj => obj.RunCommandAsync(It.Is<ParseCommand>(command => command.Path == "requestPasswordReset"), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+            });
+        }
+
+        Mock<IParseCommandRunner> CreateMockRunner(Tuple<HttpStatusCode, IDictionary<string, object>> response)
+        {
+            Mock<IParseCommandRunner> mockRunner = new Mock<IParseCommandRunner> { };
+            mockRunner.Setup(obj => obj.RunCommandAsync(It.IsAny<ParseCommand>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<IProgress<IDataTransferLevel>>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(response));
+
+            return mockRunner;
+        }
+    }
+}
diff --git a/Parse.Tests/UserTests.cs b/Parse.Tests/UserTests.cs
new file mode 100644
index 00000000..4e205ff2
--- /dev/null
+++ b/Parse.Tests/UserTests.cs
@@ -0,0 +1,790 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Infrastructure;
+using Parse.Abstractions.Infrastructure.Control;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Abstractions.Platform.Sessions;
+using Parse.Abstractions.Platform.Users;
+using Parse.Platform.Objects;
+
+namespace Parse.Tests
+{
+#warning Class refactoring requires completion.
+
+    [TestClass]
+    public class UserTests
+    {
+        ParseClient Client { get; set; } = new ParseClient(new ServerConnectionData { Test = true });
+
+        [TestCleanup]
+        public void TearDown() => (Client.Services as ServiceHub).Reset();
+
+        [TestMethod]
+        public void TestRemoveFields()
+        {
+            IObjectState state = new MutableObjectState
+            {
+                ServerData = new Dictionary<string, object>
+                {
+                    ["username"] = "kevin",
+                    ["name"] = "andrew"
+                }
+            };
+
+            ParseUser user = Client.GenerateObjectFromState<ParseUser>(state, "_User");
+            Assert.ThrowsException<InvalidOperationException>(() => user.Remove("username"));
+
+            try
+            {
+                user.Remove("name");
+            }
+            catch
+            {
+                Assert.Fail(@"Removing ""name"" field on ParseUser should not throw an exception because ""name"" is not an immutable field and was defined on the object.");
+            }
+
+            Assert.IsFalse(user.ContainsKey("name"));
+        }
+
+        [TestMethod]
+        public void TestSessionTokenGetter()
+        {
+            IObjectState state = new MutableObjectState
+            {
+                ServerData = new Dictionary<string, object>
+                {
+                    ["username"] = "kevin",
+                    ["sessionToken"] = "se551onT0k3n"
+                }
+            };
+
+            ParseUser user = Client.GenerateObjectFromState<ParseUser>(state, "_User");
+            Assert.AreEqual("se551onT0k3n", user.SessionToken);
+        }
+
+        [TestMethod]
+        public void TestUsernameGetterSetter()
+        {
+            IObjectState state = new MutableObjectState
+            {
+                ServerData = new Dictionary<string, object>
+                {
+                    ["username"] = "kevin",
+                }
+            };
+
+            ParseUser user = Client.GenerateObjectFromState<ParseUser>(state, "_User");
+            Assert.AreEqual("kevin", user.Username);
+            user.Username = "ilya";
+            Assert.AreEqual("ilya", user.Username);
+        }
+
+        [TestMethod]
+        public void TestPasswordGetterSetter()
+        {
+            IObjectState state = new MutableObjectState
+            {
+                ServerData = new Dictionary<string, object>
+                {
+                    ["username"] = "kevin",
+                    ["password"] = "hurrah"
+                }
+            };
+
+            ParseUser user = Client.GenerateObjectFromState<ParseUser>(state, "_User");
+            Assert.AreEqual("hurrah", user.State["password"]);
+            user.Password = "david";
+            Assert.IsNotNull(user.CurrentOperations["password"]);
+        }
+
+        [TestMethod]
+        public void TestEmailGetterSetter()
+        {
+            IObjectState state = new MutableObjectState
+            {
+                ServerData = new Dictionary<string, object>
+                {
+                    ["email"] = "james@parse.com",
+                    ["name"] = "andrew",
+                    ["sessionToken"] = "se551onT0k3n"
+                }
+            };
+
+            ParseUser user = Client.GenerateObjectFromState<ParseUser>(state, "_User");
+            Assert.AreEqual("james@parse.com", user.Email);
+            user.Email = "bryan@parse.com";
+            Assert.AreEqual("bryan@parse.com", user.Email);
+        }
+
+        [TestMethod]
+        public void TestAuthDataGetter()
+        {
+            IObjectState state = new MutableObjectState
+            {
+                ServerData = new Dictionary<string, object>
+                {
+                    ["email"] = "james@parse.com",
+                    ["authData"] = new Dictionary<string, object>
+                    {
+                        ["facebook"] = new Dictionary<string, object>
+                        {
+                            ["sessionToken"] = "none"
+                        }
+                    }
+                }
+            };
+
+            ParseUser user = Client.GenerateObjectFromState<ParseUser>(state, "_User");
+            Assert.AreEqual(1, user.AuthData.Count);
+            Assert.IsInstanceOfType(user.AuthData["facebook"], typeof(IDictionary<string, object>));
+        }
+
+        [TestMethod]
+        public void TestGetUserQuery() => Assert.IsInstanceOfType(Client.GetUserQuery(), typeof(ParseQuery<ParseUser>));
+
+        [TestMethod]
+        public void TestIsAuthenticated()
+        {
+            IObjectState state = new MutableObjectState
+            {
+                ObjectId = "wagimanPutraPetir",
+                ServerData = new Dictionary<string, object>
+                {
+                    ["sessionToken"] = "llaKcolnu"
+                }
+            };
+
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            ParseUser user = client.GenerateObjectFromState<ParseUser>(state, "_User");
+
+            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController> { };
+            mockCurrentUserController.Setup(obj => obj.GetAsync(It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(user));
+
+            hub.CurrentUserController = mockCurrentUserController.Object;
+
+            Assert.IsTrue(user.IsAuthenticated);
+        }
+
+        [TestMethod]
+        public void TestIsAuthenticatedWithOtherParseUser()
+        {
+            IObjectState state = new MutableObjectState
+            {
+                ObjectId = "wagimanPutraPetir",
+                ServerData = new Dictionary<string, object>
+                {
+                    ["sessionToken"] = "llaKcolnu"
+                }
+            };
+
+            IObjectState state2 = new MutableObjectState
+            {
+                ObjectId = "wagimanPutraPetir2",
+                ServerData = new Dictionary<string, object>
+                {
+                    ["sessionToken"] = "llaKcolnu"
+                }
+            };
+
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            ParseUser user = client.GenerateObjectFromState<ParseUser>(state, "_User");
+            ParseUser user2 = client.GenerateObjectFromState<ParseUser>(state2, "_User");
+
+            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController> { };
+            mockCurrentUserController.Setup(obj => obj.GetAsync(It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(user));
+
+            hub.CurrentUserController = mockCurrentUserController.Object;
+
+            Assert.IsFalse(user2.IsAuthenticated);
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(UserTests))]
+        public Task TestSignUpWithInvalidServerData()
+        {
+            IObjectState state = new MutableObjectState
+            {
+                ServerData = new Dictionary<string, object>
+                {
+                    ["sessionToken"] = "llaKcolnu"
+                }
+            };
+
+            ParseUser user = Client.GenerateObjectFromState<ParseUser>(state, "_User");
+
+            return user.SignUpAsync().ContinueWith(task =>
+            {
+                Assert.IsTrue(task.IsFaulted);
+                Assert.IsInstanceOfType(task.Exception.InnerException, typeof(InvalidOperationException));
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(UserTests))]
+        public Task TestSignUp()
+        {
+            IObjectState state = new MutableObjectState
+            {
+                ServerData = new Dictionary<string, object>
+                {
+                    ["sessionToken"] = "llaKcolnu",
+                    ["username"] = "ihave",
+                    ["password"] = "adream"
+                }
+            };
+
+            IObjectState newState = new MutableObjectState
+            {
+                ObjectId = "some0neTol4v4"
+            };
+
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            ParseUser user = client.GenerateObjectFromState<ParseUser>(state, "_User");
+
+            Mock<IParseUserController> mockController = new Mock<IParseUserController> { };
+            mockController.Setup(obj => obj.SignUpAsync(It.IsAny<IObjectState>(), It.IsAny<IDictionary<string, IParseFieldOperation>>(), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(newState));
+
+            hub.UserController = mockController.Object;
+
+            return user.SignUpAsync().ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockController.Verify(obj => obj.SignUpAsync(It.IsAny<IObjectState>(), It.IsAny<IDictionary<string, IParseFieldOperation>>(), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+
+                Assert.IsFalse(user.IsDirty);
+                Assert.AreEqual("ihave", user.Username);
+                Assert.IsFalse(user.State.ContainsKey("password"));
+                Assert.AreEqual("some0neTol4v4", user.ObjectId);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(UserTests))]
+        public Task TestLogIn()
+        {
+            IObjectState state = new MutableObjectState
+            {
+                ServerData = new Dictionary<string, object>
+                {
+                    ["sessionToken"] = "llaKcolnu",
+                    ["username"] = "ihave",
+                    ["password"] = "adream"
+                }
+            };
+
+            IObjectState newState = new MutableObjectState
+            {
+                ObjectId = "some0neTol4v4"
+            };
+
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            Mock<IParseUserController> mockController = new Mock<IParseUserController> { };
+            mockController.Setup(obj => obj.LogInAsync("ihave", "adream", It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(newState));
+
+            hub.UserController = mockController.Object;
+
+            return client.LogInAsync("ihave", "adream").ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockController.Verify(obj => obj.LogInAsync("ihave", "adream", It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+
+                ParseUser user = task.Result;
+                Assert.IsFalse(user.IsDirty);
+                Assert.IsNull(user.Username);
+                Assert.AreEqual("some0neTol4v4", user.ObjectId);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(UserTests))]
+        public Task TestBecome()
+        {
+            IObjectState state = new MutableObjectState
+            {
+                ObjectId = "some0neTol4v4",
+                ServerData = new Dictionary<string, object> { ["sessionToken"] = "llaKcolnu" }
+            };
+
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            Mock<IParseUserController> mockController = new Mock<IParseUserController> { };
+            mockController.Setup(obj => obj.GetUserAsync("llaKcolnu", It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(state));
+
+            hub.UserController = mockController.Object;
+
+            return client.BecomeAsync("llaKcolnu").ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockController.Verify(obj => obj.GetUserAsync("llaKcolnu", It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+
+                ParseUser user = task.Result;
+                Assert.AreEqual("some0neTol4v4", user.ObjectId);
+                Assert.AreEqual("llaKcolnu", user.SessionToken);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(UserTests))]
+        public Task TestLogOut()
+        {
+            IObjectState state = new MutableObjectState
+            {
+                ServerData = new Dictionary<string, object>
+                {
+                    ["sessionToken"] = "r:llaKcolnu"
+                }
+            };
+
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            ParseUser user = client.GenerateObjectFromState<ParseUser>(state, "_User");
+
+            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController> { };
+            mockCurrentUserController.Setup(obj => obj.GetAsync(It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(user));
+
+            Mock<IParseSessionController> mockSessionController = new Mock<IParseSessionController>();
+            mockSessionController.Setup(c => c.IsRevocableSessionToken(It.IsAny<string>())).Returns(true);
+
+            hub.CurrentUserController = mockCurrentUserController.Object;
+            hub.SessionController = mockSessionController.Object;
+
+            return client.LogOutAsync().ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockCurrentUserController.Verify(obj => obj.LogOutAsync(It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+                mockSessionController.Verify(obj => obj.RevokeAsync("r:llaKcolnu", It.IsAny<CancellationToken>()), Times.Exactly(1));
+            });
+        }
+
+        [TestMethod]
+        public void TestCurrentUser()
+        {
+            IObjectState state = new MutableObjectState
+            {
+                ServerData = new Dictionary<string, object>
+                {
+                    ["sessionToken"] = "llaKcolnu"
+                }
+            };
+
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            ParseUser user = client.GenerateObjectFromState<ParseUser>(state, "_User");
+
+            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController> { };
+            mockCurrentUserController.Setup(obj => obj.GetAsync(It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(user));
+
+            hub.CurrentUserController = mockCurrentUserController.Object;
+
+            Assert.AreEqual(user, client.GetCurrentUser());
+        }
+
+        [TestMethod]
+        public void TestCurrentUserWithEmptyResult() => Assert.IsNull(new ParseClient(new ServerConnectionData { Test = true }, new MutableServiceHub { CurrentUserController = new Mock<IParseCurrentUserController> { }.Object }).GetCurrentUser());
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(UserTests))]
+        public Task TestRevocableSession()
+        {
+            IObjectState state = new MutableObjectState
+            {
+                ServerData = new Dictionary<string, object>
+                {
+                    ["sessionToken"] = "llaKcolnu"
+                }
+            };
+
+            IObjectState newState = new MutableObjectState
+            {
+                ServerData = new Dictionary<string, object>
+                {
+                    ["sessionToken"] = "r:llaKcolnu"
+                }
+            };
+
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            ParseUser user = client.GenerateObjectFromState<ParseUser>(state, "_User");
+
+            Mock<IParseSessionController> mockSessionController = new Mock<IParseSessionController>();
+            mockSessionController.Setup(obj => obj.UpgradeToRevocableSessionAsync("llaKcolnu", It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(newState));
+
+            hub.SessionController = mockSessionController.Object;
+
+            return user.UpgradeToRevocableSessionAsync(CancellationToken.None).ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockSessionController.Verify(obj => obj.UpgradeToRevocableSessionAsync("llaKcolnu", It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+
+                Assert.AreEqual("r:llaKcolnu", user.SessionToken);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(UserTests))]
+        public Task TestRequestPasswordReset()
+        {
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            Mock<IParseUserController> mockController = new Mock<IParseUserController> { };
+
+            hub.UserController = mockController.Object;
+
+            return client.RequestPasswordResetAsync("gogo@parse.com").ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockController.Verify(obj => obj.RequestPasswordResetAsync("gogo@parse.com", It.IsAny<CancellationToken>()), Times.Exactly(1));
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(UserTests))]
+        public Task TestUserSave()
+        {
+            IObjectState state = new MutableObjectState
+            {
+                ObjectId = "some0neTol4v4",
+                ServerData = new Dictionary<string, object>
+                {
+                    ["sessionToken"] = "llaKcolnu",
+                    ["username"] = "ihave",
+                    ["password"] = "adream"
+                }
+            };
+
+            IObjectState newState = new MutableObjectState
+            {
+                ServerData = new Dictionary<string, object>
+                {
+                    ["Alliance"] = "rekt"
+                }
+            };
+
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            ParseUser user = client.GenerateObjectFromState<ParseUser>(state, "_User");
+            Mock<IParseObjectController> mockObjectController = new Mock<IParseObjectController>();
+
+            mockObjectController.Setup(obj => obj.SaveAsync(It.IsAny<IObjectState>(), It.IsAny<IDictionary<string, IParseFieldOperation>>(), It.IsAny<string>(), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(newState));
+
+            hub.ObjectController = mockObjectController.Object;
+            hub.CurrentUserController = new Mock<IParseCurrentUserController> { }.Object;
+
+            user["Alliance"] = "rekt";
+
+            return user.SaveAsync().ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockObjectController.Verify(obj => obj.SaveAsync(It.IsAny<IObjectState>(), It.IsAny<IDictionary<string, IParseFieldOperation>>(), It.IsAny<string>(), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+
+                Assert.IsFalse(user.IsDirty);
+                Assert.AreEqual("ihave", user.Username);
+                Assert.IsFalse(user.State.ContainsKey("password"));
+                Assert.AreEqual("some0neTol4v4", user.ObjectId);
+                Assert.AreEqual("rekt", user["Alliance"]);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(UserTests))]
+        public Task TestUserFetch()
+        {
+            IObjectState state = new MutableObjectState
+            {
+                ObjectId = "some0neTol4v4",
+                ServerData = new Dictionary<string, object>
+                {
+                    ["sessionToken"] = "llaKcolnu",
+                    ["username"] = "ihave",
+                    ["password"] = "adream"
+                }
+            };
+
+            IObjectState newState = new MutableObjectState
+            {
+                ServerData = new Dictionary<string, object>
+                {
+                    ["Alliance"] = "rekt"
+                }
+            };
+
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            ParseUser user = client.GenerateObjectFromState<ParseUser>(state, "_User");
+
+            Mock<IParseObjectController> mockObjectController = new Mock<IParseObjectController>();
+            mockObjectController.Setup(obj => obj.FetchAsync(It.IsAny<IObjectState>(), It.IsAny<string>(), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(newState));
+
+            hub.ObjectController = mockObjectController.Object;
+            hub.CurrentUserController = new Mock<IParseCurrentUserController> { }.Object;
+
+            user["Alliance"] = "rekt";
+
+            return user.FetchAsync().ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockObjectController.Verify(obj => obj.FetchAsync(It.IsAny<IObjectState>(), It.IsAny<string>(), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+
+                Assert.IsTrue(user.IsDirty);
+                Assert.AreEqual("ihave", user.Username);
+                Assert.IsTrue(user.State.ContainsKey("password"));
+                Assert.AreEqual("some0neTol4v4", user.ObjectId);
+                Assert.AreEqual("rekt", user["Alliance"]);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(UserTests))]
+        public Task TestLink()
+        {
+            IObjectState state = new MutableObjectState
+            {
+                ObjectId = "some0neTol4v4",
+                ServerData = new Dictionary<string, object>
+                {
+                    ["sessionToken"] = "llaKcolnu"
+                }
+            };
+
+            IObjectState newState = new MutableObjectState
+            {
+                ServerData = new Dictionary<string, object>
+                {
+                    ["garden"] = "ofWords"
+                }
+            };
+
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            ParseUser user = client.GenerateObjectFromState<ParseUser>(state, "_User");
+
+            Mock<IParseObjectController> mockObjectController = new Mock<IParseObjectController>();
+            mockObjectController.Setup(obj => obj.SaveAsync(It.IsAny<IObjectState>(), It.IsAny<IDictionary<string, IParseFieldOperation>>(), It.IsAny<string>(), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(newState));
+
+            hub.ObjectController = mockObjectController.Object;
+            hub.CurrentUserController = new Mock<IParseCurrentUserController> { }.Object;
+
+            return user.LinkWithAsync("parse", new Dictionary<string, object> { }, CancellationToken.None).ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockObjectController.Verify(obj => obj.SaveAsync(It.IsAny<IObjectState>(), It.IsAny<IDictionary<string, IParseFieldOperation>>(), It.IsAny<string>(), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+
+                Assert.IsFalse(user.IsDirty);
+                Assert.IsNotNull(user.AuthData);
+                Assert.IsNotNull(user.AuthData["parse"]);
+                Assert.AreEqual("some0neTol4v4", user.ObjectId);
+                Assert.AreEqual("ofWords", user["garden"]);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(UserTests))]
+        public Task TestUnlink()
+        {
+            IObjectState state = new MutableObjectState
+            {
+                ObjectId = "some0neTol4v4",
+                ServerData = new Dictionary<string, object>
+                {
+                    ["sessionToken"] = "llaKcolnu",
+                    ["authData"] = new Dictionary<string, object>
+                    {
+                        ["parse"] = new Dictionary<string, object> { }
+                    }
+                }
+            };
+
+            IObjectState newState = new MutableObjectState
+            {
+                ServerData = new Dictionary<string, object>
+                {
+                    ["garden"] = "ofWords"
+                }
+            };
+
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            ParseUser user = client.GenerateObjectFromState<ParseUser>(state, "_User");
+
+            Mock<IParseObjectController> mockObjectController = new Mock<IParseObjectController>();
+            mockObjectController.Setup(obj => obj.SaveAsync(It.IsAny<IObjectState>(), It.IsAny<IDictionary<string, IParseFieldOperation>>(), It.IsAny<string>(), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(newState));
+
+            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController> { };
+            mockCurrentUserController.Setup(obj => obj.IsCurrent(user)).Returns(true);
+
+            hub.ObjectController = mockObjectController.Object;
+            hub.CurrentUserController = mockCurrentUserController.Object;
+
+            return user.UnlinkFromAsync("parse", CancellationToken.None).ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockObjectController.Verify(obj => obj.SaveAsync(It.IsAny<IObjectState>(), It.IsAny<IDictionary<string, IParseFieldOperation>>(), It.IsAny<string>(), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+
+                Assert.IsFalse(user.IsDirty);
+                Assert.IsNotNull(user.AuthData);
+                Assert.IsFalse(user.AuthData.ContainsKey("parse"));
+                Assert.AreEqual("some0neTol4v4", user.ObjectId);
+                Assert.AreEqual("ofWords", user["garden"]);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(UserTests))]
+        public Task TestUnlinkNonCurrentUser()
+        {
+            IObjectState state = new MutableObjectState
+            {
+                ObjectId = "some0neTol4v4",
+                ServerData = new Dictionary<string, object>
+                {
+                    ["sessionToken"] = "llaKcolnu",
+                    ["authData"] = new Dictionary<string, object>
+                    {
+                        ["parse"] = new Dictionary<string, object> { }
+                    }
+                }
+            };
+
+            IObjectState newState = new MutableObjectState
+            {
+                ServerData = new Dictionary<string, object>
+                {
+                    ["garden"] = "ofWords"
+                }
+            };
+
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            ParseUser user = client.GenerateObjectFromState<ParseUser>(state, "_User");
+
+            Mock<IParseObjectController> mockObjectController = new Mock<IParseObjectController>();
+            mockObjectController.Setup(obj => obj.SaveAsync(It.IsAny<IObjectState>(), It.IsAny<IDictionary<string, IParseFieldOperation>>(), It.IsAny<string>(), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(newState));
+
+            Mock<IParseCurrentUserController> mockCurrentUserController = new Mock<IParseCurrentUserController> { };
+            mockCurrentUserController.Setup(obj => obj.IsCurrent(user)).Returns(false);
+
+            hub.ObjectController = mockObjectController.Object;
+            hub.CurrentUserController = mockCurrentUserController.Object;
+
+            return user.UnlinkFromAsync("parse", CancellationToken.None).ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockObjectController.Verify(obj => obj.SaveAsync(It.IsAny<IObjectState>(), It.IsAny<IDictionary<string, IParseFieldOperation>>(), It.IsAny<string>(), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+
+                Assert.IsFalse(user.IsDirty);
+                Assert.IsNotNull(user.AuthData);
+                Assert.IsTrue(user.AuthData.ContainsKey("parse"));
+                Assert.IsNull(user.AuthData["parse"]);
+                Assert.AreEqual("some0neTol4v4", user.ObjectId);
+                Assert.AreEqual("ofWords", user["garden"]);
+            });
+        }
+
+        [TestMethod]
+        [AsyncStateMachine(typeof(UserTests))]
+        public Task TestLogInWith()
+        {
+            IObjectState state = new MutableObjectState
+            {
+                ObjectId = "some0neTol4v4",
+                ServerData = new Dictionary<string, object>
+                {
+                    ["sessionToken"] = "llaKcolnu"
+                }
+            };
+
+            MutableServiceHub hub = new MutableServiceHub { };
+            ParseClient client = new ParseClient(new ServerConnectionData { Test = true }, hub);
+
+            Mock<IParseUserController> mockController = new Mock<IParseUserController> { };
+            mockController.Setup(obj => obj.LogInAsync("parse", It.IsAny<IDictionary<string, object>>(), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(state));
+
+            hub.UserController = mockController.Object;
+
+            return client.LogInWithAsync("parse", new Dictionary<string, object> { }, CancellationToken.None).ContinueWith(task =>
+            {
+                Assert.IsFalse(task.IsFaulted);
+                Assert.IsFalse(task.IsCanceled);
+
+                mockController.Verify(obj => obj.LogInAsync("parse", It.IsAny<IDictionary<string, object>>(), It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
+
+                ParseUser user = task.Result;
+
+                Assert.IsNotNull(user.AuthData);
+                Assert.IsNotNull(user.AuthData["parse"]);
+                Assert.AreEqual("some0neTol4v4", user.ObjectId);
+            });
+        }
+
+        [TestMethod]
+        public void TestImmutableKeys()
+        {
+            ParseUser user = new ParseUser { }.Bind(Client) as ParseUser;
+            string[] immutableKeys = new string[] { "sessionToken", "isNew" };
+
+            foreach (string key in immutableKeys)
+            {
+                Assert.ThrowsException<InvalidOperationException>(() => user[key] = "1234567890");
+
+                Assert.ThrowsException<InvalidOperationException>(() => user.Add(key, "1234567890"));
+
+                Assert.ThrowsException<InvalidOperationException>(() => user.AddRangeUniqueToList(key, new string[] { "1234567890" }));
+
+                Assert.ThrowsException<InvalidOperationException>(() => user.Remove(key));
+
+                Assert.ThrowsException<InvalidOperationException>(() => user.RemoveAllFromList(key, new string[] { "1234567890" }));
+            }
+
+            // Other special keys should be good.
+
+            user["username"] = "username";
+            user["password"] = "password";
+        }
+    }
+}
diff --git a/Parse.sln b/Parse.sln
index e7669198..cb26bb64 100644
--- a/Parse.sln
+++ b/Parse.sln
@@ -1,12 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2036
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29905.134
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Parse", "Parse\Parse.csproj", "{297FE1CA-AEDF-47BB-964D-E82780EA0A1C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Parse.Test", "Parse.Test\Parse.Test.csproj", "{F54F1CF4-89AB-48E9-99C5-6CCD88B3EDBB}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{35AC7BF1-C7AA-4B48-A41D-858F226E660E}"
 	ProjectSection(SolutionItems) = preProject
 		.appveyor.yml = .appveyor.yml
@@ -17,6 +15,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Parse.Tests", "Parse.Tests\Parse.Tests.csproj", "{E5529694-B75B-4F07-8436-A749B5E801C3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,10 +27,10 @@ Global
 		{297FE1CA-AEDF-47BB-964D-E82780EA0A1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{297FE1CA-AEDF-47BB-964D-E82780EA0A1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{297FE1CA-AEDF-47BB-964D-E82780EA0A1C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F54F1CF4-89AB-48E9-99C5-6CCD88B3EDBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F54F1CF4-89AB-48E9-99C5-6CCD88B3EDBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F54F1CF4-89AB-48E9-99C5-6CCD88B3EDBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F54F1CF4-89AB-48E9-99C5-6CCD88B3EDBB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5529694-B75B-4F07-8436-A749B5E801C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5529694-B75B-4F07-8436-A749B5E801C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5529694-B75B-4F07-8436-A749B5E801C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5529694-B75B-4F07-8436-A749B5E801C3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Parse/Internal/Operation/IParseFieldOperation.cs b/Parse/Abstractions/Infrastructure/Control/IParseFieldOperation.cs
similarity index 96%
rename from Parse/Internal/Operation/IParseFieldOperation.cs
rename to Parse/Abstractions/Infrastructure/Control/IParseFieldOperation.cs
index 1dd018c2..102b0b98 100644
--- a/Parse/Internal/Operation/IParseFieldOperation.cs
+++ b/Parse/Abstractions/Infrastructure/Control/IParseFieldOperation.cs
@@ -1,6 +1,6 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
-namespace Parse.Core.Internal
+namespace Parse.Abstractions.Infrastructure.Control
 {
     /// <summary>
     /// A ParseFieldOperation represents a modification to a value in a ParseObject.
@@ -15,7 +15,7 @@ public interface IParseFieldOperation
         /// Parse as part of a save operation.
         /// </summary>
         /// <returns>An object to be JSONified.</returns>
-        object Encode();
+        object Encode(IServiceHub serviceHub);
 
         /// <summary>
         /// Returns a field operation that is composed of a previous operation followed by
diff --git a/Parse/Abstractions/Infrastructure/CustomServiceHub.cs b/Parse/Abstractions/Infrastructure/CustomServiceHub.cs
new file mode 100644
index 00000000..49689c94
--- /dev/null
+++ b/Parse/Abstractions/Infrastructure/CustomServiceHub.cs
@@ -0,0 +1,66 @@
+using Parse.Abstractions.Infrastructure.Data;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Abstractions.Platform.Analytics;
+using Parse.Abstractions.Platform.Cloud;
+using Parse.Abstractions.Platform.Configuration;
+using Parse.Abstractions.Platform.Files;
+using Parse.Abstractions.Platform.Installations;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Abstractions.Platform.Push;
+using Parse.Abstractions.Platform.Queries;
+using Parse.Abstractions.Platform.Sessions;
+using Parse.Abstractions.Platform.Users;
+
+namespace Parse.Abstractions.Infrastructure
+{
+    public abstract class CustomServiceHub : ICustomServiceHub
+    {
+        public virtual IServiceHub Services { get; internal set; }
+
+        public virtual IServiceHubCloner Cloner => Services.Cloner;
+
+        public virtual IMetadataController MetadataController => Services.MetadataController;
+
+        public virtual IWebClient WebClient => Services.WebClient;
+
+        public virtual ICacheController CacheController => Services.CacheController;
+
+        public virtual IParseObjectClassController ClassController => Services.ClassController;
+
+        public virtual IParseInstallationController InstallationController => Services.InstallationController;
+
+        public virtual IParseCommandRunner CommandRunner => Services.CommandRunner;
+
+        public virtual IParseCloudCodeController CloudCodeController => Services.CloudCodeController;
+
+        public virtual IParseConfigurationController ConfigurationController => Services.ConfigurationController;
+
+        public virtual IParseFileController FileController => Services.FileController;
+
+        public virtual IParseObjectController ObjectController => Services.ObjectController;
+
+        public virtual IParseQueryController QueryController => Services.QueryController;
+
+        public virtual IParseSessionController SessionController => Services.SessionController;
+
+        public virtual IParseUserController UserController => Services.UserController;
+
+        public virtual IParseCurrentUserController CurrentUserController => Services.CurrentUserController;
+
+        public virtual IParseAnalyticsController AnalyticsController => Services.AnalyticsController;
+
+        public virtual IParseInstallationCoder InstallationCoder => Services.InstallationCoder;
+
+        public virtual IParsePushChannelsController PushChannelsController => Services.PushChannelsController;
+
+        public virtual IParsePushController PushController => Services.PushController;
+
+        public virtual IParseCurrentInstallationController CurrentInstallationController => Services.CurrentInstallationController;
+
+        public virtual IServerConnectionData ServerConnectionData => Services.ServerConnectionData;
+
+        public virtual IParseDataDecoder Decoder => Services.Decoder;
+
+        public virtual IParseInstallationDataFinalizer InstallationDataFinalizer => Services.InstallationDataFinalizer;
+    }
+}
diff --git a/Parse/Abstractions/Infrastructure/Data/IParseDataDecoder.cs b/Parse/Abstractions/Infrastructure/Data/IParseDataDecoder.cs
new file mode 100644
index 00000000..590cf169
--- /dev/null
+++ b/Parse/Abstractions/Infrastructure/Data/IParseDataDecoder.cs
@@ -0,0 +1,18 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+namespace Parse.Abstractions.Infrastructure.Data
+{
+    /// <summary>
+    /// A generalized input data decoding interface for the Parse SDK.
+    /// </summary>
+    public interface IParseDataDecoder
+    {
+        /// <summary>
+        /// Decodes input data into Parse-SDK-related entities, such as <see cref="ParseObject"/> instances, which is why an <see cref="IServiceHub"/> implementation instance is sometimes required.
+        /// </summary>
+        /// <param name="data">The target input data to decode.</param>
+        /// <param name="serviceHub">A <see cref="IServiceHub"/> implementation instance to use when instantiating <see cref="ParseObject"/>s.</param>
+        /// <returns>A Parse SDK entity such as a <see cref="ParseObject"/>.</returns>
+        object Decode(object data, IServiceHub serviceHub);
+    }
+}
\ No newline at end of file
diff --git a/Parse/Internal/Command/IParseCommandRunner.cs b/Parse/Abstractions/Infrastructure/Execution/IParseCommandRunner.cs
similarity index 76%
rename from Parse/Internal/Command/IParseCommandRunner.cs
rename to Parse/Abstractions/Infrastructure/Execution/IParseCommandRunner.cs
index 0739a45d..6718f003 100644
--- a/Parse/Internal/Command/IParseCommandRunner.cs
+++ b/Parse/Abstractions/Infrastructure/Execution/IParseCommandRunner.cs
@@ -5,8 +5,9 @@
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
+using Parse.Infrastructure.Execution;
 
-namespace Parse.Core.Internal
+namespace Parse.Abstractions.Infrastructure.Execution
 {
     public interface IParseCommandRunner
     {
@@ -18,9 +19,6 @@ public interface IParseCommandRunner
         /// <param name="downloadProgress">Download progress callback.</param>
         /// <param name="cancellationToken">The cancellation token for the request.</param>
         /// <returns></returns>
-        Task<Tuple<HttpStatusCode, IDictionary<string, object>>> RunCommandAsync(ParseCommand command,
-            IProgress<ParseUploadProgressEventArgs> uploadProgress = null,
-            IProgress<ParseDownloadProgressEventArgs> downloadProgress = null,
-            CancellationToken cancellationToken = default(CancellationToken));
+        Task<Tuple<HttpStatusCode, IDictionary<string, object>>> RunCommandAsync(ParseCommand command, IProgress<IDataTransferLevel> uploadProgress = null, IProgress<IDataTransferLevel> downloadProgress = null, CancellationToken cancellationToken = default);
     }
 }
diff --git a/Parse/Internal/HttpClient/IHttpClient.cs b/Parse/Abstractions/Infrastructure/Execution/IWebClient.cs
similarity index 58%
rename from Parse/Internal/HttpClient/IHttpClient.cs
rename to Parse/Abstractions/Infrastructure/Execution/IWebClient.cs
index 5d9a5cbd..db4f50ba 100644
--- a/Parse/Internal/HttpClient/IHttpClient.cs
+++ b/Parse/Abstractions/Infrastructure/Execution/IWebClient.cs
@@ -1,26 +1,24 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
 using System;
-using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
+using Parse.Infrastructure.Execution;
+using Status = System.Net.HttpStatusCode;
 
-namespace Parse.Common.Internal
+namespace Parse.Abstractions.Infrastructure.Execution
 {
-    public interface IHttpClient
+    public interface IWebClient
     {
         /// <summary>
-        /// Executes HTTP request to a <see cref="HttpRequest.Uri"/> with <see cref="HttpRequest.Method"/> HTTP verb
-        /// and <see cref="HttpRequest.Headers"/>.
+        /// Executes HTTP request to a <see cref="WebRequest.Target"/> with <see cref="WebRequest.Method"/> HTTP verb
+        /// and <see cref="WebRequest.Headers"/>.
         /// </summary>
         /// <param name="httpRequest">The HTTP request to be executed.</param>
         /// <param name="uploadProgress">Upload progress callback.</param>
         /// <param name="downloadProgress">Download progress callback.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>A task that resolves to Htt</returns>
-        Task<Tuple<HttpStatusCode, string>> ExecuteAsync(HttpRequest httpRequest,
-            IProgress<ParseUploadProgressEventArgs> uploadProgress,
-            IProgress<ParseDownloadProgressEventArgs> downloadProgress,
-            CancellationToken cancellationToken);
+        Task<Tuple<Status, string>> ExecuteAsync(WebRequest httpRequest, IProgress<IDataTransferLevel> uploadProgress, IProgress<IDataTransferLevel> downloadProgress, CancellationToken cancellationToken = default);
     }
 }
diff --git a/Parse/Abstractions/Infrastructure/ICacheController.cs b/Parse/Abstractions/Infrastructure/ICacheController.cs
new file mode 100644
index 00000000..e3445deb
--- /dev/null
+++ b/Parse/Abstractions/Infrastructure/ICacheController.cs
@@ -0,0 +1,47 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace Parse.Abstractions.Infrastructure
+{
+    // TODO: Move TransferAsync to IDiskFileCacheController and find viable alternative for use in ICacheController if needed.
+
+    /// <summary>
+    /// An abstraction for accessing persistent storage in the Parse SDK.
+    /// </summary>
+    public interface ICacheController
+    {
+        /// <summary>
+        /// Cleans up any temporary files and/or directories created during SDK operation.
+        /// </summary>
+        public void Clear();
+
+        /// <summary>
+        /// Gets the file wrapper for the specified <paramref name="path"/>.
+        /// </summary>
+        /// <param name="path">The relative path to the target file</param>
+        /// <returns>An instance of <see cref="FileInfo"/> wrapping the the <paramref name="path"/> value</returns>
+        FileInfo GetRelativeFile(string path);
+
+        /// <summary>
+        /// Transfers a file from <paramref name="originFilePath"/> to <paramref name="targetFilePath"/>.
+        /// </summary>
+        /// <param name="originFilePath"></param>
+        /// <param name="targetFilePath"></param>
+        /// <returns>A task that completes once the file move operation form <paramref name="originFilePath"/> to <paramref name="targetFilePath"/> completes.</returns>
+        Task TransferAsync(string originFilePath, string targetFilePath);
+
+        /// <summary>
+        /// Load the contents of this storage controller asynchronously.
+        /// </summary>
+        /// <returns></returns>
+        Task<IDataCache<string, object>> LoadAsync();
+
+        /// <summary>
+        /// Overwrites the contents of this storage controller asynchronously.
+        /// </summary>
+        /// <param name="contents"></param>
+        /// <returns></returns>
+        Task<IDataCache<string, object>> SaveAsync(IDictionary<string, object> contents);
+    }
+}
\ No newline at end of file
diff --git a/Parse/Abstractions/Infrastructure/ICustomServiceHub.cs b/Parse/Abstractions/Infrastructure/ICustomServiceHub.cs
new file mode 100644
index 00000000..967f77bc
--- /dev/null
+++ b/Parse/Abstractions/Infrastructure/ICustomServiceHub.cs
@@ -0,0 +1,7 @@
+namespace Parse.Abstractions.Infrastructure
+{
+    public interface ICustomServiceHub : IServiceHub
+    {
+        IServiceHub Services { get; }
+    }
+}
diff --git a/Parse/Abstractions/Infrastructure/IDataCache.cs b/Parse/Abstractions/Infrastructure/IDataCache.cs
new file mode 100644
index 00000000..047d489f
--- /dev/null
+++ b/Parse/Abstractions/Infrastructure/IDataCache.cs
@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Parse.Abstractions.Infrastructure
+{
+    // IGeneralizedDataCache
+
+    /// <summary>
+    /// An interface for a dictionary that is persisted to disk asynchronously.
+    /// </summary>
+    /// <typeparam name="TKey">They key type of the dictionary.</typeparam>
+    /// <typeparam name="TValue">The value type of the dictionary.</typeparam>
+    public interface IDataCache<TKey, TValue> : IDictionary<TKey, TValue>
+    {
+        /// <summary>
+        /// Adds a key to this dictionary, and saves it asynchronously.
+        /// </summary>
+        /// <param name="key">The key to insert.</param>
+        /// <param name="value">The value to insert.</param>
+        /// <returns></returns>
+        Task AddAsync(TKey key, TValue value);
+
+        /// <summary>
+        /// Removes a key from this dictionary, and saves it asynchronously.
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        Task RemoveAsync(TKey key);
+    }
+}
\ No newline at end of file
diff --git a/Parse/Internal/Analytics/IParseAnalyticsPlugins.cs b/Parse/Abstractions/Infrastructure/IDataTransferLevel.cs
similarity index 54%
rename from Parse/Internal/Analytics/IParseAnalyticsPlugins.cs
rename to Parse/Abstractions/Infrastructure/IDataTransferLevel.cs
index 0e31876e..4257d1b4 100644
--- a/Parse/Internal/Analytics/IParseAnalyticsPlugins.cs
+++ b/Parse/Abstractions/Infrastructure/IDataTransferLevel.cs
@@ -1,15 +1,9 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
-using Parse.Core.Internal;
-using System;
-
-namespace Parse.Analytics.Internal
+namespace Parse.Abstractions.Infrastructure
 {
-    public interface IParseAnalyticsPlugins
+    public interface IDataTransferLevel
     {
-        void Reset();
-
-        IParseCorePlugins CorePlugins { get; }
-        IParseAnalyticsController AnalyticsController { get; }
+        double Amount { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/Parse/Abstractions/Infrastructure/IDiskFileCacheController.cs b/Parse/Abstractions/Infrastructure/IDiskFileCacheController.cs
new file mode 100644
index 00000000..dff5a045
--- /dev/null
+++ b/Parse/Abstractions/Infrastructure/IDiskFileCacheController.cs
@@ -0,0 +1,26 @@
+using System;
+
+namespace Parse.Abstractions.Infrastructure
+{
+    /// <summary>
+    /// An <see cref="ICacheController"/> which stores the cache on disk via a file.
+    /// </summary>
+    public interface IDiskFileCacheController : ICacheController
+    {
+        /// <summary>
+        /// The path to a persistent user-specific storage location specific to the final client assembly of the Parse library.
+        /// </summary>
+        public string AbsoluteCacheFilePath { get; set; }
+
+        /// <summary>
+        /// The relative path from the <see cref="Environment.SpecialFolder.LocalApplicationData"/> on the device an to application-specific persistent storage folder.
+        /// </summary>
+        public string RelativeCacheFilePath { get; set; }
+
+        /// <summary>
+        /// Refreshes this cache controller's internal tracked cache file to reflect the <see cref="AbsoluteCacheFilePath"/> and/or <see cref="RelativeCacheFilePath"/>.
+        /// </summary>
+        /// <remarks>This will not delete the active tracked cache file that will be un-tracked after a call to this method. To do so, call <see cref="ICacheController.Clear()"/>.</remarks>
+        void RefreshPaths();
+    }
+}
\ No newline at end of file
diff --git a/Parse/Abstractions/Infrastructure/IEnvironmentData.cs b/Parse/Abstractions/Infrastructure/IEnvironmentData.cs
new file mode 100644
index 00000000..14b454b5
--- /dev/null
+++ b/Parse/Abstractions/Infrastructure/IEnvironmentData.cs
@@ -0,0 +1,24 @@
+namespace Parse.Abstractions.Infrastructure
+{
+    /// <summary>
+    /// Information about the environment in which the library will be operating.
+    /// </summary>
+    public interface IEnvironmentData
+    {
+        /// <summary>
+        /// The currently active time zone when the library will be used.
+        /// </summary>
+        string TimeZone { get; }
+
+        /// <summary>
+        /// The operating system version of the platform the SDK is operating in.
+        /// </summary>
+        string OSVersion { get; }
+
+        /// <summary>
+        /// An identifier of the platform.
+        /// </summary>
+        /// <remarks>Expected to be one of ios, android, winrt, winphone, or dotnet.</remarks>
+        public string Platform { get; set; }
+    }
+}
diff --git a/Parse/Abstractions/Infrastructure/IHostManifestData.cs b/Parse/Abstractions/Infrastructure/IHostManifestData.cs
new file mode 100644
index 00000000..b8f2c5f7
--- /dev/null
+++ b/Parse/Abstractions/Infrastructure/IHostManifestData.cs
@@ -0,0 +1,28 @@
+namespace Parse.Abstractions.Infrastructure
+{
+    /// <summary>
+    /// Information about the application using the Parse SDK.
+    /// </summary>
+    public interface IHostManifestData
+    {
+        /// <summary>
+        /// The build number of your app.
+        /// </summary>
+        string Version { get; }
+
+        /// <summary>
+        /// The human friendly version number of your app.
+        /// </summary>
+        string ShortVersion { get; }
+
+        /// <summary>
+        /// A unique string representing your app.
+        /// </summary>
+        string Identifier { get; }
+
+        /// <summary>
+        /// The name of your app.
+        /// </summary>
+        string Name { get; }
+    }
+}
diff --git a/Parse/Internal/Utilities/IJsonConvertible.cs b/Parse/Abstractions/Infrastructure/IJsonConvertible.cs
similarity index 87%
rename from Parse/Internal/Utilities/IJsonConvertible.cs
rename to Parse/Abstractions/Infrastructure/IJsonConvertible.cs
index 0a9f1aff..6071d8bb 100644
--- a/Parse/Internal/Utilities/IJsonConvertible.cs
+++ b/Parse/Abstractions/Infrastructure/IJsonConvertible.cs
@@ -1,9 +1,8 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
-using System;
 using System.Collections.Generic;
 
-namespace Parse.Common.Internal
+namespace Parse.Abstractions.Infrastructure
 {
     /// <summary>
     /// Represents an object that can be converted into JSON.
@@ -14,6 +13,6 @@ public interface IJsonConvertible
         /// Converts the object to a data structure that can be converted to JSON.
         /// </summary>
         /// <returns>An object to be JSONified.</returns>
-        IDictionary<string, object> ToJSON();
+        IDictionary<string, object> ConvertToJSON();
     }
 }
diff --git a/Parse/Abstractions/Infrastructure/IMetadataController.cs b/Parse/Abstractions/Infrastructure/IMetadataController.cs
new file mode 100644
index 00000000..90332138
--- /dev/null
+++ b/Parse/Abstractions/Infrastructure/IMetadataController.cs
@@ -0,0 +1,19 @@
+namespace Parse.Abstractions.Infrastructure
+{
+    /// <summary>
+    /// A controller for <see cref="ParseClient"/> metadata. This is provided in a dependency injection container because if a beta feature is activated for a client managing a specific aspect of application operation, then this might need to be reflected in the application versioning information as it is used to determine the data cache location.
+    /// </summary>
+    /// <remarks>This container could have been implemented as a <see langword="class"/> or <see langword="struct"/>, due to it's simplicity but, more information may be added in the future so it is kept general.</remarks>
+    public interface IMetadataController
+    {
+        /// <summary>
+        /// Information about the application using the Parse SDK.
+        /// </summary>
+        public IHostManifestData HostManifestData { get; }
+
+        /// <summary>
+        /// Environment data specific to the application hosting the Parse SDK.
+        /// </summary>
+        public IEnvironmentData EnvironmentData { get; }
+    }
+}
diff --git a/Parse/Abstractions/Infrastructure/IMutableServiceHub.cs b/Parse/Abstractions/Infrastructure/IMutableServiceHub.cs
new file mode 100644
index 00000000..7282985f
--- /dev/null
+++ b/Parse/Abstractions/Infrastructure/IMutableServiceHub.cs
@@ -0,0 +1,52 @@
+#pragma warning disable CS0108 // Member hides inherited member; missing new keyword
+
+using Parse.Abstractions.Infrastructure.Data;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Abstractions.Platform.Analytics;
+using Parse.Abstractions.Platform.Cloud;
+using Parse.Abstractions.Platform.Configuration;
+using Parse.Abstractions.Platform.Files;
+using Parse.Abstractions.Platform.Installations;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Abstractions.Platform.Push;
+using Parse.Abstractions.Platform.Queries;
+using Parse.Abstractions.Platform.Sessions;
+using Parse.Abstractions.Platform.Users;
+
+namespace Parse.Abstractions.Infrastructure
+{
+    public interface IMutableServiceHub : IServiceHub
+    {
+        IServerConnectionData ServerConnectionData { set; }
+        IMetadataController MetadataController { set; }
+
+        IServiceHubCloner Cloner { set; }
+
+        IWebClient WebClient { set; }
+        ICacheController CacheController { set; }
+        IParseObjectClassController ClassController { set; }
+
+        IParseDataDecoder Decoder { set; }
+
+        IParseInstallationController InstallationController { set; }
+        IParseCommandRunner CommandRunner { set; }
+
+        IParseCloudCodeController CloudCodeController { set; }
+        IParseConfigurationController ConfigurationController { set; }
+        IParseFileController FileController { set; }
+        IParseObjectController ObjectController { set; }
+        IParseQueryController QueryController { set; }
+        IParseSessionController SessionController { set; }
+        IParseUserController UserController { set; }
+        IParseCurrentUserController CurrentUserController { set; }
+
+        IParseAnalyticsController AnalyticsController { set; }
+
+        IParseInstallationCoder InstallationCoder { set; }
+
+        IParsePushChannelsController PushChannelsController { set; }
+        IParsePushController PushController { set; }
+        IParseCurrentInstallationController CurrentInstallationController { set; }
+        IParseInstallationDataFinalizer InstallationDataFinalizer { set; }
+    }
+}
diff --git a/Parse/Abstractions/Infrastructure/IRelativeCacheLocationGenerator.cs b/Parse/Abstractions/Infrastructure/IRelativeCacheLocationGenerator.cs
new file mode 100644
index 00000000..7ceabe26
--- /dev/null
+++ b/Parse/Abstractions/Infrastructure/IRelativeCacheLocationGenerator.cs
@@ -0,0 +1,13 @@
+namespace Parse.Abstractions.Infrastructure
+{
+    /// <summary>
+    /// A unit that can generate a relative path to a persistent storage file.
+    /// </summary>
+    public interface IRelativeCacheLocationGenerator
+    {
+        /// <summary>
+        /// The corresponding relative path generated by this <see cref="IRelativeCacheLocationGenerator"/>.
+        /// </summary>
+        string GetRelativeCacheFilePath(IServiceHub serviceHub);
+    }
+}
diff --git a/Parse/Abstractions/Infrastructure/IServerConnectionData.cs b/Parse/Abstractions/Infrastructure/IServerConnectionData.cs
new file mode 100644
index 00000000..bad1c01d
--- /dev/null
+++ b/Parse/Abstractions/Infrastructure/IServerConnectionData.cs
@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+
+namespace Parse.Abstractions.Infrastructure
+{
+    public interface IServerConnectionData
+    {
+        /// <summary>
+        /// The App ID of your app.
+        /// </summary>
+        string ApplicationID { get; set; }
+
+        /// <summary>
+        /// A URI pointing to the target Parse Server instance hosting the app targeted by <see cref="ApplicationID"/>.
+        /// </summary>
+        string ServerURI { get; set; }
+
+        /// <summary>
+        /// The .NET Key for the Parse app targeted by <see cref="ServerURI"/>.
+        /// </summary>
+        string Key { get; set; }
+
+        /// <summary>
+        /// The Master Key for the Parse app targeted by <see cref="Key"/>.
+        /// </summary>
+        string MasterKey { get; set; }
+
+        /// <summary>
+        /// Additional HTTP headers to be sent with network requests from the SDK.
+        /// </summary>
+        IDictionary<string, string> Headers { get; set; }
+    }
+}
diff --git a/Parse/Abstractions/Infrastructure/IServiceHub.cs b/Parse/Abstractions/Infrastructure/IServiceHub.cs
new file mode 100644
index 00000000..c7e65992
--- /dev/null
+++ b/Parse/Abstractions/Infrastructure/IServiceHub.cs
@@ -0,0 +1,60 @@
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+
+using Parse.Abstractions.Infrastructure.Data;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Abstractions.Platform.Analytics;
+using Parse.Abstractions.Platform.Cloud;
+using Parse.Abstractions.Platform.Configuration;
+using Parse.Abstractions.Platform.Files;
+using Parse.Abstractions.Platform.Installations;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Abstractions.Platform.Push;
+using Parse.Abstractions.Platform.Queries;
+using Parse.Abstractions.Platform.Sessions;
+using Parse.Abstractions.Platform.Users;
+
+namespace Parse.Abstractions.Infrastructure
+{
+    // TODO: Consider splitting up IServiceHub into IResourceHub and IServiceHub, where the former would provide the current functionality of IServiceHub and the latter would be a public-facing sub-section containing formerly-static memebers from classes such as ParseObject which require the use of some broader resource.
+
+    /// <summary>
+    /// The dependency injection container for all internal .NET Parse SDK services.
+    /// </summary>
+    public interface IServiceHub
+    {
+        /// <summary>
+        /// The current server connection data that the the Parse SDK has been initialized with.
+        /// </summary>
+        IServerConnectionData ServerConnectionData { get; }
+        IMetadataController MetadataController { get; }
+
+        IServiceHubCloner Cloner { get; }
+
+        IWebClient WebClient { get; }
+        ICacheController CacheController { get; }
+        IParseObjectClassController ClassController { get; }
+
+        IParseDataDecoder Decoder { get; }
+
+        IParseInstallationController InstallationController { get; }
+        IParseCommandRunner CommandRunner { get; }
+
+        IParseCloudCodeController CloudCodeController { get; }
+        IParseConfigurationController ConfigurationController { get; }
+        IParseFileController FileController { get; }
+        IParseObjectController ObjectController { get; }
+        IParseQueryController QueryController { get; }
+        IParseSessionController SessionController { get; }
+        IParseUserController UserController { get; }
+        IParseCurrentUserController CurrentUserController { get; }
+
+        IParseAnalyticsController AnalyticsController { get; }
+
+        IParseInstallationCoder InstallationCoder { get; }
+
+        IParsePushChannelsController PushChannelsController { get; }
+        IParsePushController PushController { get; }
+        IParseCurrentInstallationController CurrentInstallationController { get; }
+        IParseInstallationDataFinalizer InstallationDataFinalizer { get; }
+    }
+}
diff --git a/Parse/Abstractions/Infrastructure/IServiceHubCloner.cs b/Parse/Abstractions/Infrastructure/IServiceHubCloner.cs
new file mode 100644
index 00000000..d88dea9e
--- /dev/null
+++ b/Parse/Abstractions/Infrastructure/IServiceHubCloner.cs
@@ -0,0 +1,7 @@
+namespace Parse.Abstractions.Infrastructure
+{
+    public interface IServiceHubCloner
+    {
+        public IServiceHub BuildHub(in IServiceHub reference, IServiceHubComposer composer, params IServiceHubMutator[] requestedMutators);
+    }
+}
diff --git a/Parse/Abstractions/Infrastructure/IServiceHubComposer.cs b/Parse/Abstractions/Infrastructure/IServiceHubComposer.cs
new file mode 100644
index 00000000..73dc3597
--- /dev/null
+++ b/Parse/Abstractions/Infrastructure/IServiceHubComposer.cs
@@ -0,0 +1,9 @@
+namespace Parse.Abstractions.Infrastructure
+{
+    // ALTERNATE NAME: IClient, IDataContainmentHub, IResourceContainmentHub, IDataContainer, IServiceHubComposer
+
+    public interface IServiceHubComposer
+    {
+        public IServiceHub BuildHub(IMutableServiceHub serviceHub = default, IServiceHub extension = default, params IServiceHubMutator[] configurators);
+    }
+}
diff --git a/Parse/Abstractions/Infrastructure/IServiceHubMutator.cs b/Parse/Abstractions/Infrastructure/IServiceHubMutator.cs
new file mode 100644
index 00000000..6ce77d67
--- /dev/null
+++ b/Parse/Abstractions/Infrastructure/IServiceHubMutator.cs
@@ -0,0 +1,22 @@
+namespace Parse.Abstractions.Infrastructure
+{
+    // IServiceHubComposer, IServiceHubMutator, IServiceHubConfigurator, IClientConfigurator, IServiceConfigurationLayer
+
+    /// <summary>
+    /// A class which makes a deliberate mutation to a service.
+    /// </summary>
+    public interface IServiceHubMutator
+    {
+        /// <summary>
+        /// A value which dictates whether or not the <see cref="IServiceHubMutator"/> should be considered in a valid state.
+        /// </summary>
+        bool Valid { get; }
+
+        /// <summary>
+        /// A method which mutates an <see cref="IMutableServiceHub"/> implementation instance.
+        /// </summary>
+        /// <param name="target">The target <see cref="IMutableServiceHub"/> implementation instance</param>
+        /// <param name="composedHub">A hub which the <paramref name="target"/> is composed onto that should be used when <see cref="Mutate(ref IMutableServiceHub, in IServiceHub)"/> needs to access services.</param>
+        void Mutate(ref IMutableServiceHub target, in IServiceHub composedHub);
+    }
+}
diff --git a/Parse/Internal/Analytics/Controller/IParseAnalyticsController.cs b/Parse/Abstractions/Platform/Analytics/IParseAnalyticsController.cs
similarity index 79%
rename from Parse/Internal/Analytics/Controller/IParseAnalyticsController.cs
rename to Parse/Abstractions/Platform/Analytics/IParseAnalyticsController.cs
index 334abad3..250d9ad9 100644
--- a/Parse/Internal/Analytics/Controller/IParseAnalyticsController.cs
+++ b/Parse/Abstractions/Platform/Analytics/IParseAnalyticsController.cs
@@ -3,9 +3,9 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
 
-
-namespace Parse.Analytics.Internal
+namespace Parse.Abstractions.Platform.Analytics
 {
     /// <summary>
     /// The interface for the Parse Analytics API controller.
@@ -20,10 +20,7 @@ public interface IParseAnalyticsController
         /// <param name="sessionToken">The session token for the event.</param>
         /// <param name="cancellationToken">The asynchonous cancellation token.</param>
         /// <returns>A <see cref="Task"/> that will complete successfully once the event has been set to be tracked.</returns>
-        Task TrackEventAsync(string name,
-            IDictionary<string, string> dimensions,
-            string sessionToken,
-            CancellationToken cancellationToken);
+        Task TrackEventAsync(string name, IDictionary<string, string> dimensions, string sessionToken, IServiceHub serviceHub, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Tracks an app open for the specified event.
@@ -32,8 +29,6 @@ Task TrackEventAsync(string name,
         /// <param name="sessionToken">The token of the current session.</param>
         /// <param name="cancellationToken">The asynchronous cancellation token.</param>
         /// <returns>A <see cref="Task"/> the will complete successfully once app openings for the target push notification have been set to be tracked.</returns>
-        Task TrackAppOpenedAsync(string pushHash,
-            string sessionToken,
-            CancellationToken cancellationToken);
+        Task TrackAppOpenedAsync(string pushHash, string sessionToken, IServiceHub serviceHub, CancellationToken cancellationToken = default);
     }
 }
diff --git a/Parse/Internal/Authentication/IParseAuthenticationProvider.cs b/Parse/Abstractions/Platform/Authentication/IParseAuthenticationProvider.cs
similarity index 97%
rename from Parse/Internal/Authentication/IParseAuthenticationProvider.cs
rename to Parse/Abstractions/Platform/Authentication/IParseAuthenticationProvider.cs
index 96e4145f..d177ee9d 100644
--- a/Parse/Internal/Authentication/IParseAuthenticationProvider.cs
+++ b/Parse/Abstractions/Platform/Authentication/IParseAuthenticationProvider.cs
@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Parse.Core.Internal
+namespace Parse.Abstractions.Platform.Authentication
 {
     public interface IParseAuthenticationProvider
     {
diff --git a/Parse/Internal/Cloud/Controller/IParseCloudCodeController.cs b/Parse/Abstractions/Platform/Cloud/IParseCloudCodeController.cs
similarity index 62%
rename from Parse/Internal/Cloud/Controller/IParseCloudCodeController.cs
rename to Parse/Abstractions/Platform/Cloud/IParseCloudCodeController.cs
index bc4d237d..a816ad2e 100644
--- a/Parse/Internal/Cloud/Controller/IParseCloudCodeController.cs
+++ b/Parse/Abstractions/Platform/Cloud/IParseCloudCodeController.cs
@@ -1,17 +1,14 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
 
-namespace Parse.Core.Internal
+namespace Parse.Abstractions.Platform.Cloud
 {
     public interface IParseCloudCodeController
     {
-        Task<T> CallFunctionAsync<T>(string name,
-            IDictionary<string, object> parameters,
-            string sessionToken,
-            CancellationToken cancellationToken);
+        Task<T> CallFunctionAsync<T>(string name, IDictionary<string, object> parameters, string sessionToken, IServiceHub serviceHub, CancellationToken cancellationToken = default);
     }
 }
diff --git a/Parse/Internal/Config/Controller/IParseConfigController.cs b/Parse/Abstractions/Platform/Configuration/IParseConfigurationController.cs
similarity index 61%
rename from Parse/Internal/Config/Controller/IParseConfigController.cs
rename to Parse/Abstractions/Platform/Configuration/IParseConfigurationController.cs
index f3051eb5..58fb0247 100644
--- a/Parse/Internal/Config/Controller/IParseConfigController.cs
+++ b/Parse/Abstractions/Platform/Configuration/IParseConfigurationController.cs
@@ -1,18 +1,15 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
-using System;
-using System.Threading.Tasks;
 using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
+using Parse.Platform.Configuration;
 
-namespace Parse.Core.Internal
+namespace Parse.Abstractions.Platform.Configuration
 {
-    public interface IParseConfigController
+    public interface IParseConfigurationController
     {
-        /// <summary>
-        /// Gets the current config controller.
-        /// </summary>
-        /// <value>The current config controller.</value>
-        IParseCurrentConfigController CurrentConfigController { get; }
+        public IParseCurrentConfigurationController CurrentConfigurationController { get; }
 
         /// <summary>
         /// Fetches the config from the server asynchronously.
@@ -20,6 +17,6 @@ public interface IParseConfigController
         /// <returns>The config async.</returns>
         /// <param name="sessionToken">Session token.</param>
         /// <param name="cancellationToken">Cancellation token.</param>
-        Task<ParseConfig> FetchConfigAsync(string sessionToken, CancellationToken cancellationToken);
+        Task<ParseConfiguration> FetchConfigAsync(string sessionToken, IServiceHub serviceHub, CancellationToken cancellationToken = default);
     }
 }
diff --git a/Parse/Internal/Config/Controller/IParseCurrentConfigController.cs b/Parse/Abstractions/Platform/Configuration/IParseCurrentConfigurationController.cs
similarity index 76%
rename from Parse/Internal/Config/Controller/IParseCurrentConfigController.cs
rename to Parse/Abstractions/Platform/Configuration/IParseCurrentConfigurationController.cs
index 307e431e..427073c8 100644
--- a/Parse/Internal/Config/Controller/IParseCurrentConfigController.cs
+++ b/Parse/Abstractions/Platform/Configuration/IParseCurrentConfigurationController.cs
@@ -1,24 +1,25 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
-using System;
 using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
+using Parse.Platform.Configuration;
 
-namespace Parse.Core.Internal
+namespace Parse.Abstractions.Platform.Configuration
 {
-    public interface IParseCurrentConfigController
+    public interface IParseCurrentConfigurationController
     {
         /// <summary>
         /// Gets the current config async.
         /// </summary>
         /// <returns>The current config async.</returns>
-        Task<ParseConfig> GetCurrentConfigAsync();
+        Task<ParseConfiguration> GetCurrentConfigAsync(IServiceHub serviceHub);
 
         /// <summary>
         /// Sets the current config async.
         /// </summary>
         /// <returns>The current config async.</returns>
         /// <param name="config">Config.</param>
-        Task SetCurrentConfigAsync(ParseConfig config);
+        Task SetCurrentConfigAsync(ParseConfiguration config);
 
         /// <summary>
         /// Clears the current config async.
diff --git a/Parse/Internal/File/Controller/IParseFileController.cs b/Parse/Abstractions/Platform/Files/IParseFileController.cs
similarity index 60%
rename from Parse/Internal/File/Controller/IParseFileController.cs
rename to Parse/Abstractions/Platform/Files/IParseFileController.cs
index f2e1e6a2..bfe1a117 100644
--- a/Parse/Internal/File/Controller/IParseFileController.cs
+++ b/Parse/Abstractions/Platform/Files/IParseFileController.cs
@@ -4,15 +4,13 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
+using Parse.Platform.Files;
 
-namespace Parse.Core.Internal
+namespace Parse.Abstractions.Platform.Files
 {
     public interface IParseFileController
     {
-        Task<FileState> SaveAsync(FileState state,
-            Stream dataStream,
-            string sessionToken,
-            IProgress<ParseUploadProgressEventArgs> progress,
-            CancellationToken cancellationToken);
+        Task<FileState> SaveAsync(FileState state, Stream dataStream, string sessionToken, IProgress<IDataTransferLevel> progress, CancellationToken cancellationToken);
     }
 }
diff --git a/Parse/Internal/Push/Installation/Controller/IParseCurrentInstallationController.cs b/Parse/Abstractions/Platform/Installations/IParseCurrentInstallationController.cs
similarity index 81%
rename from Parse/Internal/Push/Installation/Controller/IParseCurrentInstallationController.cs
rename to Parse/Abstractions/Platform/Installations/IParseCurrentInstallationController.cs
index c8d6fb0a..77b73077 100644
--- a/Parse/Internal/Push/Installation/Controller/IParseCurrentInstallationController.cs
+++ b/Parse/Abstractions/Platform/Installations/IParseCurrentInstallationController.cs
@@ -1,9 +1,8 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
-using Parse.Core.Internal;
-using System;
+using Parse.Abstractions.Platform.Objects;
 
-namespace Parse.Push.Internal
+namespace Parse.Abstractions.Platform.Installations
 {
     public interface IParseCurrentInstallationController : IParseObjectCurrentController<ParseInstallation>
     {
diff --git a/Parse/Internal/Push/Installation/Coder/IParseInstallationCoder.cs b/Parse/Abstractions/Platform/Installations/IParseInstallationCoder.cs
similarity index 72%
rename from Parse/Internal/Push/Installation/Coder/IParseInstallationCoder.cs
rename to Parse/Abstractions/Platform/Installations/IParseInstallationCoder.cs
index a1166ded..0db3b683 100644
--- a/Parse/Internal/Push/Installation/Coder/IParseInstallationCoder.cs
+++ b/Parse/Abstractions/Platform/Installations/IParseInstallationCoder.cs
@@ -1,14 +1,14 @@
-using System;
 using System.Collections.Generic;
-using Parse;
+using Parse.Abstractions.Infrastructure;
 
-namespace Parse.Push.Internal
+namespace Parse.Abstractions.Platform.Installations
 {
     // TODO: (richardross) once coder is refactored, make this extend IParseObjectCoder.
+
     public interface IParseInstallationCoder
     {
         IDictionary<string, object> Encode(ParseInstallation installation);
 
-        ParseInstallation Decode(IDictionary<string, object> data);
+        ParseInstallation Decode(IDictionary<string, object> data, IServiceHub serviceHub);
     }
 }
\ No newline at end of file
diff --git a/Parse/Internal/InstallationId/Controller/IInstallationIdController.cs b/Parse/Abstractions/Platform/Installations/IParseInstallationController.cs
similarity index 90%
rename from Parse/Internal/InstallationId/Controller/IInstallationIdController.cs
rename to Parse/Abstractions/Platform/Installations/IParseInstallationController.cs
index 1cdf27ea..1fc9f1b4 100644
--- a/Parse/Internal/InstallationId/Controller/IInstallationIdController.cs
+++ b/Parse/Abstractions/Platform/Installations/IParseInstallationController.cs
@@ -1,12 +1,11 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
 using System;
-using System.Threading;
 using System.Threading.Tasks;
 
-namespace Parse.Core.Internal
+namespace Parse.Abstractions.Platform.Installations
 {
-    public interface IInstallationIdController
+    public interface IParseInstallationController
     {
         /// <summary>
         /// Sets current <code>installationId</code> and saves it to local storage.
diff --git a/Parse/Abstractions/Platform/Installations/IParseInstallationDataFinalizer.cs b/Parse/Abstractions/Platform/Installations/IParseInstallationDataFinalizer.cs
new file mode 100644
index 00000000..9296ffef
--- /dev/null
+++ b/Parse/Abstractions/Platform/Installations/IParseInstallationDataFinalizer.cs
@@ -0,0 +1,20 @@
+using System.Threading.Tasks;
+
+namespace Parse.Abstractions.Platform.Installations
+{
+    public interface IParseInstallationDataFinalizer
+    {
+        /// <summary>
+        /// Executes platform specific hook that mutate the installation based on
+        /// the device platforms.
+        /// </summary>
+        /// <param name="installation">Installation to be mutated.</param>
+        /// <returns></returns>
+        Task FinalizeAsync(ParseInstallation installation);
+
+        /// <summary>
+        /// Allows an implementation to get static information that needs to be used in <see cref="FinalizeAsync(ParseInstallation)"/>.
+        /// </summary>
+        void Initialize();
+    }
+}
diff --git a/Parse/Internal/Object/State/IObjectState.cs b/Parse/Abstractions/Platform/Objects/IObjectState.cs
similarity index 90%
rename from Parse/Internal/Object/State/IObjectState.cs
rename to Parse/Abstractions/Platform/Objects/IObjectState.cs
index 473f4428..1da67c59 100644
--- a/Parse/Internal/Object/State/IObjectState.cs
+++ b/Parse/Abstractions/Platform/Objects/IObjectState.cs
@@ -2,8 +2,9 @@
 
 using System;
 using System.Collections.Generic;
+using Parse.Platform.Objects;
 
-namespace Parse.Core.Internal
+namespace Parse.Abstractions.Platform.Objects
 {
     public interface IObjectState : IEnumerable<KeyValuePair<string, object>>
     {
diff --git a/Parse/Abstractions/Platform/Objects/IParseObjectClassController.cs b/Parse/Abstractions/Platform/Objects/IParseObjectClassController.cs
new file mode 100644
index 00000000..07ad585c
--- /dev/null
+++ b/Parse/Abstractions/Platform/Objects/IParseObjectClassController.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using Parse.Abstractions.Infrastructure;
+
+namespace Parse.Abstractions.Platform.Objects
+{
+    public interface IParseObjectClassController
+    {
+        string GetClassName(Type type);
+
+        Type GetType(string className);
+
+        bool GetClassMatch(string className, Type type);
+
+        void AddValid(Type type);
+
+        void RemoveClass(Type type);
+
+        void AddRegisterHook(Type type, Action action);
+
+        ParseObject Instantiate(string className, IServiceHub serviceHub);
+
+        IDictionary<string, string> GetPropertyMappings(string className);
+
+        void AddIntrinsic();
+    }
+}
diff --git a/Parse/Internal/Object/Controller/IParseObjectController.cs b/Parse/Abstractions/Platform/Objects/IParseObjectController.cs
similarity index 62%
rename from Parse/Internal/Object/Controller/IParseObjectController.cs
rename to Parse/Abstractions/Platform/Objects/IParseObjectController.cs
index 0dd2363d..a17bfd14 100644
--- a/Parse/Internal/Object/Controller/IParseObjectController.cs
+++ b/Parse/Abstractions/Platform/Objects/IParseObjectController.cs
@@ -1,22 +1,23 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure.Control;
+using Parse.Abstractions.Infrastructure;
 
-namespace Parse.Core.Internal
+namespace Parse.Abstractions.Platform.Objects
 {
     public interface IParseObjectController
     {
-        Task<IObjectState> FetchAsync(IObjectState state, string sessionToken, CancellationToken cancellationToken);
+        Task<IObjectState> FetchAsync(IObjectState state, string sessionToken, IServiceHub serviceHub, CancellationToken cancellationToken = default);
 
-        Task<IObjectState> SaveAsync(IObjectState state, IDictionary<string, IParseFieldOperation> operations, string sessionToken, CancellationToken cancellationToken);
+        Task<IObjectState> SaveAsync(IObjectState state, IDictionary<string, IParseFieldOperation> operations, string sessionToken, IServiceHub serviceHub, CancellationToken cancellationToken = default);
 
-        IList<Task<IObjectState>> SaveAllAsync(IList<IObjectState> states, IList<IDictionary<string, IParseFieldOperation>> operationsList, string sessionToken, CancellationToken cancellationToken);
+        IList<Task<IObjectState>> SaveAllAsync(IList<IObjectState> states, IList<IDictionary<string, IParseFieldOperation>> operationsList, string sessionToken, IServiceHub serviceHub, CancellationToken cancellationToken = default);
 
-        Task DeleteAsync(IObjectState state, string sessionToken, CancellationToken cancellationToken);
+        Task DeleteAsync(IObjectState state, string sessionToken, CancellationToken cancellationToken = default);
 
-        IList<Task> DeleteAllAsync(IList<IObjectState> states, string sessionToken, CancellationToken cancellationToken);
+        IList<Task> DeleteAllAsync(IList<IObjectState> states, string sessionToken, CancellationToken cancellationToken = default);
     }
 }
diff --git a/Parse/Internal/Object/Controller/IParseObjectCurrentController.cs b/Parse/Abstractions/Platform/Objects/IParseObjectCurrentController.cs
similarity index 91%
rename from Parse/Internal/Object/Controller/IParseObjectCurrentController.cs
rename to Parse/Abstractions/Platform/Objects/IParseObjectCurrentController.cs
index eb505108..55418651 100644
--- a/Parse/Internal/Object/Controller/IParseObjectCurrentController.cs
+++ b/Parse/Abstractions/Platform/Objects/IParseObjectCurrentController.cs
@@ -1,10 +1,10 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
-using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
 
-namespace Parse.Core.Internal
+namespace Parse.Abstractions.Platform.Objects
 {
     /// <summary>
     /// <code>IParseObjectCurrentController</code> controls the single-instance <see cref="ParseObject"/>
@@ -19,20 +19,20 @@ public interface IParseObjectCurrentController<T> where T : ParseObject
         /// </summary>
         /// <param name="obj"><see cref="ParseObject"/> to be persisted.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
-        Task SetAsync(T obj, CancellationToken cancellationToken);
+        Task SetAsync(T obj, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Gets the persisted current <see cref="ParseObject"/>.
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
-        Task<T> GetAsync(CancellationToken cancellationToken);
+        Task<T> GetAsync(IServiceHub serviceHub, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Returns a <see cref="Task"/> that resolves to <code>true</code> if current
         /// <see cref="ParseObject"/> exists.
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
-        Task<bool> ExistsAsync(CancellationToken cancellationToken);
+        Task<bool> ExistsAsync(CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Returns <code>true</code> if the given <see cref="ParseObject"/> is the persisted current
diff --git a/Parse/Internal/Push/Controller/IParsePushChannelsController.cs b/Parse/Abstractions/Platform/Push/IParsePushChannelsController.cs
similarity index 57%
rename from Parse/Internal/Push/Controller/IParsePushChannelsController.cs
rename to Parse/Abstractions/Platform/Push/IParsePushChannelsController.cs
index 9ed55bdb..e24829b8 100644
--- a/Parse/Internal/Push/Controller/IParsePushChannelsController.cs
+++ b/Parse/Abstractions/Platform/Push/IParsePushChannelsController.cs
@@ -1,16 +1,16 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
-using System;
-using System.Threading.Tasks;
-using System.Collections;
-using System.Threading;
 using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
 
-namespace Parse.Push.Internal
+namespace Parse.Abstractions.Platform.Push
 {
     public interface IParsePushChannelsController
     {
-        Task SubscribeAsync(IEnumerable<string> channels, CancellationToken cancellationToken);
-        Task UnsubscribeAsync(IEnumerable<string> channels, CancellationToken cancellationToken);
+        Task SubscribeAsync(IEnumerable<string> channels, IServiceHub serviceHub, CancellationToken cancellationToken);
+
+        Task UnsubscribeAsync(IEnumerable<string> channels, IServiceHub serviceHub, CancellationToken cancellationToken);
     }
 }
diff --git a/Parse/Internal/Push/Controller/IParsePushController.cs b/Parse/Abstractions/Platform/Push/IParsePushController.cs
similarity index 65%
rename from Parse/Internal/Push/Controller/IParsePushController.cs
rename to Parse/Abstractions/Platform/Push/IParsePushController.cs
index 14b1569e..c5c5e133 100644
--- a/Parse/Internal/Push/Controller/IParsePushController.cs
+++ b/Parse/Abstractions/Platform/Push/IParsePushController.cs
@@ -1,13 +1,13 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
-using System;
-using System.Threading.Tasks;
 using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
 
-namespace Parse.Push.Internal
+namespace Parse.Abstractions.Platform.Push
 {
     public interface IParsePushController
     {
-        Task SendPushNotificationAsync(IPushState state, CancellationToken cancellationToken);
+        Task SendPushNotificationAsync(IPushState state, IServiceHub serviceHub, CancellationToken cancellationToken = default);
     }
 }
diff --git a/Parse/Internal/Push/State/IPushState.cs b/Parse/Abstractions/Platform/Push/IPushState.cs
similarity index 91%
rename from Parse/Internal/Push/State/IPushState.cs
rename to Parse/Abstractions/Platform/Push/IPushState.cs
index 4b8fd9b4..e62a16b0 100644
--- a/Parse/Internal/Push/State/IPushState.cs
+++ b/Parse/Abstractions/Platform/Push/IPushState.cs
@@ -2,8 +2,9 @@
 
 using System;
 using System.Collections.Generic;
+using Parse.Platform.Push;
 
-namespace Parse.Push.Internal
+namespace Parse.Abstractions.Platform.Push
 {
     public interface IPushState
     {
diff --git a/Parse/Internal/Query/Controller/IParseQueryController.cs b/Parse/Abstractions/Platform/Queries/IParseQueryController.cs
similarity index 64%
rename from Parse/Internal/Query/Controller/IParseQueryController.cs
rename to Parse/Abstractions/Platform/Queries/IParseQueryController.cs
index 7a490ac0..0e174fea 100644
--- a/Parse/Internal/Query/Controller/IParseQueryController.cs
+++ b/Parse/Abstractions/Platform/Queries/IParseQueryController.cs
@@ -1,19 +1,18 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
-using System;
-using System.Linq;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Parse.Abstractions.Platform.Objects;
 
-namespace Parse.Core.Internal
+namespace Parse.Abstractions.Platform.Queries
 {
     public interface IParseQueryController
     {
-        Task<IEnumerable<IObjectState>> FindAsync<T>(ParseQuery<T> query, ParseUser user, CancellationToken cancellationToken) where T : ParseObject;
+        Task<IEnumerable<IObjectState>> FindAsync<T>(ParseQuery<T> query, ParseUser user, CancellationToken cancellationToken = default) where T : ParseObject;
 
-        Task<int> CountAsync<T>(ParseQuery<T> query, ParseUser user, CancellationToken cancellationToken) where T : ParseObject;
+        Task<int> CountAsync<T>(ParseQuery<T> query, ParseUser user, CancellationToken cancellationToken = default) where T : ParseObject;
 
-        Task<IObjectState> FirstAsync<T>(ParseQuery<T> query, ParseUser user, CancellationToken cancellationToken) where T : ParseObject;
+        Task<IObjectState> FirstAsync<T>(ParseQuery<T> query, ParseUser user, CancellationToken cancellationToken = default) where T : ParseObject;
     }
 }
diff --git a/Parse/Internal/Session/Controller/IParseSessionController.cs b/Parse/Abstractions/Platform/Sessions/IParseSessionController.cs
similarity index 67%
rename from Parse/Internal/Session/Controller/IParseSessionController.cs
rename to Parse/Abstractions/Platform/Sessions/IParseSessionController.cs
index a7f75b27..ab6016e0 100644
--- a/Parse/Internal/Session/Controller/IParseSessionController.cs
+++ b/Parse/Abstractions/Platform/Sessions/IParseSessionController.cs
@@ -1,18 +1,19 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
-using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Objects;
 
-namespace Parse.Core.Internal
+namespace Parse.Abstractions.Platform.Sessions
 {
     public interface IParseSessionController
     {
-        Task<IObjectState> GetSessionAsync(string sessionToken, CancellationToken cancellationToken);
+        Task<IObjectState> GetSessionAsync(string sessionToken, IServiceHub serviceHub, CancellationToken cancellationToken = default);
 
-        Task RevokeAsync(string sessionToken, CancellationToken cancellationToken);
+        Task RevokeAsync(string sessionToken, CancellationToken cancellationToken = default);
 
-        Task<IObjectState> UpgradeToRevocableSessionAsync(string sessionToken, CancellationToken cancellationToken);
+        Task<IObjectState> UpgradeToRevocableSessionAsync(string sessionToken, IServiceHub serviceHub, CancellationToken cancellationToken = default);
 
         bool IsRevocableSessionToken(string sessionToken);
     }
diff --git a/Parse/Internal/User/Controller/IParseCurrentUserController.cs b/Parse/Abstractions/Platform/Users/IParseCurrentUserController.cs
similarity index 56%
rename from Parse/Internal/User/Controller/IParseCurrentUserController.cs
rename to Parse/Abstractions/Platform/Users/IParseCurrentUserController.cs
index d235c480..5b6b50a5 100644
--- a/Parse/Internal/User/Controller/IParseCurrentUserController.cs
+++ b/Parse/Abstractions/Platform/Users/IParseCurrentUserController.cs
@@ -1,15 +1,16 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
-using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Objects;
 
-namespace Parse.Core.Internal
+namespace Parse.Abstractions.Platform.Users
 {
     public interface IParseCurrentUserController : IParseObjectCurrentController<ParseUser>
     {
-        Task<string> GetCurrentSessionTokenAsync(CancellationToken cancellationToken);
+        Task<string> GetCurrentSessionTokenAsync(IServiceHub serviceHub, CancellationToken cancellationToken = default);
 
-        Task LogOutAsync(CancellationToken cancellationToken);
+        Task LogOutAsync(IServiceHub serviceHub, CancellationToken cancellationToken = default);
     }
 }
diff --git a/Parse/Abstractions/Platform/Users/IParseUserController.cs b/Parse/Abstractions/Platform/Users/IParseUserController.cs
new file mode 100644
index 00000000..11cd0217
--- /dev/null
+++ b/Parse/Abstractions/Platform/Users/IParseUserController.cs
@@ -0,0 +1,28 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure.Control;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Objects;
+
+namespace Parse.Abstractions.Platform.Users
+{
+    public interface IParseUserController
+    {
+        Task<IObjectState> SignUpAsync(IObjectState state, IDictionary<string, IParseFieldOperation> operations, IServiceHub serviceHub, CancellationToken cancellationToken = default);
+
+        Task<IObjectState> LogInAsync(string username, string password, IServiceHub serviceHub, CancellationToken cancellationToken = default);
+
+        Task<IObjectState> LogInAsync(string authType, IDictionary<string, object> data, IServiceHub serviceHub, CancellationToken cancellationToken = default);
+
+        Task<IObjectState> GetUserAsync(string sessionToken, IServiceHub serviceHub, CancellationToken cancellationToken = default);
+
+        Task RequestPasswordResetAsync(string email, CancellationToken cancellationToken = default);
+
+        bool RevocableSessionEnabled { get; set; }
+
+        object RevocableSessionEnabledMutex { get; }
+    }
+}
diff --git a/Parse/Infrastructure/AbsoluteCacheLocationMutator.cs b/Parse/Infrastructure/AbsoluteCacheLocationMutator.cs
new file mode 100644
index 00000000..416aad1a
--- /dev/null
+++ b/Parse/Infrastructure/AbsoluteCacheLocationMutator.cs
@@ -0,0 +1,34 @@
+using Parse.Abstractions.Infrastructure;
+
+namespace Parse.Infrastructure
+{
+    /// <summary>
+    /// An <see cref="IServiceHubMutator"/> implementation which changes the <see cref="IServiceHub.CacheController"/>'s <see cref="IDiskFileCacheController.AbsoluteCacheFilePath"/> if available.
+    /// </summary>
+    public class AbsoluteCacheLocationMutator : IServiceHubMutator
+    {
+        /// <summary>
+        /// A custom absolute cache file path to be set on the active <see cref="IServiceHub.CacheController"/> if it implements <see cref="IDiskFileCacheController"/>.
+        /// </summary>
+        public string CustomAbsoluteCacheFilePath { get; set; }
+
+        /// <summary>
+        /// <inheritdoc/>
+        /// </summary>
+        public bool Valid => CustomAbsoluteCacheFilePath is { };
+
+        /// <summary>
+        /// <inheritdoc/>
+        /// </summary>
+        /// <param name="target"><inheritdoc/></param>
+        /// <param name="composedHub"><inheritdoc/></param>
+        public void Mutate(ref IMutableServiceHub target, in IServiceHub composedHub)
+        {
+            if ((target as IServiceHub).CacheController is IDiskFileCacheController { } diskFileCacheController)
+            {
+                diskFileCacheController.AbsoluteCacheFilePath = CustomAbsoluteCacheFilePath;
+                diskFileCacheController.RefreshPaths();
+            }
+        }
+    }
+}
diff --git a/Parse/Infrastructure/CacheController.cs b/Parse/Infrastructure/CacheController.cs
new file mode 100644
index 00000000..f85d2d47
--- /dev/null
+++ b/Parse/Infrastructure/CacheController.cs
@@ -0,0 +1,262 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
+using Parse.Infrastructure.Utilities;
+using static Parse.Resources;
+
+namespace Parse.Infrastructure
+{
+    /// <summary>
+    /// Implements `IStorageController` for PCL targets, based off of PCLStorage.
+    /// </summary>
+    public class CacheController : IDiskFileCacheController
+    {
+        class FileBackedCache : IDataCache<string, object>
+        {
+            public FileBackedCache(FileInfo file) => File = file;
+
+            internal Task SaveAsync() => Lock(() => File.WriteContentAsync(JsonUtilities.Encode(Storage)));
+
+            internal Task LoadAsync() => File.ReadAllTextAsync().ContinueWith(task =>
+            {
+                lock (Mutex)
+                {
+                    try
+                    {
+                        Storage = JsonUtilities.Parse(task.Result) as Dictionary<string, object>;
+                    }
+                    catch
+                    {
+                        Storage = new Dictionary<string, object> { };
+                    }
+                }
+            });
+
+            // TODO: Check if the call to ToDictionary is necessary here considering contents is IDictionary<string object>.
+
+            internal void Update(IDictionary<string, object> contents) => Lock(() => Storage = contents.ToDictionary(element => element.Key, element => element.Value));
+
+            public Task AddAsync(string key, object value)
+            {
+                lock (Mutex)
+                {
+                    Storage[key] = value;
+                    return SaveAsync();
+                }
+            }
+
+            public Task RemoveAsync(string key)
+            {
+                lock (Mutex)
+                {
+                    Storage.Remove(key);
+                    return SaveAsync();
+                }
+            }
+
+            public void Add(string key, object value) => throw new NotSupportedException(FileBackedCacheSynchronousMutationNotSupportedMessage);
+
+            public bool Remove(string key) => throw new NotSupportedException(FileBackedCacheSynchronousMutationNotSupportedMessage);
+
+            public void Add(KeyValuePair<string, object> item) => throw new NotSupportedException(FileBackedCacheSynchronousMutationNotSupportedMessage);
+
+            public bool Remove(KeyValuePair<string, object> item) => throw new NotSupportedException(FileBackedCacheSynchronousMutationNotSupportedMessage);
+
+            public bool ContainsKey(string key) => Lock(() => Storage.ContainsKey(key));
+
+            public bool TryGetValue(string key, out object value)
+            {
+                lock (Mutex)
+                {
+                    return (Result: Storage.TryGetValue(key, out object found), value = found).Result;
+                }
+            }
+
+            public void Clear() => Lock(() => Storage.Clear());
+
+            public bool Contains(KeyValuePair<string, object> item) => Lock(() => Elements.Contains(item));
+
+            public void CopyTo(KeyValuePair<string, object>[] array, int arrayIndex) => Lock(() => Elements.CopyTo(array, arrayIndex));
+
+            public IEnumerator<KeyValuePair<string, object>> GetEnumerator() => Storage.GetEnumerator();
+
+            IEnumerator IEnumerable.GetEnumerator() => Storage.GetEnumerator();
+
+            public FileInfo File { get; set; }
+
+            public object Mutex { get; set; } = new object { };
+
+            // ALTNAME: Operate
+
+            TResult Lock<TResult>(Func<TResult> operation)
+            {
+                lock (Mutex)
+                {
+                    return operation.Invoke();
+                }
+            }
+
+            void Lock(Action operation)
+            {
+                lock (Mutex)
+                {
+                    operation.Invoke();
+                }
+            }
+
+            ICollection<KeyValuePair<string, object>> Elements => Storage as ICollection<KeyValuePair<string, object>>;
+
+            Dictionary<string, object> Storage { get; set; } = new Dictionary<string, object> { };
+
+            public ICollection<string> Keys => Storage.Keys;
+
+            public ICollection<object> Values => Storage.Values;
+
+            public int Count => Storage.Count;
+
+            public bool IsReadOnly => Elements.IsReadOnly;
+
+            public object this[string key]
+            {
+                get => Storage[key];
+                set => throw new NotSupportedException(FileBackedCacheSynchronousMutationNotSupportedMessage);
+            }
+        }
+
+        FileInfo File { get; set; }
+        FileBackedCache Cache { get; set; }
+        TaskQueue Queue { get; } = new TaskQueue { };
+
+        /// <summary>
+        /// Creates a Parse storage controller and attempts to extract a previously created settings storage file from the persistent storage location.
+        /// </summary>
+        public CacheController() { }
+
+        /// <summary>
+        /// Creates a Parse storage controller with the provided <paramref name="file"/> wrapper.
+        /// </summary>
+        /// <param name="file">The file wrapper that the storage controller instance should target</param>
+        public CacheController(FileInfo file) => EnsureCacheExists(file);
+
+        FileBackedCache EnsureCacheExists(FileInfo file = default) => Cache ??= new FileBackedCache(file ?? (File ??= PersistentCacheFile));
+
+        /// <summary>
+        /// Loads a settings dictionary from the file wrapped by <see cref="File"/>.
+        /// </summary>
+        /// <returns>A storage dictionary containing the deserialized content of the storage file targeted by the <see cref="CacheController"/> instance</returns>
+        public Task<IDataCache<string, object>> LoadAsync()
+        {
+            // Check if storage dictionary is already created from the controllers file (create if not)
+            EnsureCacheExists();
+
+            // Load storage dictionary content async and return the resulting dictionary type
+            return Queue.Enqueue(toAwait => toAwait.ContinueWith(_ => Cache.LoadAsync().OnSuccess(__ => Cache as IDataCache<string, object>)).Unwrap(), CancellationToken.None);
+        }
+
+        /// <summary>
+        /// Saves the requested data.
+        /// </summary>
+        /// <param name="contents">The data to be saved.</param>
+        /// <returns>A data cache containing the saved data.</returns>
+        public Task<IDataCache<string, object>> SaveAsync(IDictionary<string, object> contents) => Queue.Enqueue(toAwait => toAwait.ContinueWith(_ =>
+        {
+            EnsureCacheExists().Update(contents);
+            return Cache.SaveAsync().OnSuccess(__ => Cache as IDataCache<string, object>);
+        }).Unwrap());
+
+        /// <summary>
+        /// <inheritdoc/>
+        /// </summary>
+        public void RefreshPaths() => Cache = new FileBackedCache(File = PersistentCacheFile);
+
+        // TODO: Attach the following method to AppDomain.CurrentDomain.ProcessExit if that actually ever made sense for anything except randomly generated file names, otherwise attach the delegate when it is known the file name is a randomly generated string.
+
+        /// <summary>
+        /// Clears the data controlled by this class.
+        /// </summary>
+        public void Clear()
+        {
+            if (new FileInfo(FallbackRelativeCacheFilePath) is { Exists: true } file)
+            {
+                file.Delete();
+            }
+        }
+
+        /// <summary>
+        /// <inheritdoc/>
+        /// </summary>
+        public string RelativeCacheFilePath { get; set; }
+
+        /// <summary>
+        /// <inheritdoc/>
+        /// </summary>
+        public string AbsoluteCacheFilePath
+        {
+            get => StoredAbsoluteCacheFilePath ?? Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), RelativeCacheFilePath ?? FallbackRelativeCacheFilePath));
+            set => StoredAbsoluteCacheFilePath = value;
+        }
+
+        string StoredAbsoluteCacheFilePath { get; set; }
+
+        /// <summary>
+        /// Gets the calculated persistent storage file fallback path for this app execution.
+        /// </summary>
+        public string FallbackRelativeCacheFilePath => StoredFallbackRelativeCacheFilePath ??= IdentifierBasedRelativeCacheLocationGenerator.Fallback.GetRelativeCacheFilePath(new MutableServiceHub { CacheController = this });
+
+        string StoredFallbackRelativeCacheFilePath { get; set; }
+
+        /// <summary>
+        /// Gets or creates the file pointed to by <see cref="AbsoluteCacheFilePath"/> and returns it's wrapper as a <see cref="FileInfo"/> instance.
+        /// </summary>
+        public FileInfo PersistentCacheFile
+        {
+            get
+            {
+                Directory.CreateDirectory(AbsoluteCacheFilePath.Substring(0, AbsoluteCacheFilePath.LastIndexOf(Path.DirectorySeparatorChar)));
+
+                FileInfo file = new FileInfo(AbsoluteCacheFilePath);
+                if (!file.Exists)
+                    using (file.Create())
+                        ; // Hopefully the JIT doesn't no-op this. The behaviour of the "using" clause should dictate how the stream is closed, to make sure it happens properly.
+
+                return file;
+            }
+        }
+
+        /// <summary>
+        /// Gets the file wrapper for the specified <paramref name="path"/>.
+        /// </summary>
+        /// <param name="path">The relative path to the target file</param>
+        /// <returns>An instance of <see cref="FileInfo"/> wrapping the the <paramref name="path"/> value</returns>
+        public FileInfo GetRelativeFile(string path)
+        {
+            Directory.CreateDirectory((path = Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), path))).Substring(0, path.LastIndexOf(Path.DirectorySeparatorChar)));
+            return new FileInfo(path);
+        }
+
+        // MoveAsync
+
+        /// <summary>
+        /// Transfers a file from <paramref name="originFilePath"/> to <paramref name="targetFilePath"/>.
+        /// </summary>
+        /// <param name="originFilePath"></param>
+        /// <param name="targetFilePath"></param>
+        /// <returns>A task that completes once the file move operation form <paramref name="originFilePath"/> to <paramref name="targetFilePath"/> completes.</returns>
+        public async Task TransferAsync(string originFilePath, string targetFilePath)
+        {
+            if (!String.IsNullOrWhiteSpace(originFilePath) && !String.IsNullOrWhiteSpace(targetFilePath) && new FileInfo(originFilePath) is { Exists: true } originFile && new FileInfo(targetFilePath) is { } targetFile)
+            {
+                using StreamWriter writer = new StreamWriter(targetFile.OpenWrite(), Encoding.Unicode);
+                using StreamReader reader = new StreamReader(originFile.OpenRead(), Encoding.Unicode);
+
+                await writer.WriteAsync(await reader.ReadToEndAsync());
+            }
+        }
+    }
+}
diff --git a/Parse/Infrastructure/ConcurrentUserServiceHubCloner.cs b/Parse/Infrastructure/ConcurrentUserServiceHubCloner.cs
new file mode 100644
index 00000000..44eb69ee
--- /dev/null
+++ b/Parse/Infrastructure/ConcurrentUserServiceHubCloner.cs
@@ -0,0 +1,19 @@
+using System.Linq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Platform.Users;
+
+namespace Parse.Infrastructure
+{
+    public class ConcurrentUserServiceHubCloner : IServiceHubCloner, IServiceHubMutator
+    {
+        public bool Valid { get; } = true;
+
+        public IServiceHub BuildHub(in IServiceHub reference, IServiceHubComposer composer, params IServiceHubMutator[] requestedMutators) => composer.BuildHub(default, reference, requestedMutators.Concat(new[] { this }).ToArray());
+
+        public void Mutate(ref IMutableServiceHub target, in IServiceHub composedHub)
+        {
+            target.Cloner = this;
+            target.CurrentUserController = new ParseCurrentUserController(new TransientCacheController { }, composedHub.ClassController, composedHub.Decoder);
+        }
+    }
+}
diff --git a/Parse/Infrastructure/Control/ParseAddOperation.cs b/Parse/Infrastructure/Control/ParseAddOperation.cs
new file mode 100644
index 00000000..b485bbe1
--- /dev/null
+++ b/Parse/Infrastructure/Control/ParseAddOperation.cs
@@ -0,0 +1,39 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Control;
+using Parse.Infrastructure.Data;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse.Infrastructure.Control
+{
+    public class ParseAddOperation : IParseFieldOperation
+    {
+        ReadOnlyCollection<object> Data { get; }
+
+        public ParseAddOperation(IEnumerable<object> objects) => Data = new ReadOnlyCollection<object>(objects.ToList());
+
+        public object Encode(IServiceHub serviceHub) => new Dictionary<string, object>
+        {
+            ["__op"] = "Add",
+            ["objects"] = PointerOrLocalIdEncoder.Instance.Encode(Data, serviceHub)
+        };
+
+        public IParseFieldOperation MergeWithPrevious(IParseFieldOperation previous) => previous switch
+        {
+            null => this,
+            ParseDeleteOperation { } => new ParseSetOperation(Data.ToList()),
+            ParseSetOperation { } setOp => new ParseSetOperation(Conversion.To<IList<object>>(setOp.Value).Concat(Data).ToList()),
+            ParseAddOperation { } addition => new ParseAddOperation(addition.Objects.Concat(Data)),
+            _ => throw new InvalidOperationException("Operation is invalid after previous operation.")
+        };
+
+        public object Apply(object oldValue, string key) => oldValue is { } ? Conversion.To<IList<object>>(oldValue).Concat(Data).ToList() : Data.ToList();
+
+        public IEnumerable<object> Objects => Data;
+    }
+}
diff --git a/Parse/Infrastructure/Control/ParseAddUniqueOperation.cs b/Parse/Infrastructure/Control/ParseAddUniqueOperation.cs
new file mode 100644
index 00000000..6d36bb47
--- /dev/null
+++ b/Parse/Infrastructure/Control/ParseAddUniqueOperation.cs
@@ -0,0 +1,69 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Control;
+using Parse.Infrastructure.Data;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse.Infrastructure.Control
+{
+    public class ParseAddUniqueOperation : IParseFieldOperation
+    {
+        ReadOnlyCollection<object> Data { get; }
+
+        public ParseAddUniqueOperation(IEnumerable<object> objects) => Data = new ReadOnlyCollection<object>(objects.Distinct().ToList());
+
+        public object Encode(IServiceHub serviceHub) => new Dictionary<string, object>
+        {
+            ["__op"] = "AddUnique",
+            ["objects"] = PointerOrLocalIdEncoder.Instance.Encode(Data, serviceHub)
+        };
+
+        public IParseFieldOperation MergeWithPrevious(IParseFieldOperation previous) => previous switch
+        {
+            null => this,
+            ParseDeleteOperation _ => new ParseSetOperation(Data.ToList()),
+            ParseSetOperation setOp => new ParseSetOperation(Apply(Conversion.To<IList<object>>(setOp.Value), default)),
+            ParseAddUniqueOperation addition => new ParseAddUniqueOperation(Apply(addition.Objects, default) as IList<object>),
+            _ => throw new InvalidOperationException("Operation is invalid after previous operation.")
+        };
+
+        public object Apply(object oldValue, string key)
+        {
+            if (oldValue == null)
+            {
+                return Data.ToList();
+            }
+
+            List<object> result = Conversion.To<IList<object>>(oldValue).ToList();
+            IEqualityComparer<object> comparer = ParseFieldOperations.ParseObjectComparer;
+
+            foreach (object target in Data)
+            {
+                if (target is ParseObject)
+                {
+                    if (!(result.FirstOrDefault(reference => comparer.Equals(target, reference)) is { } matched))
+                    {
+                        result.Add(target);
+                    }
+                    else
+                    {
+                        result[result.IndexOf(matched)] = target;
+                    }
+                }
+                else if (!result.Contains(target, comparer))
+                {
+                    result.Add(target);
+                }
+            }
+
+            return result;
+        }
+
+        public IEnumerable<object> Objects => Data;
+    }
+}
diff --git a/Parse/Infrastructure/Control/ParseDeleteOperation.cs b/Parse/Infrastructure/Control/ParseDeleteOperation.cs
new file mode 100644
index 00000000..6a0feb0a
--- /dev/null
+++ b/Parse/Infrastructure/Control/ParseDeleteOperation.cs
@@ -0,0 +1,26 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System.Collections.Generic;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Control;
+
+namespace Parse.Infrastructure.Control
+{
+    /// <summary>
+    /// An operation where a field is deleted from the object.
+    /// </summary>
+    public class ParseDeleteOperation : IParseFieldOperation
+    {
+        internal static object Token { get; } = new object { };
+
+        public static ParseDeleteOperation Instance { get; } = new ParseDeleteOperation { };
+
+        private ParseDeleteOperation() { }
+
+        public object Encode(IServiceHub serviceHub) => new Dictionary<string, object> { ["__op"] = "Delete" };
+
+        public IParseFieldOperation MergeWithPrevious(IParseFieldOperation previous) => this;
+
+        public object Apply(object oldValue, string key) => Token;
+    }
+}
diff --git a/Parse/Internal/Operation/ParseFieldOperations.cs b/Parse/Infrastructure/Control/ParseFieldOperations.cs
similarity index 81%
rename from Parse/Internal/Operation/ParseFieldOperations.cs
rename to Parse/Infrastructure/Control/ParseFieldOperations.cs
index e5638978..593a02a3 100644
--- a/Parse/Internal/Operation/ParseFieldOperations.cs
+++ b/Parse/Infrastructure/Control/ParseFieldOperations.cs
@@ -2,15 +2,16 @@
 
 using System;
 using System.Collections.Generic;
+using Parse.Abstractions.Infrastructure.Control;
 
-namespace Parse.Core.Internal
+namespace Parse.Infrastructure.Control
 {
     public class ParseObjectIdComparer : IEqualityComparer<object>
     {
         bool IEqualityComparer<object>.Equals(object p1, object p2)
         {
-            var parseObj1 = p1 as ParseObject;
-            var parseObj2 = p2 as ParseObject;
+            ParseObject parseObj1 = p1 as ParseObject;
+            ParseObject parseObj2 = p2 as ParseObject;
             if (parseObj1 != null && parseObj2 != null)
             {
                 return Equals(parseObj1.ObjectId, parseObj2.ObjectId);
@@ -20,7 +21,7 @@ bool IEqualityComparer<object>.Equals(object p1, object p2)
 
         public int GetHashCode(object p)
         {
-            var parseObject = p as ParseObject;
+            ParseObject parseObject = p as ParseObject;
             if (parseObject != null)
             {
                 return parseObject.ObjectId.GetHashCode();
@@ -33,10 +34,7 @@ static class ParseFieldOperations
     {
         private static ParseObjectIdComparer comparer;
 
-        public static IParseFieldOperation Decode(IDictionary<string, object> json)
-        {
-            throw new NotImplementedException();
-        }
+        public static IParseFieldOperation Decode(IDictionary<string, object> json) => throw new NotImplementedException();
 
         public static IEqualityComparer<object> ParseObjectComparer
         {
diff --git a/Parse/Infrastructure/Control/ParseIncrementOperation.cs b/Parse/Infrastructure/Control/ParseIncrementOperation.cs
new file mode 100644
index 00000000..eec00787
--- /dev/null
+++ b/Parse/Infrastructure/Control/ParseIncrementOperation.cs
@@ -0,0 +1,126 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Control;
+
+namespace Parse.Infrastructure.Control
+{
+    public class ParseIncrementOperation : IParseFieldOperation
+    {
+        // Defines adders for all of the implicit conversions: http://msdn.microsoft.com/en-US/library/y5b434w4(v=vs.80).aspx.
+
+        static IDictionary<Tuple<Type, Type>, Func<object, object, object>> Adders { get; } = new Dictionary<Tuple<Type, Type>, Func<object, object, object>>
+        {
+            [new Tuple<Type, Type>(typeof(sbyte), typeof(sbyte))] = (left, right) => (sbyte) left + (sbyte) right,
+            [new Tuple<Type, Type>(typeof(sbyte), typeof(short))] = (left, right) => (sbyte) left + (short) right,
+            [new Tuple<Type, Type>(typeof(sbyte), typeof(int))] = (left, right) => (sbyte) left + (int) right,
+            [new Tuple<Type, Type>(typeof(sbyte), typeof(long))] = (left, right) => (sbyte) left + (long) right,
+            [new Tuple<Type, Type>(typeof(sbyte), typeof(float))] = (left, right) => (sbyte) left + (float) right,
+            [new Tuple<Type, Type>(typeof(sbyte), typeof(double))] = (left, right) => (sbyte) left + (double) right,
+            [new Tuple<Type, Type>(typeof(sbyte), typeof(decimal))] = (left, right) => (sbyte) left + (decimal) right,
+            [new Tuple<Type, Type>(typeof(byte), typeof(byte))] = (left, right) => (byte) left + (byte) right,
+            [new Tuple<Type, Type>(typeof(byte), typeof(short))] = (left, right) => (byte) left + (short) right,
+            [new Tuple<Type, Type>(typeof(byte), typeof(ushort))] = (left, right) => (byte) left + (ushort) right,
+            [new Tuple<Type, Type>(typeof(byte), typeof(int))] = (left, right) => (byte) left + (int) right,
+            [new Tuple<Type, Type>(typeof(byte), typeof(uint))] = (left, right) => (byte) left + (uint) right,
+            [new Tuple<Type, Type>(typeof(byte), typeof(long))] = (left, right) => (byte) left + (long) right,
+            [new Tuple<Type, Type>(typeof(byte), typeof(ulong))] = (left, right) => (byte) left + (ulong) right,
+            [new Tuple<Type, Type>(typeof(byte), typeof(float))] = (left, right) => (byte) left + (float) right,
+            [new Tuple<Type, Type>(typeof(byte), typeof(double))] = (left, right) => (byte) left + (double) right,
+            [new Tuple<Type, Type>(typeof(byte), typeof(decimal))] = (left, right) => (byte) left + (decimal) right,
+            [new Tuple<Type, Type>(typeof(short), typeof(short))] = (left, right) => (short) left + (short) right,
+            [new Tuple<Type, Type>(typeof(short), typeof(int))] = (left, right) => (short) left + (int) right,
+            [new Tuple<Type, Type>(typeof(short), typeof(long))] = (left, right) => (short) left + (long) right,
+            [new Tuple<Type, Type>(typeof(short), typeof(float))] = (left, right) => (short) left + (float) right,
+            [new Tuple<Type, Type>(typeof(short), typeof(double))] = (left, right) => (short) left + (double) right,
+            [new Tuple<Type, Type>(typeof(short), typeof(decimal))] = (left, right) => (short) left + (decimal) right,
+            [new Tuple<Type, Type>(typeof(ushort), typeof(ushort))] = (left, right) => (ushort) left + (ushort) right,
+            [new Tuple<Type, Type>(typeof(ushort), typeof(int))] = (left, right) => (ushort) left + (int) right,
+            [new Tuple<Type, Type>(typeof(ushort), typeof(uint))] = (left, right) => (ushort) left + (uint) right,
+            [new Tuple<Type, Type>(typeof(ushort), typeof(long))] = (left, right) => (ushort) left + (long) right,
+            [new Tuple<Type, Type>(typeof(ushort), typeof(ulong))] = (left, right) => (ushort) left + (ulong) right,
+            [new Tuple<Type, Type>(typeof(ushort), typeof(float))] = (left, right) => (ushort) left + (float) right,
+            [new Tuple<Type, Type>(typeof(ushort), typeof(double))] = (left, right) => (ushort) left + (double) right,
+            [new Tuple<Type, Type>(typeof(ushort), typeof(decimal))] = (left, right) => (ushort) left + (decimal) right,
+            [new Tuple<Type, Type>(typeof(int), typeof(int))] = (left, right) => (int) left + (int) right,
+            [new Tuple<Type, Type>(typeof(int), typeof(long))] = (left, right) => (int) left + (long) right,
+            [new Tuple<Type, Type>(typeof(int), typeof(float))] = (left, right) => (int) left + (float) right,
+            [new Tuple<Type, Type>(typeof(int), typeof(double))] = (left, right) => (int) left + (double) right,
+            [new Tuple<Type, Type>(typeof(int), typeof(decimal))] = (left, right) => (int) left + (decimal) right,
+            [new Tuple<Type, Type>(typeof(uint), typeof(uint))] = (left, right) => (uint) left + (uint) right,
+            [new Tuple<Type, Type>(typeof(uint), typeof(long))] = (left, right) => (uint) left + (long) right,
+            [new Tuple<Type, Type>(typeof(uint), typeof(ulong))] = (left, right) => (uint) left + (ulong) right,
+            [new Tuple<Type, Type>(typeof(uint), typeof(float))] = (left, right) => (uint) left + (float) right,
+            [new Tuple<Type, Type>(typeof(uint), typeof(double))] = (left, right) => (uint) left + (double) right,
+            [new Tuple<Type, Type>(typeof(uint), typeof(decimal))] = (left, right) => (uint) left + (decimal) right,
+            [new Tuple<Type, Type>(typeof(long), typeof(long))] = (left, right) => (long) left + (long) right,
+            [new Tuple<Type, Type>(typeof(long), typeof(float))] = (left, right) => (long) left + (float) right,
+            [new Tuple<Type, Type>(typeof(long), typeof(double))] = (left, right) => (long) left + (double) right,
+            [new Tuple<Type, Type>(typeof(long), typeof(decimal))] = (left, right) => (long) left + (decimal) right,
+            [new Tuple<Type, Type>(typeof(char), typeof(char))] = (left, right) => (char) left + (char) right,
+            [new Tuple<Type, Type>(typeof(char), typeof(ushort))] = (left, right) => (char) left + (ushort) right,
+            [new Tuple<Type, Type>(typeof(char), typeof(int))] = (left, right) => (char) left + (int) right,
+            [new Tuple<Type, Type>(typeof(char), typeof(uint))] = (left, right) => (char) left + (uint) right,
+            [new Tuple<Type, Type>(typeof(char), typeof(long))] = (left, right) => (char) left + (long) right,
+            [new Tuple<Type, Type>(typeof(char), typeof(ulong))] = (left, right) => (char) left + (ulong) right,
+            [new Tuple<Type, Type>(typeof(char), typeof(float))] = (left, right) => (char) left + (float) right,
+            [new Tuple<Type, Type>(typeof(char), typeof(double))] = (left, right) => (char) left + (double) right,
+            [new Tuple<Type, Type>(typeof(char), typeof(decimal))] = (left, right) => (char) left + (decimal) right,
+            [new Tuple<Type, Type>(typeof(float), typeof(float))] = (left, right) => (float) left + (float) right,
+            [new Tuple<Type, Type>(typeof(float), typeof(double))] = (left, right) => (float) left + (double) right,
+            [new Tuple<Type, Type>(typeof(ulong), typeof(ulong))] = (left, right) => (ulong) left + (ulong) right,
+            [new Tuple<Type, Type>(typeof(ulong), typeof(float))] = (left, right) => (ulong) left + (float) right,
+            [new Tuple<Type, Type>(typeof(ulong), typeof(double))] = (left, right) => (ulong) left + (double) right,
+            [new Tuple<Type, Type>(typeof(ulong), typeof(decimal))] = (left, right) => (ulong) left + (decimal) right,
+            [new Tuple<Type, Type>(typeof(double), typeof(double))] = (left, right) => (double) left + (double) right,
+            [new Tuple<Type, Type>(typeof(decimal), typeof(decimal))] = (left, right) => (decimal) left + (decimal) right
+        };
+
+        static ParseIncrementOperation()
+        {
+            // Generate the adders in the other direction
+
+            foreach (Tuple<Type, Type> pair in Adders.Keys.ToList())
+            {
+                if (pair.Item1.Equals(pair.Item2))
+                {
+                    continue;
+                }
+
+                Tuple<Type, Type> reversePair = new Tuple<Type, Type>(pair.Item2, pair.Item1);
+                Func<object, object, object> func = Adders[pair];
+                Adders[reversePair] = (left, right) => func(right, left);
+            }
+        }
+
+        public ParseIncrementOperation(object amount) => Amount = amount;
+
+        public object Encode(IServiceHub serviceHub) => new Dictionary<string, object>
+        {
+            ["__op"] = "Increment",
+            ["amount"] = Amount
+        };
+
+        static object Add(object first, object second) => Adders.TryGetValue(new Tuple<Type, Type>(first.GetType(), second.GetType()), out Func<object, object, object> adder) ? adder(first, second) : throw new InvalidCastException($"Could not add objects of type {first.GetType()} and {second.GetType()} to each other.");
+
+        public IParseFieldOperation MergeWithPrevious(IParseFieldOperation previous) => previous switch
+        {
+            null => this,
+            ParseDeleteOperation _ => new ParseSetOperation(Amount),
+
+            // This may be a bug, but it was in the original logic.
+
+            ParseSetOperation { Value: string { } } => throw new InvalidOperationException("Cannot increment a non-number type."),
+            ParseSetOperation { Value: var value } => new ParseSetOperation(Add(value, Amount)),
+            ParseIncrementOperation { Amount: var amount } => new ParseIncrementOperation(Add(amount, Amount)),
+            _ => throw new InvalidOperationException("Operation is invalid after previous operation.")
+        };
+
+        public object Apply(object oldValue, string key) => oldValue is string ? throw new InvalidOperationException("Cannot increment a non-number type.") : Add(oldValue ?? 0, Amount);
+
+        public object Amount { get; }
+    }
+}
diff --git a/Parse/Infrastructure/Control/ParseRelationOperation.cs b/Parse/Infrastructure/Control/ParseRelationOperation.cs
new file mode 100644
index 00000000..43915d77
--- /dev/null
+++ b/Parse/Infrastructure/Control/ParseRelationOperation.cs
@@ -0,0 +1,106 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Control;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Infrastructure.Data;
+
+namespace Parse.Infrastructure.Control
+{
+    public class ParseRelationOperation : IParseFieldOperation
+    {
+        IList<string> Additions { get; }
+
+        IList<string> Removals { get; }
+
+        IParseObjectClassController ClassController { get; }
+
+        ParseRelationOperation(IParseObjectClassController classController) => ClassController = classController;
+
+        ParseRelationOperation(IParseObjectClassController classController, IEnumerable<string> adds, IEnumerable<string> removes, string targetClassName) : this(classController)
+        {
+            TargetClassName = targetClassName;
+            Additions = new ReadOnlyCollection<string>(adds.ToList());
+            Removals = new ReadOnlyCollection<string>(removes.ToList());
+        }
+
+        public ParseRelationOperation(IParseObjectClassController classController, IEnumerable<ParseObject> adds, IEnumerable<ParseObject> removes) : this(classController)
+        {
+            adds ??= new ParseObject[0];
+            removes ??= new ParseObject[0];
+
+            TargetClassName = adds.Concat(removes).Select(entity => entity.ClassName).FirstOrDefault();
+            Additions = new ReadOnlyCollection<string>(GetIdsFromObjects(adds).ToList());
+            Removals = new ReadOnlyCollection<string>(GetIdsFromObjects(removes).ToList());
+        }
+
+        public object Encode(IServiceHub serviceHub)
+        {
+            List<object> additions = Additions.Select(id => PointerOrLocalIdEncoder.Instance.Encode(ClassController.CreateObjectWithoutData(TargetClassName, id, serviceHub), serviceHub)).ToList(), removals = Removals.Select(id => PointerOrLocalIdEncoder.Instance.Encode(ClassController.CreateObjectWithoutData(TargetClassName, id, serviceHub), serviceHub)).ToList();
+
+            Dictionary<string, object> addition = additions.Count == 0 ? default : new Dictionary<string, object>
+            {
+                ["__op"] = "AddRelation",
+                ["objects"] = additions
+            };
+
+            Dictionary<string, object> removal = removals.Count == 0 ? default : new Dictionary<string, object>
+            {
+                ["__op"] = "RemoveRelation",
+                ["objects"] = removals
+            };
+
+            if (addition is { } && removal is { })
+            {
+                return new Dictionary<string, object>
+                {
+                    ["__op"] = "Batch",
+                    ["ops"] = new[] { addition, removal }
+                };
+            }
+            return addition ?? removal;
+        }
+
+        public IParseFieldOperation MergeWithPrevious(IParseFieldOperation previous) => previous switch
+        {
+            null => this,
+            ParseDeleteOperation { } => throw new InvalidOperationException("You can't modify a relation after deleting it."),
+            ParseRelationOperation { } other when other.TargetClassName != TargetClassName => throw new InvalidOperationException($"Related object must be of class {other.TargetClassName}, but {TargetClassName} was passed in."),
+            ParseRelationOperation { ClassController: var classController } other => new ParseRelationOperation(classController, Additions.Union(other.Additions.Except(Removals)).ToList(), Removals.Union(other.Removals.Except(Additions)).ToList(), TargetClassName),
+            _ => throw new InvalidOperationException("Operation is invalid after previous operation.")
+        };
+
+        public object Apply(object oldValue, string key) => oldValue switch
+        {
+            _ when Additions.Count == 0 && Removals.Count == 0 => default,
+            null => ClassController.CreateRelation(null, key, TargetClassName),
+            ParseRelationBase { TargetClassName: { } oldClassname } when oldClassname != TargetClassName => throw new InvalidOperationException($"Related object must be a {oldClassname}, but a {TargetClassName} was passed in."),
+            ParseRelationBase { } oldRelation => (Relation: oldRelation, oldRelation.TargetClassName = TargetClassName).Relation,
+            _ => throw new InvalidOperationException("Operation is invalid after previous operation.")
+        };
+
+        public string TargetClassName { get; }
+
+        IEnumerable<string> GetIdsFromObjects(IEnumerable<ParseObject> objects)
+        {
+            foreach (ParseObject entity in objects)
+            {
+                if (entity.ObjectId is null)
+                {
+                    throw new ArgumentException("You can't add an unsaved ParseObject to a relation.");
+                }
+
+                if (entity.ClassName != TargetClassName)
+                {
+                    throw new ArgumentException($"Tried to create a ParseRelation with 2 different types: {TargetClassName} and {entity.ClassName}");
+                }
+            }
+
+            return objects.Select(entity => entity.ObjectId).Distinct();
+        }
+    }
+}
diff --git a/Parse/Infrastructure/Control/ParseRemoveOperation.cs b/Parse/Infrastructure/Control/ParseRemoveOperation.cs
new file mode 100644
index 00000000..17987e0c
--- /dev/null
+++ b/Parse/Infrastructure/Control/ParseRemoveOperation.cs
@@ -0,0 +1,39 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Control;
+using Parse.Infrastructure.Data;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse.Infrastructure.Control
+{
+    public class ParseRemoveOperation : IParseFieldOperation
+    {
+        ReadOnlyCollection<object> Data { get; }
+
+        public ParseRemoveOperation(IEnumerable<object> objects) => Data = new ReadOnlyCollection<object>(objects.Distinct().ToList());
+
+        public object Encode(IServiceHub serviceHub) => new Dictionary<string, object>
+        {
+            ["__op"] = "Remove",
+            ["objects"] = PointerOrLocalIdEncoder.Instance.Encode(Data, serviceHub)
+        };
+
+        public IParseFieldOperation MergeWithPrevious(IParseFieldOperation previous) => previous switch
+        {
+            null => this,
+            ParseDeleteOperation _ => previous,
+            ParseSetOperation setOp => new ParseSetOperation(Apply(Conversion.As<IList<object>>(setOp.Value), default)),
+            ParseRemoveOperation oldOp => new ParseRemoveOperation(oldOp.Objects.Concat(Data)),
+            _ => throw new InvalidOperationException("Operation is invalid after previous operation.")
+        };
+
+        public object Apply(object oldValue, string key) => oldValue is { } ? Conversion.As<IList<object>>(oldValue).Except(Data, ParseFieldOperations.ParseObjectComparer).ToList() : new List<object> { };
+
+        public IEnumerable<object> Objects => Data;
+    }
+}
diff --git a/Parse/Internal/Operation/ParseSetOperation.cs b/Parse/Infrastructure/Control/ParseSetOperation.cs
similarity index 52%
rename from Parse/Internal/Operation/ParseSetOperation.cs
rename to Parse/Infrastructure/Control/ParseSetOperation.cs
index ebefc190..30c27a97 100644
--- a/Parse/Internal/Operation/ParseSetOperation.cs
+++ b/Parse/Infrastructure/Control/ParseSetOperation.cs
@@ -1,28 +1,20 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
-namespace Parse.Core.Internal
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Control;
+using Parse.Infrastructure.Data;
+
+namespace Parse.Infrastructure.Control
 {
     public class ParseSetOperation : IParseFieldOperation
     {
-        public ParseSetOperation(object value)
-        {
-            Value = value;
-        }
+        public ParseSetOperation(object value) => Value = value;
 
-        public object Encode()
-        {
-            return PointerOrLocalIdEncoder.Instance.Encode(Value);
-        }
+        public object Encode(IServiceHub serviceHub) => PointerOrLocalIdEncoder.Instance.Encode(Value, serviceHub);
 
-        public IParseFieldOperation MergeWithPrevious(IParseFieldOperation previous)
-        {
-            return this;
-        }
+        public IParseFieldOperation MergeWithPrevious(IParseFieldOperation previous) => this;
 
-        public object Apply(object oldValue, string key)
-        {
-            return Value;
-        }
+        public object Apply(object oldValue, string key) => Value;
 
         public object Value { get; private set; }
     }
diff --git a/Parse/Infrastructure/Data/NoObjectsEncoder.cs b/Parse/Infrastructure/Data/NoObjectsEncoder.cs
new file mode 100644
index 00000000..30215c3a
--- /dev/null
+++ b/Parse/Infrastructure/Data/NoObjectsEncoder.cs
@@ -0,0 +1,20 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+
+namespace Parse.Infrastructure.Data
+{
+    // This class isn't really a Singleton, but since it has no state, it's more efficient to get the default instance.
+
+    /// <summary>
+    /// A <see cref="ParseDataEncoder"/> that throws an exception if it attempts to encode
+    /// a <see cref="ParseObject"/>
+    /// </summary>
+    public class NoObjectsEncoder : ParseDataEncoder
+    {
+        public static NoObjectsEncoder Instance { get; } = new NoObjectsEncoder();
+
+        protected override IDictionary<string, object> EncodeObject(ParseObject value) => throw new ArgumentException("ParseObjects not allowed here.");
+    }
+}
diff --git a/Parse/Infrastructure/Data/ParseDataDecoder.cs b/Parse/Infrastructure/Data/ParseDataDecoder.cs
new file mode 100644
index 00000000..7be73093
--- /dev/null
+++ b/Parse/Infrastructure/Data/ParseDataDecoder.cs
@@ -0,0 +1,50 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Data;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Infrastructure.Control;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse.Infrastructure.Data
+{
+    public class ParseDataDecoder : IParseDataDecoder
+    {
+        // Prevent default constructor.
+
+        IParseObjectClassController ClassController { get; }
+
+        public ParseDataDecoder(IParseObjectClassController classController) => ClassController = classController;
+
+        static string[] Types { get; } = { "Date", "Bytes", "Pointer", "File", "GeoPoint", "Object", "Relation" };
+
+        public object Decode(object data, IServiceHub serviceHub) => data switch
+        {
+            null => default,
+            IDictionary<string, object> { } dictionary when dictionary.ContainsKey("__op") => ParseFieldOperations.Decode(dictionary),
+            IDictionary<string, object> { } dictionary when dictionary.TryGetValue("__type", out object type) && Types.Contains(type) => type switch
+            {
+                "Date" => ParseDate(dictionary["iso"] as string),
+                "Bytes" => Convert.FromBase64String(dictionary["base64"] as string),
+                "Pointer" => DecodePointer(dictionary["className"] as string, dictionary["objectId"] as string, serviceHub),
+                "File" => new ParseFile(dictionary["name"] as string, new Uri(dictionary["url"] as string)),
+                "GeoPoint" => new ParseGeoPoint(Conversion.To<double>(dictionary["latitude"]), Conversion.To<double>(dictionary["longitude"])),
+                "Object" => ClassController.GenerateObjectFromState<ParseObject>(ParseObjectCoder.Instance.Decode(dictionary, this, serviceHub), dictionary["className"] as string, serviceHub),
+                "Relation" => serviceHub.CreateRelation(null, null, dictionary["className"] as string)
+            },
+            IDictionary<string, object> { } dictionary => dictionary.ToDictionary(pair => pair.Key, pair => Decode(pair.Value, serviceHub)),
+            IList<object> { } list => list.Select(item => Decode(item, serviceHub)).ToList(),
+            _ => data
+        };
+
+        protected virtual object DecodePointer(string className, string objectId, IServiceHub serviceHub) => ClassController.CreateObjectWithoutData(className, objectId, serviceHub);
+
+        // TODO(hallucinogen): Figure out if we should be more flexible with the date formats we accept.
+
+        public static DateTime ParseDate(string input) => DateTime.ParseExact(input, ParseClient.DateFormatStrings, CultureInfo.InvariantCulture, DateTimeStyles.None);
+    }
+}
diff --git a/Parse/Infrastructure/Data/ParseDataEncoder.cs b/Parse/Infrastructure/Data/ParseDataEncoder.cs
new file mode 100644
index 00000000..8cee8060
--- /dev/null
+++ b/Parse/Infrastructure/Data/ParseDataEncoder.cs
@@ -0,0 +1,73 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Control;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse.Infrastructure.Data
+{
+    /// <summary>
+    /// A <c>ParseEncoder</c> can be used to transform objects such as <see cref="ParseObject"/> into JSON
+    /// data structures.
+    /// </summary>
+    /// <seealso cref="ParseDataDecoder"/>
+    public abstract class ParseDataEncoder
+    {
+        public static bool Validate(object value) => value is null || value.GetType().IsPrimitive || value is string || value is ParseObject || value is ParseACL || value is ParseFile || value is ParseGeoPoint || value is ParseRelationBase || value is DateTime || value is byte[] || Conversion.As<IDictionary<string, object>>(value) is { } || Conversion.As<IList<object>>(value) is { };
+
+        // If this object has a special encoding, encode it and return the encoded object. Otherwise, just return the original object.
+
+        public object Encode(object value, IServiceHub serviceHub) => value switch
+        {
+            DateTime { } date => new Dictionary<string, object>
+            {
+                ["iso"] = date.ToString(ParseClient.DateFormatStrings.First(), CultureInfo.InvariantCulture),
+                ["__type"] = "Date"
+            },
+            byte[] { } bytes => new Dictionary<string, object>
+            {
+                ["__type"] = "Bytes",
+                ["base64"] = Convert.ToBase64String(bytes)
+            },
+            ParseObject { } entity => EncodeObject(entity),
+            IJsonConvertible { } jsonConvertible => jsonConvertible.ConvertToJSON(),
+            { } when Conversion.As<IDictionary<string, object>>(value) is { } dictionary => dictionary.ToDictionary(pair => pair.Key, pair => Encode(pair.Value, serviceHub)),
+            { } when Conversion.As<IList<object>>(value) is { } list => EncodeList(list, serviceHub),
+
+            // TODO (hallucinogen): convert IParseFieldOperation to IJsonConvertible
+
+            IParseFieldOperation { } fieldOperation => fieldOperation.Encode(serviceHub),
+            _ => value
+        };
+
+        protected abstract IDictionary<string, object> EncodeObject(ParseObject value);
+
+        object EncodeList(IList<object> list, IServiceHub serviceHub)
+        {
+            List<object> encoded = new List<object> { };
+
+            // We need to explicitly cast `list` to `List<object>` rather than `IList<object>` because IL2CPP is stricter than the usual Unity AOT compiler pipeline.
+
+            if (ParseClient.IL2CPPCompiled && list.GetType().IsArray)
+            {
+                list = new List<object>(list);
+            }
+
+            foreach (object item in list)
+            {
+                if (!Validate(item))
+                {
+                    throw new ArgumentException("Invalid type for value in an array");
+                }
+
+                encoded.Add(Encode(item, serviceHub));
+            }
+
+            return encoded;
+        }
+    }
+}
diff --git a/Parse/Internal/Encoding/ParseObjectCoder.cs b/Parse/Infrastructure/Data/ParseObjectCoder.cs
similarity index 61%
rename from Parse/Internal/Encoding/ParseObjectCoder.cs
rename to Parse/Infrastructure/Data/ParseObjectCoder.cs
index 12c6b208..8dedd347 100644
--- a/Parse/Internal/Encoding/ParseObjectCoder.cs
+++ b/Parse/Infrastructure/Data/ParseObjectCoder.cs
@@ -2,42 +2,48 @@
 
 using System;
 using System.Collections.Generic;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Control;
+using Parse.Abstractions.Infrastructure.Data;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Platform.Objects;
 
-namespace Parse.Core.Internal
+namespace Parse.Infrastructure.Data
 {
     // TODO: (richardross) refactor entire parse coder interfaces.
+
     public class ParseObjectCoder
     {
-        public static ParseObjectCoder Instance { get; } = new ParseObjectCoder();
+        public static ParseObjectCoder Instance { get; } = new ParseObjectCoder { };
 
         // Prevent default constructor.
-        private ParseObjectCoder() { }
 
-        public IDictionary<string, object> Encode<T>(T state, IDictionary<string, IParseFieldOperation> operations, ParseEncoder encoder) where T : IObjectState
+        ParseObjectCoder() { }
+
+        public IDictionary<string, object> Encode<T>(T state, IDictionary<string, IParseFieldOperation> operations, ParseDataEncoder encoder, IServiceHub serviceHub) where T : IObjectState
         {
-            Dictionary<string, object> result = new Dictionary<string, object>();
+            Dictionary<string, object> result = new Dictionary<string, object> { };
             foreach (KeyValuePair<string, IParseFieldOperation> pair in operations)
             {
                 // Serialize the data
                 IParseFieldOperation operation = pair.Value;
 
-                result[pair.Key] = encoder.Encode(operation);
+                result[pair.Key] = encoder.Encode(operation, serviceHub);
             }
 
             return result;
         }
 
-        public IObjectState Decode(IDictionary<string, object> data, ParseDecoder decoder)
+        public IObjectState Decode(IDictionary<string, object> data, IParseDataDecoder decoder, IServiceHub serviceHub)
         {
-            IDictionary<string, object> serverData = new Dictionary<string, object>();
-            Dictionary<string, object> mutableData = new Dictionary<string, object>(data);
-            string objectId = extractFromDictionary(mutableData, "objectId", (obj) => obj as string);
-            DateTime? createdAt = extractFromDictionary<DateTime?>(mutableData, "createdAt", (obj) => ParseDecoder.ParseDate(obj as string));
-            DateTime? updatedAt = extractFromDictionary<DateTime?>(mutableData, "updatedAt", (obj) => ParseDecoder.ParseDate(obj as string));
+            IDictionary<string, object> serverData = new Dictionary<string, object> { }, mutableData = new Dictionary<string, object>(data);
+
+            string objectId = Extract(mutableData, "objectId", (obj) => obj as string);
+            DateTime? createdAt = Extract<DateTime?>(mutableData, "createdAt", (obj) => ParseDataDecoder.ParseDate(obj as string)), updatedAt = Extract<DateTime?>(mutableData, "updatedAt", (obj) => ParseDataDecoder.ParseDate(obj as string));
 
             if (mutableData.ContainsKey("ACL"))
             {
-                serverData["ACL"] = extractFromDictionary(mutableData, "ACL", (obj) => new ParseACL(obj as IDictionary<string, object>));
+                serverData["ACL"] = Extract(mutableData, "ACL", (obj) => new ParseACL(obj as IDictionary<string, object>));
             }
 
             if (createdAt != null && updatedAt == null)
@@ -46,6 +52,7 @@ public IObjectState Decode(IDictionary<string, object> data, ParseDecoder decode
             }
 
             // Bring in the new server data.
+
             foreach (KeyValuePair<string, object> pair in mutableData)
             {
                 if (pair.Key == "__type" || pair.Key == "className")
@@ -53,8 +60,7 @@ public IObjectState Decode(IDictionary<string, object> data, ParseDecoder decode
                     continue;
                 }
 
-                object value = pair.Value;
-                serverData[pair.Key] = decoder.Decode(value);
+                serverData[pair.Key] = decoder.Decode(pair.Value, serviceHub);
             }
 
             return new MutableObjectState
@@ -66,9 +72,10 @@ public IObjectState Decode(IDictionary<string, object> data, ParseDecoder decode
             };
         }
 
-        private T extractFromDictionary<T>(IDictionary<string, object> data, string key, Func<object, T> action)
+        T Extract<T>(IDictionary<string, object> data, string key, Func<object, T> action)
         {
             T result = default;
+
             if (data.ContainsKey(key))
             {
                 result = action(data[key]);
diff --git a/Parse/Infrastructure/Data/PointerOrLocalIdEncoder.cs b/Parse/Infrastructure/Data/PointerOrLocalIdEncoder.cs
new file mode 100644
index 00000000..d6a81d1d
--- /dev/null
+++ b/Parse/Infrastructure/Data/PointerOrLocalIdEncoder.cs
@@ -0,0 +1,32 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+
+namespace Parse.Infrastructure.Data
+{
+    /// <summary>
+    /// A <see cref="ParseDataEncoder"/> that encodes <see cref="ParseObject"/> as pointers. If the object does not have an <see cref="ParseObject.ObjectId"/>, uses a local id.
+    /// </summary>
+    public class PointerOrLocalIdEncoder : ParseDataEncoder
+    {
+        public static PointerOrLocalIdEncoder Instance { get; } = new PointerOrLocalIdEncoder { };
+
+        protected override IDictionary<string, object> EncodeObject(ParseObject value)
+        {
+            if (value.ObjectId is null)
+            {
+                // TODO (hallucinogen): handle local id. For now we throw.
+
+                throw new InvalidOperationException("Cannot create a pointer to an object without an objectId.");
+            }
+
+            return new Dictionary<string, object>
+            {
+                ["__type"] = "Pointer",
+                ["className"] = value.ClassName,
+                ["objectId"] = value.ObjectId
+            };
+        }
+    }
+}
diff --git a/Parse/Public/ParseUploadProgressEventArgs.cs b/Parse/Infrastructure/DataTransferLevel.cs
similarity index 70%
rename from Parse/Public/ParseUploadProgressEventArgs.cs
rename to Parse/Infrastructure/DataTransferLevel.cs
index 35df390c..6dfcf1dd 100644
--- a/Parse/Public/ParseUploadProgressEventArgs.cs
+++ b/Parse/Infrastructure/DataTransferLevel.cs
@@ -1,19 +1,18 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
 using System;
+using Parse.Abstractions.Infrastructure;
 
-namespace Parse
+namespace Parse.Infrastructure
 {
     /// <summary>
     /// Represents upload progress.
     /// </summary>
-    public class ParseUploadProgressEventArgs : EventArgs
+    public class DataTransferLevel : EventArgs, IDataTransferLevel
     {
-        public ParseUploadProgressEventArgs() { }
-
         /// <summary>
-        /// Gets the progress (a number between 0.0 and 1.0) of an upload.
+        /// Gets the progress (a number between 0.0 and 1.0) of an upload or download.
         /// </summary>
-        public double Progress { get; set; }
+        public double Amount { get; set; }
     }
 }
diff --git a/Parse/Infrastructure/EnvironmentData.cs b/Parse/Infrastructure/EnvironmentData.cs
new file mode 100644
index 00000000..3ec2061d
--- /dev/null
+++ b/Parse/Infrastructure/EnvironmentData.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Runtime.InteropServices;
+using Parse.Abstractions.Infrastructure;
+
+namespace Parse.Infrastructure
+{
+    /// <summary>
+    /// Inferred data about the environment in which parse is operating.
+    /// </summary>
+    public class EnvironmentData : IEnvironmentData
+    {
+        /// <summary>
+        /// A <see cref="EnvironmentData"/> instance that the Parse SDK will attempt to generate from environment metadata it should be able to access.
+        /// </summary>
+        public static EnvironmentData Inferred => new EnvironmentData
+        {
+            TimeZone = TimeZoneInfo.Local.StandardName,
+            OSVersion = RuntimeInformation.OSDescription ?? Environment.OSVersion.ToString(),
+            Platform = RuntimeInformation.FrameworkDescription ?? ".NET"
+        };
+
+        /// <summary>
+        /// The active time zone for the app and/or system.
+        /// </summary>
+        public string TimeZone { get; set; }
+
+        /// <summary>
+        /// The host operating system version of the platform the host application is operating in.
+        /// </summary>
+        public string OSVersion { get; set; }
+
+        /// <summary>
+        /// The target platform the app is running on. Defaults to .NET.
+        /// </summary>
+        public string Platform { get; set; }
+    }
+}
diff --git a/Parse/Infrastructure/Execution/ParseCommand.cs b/Parse/Infrastructure/Execution/ParseCommand.cs
new file mode 100644
index 00000000..705b2e1e
--- /dev/null
+++ b/Parse/Infrastructure/Execution/ParseCommand.cs
@@ -0,0 +1,56 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse.Infrastructure.Execution
+{
+    /// <summary>
+    /// ParseCommand is an <see cref="WebRequest"/> with pre-populated
+    /// headers.
+    /// </summary>
+    public class ParseCommand : WebRequest
+    {
+        public IDictionary<string, object> DataObject { get; private set; }
+
+        public override Stream Data
+        {
+            get => base.Data ??= DataObject is { } ? new MemoryStream(Encoding.UTF8.GetBytes(JsonUtilities.Encode(DataObject))) : default;
+            set => base.Data = value;
+        }
+
+        public ParseCommand(string relativeUri, string method, string sessionToken = null, IList<KeyValuePair<string, string>> headers = null, IDictionary<string, object> data = null) : this(relativeUri: relativeUri, method: method, sessionToken: sessionToken, headers: headers, stream: null, contentType: data != null ? "application/json" : null) => DataObject = data;
+
+        public ParseCommand(string relativeUri, string method, string sessionToken = null, IList<KeyValuePair<string, string>> headers = null, Stream stream = null, string contentType = null)
+        {
+            Path = relativeUri;
+            Method = method;
+            Data = stream;
+            Headers = new List<KeyValuePair<string, string>>(headers ?? Enumerable.Empty<KeyValuePair<string, string>>());
+
+            if (!String.IsNullOrEmpty(sessionToken))
+            {
+                Headers.Add(new KeyValuePair<string, string>("X-Parse-Session-Token", sessionToken));
+            }
+
+            if (!String.IsNullOrEmpty(contentType))
+            {
+                Headers.Add(new KeyValuePair<string, string>("Content-Type", contentType));
+            }
+        }
+
+        public ParseCommand(ParseCommand other)
+        {
+            Resource = other.Resource;
+            Path = other.Path;
+            Method = other.Method;
+            DataObject = other.DataObject;
+            Headers = new List<KeyValuePair<string, string>>(other.Headers);
+            Data = other.Data;
+        }
+    }
+}
diff --git a/Parse/Infrastructure/Execution/ParseCommandRunner.cs b/Parse/Infrastructure/Execution/ParseCommandRunner.cs
new file mode 100644
index 00000000..ab74abb4
--- /dev/null
+++ b/Parse/Infrastructure/Execution/ParseCommandRunner.cs
@@ -0,0 +1,160 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Abstractions.Platform.Installations;
+using Parse.Abstractions.Platform.Users;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse.Infrastructure.Execution
+{
+    /// <summary>
+    /// The command runner for all SDK operations that need to interact with the targeted deployment of Parse Server.
+    /// </summary>
+    public class ParseCommandRunner : IParseCommandRunner
+    {
+        IWebClient WebClient { get; }
+
+        IParseInstallationController InstallationController { get; }
+
+        IMetadataController MetadataController { get; }
+
+        IServerConnectionData ServerConnectionData { get; }
+
+        Lazy<IParseUserController> UserController { get; }
+
+        IWebClient GetWebClient() => WebClient;
+
+        /// <summary>
+        /// Creates a new Parse SDK command runner.
+        /// </summary>
+        /// <param name="webClient">The <see cref="IWebClient"/> implementation instance to use.</param>
+        /// <param name="installationController">The <see cref="IParseInstallationController"/> implementation instance to use.</param>
+        public ParseCommandRunner(IWebClient webClient, IParseInstallationController installationController, IMetadataController metadataController, IServerConnectionData serverConnectionData, Lazy<IParseUserController> userController)
+        {
+            WebClient = webClient;
+            InstallationController = installationController;
+            MetadataController = metadataController;
+            ServerConnectionData = serverConnectionData;
+            UserController = userController;
+        }
+
+        /// <summary>
+        /// Runs a specified <see cref="ParseCommand"/>.
+        /// </summary>
+        /// <param name="command">The <see cref="ParseCommand"/> to run.</param>
+        /// <param name="uploadProgress">An <see cref="IProgress{ParseUploadProgressEventArgs}"/> instance to push upload progress data to.</param>
+        /// <param name="downloadProgress">An <see cref="IProgress{ParseDownloadProgressEventArgs}"/> instance to push download progress data to.</param>
+        /// <param name="cancellationToken">An asynchronous operation cancellation token that dictates if and when the operation should be cancelled.</param>
+        /// <returns></returns>
+        public Task<Tuple<HttpStatusCode, IDictionary<string, object>>> RunCommandAsync(ParseCommand command, IProgress<IDataTransferLevel> uploadProgress = null, IProgress<IDataTransferLevel> downloadProgress = null, CancellationToken cancellationToken = default) => PrepareCommand(command).ContinueWith(commandTask => GetWebClient().ExecuteAsync(commandTask.Result, uploadProgress, downloadProgress, cancellationToken).OnSuccess(task =>
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            Tuple<HttpStatusCode, string> response = task.Result;
+            string content = response.Item2;
+            int responseCode = (int) response.Item1;
+
+            if (responseCode >= 500)
+            {
+                // Server error, return InternalServerError.
+
+                throw new ParseFailureException(ParseFailureException.ErrorCode.InternalServerError, response.Item2);
+            }
+            else if (content is { })
+            {
+                IDictionary<string, object> contentJson = default;
+
+                try
+                {
+                    // TODO: Newer versions of Parse Server send the failure results back as HTML.
+
+                    contentJson = content.StartsWith("[") ? new Dictionary<string, object> { ["results"] = JsonUtilities.Parse(content) } : JsonUtilities.Parse(content) as IDictionary<string, object>;
+                }
+                catch (Exception e)
+                {
+                    throw new ParseFailureException(ParseFailureException.ErrorCode.OtherCause, "Invalid or alternatively-formatted response recieved from server.", e);
+                }
+
+                if (responseCode < 200 || responseCode > 299)
+                {
+                    throw new ParseFailureException(contentJson.ContainsKey("code") ? (ParseFailureException.ErrorCode) (long) contentJson["code"] : ParseFailureException.ErrorCode.OtherCause, contentJson.ContainsKey("error") ? contentJson["error"] as string : content);
+                }
+
+                return new Tuple<HttpStatusCode, IDictionary<string, object>>(response.Item1, contentJson);
+            }
+            return new Tuple<HttpStatusCode, IDictionary<string, object>>(response.Item1, null);
+        })).Unwrap();
+
+        Task<ParseCommand> PrepareCommand(ParseCommand command)
+        {
+            ParseCommand newCommand = new ParseCommand(command)
+            {
+                Resource = ServerConnectionData.ServerURI
+            };
+
+            Task<ParseCommand> installationIdFetchTask = InstallationController.GetAsync().ContinueWith(task =>
+            {
+                lock (newCommand.Headers)
+                {
+                    newCommand.Headers.Add(new KeyValuePair<string, string>("X-Parse-Installation-Id", task.Result.ToString()));
+                }
+
+                return newCommand;
+            });
+
+            // Locks needed due to installationFetchTask continuation newCommand.Headers.Add-call-related race condition (occurred once in Unity).
+            // TODO: Consider removal of installationFetchTask variable.
+
+            lock (newCommand.Headers)
+            {
+                newCommand.Headers.Add(new KeyValuePair<string, string>("X-Parse-Application-Id", ServerConnectionData.ApplicationID));
+                newCommand.Headers.Add(new KeyValuePair<string, string>("X-Parse-Client-Version", ParseClient.Version.ToString()));
+
+                if (ServerConnectionData.Headers != null)
+                {
+                    foreach (KeyValuePair<string, string> header in ServerConnectionData.Headers)
+                    {
+                        newCommand.Headers.Add(header);
+                    }
+                }
+
+                if (!String.IsNullOrEmpty(MetadataController.HostManifestData.Version))
+                {
+                    newCommand.Headers.Add(new KeyValuePair<string, string>("X-Parse-App-Build-Version", MetadataController.HostManifestData.Version));
+                }
+
+                if (!String.IsNullOrEmpty(MetadataController.HostManifestData.ShortVersion))
+                {
+                    newCommand.Headers.Add(new KeyValuePair<string, string>("X-Parse-App-Display-Version", MetadataController.HostManifestData.ShortVersion));
+                }
+
+                if (!String.IsNullOrEmpty(MetadataController.EnvironmentData.OSVersion))
+                {
+                    newCommand.Headers.Add(new KeyValuePair<string, string>("X-Parse-OS-Version", MetadataController.EnvironmentData.OSVersion));
+                }
+
+                if (!String.IsNullOrEmpty(ServerConnectionData.MasterKey))
+                {
+                    newCommand.Headers.Add(new KeyValuePair<string, string>("X-Parse-Master-Key", ServerConnectionData.MasterKey));
+                }
+                else
+                {
+                    newCommand.Headers.Add(new KeyValuePair<string, string>("X-Parse-Windows-Key", ServerConnectionData.Key));
+                }
+
+                if (UserController.Value.RevocableSessionEnabled)
+                {
+                    newCommand.Headers.Add(new KeyValuePair<string, string>("X-Parse-Revocable-Session", "1"));
+                }
+            }
+
+            return installationIdFetchTask;
+        }
+    }
+}
diff --git a/Parse/Internal/HttpClient/Portable/HttpClient.Portable.cs b/Parse/Infrastructure/Execution/UniversalWebClient.cs
similarity index 51%
rename from Parse/Internal/HttpClient/Portable/HttpClient.Portable.cs
rename to Parse/Infrastructure/Execution/UniversalWebClient.cs
index aa984811..30f07a69 100644
--- a/Parse/Internal/HttpClient/Portable/HttpClient.Portable.cs
+++ b/Parse/Infrastructure/Execution/UniversalWebClient.cs
@@ -1,78 +1,101 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Net;
+using System.Net.Http;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Net.Http;
-using System.Linq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Infrastructure.Utilities;
+using BCLWebClient = System.Net.Http.HttpClient;
 
-using NetHttpClient = System.Net.Http.HttpClient;
-using System.Net.Http.Headers;
-using System.Collections.Generic;
-
-namespace Parse.Common.Internal
+namespace Parse.Infrastructure.Execution
 {
-    public class HttpClient : IHttpClient
+    /// <summary>
+    /// A universal implementation of <see cref="IWebClient"/>.
+    /// </summary>
+    public class UniversalWebClient : IWebClient
     {
-        private static HashSet<string> HttpContentHeaders = new HashSet<string> { { "Allow" }, { "Content-Disposition" }, { "Content-Encoding" }, { "Content-Language" }, { "Content-Length" }, { "Content-Location" }, { "Content-MD5" }, { "Content-Range" }, { "Content-Type" }, { "Expires" }, { "Last-Modified" } };
-
-        public HttpClient() : this(new NetHttpClient { }) { }
-
-        public HttpClient(NetHttpClient client) => this.client = client;
-
-        private NetHttpClient client;
-
-        public Task<Tuple<HttpStatusCode, string>> ExecuteAsync(HttpRequest httpRequest, IProgress<ParseUploadProgressEventArgs> uploadProgress, IProgress<ParseDownloadProgressEventArgs> downloadProgress, CancellationToken cancellationToken)
+        static HashSet<string> ContentHeaders { get; } = new HashSet<string>
         {
-            uploadProgress = uploadProgress ?? new Progress<ParseUploadProgressEventArgs> { };
-            downloadProgress = downloadProgress ?? new Progress<ParseDownloadProgressEventArgs> { };
+            { "Allow" },
+            { "Content-Disposition" },
+            { "Content-Encoding" },
+            { "Content-Language" },
+            { "Content-Length" },
+            { "Content-Location" },
+            { "Content-MD5" },
+            { "Content-Range" },
+            { "Content-Type" },
+            { "Expires" },
+            { "Last-Modified" }
+        };
+
+        public UniversalWebClient() : this(new BCLWebClient { }) { }
+
+        public UniversalWebClient(BCLWebClient client) => Client = client;
+
+        BCLWebClient Client { get; set; }
+
+        public Task<Tuple<HttpStatusCode, string>> ExecuteAsync(WebRequest httpRequest, IProgress<IDataTransferLevel> uploadProgress, IProgress<IDataTransferLevel> downloadProgress, CancellationToken cancellationToken)
+        {
+            uploadProgress ??= new Progress<IDataTransferLevel> { };
+            downloadProgress ??= new Progress<IDataTransferLevel> { };
 
-            HttpRequestMessage message = new HttpRequestMessage(new HttpMethod(httpRequest.Method), httpRequest.Uri);
+            HttpRequestMessage message = new HttpRequestMessage(new HttpMethod(httpRequest.Method), httpRequest.Target);
 
             // Fill in zero-length data if method is post.
-            Stream data = httpRequest.Data == null && httpRequest.Method.ToLower().Equals("post") ? new MemoryStream(new byte[0]) : httpRequest.Data;
-            if (data != null)
+            if ((httpRequest.Data is null && httpRequest.Method.ToLower().Equals("post") ? new MemoryStream(new byte[0]) : httpRequest.Data) is Stream { } data)
+            {
                 message.Content = new StreamContent(data);
+            }
 
             if (httpRequest.Headers != null)
             {
-                foreach (var header in httpRequest.Headers)
+                foreach (KeyValuePair<string, string> header in httpRequest.Headers)
                 {
-                    if (HttpContentHeaders.Contains(header.Key))
+                    if (ContentHeaders.Contains(header.Key))
+                    {
                         message.Content.Headers.Add(header.Key, header.Value);
+                    }
                     else
+                    {
                         message.Headers.Add(header.Key, header.Value);
+                    }
                 }
             }
 
             // Avoid aggressive caching on Windows Phone 8.1.
+
             message.Headers.Add("Cache-Control", "no-cache");
             message.Headers.IfModifiedSince = DateTimeOffset.UtcNow;
 
             // TODO: (richardross) investigate progress here, maybe there's something we're missing in order to support this.
-            uploadProgress.Report(new ParseUploadProgressEventArgs { Progress = 0 });
 
-            return client.SendAsync(message, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ContinueWith(httpMessageTask =>
+            uploadProgress.Report(new DataTransferLevel { Amount = 0 });
+
+            return Client.SendAsync(message, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ContinueWith(httpMessageTask =>
             {
-                var response = httpMessageTask.Result;
-                uploadProgress.Report(new ParseUploadProgressEventArgs { Progress = 1 });
+                HttpResponseMessage response = httpMessageTask.Result;
+                uploadProgress.Report(new DataTransferLevel { Amount = 1 });
 
                 return response.Content.ReadAsStreamAsync().ContinueWith(streamTask =>
                 {
-                    var resultStream = new MemoryStream();
-                    var responseStream = streamTask.Result;
+                    MemoryStream resultStream = new MemoryStream { };
+                    Stream responseStream = streamTask.Result;
 
-                    int bufferSize = 4096;
+                    int bufferSize = 4096, bytesRead = 0;
                     byte[] buffer = new byte[bufferSize];
-                    int bytesRead = 0;
-                    long totalLength = -1;
-                    long readSoFar = 0;
+                    long totalLength = -1, readSoFar = 0;
 
                     try
-                    { totalLength = responseStream.Length; }
+                    {
+                        totalLength = responseStream.Length;
+                    }
                     catch { };
 
                     return InternalExtensions.WhileAsync(() => responseStream.ReadAsync(buffer, 0, bufferSize, cancellationToken).OnSuccess(readTask => (bytesRead = readTask.Result) > 0), () =>
@@ -85,7 +108,9 @@ public Task<Tuple<HttpStatusCode, string>> ExecuteAsync(HttpRequest httpRequest,
                             readSoFar += bytesRead;
 
                             if (totalLength > -1)
-                                downloadProgress.Report(new ParseDownloadProgressEventArgs { Progress = 1.0 * readSoFar / totalLength });
+                            {
+                                downloadProgress.Report(new DataTransferLevel { Amount = 1.0 * readSoFar / totalLength });
+                            }
                         });
                     }).ContinueWith(_ =>
                     {
@@ -94,11 +119,17 @@ public Task<Tuple<HttpStatusCode, string>> ExecuteAsync(HttpRequest httpRequest,
                     }).Unwrap().OnSuccess(_ =>
                     {
                         // If getting stream size is not supported, then report download only once.
+
                         if (totalLength == -1)
-                            downloadProgress.Report(new ParseDownloadProgressEventArgs { Progress = 1.0 });
-                        var resultAsArray = resultStream.ToArray();
+                        {
+                            downloadProgress.Report(new DataTransferLevel { Amount = 1.0 });
+                        }
+
+                        byte[] resultAsArray = resultStream.ToArray();
                         resultStream.Dispose();
+
                         // Assume UTF-8 encoding.
+
                         return new Tuple<HttpStatusCode, string>(response.StatusCode, Encoding.UTF8.GetString(resultAsArray, 0, resultAsArray.Length));
                     });
                 });
diff --git a/Parse/Internal/HttpClient/HttpRequest.cs b/Parse/Infrastructure/Execution/WebRequest.cs
similarity index 80%
rename from Parse/Internal/HttpClient/HttpRequest.cs
rename to Parse/Infrastructure/Execution/WebRequest.cs
index f1c4fc14..e4a3b059 100644
--- a/Parse/Internal/HttpClient/HttpRequest.cs
+++ b/Parse/Infrastructure/Execution/WebRequest.cs
@@ -4,14 +4,19 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Parse.Common.Internal
+namespace Parse.Infrastructure.Execution
 {
     /// <summary>
     /// <code>IHttpRequest</code> is an interface that provides an API to execute HTTP request data.
     /// </summary>
-    public class HttpRequest
+    public class WebRequest
     {
-        public Uri Uri { get; set; }
+        public Uri Target => new Uri(new Uri(Resource), Path);
+
+        public string Resource { get; set; }
+
+        public string Path { get; set; }
+
         public IList<KeyValuePair<string, string>> Headers { get; set; }
 
         /// <summary>
diff --git a/Parse/Infrastructure/HostManifestData.cs b/Parse/Infrastructure/HostManifestData.cs
new file mode 100644
index 00000000..75e38b86
--- /dev/null
+++ b/Parse/Infrastructure/HostManifestData.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Reflection;
+using Parse.Abstractions.Infrastructure;
+
+namespace Parse.Infrastructure
+{
+    /// <summary>
+    /// In the event that you would like to use the Parse SDK
+    /// from a completely portable project, with no platform-specific library required,
+    /// to get full access to all of our features available on Parse Dashboard
+    /// (A/B testing, slow queries, etc.), you must set the values of this struct
+    /// to be appropriate for your platform.
+    ///
+    /// Any values set here will overwrite those that are automatically configured by
+    /// any platform-specific migration library your app includes.
+    /// </summary>
+    public class HostManifestData : IHostManifestData
+    {
+        /// <summary>
+        /// An instance of <see cref="HostManifestData"/> with inferred values based on the entry assembly.
+        /// </summary>
+        /// <remarks>Should not be used with Unity.</remarks>
+        public static HostManifestData Inferred => new HostManifestData
+        {
+            Version = Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion,
+            Name = Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyTitleAttribute>()?.Title ?? Assembly.GetEntryAssembly().GetCustomAttribute<AssemblyProductAttribute>()?.Product ?? Assembly.GetEntryAssembly().GetName().Name,
+            ShortVersion = Assembly.GetEntryAssembly().GetName().Version.ToString(),
+            // TODO: For Xamarin, use manifest parsing, and for Unity, use some kind of package identifier API.
+            Identifier = AppDomain.CurrentDomain.FriendlyName
+        };
+
+        /// <summary>
+        /// The build version of your app.
+        /// </summary>
+        public string Version { get; set; }
+
+        /// <summary>
+        /// The human-friendly display version number of your app.
+        /// </summary>
+        public string ShortVersion { get; set; }
+
+        /// <summary>
+        /// The identifier of the application
+        /// </summary>
+        public string Identifier { get; set; }
+
+        /// <summary>
+        /// The friendly name of your app.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets a value for whether or not this instance of <see cref="HostManifestData"/> is populated with default values.
+        /// </summary>
+        public bool IsDefault => Version is null && ShortVersion is null && Identifier is null && Name is null;
+
+        /// <summary>
+        /// Gets a value for whether or not this instance of <see cref="HostManifestData"/> can currently be used for the generation of <see cref="MetadataBasedRelativeCacheLocationGenerator.Inferred"/>.
+        /// </summary>
+        public bool CanBeUsedForInference => !(IsDefault || String.IsNullOrWhiteSpace(ShortVersion));
+    }
+}
diff --git a/Parse/Infrastructure/IdentifierBasedRelativeCacheLocationGenerator.cs b/Parse/Infrastructure/IdentifierBasedRelativeCacheLocationGenerator.cs
new file mode 100644
index 00000000..0a076266
--- /dev/null
+++ b/Parse/Infrastructure/IdentifierBasedRelativeCacheLocationGenerator.cs
@@ -0,0 +1,44 @@
+using System;
+using System.IO;
+using Parse.Abstractions.Infrastructure;
+
+namespace Parse.Infrastructure
+{
+    /// <summary>
+    /// A configuration of the Parse SDK persistent storage location based on an identifier.
+    /// </summary>
+    public struct IdentifierBasedRelativeCacheLocationGenerator : IRelativeCacheLocationGenerator
+    {
+        internal static IdentifierBasedRelativeCacheLocationGenerator Fallback { get; } = new IdentifierBasedRelativeCacheLocationGenerator { IsFallback = true };
+
+        /// <summary>
+        /// Dictates whether or not this <see cref="IRelativeCacheLocationGenerator"/> instance should act as a fallback for when <see cref="ParseClient"/> has not yet been initialized but the storage path is needed.
+        /// </summary>
+        internal bool IsFallback { get; set; }
+
+        /// <summary>
+        /// The identifier that all Parse SDK cache files should be labelled with.
+        /// </summary>
+        public string Identifier { get; set; }
+
+        /// <summary>
+        /// The corresponding relative path generated by this <see cref="IRelativeCacheLocationGenerator"/>.
+        /// </summary>
+        /// <remarks>This will cause a .cachefile file extension to be added to the cache file in order to prevent the creation of files with unwanted extensions due to the value of <see cref="Identifier"/> containing periods.</remarks>
+        public string GetRelativeCacheFilePath(IServiceHub serviceHub)
+        {
+            FileInfo file;
+
+            while ((file = serviceHub.CacheController.GetRelativeFile(GeneratePath())).Exists && IsFallback)
+                ;
+
+            return file.FullName;
+        }
+
+        /// <summary>
+        /// Generates a path for use in the <see cref="GetRelativeCacheFilePath(IServiceHub)"/> method.
+        /// </summary>
+        /// <returns>A potential path to the cachefile</returns>
+        string GeneratePath() => Path.Combine(nameof(Parse), IsFallback ? "_fallback" : "_global", $"{(IsFallback ? new Random { }.Next().ToString() : Identifier)}.cachefile");
+    }
+}
diff --git a/Parse/Infrastructure/LateInitializedMutableServiceHub.cs b/Parse/Infrastructure/LateInitializedMutableServiceHub.cs
new file mode 100644
index 00000000..a5e58e4e
--- /dev/null
+++ b/Parse/Infrastructure/LateInitializedMutableServiceHub.cs
@@ -0,0 +1,165 @@
+using System;
+using Parse.Abstractions.Infrastructure.Data;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Abstractions.Platform.Installations;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Abstractions.Platform.Cloud;
+using Parse.Abstractions.Platform.Configuration;
+using Parse.Abstractions.Platform.Files;
+using Parse.Abstractions.Platform.Push;
+using Parse.Abstractions.Platform.Queries;
+using Parse.Abstractions.Platform.Sessions;
+using Parse.Abstractions.Platform.Users;
+using Parse.Abstractions.Platform.Analytics;
+using Parse.Infrastructure.Execution;
+using Parse.Platform.Objects;
+using Parse.Platform.Installations;
+using Parse.Platform.Cloud;
+using Parse.Platform.Configuration;
+using Parse.Platform.Files;
+using Parse.Platform.Queries;
+using Parse.Platform.Sessions;
+using Parse.Platform.Users;
+using Parse.Platform.Analytics;
+using Parse.Platform.Push;
+using Parse.Infrastructure.Data;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse.Infrastructure
+{
+    public class LateInitializedMutableServiceHub : IMutableServiceHub
+    {
+        LateInitializer LateInitializer { get; } = new LateInitializer { };
+
+        public IServiceHubCloner Cloner { get; set; }
+
+        public IMetadataController MetadataController
+        {
+            get => LateInitializer.GetValue<IMetadataController>(() => new MetadataController { EnvironmentData = EnvironmentData.Inferred, HostManifestData = HostManifestData.Inferred });
+            set => LateInitializer.SetValue(value);
+        }
+
+        public IWebClient WebClient
+        {
+            get => LateInitializer.GetValue<IWebClient>(() => new UniversalWebClient { });
+            set => LateInitializer.SetValue(value);
+        }
+
+        public ICacheController CacheController
+        {
+            get => LateInitializer.GetValue<ICacheController>(() => new CacheController { });
+            set => LateInitializer.SetValue(value);
+        }
+
+        public IParseObjectClassController ClassController
+        {
+            get => LateInitializer.GetValue<IParseObjectClassController>(() => new ParseObjectClassController { });
+            set => LateInitializer.SetValue(value);
+        }
+
+        public IParseInstallationController InstallationController
+        {
+            get => LateInitializer.GetValue<IParseInstallationController>(() => new ParseInstallationController(CacheController));
+            set => LateInitializer.SetValue(value);
+        }
+
+        public IParseCommandRunner CommandRunner
+        {
+            get => LateInitializer.GetValue<IParseCommandRunner>(() => new ParseCommandRunner(WebClient, InstallationController, MetadataController, ServerConnectionData, new Lazy<IParseUserController>(() => UserController)));
+            set => LateInitializer.SetValue(value);
+        }
+
+        public IParseCloudCodeController CloudCodeController
+        {
+            get => LateInitializer.GetValue<IParseCloudCodeController>(() => new ParseCloudCodeController(CommandRunner, Decoder));
+            set => LateInitializer.SetValue(value);
+        }
+
+        public IParseConfigurationController ConfigurationController
+        {
+            get => LateInitializer.GetValue<IParseConfigurationController>(() => new ParseConfigurationController(CommandRunner, CacheController, Decoder));
+            set => LateInitializer.SetValue(value);
+        }
+
+        public IParseFileController FileController
+        {
+            get => LateInitializer.GetValue<IParseFileController>(() => new ParseFileController(CommandRunner));
+            set => LateInitializer.SetValue(value);
+        }
+
+        public IParseObjectController ObjectController
+        {
+            get => LateInitializer.GetValue<IParseObjectController>(() => new ParseObjectController(CommandRunner, Decoder, ServerConnectionData));
+            set => LateInitializer.SetValue(value);
+        }
+
+        public IParseQueryController QueryController
+        {
+            get => LateInitializer.GetValue<IParseQueryController>(() => new ParseQueryController(CommandRunner, Decoder));
+            set => LateInitializer.SetValue(value);
+        }
+
+        public IParseSessionController SessionController
+        {
+            get => LateInitializer.GetValue<IParseSessionController>(() => new ParseSessionController(CommandRunner, Decoder));
+            set => LateInitializer.SetValue(value);
+        }
+
+        public IParseUserController UserController
+        {
+            get => LateInitializer.GetValue<IParseUserController>(() => new ParseUserController(CommandRunner, Decoder));
+            set => LateInitializer.SetValue(value);
+        }
+
+        public IParseCurrentUserController CurrentUserController
+        {
+            get => LateInitializer.GetValue(() => new ParseCurrentUserController(CacheController, ClassController, Decoder));
+            set => LateInitializer.SetValue(value);
+        }
+
+        public IParseAnalyticsController AnalyticsController
+        {
+            get => LateInitializer.GetValue<IParseAnalyticsController>(() => new ParseAnalyticsController(CommandRunner));
+            set => LateInitializer.SetValue(value);
+        }
+
+        public IParseInstallationCoder InstallationCoder
+        {
+            get => LateInitializer.GetValue<IParseInstallationCoder>(() => new ParseInstallationCoder(Decoder, ClassController));
+            set => LateInitializer.SetValue(value);
+        }
+
+        public IParsePushChannelsController PushChannelsController
+        {
+            get => LateInitializer.GetValue<IParsePushChannelsController>(() => new ParsePushChannelsController(CurrentInstallationController));
+            set => LateInitializer.SetValue(value);
+        }
+
+        public IParsePushController PushController
+        {
+            get => LateInitializer.GetValue<IParsePushController>(() => new ParsePushController(CommandRunner, CurrentUserController));
+            set => LateInitializer.SetValue(value);
+        }
+
+        public IParseCurrentInstallationController CurrentInstallationController
+        {
+            get => LateInitializer.GetValue<IParseCurrentInstallationController>(() => new ParseCurrentInstallationController(InstallationController, CacheController, InstallationCoder, ClassController));
+            set => LateInitializer.SetValue(value);
+        }
+
+        public IParseDataDecoder Decoder
+        {
+            get => LateInitializer.GetValue<IParseDataDecoder>(() => new ParseDataDecoder(ClassController));
+            set => LateInitializer.SetValue(value);
+        }
+
+        public IParseInstallationDataFinalizer InstallationDataFinalizer
+        {
+            get => LateInitializer.GetValue<IParseInstallationDataFinalizer>(() => new ParseInstallationDataFinalizer { });
+            set => LateInitializer.SetValue(value);
+        }
+
+        public IServerConnectionData ServerConnectionData { get; set; }
+    }
+}
diff --git a/Parse/Infrastructure/MetadataBasedRelativeCacheLocationGenerator.cs b/Parse/Infrastructure/MetadataBasedRelativeCacheLocationGenerator.cs
new file mode 100644
index 00000000..9eadc5d1
--- /dev/null
+++ b/Parse/Infrastructure/MetadataBasedRelativeCacheLocationGenerator.cs
@@ -0,0 +1,37 @@
+using System.IO;
+using System.Reflection;
+using Parse.Abstractions.Infrastructure;
+
+namespace Parse.Infrastructure
+{
+    /// <summary>
+    /// A configuration of the Parse SDK persistent storage location based on product metadata such as company name and product name.
+    /// </summary>
+    public struct MetadataBasedRelativeCacheLocationGenerator : IRelativeCacheLocationGenerator
+    {
+        /// <summary>
+        /// An instance of <see cref="MetadataBasedRelativeCacheLocationGenerator"/> with inferred values based on the entry assembly. Should be used with <see cref="EnvironmentData.Inferred"/> and <see cref="HostManifestData.Inferred"/>.
+        /// </summary>
+        /// <remarks>Should not be used with Unity.</remarks>
+        public static MetadataBasedRelativeCacheLocationGenerator Inferred => new MetadataBasedRelativeCacheLocationGenerator
+        {
+            Company = Assembly.GetExecutingAssembly()?.GetCustomAttribute<AssemblyCompanyAttribute>()?.Company,
+            Product = Assembly.GetEntryAssembly()?.GetCustomAttribute<AssemblyProductAttribute>()?.Product ?? Assembly.GetEntryAssembly()?.GetName()?.Name
+        };
+
+        /// <summary>
+        /// The name of the company that owns the product specified by <see cref="Product"/>.
+        /// </summary>
+        public string Company { get; set; }
+
+        /// <summary>
+        /// The name of the product that is using the Parse .NET SDK.
+        /// </summary>
+        public string Product { get; set; }
+
+        /// <summary>
+        /// The corresponding relative path generated by this <see cref="IRelativeCacheLocationGenerator"/>.
+        /// </summary>
+        public string GetRelativeCacheFilePath(IServiceHub serviceHub) => Path.Combine(Company ?? nameof(Parse), Product ?? "_global", $"{serviceHub.MetadataController.HostManifestData.ShortVersion ?? "1.0.0.0"}.pc");
+    }
+}
diff --git a/Parse/Infrastructure/MetadataController.cs b/Parse/Infrastructure/MetadataController.cs
new file mode 100644
index 00000000..6d8b83b3
--- /dev/null
+++ b/Parse/Infrastructure/MetadataController.cs
@@ -0,0 +1,17 @@
+using Parse.Abstractions.Infrastructure;
+
+namespace Parse.Infrastructure
+{
+    public class MetadataController : IMetadataController
+    {
+        /// <summary>
+        /// Information about your app.
+        /// </summary>
+        public IHostManifestData HostManifestData { get; set; }
+
+        /// <summary>
+        /// Information about the environment the library is operating in.
+        /// </summary>
+        public IEnvironmentData EnvironmentData { get; set; }
+    }
+}
diff --git a/Parse/Infrastructure/MetadataMutator.cs b/Parse/Infrastructure/MetadataMutator.cs
new file mode 100644
index 00000000..351f779b
--- /dev/null
+++ b/Parse/Infrastructure/MetadataMutator.cs
@@ -0,0 +1,22 @@
+using Parse.Abstractions.Infrastructure;
+
+namespace Parse.Infrastructure
+{
+    /// <summary>
+    /// An <see cref="IServiceHubMutator"/> for setting metadata information manually.
+    /// </summary>
+    public class MetadataMutator : MetadataController, IServiceHubMutator
+    {
+        /// <summary>
+        /// A value representing whether or not all of the required metadata information has been provided.
+        /// </summary>
+        public bool Valid => this is { EnvironmentData: { OSVersion: { }, Platform: { }, TimeZone: { } }, HostManifestData: { Identifier: { }, Name: { }, ShortVersion: { }, Version: { } } };
+
+        /// <summary>
+        /// Sets the <paramref name="target"/> to the <see cref="MetadataMutator"/> instance.
+        /// </summary>
+        /// <param name="target">The <see cref="IMutableServiceHub"/> to compose the information onto.</param>
+        /// <param name="referenceHub">Thhe <see cref="IServiceHub"/> to use if a default service instance is required.</param>
+        public void Mutate(ref IMutableServiceHub target, in IServiceHub referenceHub) => target.MetadataController = this;
+    }
+}
diff --git a/Parse/Infrastructure/MutableServiceHub.cs b/Parse/Infrastructure/MutableServiceHub.cs
new file mode 100644
index 00000000..4c63669b
--- /dev/null
+++ b/Parse/Infrastructure/MutableServiceHub.cs
@@ -0,0 +1,109 @@
+using System;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Data;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Abstractions.Platform.Analytics;
+using Parse.Abstractions.Platform.Cloud;
+using Parse.Abstractions.Platform.Configuration;
+using Parse.Abstractions.Platform.Files;
+using Parse.Abstractions.Platform.Installations;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Abstractions.Platform.Push;
+using Parse.Abstractions.Platform.Queries;
+using Parse.Abstractions.Platform.Sessions;
+using Parse.Abstractions.Platform.Users;
+using Parse.Infrastructure.Data;
+using Parse.Infrastructure.Execution;
+using Parse.Platform.Analytics;
+using Parse.Platform.Cloud;
+using Parse.Platform.Configuration;
+using Parse.Platform.Files;
+using Parse.Platform.Installations;
+using Parse.Platform.Objects;
+using Parse.Platform.Push;
+using Parse.Platform.Queries;
+using Parse.Platform.Sessions;
+using Parse.Platform.Users;
+
+namespace Parse.Infrastructure
+{
+    /// <summary>
+    /// A service hub that is mutable.
+    /// </summary>
+    /// <remarks>This class is not thread safe; the mutability is allowed for the purposes of overriding values before it is used, as opposed to modifying it while it is in use.</remarks>
+    public class MutableServiceHub : IMutableServiceHub
+    {
+        public IServerConnectionData ServerConnectionData { get; set; }
+        public IMetadataController MetadataController { get; set; }
+
+        public IServiceHubCloner Cloner { get; set; }
+
+        public IWebClient WebClient { get; set; }
+        public ICacheController CacheController { get; set; }
+        public IParseObjectClassController ClassController { get; set; }
+
+        public IParseDataDecoder Decoder { get; set; }
+
+        public IParseInstallationController InstallationController { get; set; }
+        public IParseCommandRunner CommandRunner { get; set; }
+
+        public IParseCloudCodeController CloudCodeController { get; set; }
+        public IParseConfigurationController ConfigurationController { get; set; }
+        public IParseFileController FileController { get; set; }
+        public IParseObjectController ObjectController { get; set; }
+        public IParseQueryController QueryController { get; set; }
+        public IParseSessionController SessionController { get; set; }
+        public IParseUserController UserController { get; set; }
+        public IParseCurrentUserController CurrentUserController { get; set; }
+
+        public IParseAnalyticsController AnalyticsController { get; set; }
+
+        public IParseInstallationCoder InstallationCoder { get; set; }
+
+        public IParsePushChannelsController PushChannelsController { get; set; }
+        public IParsePushController PushController { get; set; }
+        public IParseCurrentInstallationController CurrentInstallationController { get; set; }
+        public IParseInstallationDataFinalizer InstallationDataFinalizer { get; set; }
+
+        public MutableServiceHub SetDefaults(IServerConnectionData connectionData = default)
+        {
+            ServerConnectionData ??= connectionData;
+            MetadataController ??= new MetadataController
+            {
+                EnvironmentData = EnvironmentData.Inferred,
+                HostManifestData = HostManifestData.Inferred
+            };
+
+            Cloner ??= new ConcurrentUserServiceHubCloner { };
+
+            WebClient ??= new UniversalWebClient { };
+            CacheController ??= new CacheController { };
+            ClassController ??= new ParseObjectClassController { };
+
+            Decoder ??= new ParseDataDecoder(ClassController);
+
+            InstallationController ??= new ParseInstallationController(CacheController);
+            CommandRunner ??= new ParseCommandRunner(WebClient, InstallationController, MetadataController, ServerConnectionData, new Lazy<IParseUserController>(() => UserController));
+
+            CloudCodeController ??= new ParseCloudCodeController(CommandRunner, Decoder);
+            ConfigurationController ??= new ParseConfigurationController(CommandRunner, CacheController, Decoder);
+            FileController ??= new ParseFileController(CommandRunner);
+            ObjectController ??= new ParseObjectController(CommandRunner, Decoder, ServerConnectionData);
+            QueryController ??= new ParseQueryController(CommandRunner, Decoder);
+            SessionController ??= new ParseSessionController(CommandRunner, Decoder);
+            UserController ??= new ParseUserController(CommandRunner, Decoder);
+            CurrentUserController ??= new ParseCurrentUserController(CacheController, ClassController, Decoder);
+
+            AnalyticsController ??= new ParseAnalyticsController(CommandRunner);
+
+            InstallationCoder ??= new ParseInstallationCoder(Decoder, ClassController);
+
+            PushController ??= new ParsePushController(CommandRunner, CurrentUserController);
+            CurrentInstallationController ??= new ParseCurrentInstallationController(InstallationController, CacheController, InstallationCoder, ClassController);
+            PushChannelsController ??= new ParsePushChannelsController(CurrentInstallationController);
+            InstallationDataFinalizer ??= new ParseInstallationDataFinalizer { };
+
+            return this;
+        }
+    }
+}
diff --git a/Parse/Infrastructure/OrchestrationServiceHub.cs b/Parse/Infrastructure/OrchestrationServiceHub.cs
new file mode 100644
index 00000000..8aa99a9e
--- /dev/null
+++ b/Parse/Infrastructure/OrchestrationServiceHub.cs
@@ -0,0 +1,69 @@
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Data;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Abstractions.Platform.Analytics;
+using Parse.Abstractions.Platform.Cloud;
+using Parse.Abstractions.Platform.Configuration;
+using Parse.Abstractions.Platform.Files;
+using Parse.Abstractions.Platform.Installations;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Abstractions.Platform.Push;
+using Parse.Abstractions.Platform.Queries;
+using Parse.Abstractions.Platform.Sessions;
+using Parse.Abstractions.Platform.Users;
+
+namespace Parse.Infrastructure
+{
+    public class OrchestrationServiceHub : IServiceHub
+    {
+        public IServiceHub Default { get; set; }
+
+        public IServiceHub Custom { get; set; }
+
+        public IServiceHubCloner Cloner => Custom.Cloner ?? Default.Cloner;
+
+        public IMetadataController MetadataController => Custom.MetadataController ?? Default.MetadataController;
+
+        public IWebClient WebClient => Custom.WebClient ?? Default.WebClient;
+
+        public ICacheController CacheController => Custom.CacheController ?? Default.CacheController;
+
+        public IParseObjectClassController ClassController => Custom.ClassController ?? Default.ClassController;
+
+        public IParseInstallationController InstallationController => Custom.InstallationController ?? Default.InstallationController;
+
+        public IParseCommandRunner CommandRunner => Custom.CommandRunner ?? Default.CommandRunner;
+
+        public IParseCloudCodeController CloudCodeController => Custom.CloudCodeController ?? Default.CloudCodeController;
+
+        public IParseConfigurationController ConfigurationController => Custom.ConfigurationController ?? Default.ConfigurationController;
+
+        public IParseFileController FileController => Custom.FileController ?? Default.FileController;
+
+        public IParseObjectController ObjectController => Custom.ObjectController ?? Default.ObjectController;
+
+        public IParseQueryController QueryController => Custom.QueryController ?? Default.QueryController;
+
+        public IParseSessionController SessionController => Custom.SessionController ?? Default.SessionController;
+
+        public IParseUserController UserController => Custom.UserController ?? Default.UserController;
+
+        public IParseCurrentUserController CurrentUserController => Custom.CurrentUserController ?? Default.CurrentUserController;
+
+        public IParseAnalyticsController AnalyticsController => Custom.AnalyticsController ?? Default.AnalyticsController;
+
+        public IParseInstallationCoder InstallationCoder => Custom.InstallationCoder ?? Default.InstallationCoder;
+
+        public IParsePushChannelsController PushChannelsController => Custom.PushChannelsController ?? Default.PushChannelsController;
+
+        public IParsePushController PushController => Custom.PushController ?? Default.PushController;
+
+        public IParseCurrentInstallationController CurrentInstallationController => Custom.CurrentInstallationController ?? Default.CurrentInstallationController;
+
+        public IServerConnectionData ServerConnectionData => Custom.ServerConnectionData ?? Default.ServerConnectionData;
+
+        public IParseDataDecoder Decoder => Custom.Decoder ?? Default.Decoder;
+
+        public IParseInstallationDataFinalizer InstallationDataFinalizer => Custom.InstallationDataFinalizer ?? Default.InstallationDataFinalizer;
+    }
+}
diff --git a/Parse/Public/ParseClassNameAttribute.cs b/Parse/Infrastructure/ParseClassNameAttribute.cs
similarity index 91%
rename from Parse/Public/ParseClassNameAttribute.cs
rename to Parse/Infrastructure/ParseClassNameAttribute.cs
index c4c39726..af769056 100644
--- a/Parse/Public/ParseClassNameAttribute.cs
+++ b/Parse/Infrastructure/ParseClassNameAttribute.cs
@@ -1,10 +1,6 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Parse
 {
diff --git a/Parse/Public/ParseException.cs b/Parse/Infrastructure/ParseFailureException.cs
similarity index 97%
rename from Parse/Public/ParseException.cs
rename to Parse/Infrastructure/ParseFailureException.cs
index 3e3f49ce..57389a0b 100644
--- a/Parse/Public/ParseException.cs
+++ b/Parse/Infrastructure/ParseFailureException.cs
@@ -2,12 +2,12 @@
 
 using System;
 
-namespace Parse
+namespace Parse.Infrastructure
 {
     /// <summary>
     /// Exceptions that may occur when sending requests to Parse.
     /// </summary>
-    public class ParseException : Exception
+    public class ParseFailureException : Exception
     {
         /// <summary>
         /// Error codes that may be delivered in response to requests to Parse.
@@ -259,11 +259,7 @@ public enum ErrorCode
             UnsupportedService = 252
         }
 
-        internal ParseException(ErrorCode code, string message, Exception cause = null)
-          : base(message, cause)
-        {
-            this.Code = code;
-        }
+        internal ParseFailureException(ErrorCode code, string message, Exception cause = null) : base(message, cause) => Code = code;
 
         /// <summary>
         /// The Parse error code associated with the exception.
diff --git a/Parse/Public/ParseFieldNameAttribute.cs b/Parse/Infrastructure/ParseFieldNameAttribute.cs
similarity index 82%
rename from Parse/Public/ParseFieldNameAttribute.cs
rename to Parse/Infrastructure/ParseFieldNameAttribute.cs
index 7581ddb0..1a5e6eb3 100644
--- a/Parse/Public/ParseFieldNameAttribute.cs
+++ b/Parse/Infrastructure/ParseFieldNameAttribute.cs
@@ -1,10 +1,6 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Parse
 {
@@ -19,10 +15,7 @@ public sealed class ParseFieldNameAttribute : Attribute
         /// </summary>
         /// <param name="fieldName">The name of the field on the ParseObject that the
         /// property represents.</param>
-        public ParseFieldNameAttribute(string fieldName)
-        {
-            FieldName = fieldName;
-        }
+        public ParseFieldNameAttribute(string fieldName) => FieldName = fieldName;
 
         /// <summary>
         /// Gets the name of the field represented by this property.
diff --git a/Parse/Infrastructure/RelativeCacheLocationMutator.cs b/Parse/Infrastructure/RelativeCacheLocationMutator.cs
new file mode 100644
index 00000000..fe332424
--- /dev/null
+++ b/Parse/Infrastructure/RelativeCacheLocationMutator.cs
@@ -0,0 +1,32 @@
+using Parse.Abstractions.Infrastructure;
+
+namespace Parse.Infrastructure
+{
+    /// <summary>
+    /// An <see cref="IServiceHubMutator"/> for the relative cache file location. This should be used if the relative cache file location is not created correctly by the SDK, such as platforms on which it is not possible to gather metadata about the client assembly, or ones on which <see cref="System.Environment.SpecialFolder.LocalApplicationData"/> is inaccsessible.
+    /// </summary>
+    public class RelativeCacheLocationMutator : IServiceHubMutator
+    {
+        /// <summary>
+        /// An <see cref="IRelativeCacheLocationGenerator"/> implementation instance which creates a path that should be used as the <see cref="System.Environment.SpecialFolder.LocalApplicationData"/>-relative cache location.
+        /// </summary>
+        public IRelativeCacheLocationGenerator RelativeCacheLocationGenerator { get; set; }
+
+        /// <summary>
+        /// <inheritdoc/>
+        /// </summary>
+        public bool Valid => RelativeCacheLocationGenerator is { };
+
+        /// <summary>
+        /// <inheritdoc/>
+        /// </summary>
+        /// <param name="target"><inheritdoc/></param>
+        /// <param name="referenceHub"><inheritdoc/></param>
+        public void Mutate(ref IMutableServiceHub target, in IServiceHub referenceHub) => target.CacheController = (target as IServiceHub).CacheController switch
+        {
+            null => new CacheController { RelativeCacheFilePath = RelativeCacheLocationGenerator.GetRelativeCacheFilePath(referenceHub) },
+            IDiskFileCacheController { } controller => (Controller: controller, controller.RelativeCacheFilePath = RelativeCacheLocationGenerator.GetRelativeCacheFilePath(referenceHub)).Controller,
+            { } controller => controller
+        };
+    }
+}
diff --git a/Parse/Infrastructure/ServerConnectionData.cs b/Parse/Infrastructure/ServerConnectionData.cs
new file mode 100644
index 00000000..6cedaccc
--- /dev/null
+++ b/Parse/Infrastructure/ServerConnectionData.cs
@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+using Parse.Abstractions.Infrastructure;
+
+namespace Parse.Infrastructure
+{
+    /// <summary>
+    /// Represents the configuration of the Parse SDK.
+    /// </summary>
+    public struct ServerConnectionData : IServerConnectionData
+    {
+        // TODO: Consider simplification of names: ApplicationID => Application | Target, ServerURI => Server, MasterKey => Master.
+        // TODO: Move Test property elsewhere.
+
+        internal bool Test { get; set; }
+
+        /// <summary>
+        /// The App ID of your app.
+        /// </summary>
+        public string ApplicationID { get; set; }
+
+        /// <summary>
+        /// A URI pointing to the target Parse Server instance hosting the app targeted by <see cref="ApplicationID"/>.
+        /// </summary>
+        public string ServerURI { get; set; }
+
+        /// <summary>
+        /// The .NET Key for the Parse app targeted by <see cref="ServerURI"/>.
+        /// </summary>
+        public string Key { get; set; }
+
+        /// <summary>
+        /// The Master Key for the Parse app targeted by <see cref="Key"/>.
+        /// </summary>
+        public string MasterKey { get; set; }
+
+        // ALTERNATE NAME: AuxiliaryHeaders, AdditionalHeaders
+
+        /// <summary>
+        /// Additional HTTP headers to be sent with network requests from the SDK.
+        /// </summary>
+        public IDictionary<string, string> Headers { get; set; }
+    }
+}
diff --git a/Parse/Infrastructure/ServiceHub.cs b/Parse/Infrastructure/ServiceHub.cs
new file mode 100644
index 00000000..564b7bf6
--- /dev/null
+++ b/Parse/Infrastructure/ServiceHub.cs
@@ -0,0 +1,73 @@
+using System;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Data;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Abstractions.Platform.Analytics;
+using Parse.Abstractions.Platform.Cloud;
+using Parse.Abstractions.Platform.Configuration;
+using Parse.Abstractions.Platform.Files;
+using Parse.Abstractions.Platform.Installations;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Abstractions.Platform.Push;
+using Parse.Abstractions.Platform.Queries;
+using Parse.Abstractions.Platform.Sessions;
+using Parse.Abstractions.Platform.Users;
+using Parse.Infrastructure.Data;
+using Parse.Infrastructure.Execution;
+using Parse.Infrastructure.Utilities;
+using Parse.Platform.Analytics;
+using Parse.Platform.Cloud;
+using Parse.Platform.Configuration;
+using Parse.Platform.Files;
+using Parse.Platform.Installations;
+using Parse.Platform.Objects;
+using Parse.Platform.Push;
+using Parse.Platform.Queries;
+using Parse.Platform.Sessions;
+using Parse.Platform.Users;
+
+namespace Parse.Infrastructure
+{
+
+    /// <summary>
+    /// A service hub that uses late initialization to efficiently provide controllers and other dependencies to internal Parse SDK systems.
+    /// </summary>
+    public class ServiceHub : IServiceHub
+    {
+        LateInitializer LateInitializer { get; } = new LateInitializer { };
+
+        public IServerConnectionData ServerConnectionData { get; set; }
+        public IMetadataController MetadataController => LateInitializer.GetValue(() => new MetadataController { HostManifestData = HostManifestData.Inferred, EnvironmentData = EnvironmentData.Inferred });
+
+        public IServiceHubCloner Cloner => LateInitializer.GetValue(() => new { } as object as IServiceHubCloner);
+
+        public IWebClient WebClient => LateInitializer.GetValue(() => new UniversalWebClient { });
+        public ICacheController CacheController => LateInitializer.GetValue(() => new CacheController { });
+        public IParseObjectClassController ClassController => LateInitializer.GetValue(() => new ParseObjectClassController { });
+
+        public IParseDataDecoder Decoder => LateInitializer.GetValue(() => new ParseDataDecoder(ClassController));
+
+        public IParseInstallationController InstallationController => LateInitializer.GetValue(() => new ParseInstallationController(CacheController));
+        public IParseCommandRunner CommandRunner => LateInitializer.GetValue(() => new ParseCommandRunner(WebClient, InstallationController, MetadataController, ServerConnectionData, new Lazy<IParseUserController>(() => UserController)));
+
+        public IParseCloudCodeController CloudCodeController => LateInitializer.GetValue(() => new ParseCloudCodeController(CommandRunner, Decoder));
+        public IParseConfigurationController ConfigurationController => LateInitializer.GetValue(() => new ParseConfigurationController(CommandRunner, CacheController, Decoder));
+        public IParseFileController FileController => LateInitializer.GetValue(() => new ParseFileController(CommandRunner));
+        public IParseObjectController ObjectController => LateInitializer.GetValue(() => new ParseObjectController(CommandRunner, Decoder, ServerConnectionData));
+        public IParseQueryController QueryController => LateInitializer.GetValue(() => new ParseQueryController(CommandRunner, Decoder));
+        public IParseSessionController SessionController => LateInitializer.GetValue(() => new ParseSessionController(CommandRunner, Decoder));
+        public IParseUserController UserController => LateInitializer.GetValue(() => new ParseUserController(CommandRunner, Decoder));
+        public IParseCurrentUserController CurrentUserController => LateInitializer.GetValue(() => new ParseCurrentUserController(CacheController, ClassController, Decoder));
+
+        public IParseAnalyticsController AnalyticsController => LateInitializer.GetValue(() => new ParseAnalyticsController(CommandRunner));
+
+        public IParseInstallationCoder InstallationCoder => LateInitializer.GetValue(() => new ParseInstallationCoder(Decoder, ClassController));
+
+        public IParsePushChannelsController PushChannelsController => LateInitializer.GetValue(() => new ParsePushChannelsController(CurrentInstallationController));
+        public IParsePushController PushController => LateInitializer.GetValue(() => new ParsePushController(CommandRunner, CurrentUserController));
+        public IParseCurrentInstallationController CurrentInstallationController => LateInitializer.GetValue(() => new ParseCurrentInstallationController(InstallationController, CacheController, InstallationCoder, ClassController));
+        public IParseInstallationDataFinalizer InstallationDataFinalizer => LateInitializer.GetValue(() => new ParseInstallationDataFinalizer { });
+
+        public bool Reset() => LateInitializer.Used && LateInitializer.Reset();
+    }
+}
diff --git a/Parse/Infrastructure/TransientCacheController.cs b/Parse/Infrastructure/TransientCacheController.cs
new file mode 100644
index 00000000..ccfd62f7
--- /dev/null
+++ b/Parse/Infrastructure/TransientCacheController.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
+using static Parse.Resources;
+
+namespace Parse.Infrastructure
+{
+    public class TransientCacheController : ICacheController
+    {
+        class VirtualCache : Dictionary<string, object>, IDataCache<string, object>
+        {
+            public Task AddAsync(string key, object value)
+            {
+                Add(key, value);
+                return Task.CompletedTask;
+            }
+
+            public Task RemoveAsync(string key)
+            {
+                Remove(key);
+                return Task.CompletedTask;
+            }
+        }
+
+        VirtualCache Cache { get; } = new VirtualCache { };
+
+        public void Clear() => Cache.Clear();
+
+        public FileInfo GetRelativeFile(string path) => throw new NotSupportedException(TransientCacheControllerDiskFileOperationNotSupportedMessage);
+
+        public Task<IDataCache<string, object>> LoadAsync() => Task.FromResult<IDataCache<string, object>>(Cache);
+
+        public Task<IDataCache<string, object>> SaveAsync(IDictionary<string, object> contents)
+        {
+            foreach (KeyValuePair<string, object> pair in contents)
+            {
+                ((IDictionary<string, object>) Cache).Add(pair);
+            }
+
+            return Task.FromResult<IDataCache<string, object>>(Cache);
+        }
+
+        public Task TransferAsync(string originFilePath, string targetFilePath) => Task.FromException(new NotSupportedException(TransientCacheControllerDiskFileOperationNotSupportedMessage));
+    }
+}
diff --git a/Parse/AssemblyLister.cs b/Parse/Infrastructure/Utilities/AssemblyLister.cs
similarity index 87%
rename from Parse/AssemblyLister.cs
rename to Parse/Infrastructure/Utilities/AssemblyLister.cs
index 5ed14813..c3105903 100644
--- a/Parse/AssemblyLister.cs
+++ b/Parse/Infrastructure/Utilities/AssemblyLister.cs
@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 
-namespace AssemblyLister
+namespace Parse.Infrastructure.Utilities
 {
     /// <summary>
     /// A class that lets you list all loaded assemblies in a PCL-compliant way.
@@ -25,16 +25,14 @@ public static IEnumerable<Assembly> AllAssemblies
 
         private static IEnumerable<Assembly> DeepWalkReferences(this Assembly assembly, HashSet<string> seen = null)
         {
-            seen = seen ?? new HashSet<string>();
+            seen ??= new HashSet<string>();
 
             if (!seen.Add(assembly.FullName))
-            {
                 return Enumerable.Empty<Assembly>();
-            }
 
             List<Assembly> assemblies = new List<Assembly> { assembly };
 
-            foreach (var reference in assembly.GetReferencedAssemblies())
+            foreach (AssemblyName reference in assembly.GetReferencedAssemblies())
             {
                 if (seen.Contains(reference.FullName))
                     continue;
diff --git a/Parse/Public/Utilities/Conversion.cs b/Parse/Infrastructure/Utilities/Conversion.cs
similarity index 55%
rename from Parse/Public/Utilities/Conversion.cs
rename to Parse/Infrastructure/Utilities/Conversion.cs
index 8e0686f1..fc870831 100644
--- a/Parse/Public/Utilities/Conversion.cs
+++ b/Parse/Infrastructure/Utilities/Conversion.cs
@@ -2,10 +2,11 @@
 
 using System;
 using System.Collections.Generic;
-using Parse.Common.Internal;
 
-namespace Parse.Utilities
+namespace Parse.Infrastructure.Utilities
 {
+#warning Possibly should be refactored.
+
     /// <summary>
     /// A set of utilities for converting generic types between each other.
     /// </summary>
@@ -48,43 +49,23 @@ public static class Conversion
         internal static object ConvertTo<T>(object value)
         {
             if (value is T || value == null)
-            {
                 return value;
-            }
 
-            if (ReflectionHelpers.IsPrimitive(typeof(T)))
-            {
+            if (typeof(T).IsPrimitive)
                 return (T) Convert.ChangeType(value, typeof(T), System.Globalization.CultureInfo.InvariantCulture);
-            }
 
-            if (ReflectionHelpers.IsConstructedGenericType(typeof(T)))
+            if (typeof(T).IsConstructedGenericType)
             {
                 // Add lifting for nullables. Only supports conversions between primitives.
-                if (ReflectionHelpers.IsNullable(typeof(T)))
-                {
-                    Type innerType = ReflectionHelpers.GetGenericTypeArguments(typeof(T))[0];
-                    if (ReflectionHelpers.IsPrimitive(innerType))
-                    {
-                        return (T) Convert.ChangeType(value, innerType, System.Globalization.CultureInfo.InvariantCulture);
-                    }
-                }
-                Type listType = GetInterfaceType(value.GetType(), typeof(IList<>));
-                if (listType != null &&
-                    typeof(T).GetGenericTypeDefinition() == typeof(IList<>))
-                {
-                    Type wrapperType = typeof(FlexibleListWrapper<,>)
-                      .MakeGenericType(ReflectionHelpers.GetGenericTypeArguments(typeof(T))[0],
-                                       ReflectionHelpers.GetGenericTypeArguments(listType)[0]);
-                    return Activator.CreateInstance(wrapperType, value);
-                }
-                Type dictType = GetInterfaceType(value.GetType(), typeof(IDictionary<,>));
-                if (dictType != null && typeof(T).GetGenericTypeDefinition() == typeof(IDictionary<,>))
-                {
-                    Type wrapperType = typeof(FlexibleDictionaryWrapper<,>)
-                      .MakeGenericType(ReflectionHelpers.GetGenericTypeArguments(typeof(T))[1],
-                                       ReflectionHelpers.GetGenericTypeArguments(dictType)[1]);
-                    return Activator.CreateInstance(wrapperType, value);
-                }
+
+                if (typeof(T).CheckWrappedWithNullable() && typeof(T).GenericTypeArguments[0] is { IsPrimitive: true } innerType)
+                    return (T) Convert.ChangeType(value, innerType, System.Globalization.CultureInfo.InvariantCulture);
+
+                if (GetInterfaceType(value.GetType(), typeof(IList<>)) is { } listType && typeof(T).GetGenericTypeDefinition() == typeof(IList<>))
+                    return Activator.CreateInstance(typeof(FlexibleListWrapper<,>).MakeGenericType(typeof(T).GenericTypeArguments[0], listType.GenericTypeArguments[0]), value);
+
+                if (GetInterfaceType(value.GetType(), typeof(IDictionary<,>)) is { } dictType && typeof(T).GetGenericTypeDefinition() == typeof(IDictionary<,>))
+                    return Activator.CreateInstance(typeof(FlexibleDictionaryWrapper<,>).MakeGenericType(typeof(T).GenericTypeArguments[1], dictType.GenericTypeArguments[1]), value);
             }
 
             return value;
@@ -98,23 +79,20 @@ internal static object ConvertTo<T>(object value)
         /// The map is:
         ///    (object type, generic interface type) => constructed generic type
         /// </summary>
-        private static readonly Dictionary<Tuple<Type, Type>, Type> interfaceLookupCache = new Dictionary<Tuple<Type, Type>, Type>();
+        static Dictionary<Tuple<Type, Type>, Type> InterfaceLookupCache { get; } = new Dictionary<Tuple<Type, Type>, Type>();
 
-        private static Type GetInterfaceType(Type objType, Type genericInterfaceType)
+        static Type GetInterfaceType(Type objType, Type genericInterfaceType)
         {
             Tuple<Type, Type> cacheKey = new Tuple<Type, Type>(objType, genericInterfaceType);
-            if (interfaceLookupCache.ContainsKey(cacheKey))
-            {
-                return interfaceLookupCache[cacheKey];
-            }
-            foreach (Type type in ReflectionHelpers.GetInterfaces(objType))
-            {
-                if (ReflectionHelpers.IsConstructedGenericType(type) && type.GetGenericTypeDefinition() == genericInterfaceType)
-                {
-                    return interfaceLookupCache[cacheKey] = type;
-                }
-            }
-            return null;
+
+            if (InterfaceLookupCache.ContainsKey(cacheKey))
+                return InterfaceLookupCache[cacheKey];
+
+            foreach (Type type in objType.GetInterfaces())
+                if (type.IsConstructedGenericType && type.GetGenericTypeDefinition() == genericInterfaceType)
+                    return InterfaceLookupCache[cacheKey] = type;
+
+            return default;
         }
     }
 }
\ No newline at end of file
diff --git a/Parse/Infrastructure/Utilities/FileUtilities.cs b/Parse/Infrastructure/Utilities/FileUtilities.cs
new file mode 100644
index 00000000..43280b2b
--- /dev/null
+++ b/Parse/Infrastructure/Utilities/FileUtilities.cs
@@ -0,0 +1,36 @@
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Parse.Infrastructure.Utilities
+{
+    /// <summary>
+    /// A collection of utility methods and properties for writing to the app-specific persistent storage folder.
+    /// </summary>
+    internal static class FileUtilities
+    {
+        /// <summary>
+        /// Asynchronously read all of the little-endian 16-bit character units (UTF-16) contained within the file wrapped by the provided <see cref="FileInfo"/> instance.
+        /// </summary>
+        /// <param name="file">The <see cref="FileInfo"/> instance wrapping the target file that string content is to be read from</param>
+        /// <returns>A task that should contain the little-endian 16-bit character string (UTF-16) extracted from the <paramref name="file"/> if the read completes successfully</returns>
+        public static async Task<string> ReadAllTextAsync(this FileInfo file)
+        {
+            using StreamReader reader = new StreamReader(file.OpenRead(), Encoding.Unicode);
+            return await reader.ReadToEndAsync();
+        }
+
+        /// <summary>
+        /// Asynchronously writes the provided little-endian 16-bit character string <paramref name="content"/> to the file wrapped by the provided <see cref="FileInfo"/> instance.
+        /// </summary>
+        /// <param name="file">The <see cref="FileInfo"/> instance wrapping the target file that is to be written to</param>
+        /// <param name="content">The little-endian 16-bit Unicode character string (UTF-16) that is to be written to the <paramref name="file"/></param>
+        /// <returns>A task that completes once the write operation to the <paramref name="file"/> completes</returns>
+        public static async Task WriteContentAsync(this FileInfo file, string content)
+        {
+            using FileStream stream = new FileStream(Path.GetFullPath(file.FullName), FileMode.Create, FileAccess.Write, FileShare.Read, 4096, FileOptions.SequentialScan | FileOptions.Asynchronous);
+            byte[] data = Encoding.Unicode.GetBytes(content);
+            await stream.WriteAsync(data, 0, data.Length);
+        }
+    }
+}
diff --git a/Parse/Infrastructure/Utilities/FlexibleDictionaryWrapper.cs b/Parse/Infrastructure/Utilities/FlexibleDictionaryWrapper.cs
new file mode 100644
index 00000000..8f644275
--- /dev/null
+++ b/Parse/Infrastructure/Utilities/FlexibleDictionaryWrapper.cs
@@ -0,0 +1,77 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Parse.Infrastructure.Utilities
+{
+    /// <summary>
+    /// Provides a Dictionary implementation that can delegate to any other
+    /// dictionary, regardless of its value type. Used for coercion of
+    /// dictionaries when returning them to users.
+    /// </summary>
+    /// <typeparam name="TOut">The resulting type of value in the dictionary.</typeparam>
+    /// <typeparam name="TIn">The original type of value in the dictionary.</typeparam>
+    [Preserve(AllMembers = true, Conditional = false)]
+    public class FlexibleDictionaryWrapper<TOut, TIn> : IDictionary<string, TOut>
+    {
+        private readonly IDictionary<string, TIn> toWrap;
+        public FlexibleDictionaryWrapper(IDictionary<string, TIn> toWrap) => this.toWrap = toWrap;
+
+        public void Add(string key, TOut value) => toWrap.Add(key, (TIn) Conversion.ConvertTo<TIn>(value));
+
+        public bool ContainsKey(string key) => toWrap.ContainsKey(key);
+
+        public ICollection<string> Keys => toWrap.Keys;
+
+        public bool Remove(string key) => toWrap.Remove(key);
+
+        public bool TryGetValue(string key, out TOut value)
+        {
+            bool result = toWrap.TryGetValue(key, out TIn outValue);
+            value = (TOut) Conversion.ConvertTo<TOut>(outValue);
+            return result;
+        }
+
+        public ICollection<TOut> Values => toWrap.Values
+                    .Select(item => (TOut) Conversion.ConvertTo<TOut>(item)).ToList();
+
+        public TOut this[string key]
+        {
+            get => (TOut) Conversion.ConvertTo<TOut>(toWrap[key]);
+            set => toWrap[key] = (TIn) Conversion.ConvertTo<TIn>(value);
+        }
+
+        public void Add(KeyValuePair<string, TOut> item) => toWrap.Add(new KeyValuePair<string, TIn>(item.Key,
+                (TIn) Conversion.ConvertTo<TIn>(item.Value)));
+
+        public void Clear() => toWrap.Clear();
+
+        public bool Contains(KeyValuePair<string, TOut> item) => toWrap.Contains(new KeyValuePair<string, TIn>(item.Key,
+                (TIn) Conversion.ConvertTo<TIn>(item.Value)));
+
+        public void CopyTo(KeyValuePair<string, TOut>[] array, int arrayIndex)
+        {
+            IEnumerable<KeyValuePair<string, TOut>> converted = from pair in toWrap
+                                                                select new KeyValuePair<string, TOut>(pair.Key,
+                                                                    (TOut) Conversion.ConvertTo<TOut>(pair.Value));
+            converted.ToList().CopyTo(array, arrayIndex);
+        }
+
+        public int Count => toWrap.Count;
+
+        public bool IsReadOnly => toWrap.IsReadOnly;
+
+        public bool Remove(KeyValuePair<string, TOut> item) => toWrap.Remove(new KeyValuePair<string, TIn>(item.Key,
+                (TIn) Conversion.ConvertTo<TIn>(item.Value)));
+
+        public IEnumerator<KeyValuePair<string, TOut>> GetEnumerator()
+        {
+            foreach (KeyValuePair<string, TIn> pair in toWrap)
+                yield return new KeyValuePair<string, TOut>(pair.Key,
+                    (TOut) Conversion.ConvertTo<TOut>(pair.Value));
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
+    }
+}
diff --git a/Parse/Infrastructure/Utilities/FlexibleListWrapper.cs b/Parse/Infrastructure/Utilities/FlexibleListWrapper.cs
new file mode 100644
index 00000000..1a93d348
--- /dev/null
+++ b/Parse/Infrastructure/Utilities/FlexibleListWrapper.cs
@@ -0,0 +1,57 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Parse.Infrastructure.Utilities
+{
+    /// <summary>
+    /// Provides a List implementation that can delegate to any other
+    /// list, regardless of its value type. Used for coercion of
+    /// lists when returning them to users.
+    /// </summary>
+    /// <typeparam name="TOut">The resulting type of value in the list.</typeparam>
+    /// <typeparam name="TIn">The original type of value in the list.</typeparam>
+    [Preserve(AllMembers = true, Conditional = false)]
+    public class FlexibleListWrapper<TOut, TIn> : IList<TOut>
+    {
+        private IList<TIn> toWrap;
+        public FlexibleListWrapper(IList<TIn> toWrap) => this.toWrap = toWrap;
+
+        public int IndexOf(TOut item) => toWrap.IndexOf((TIn) Conversion.ConvertTo<TIn>(item));
+
+        public void Insert(int index, TOut item) => toWrap.Insert(index, (TIn) Conversion.ConvertTo<TIn>(item));
+
+        public void RemoveAt(int index) => toWrap.RemoveAt(index);
+
+        public TOut this[int index]
+        {
+            get => (TOut) Conversion.ConvertTo<TOut>(toWrap[index]);
+            set => toWrap[index] = (TIn) Conversion.ConvertTo<TIn>(value);
+        }
+
+        public void Add(TOut item) => toWrap.Add((TIn) Conversion.ConvertTo<TIn>(item));
+
+        public void Clear() => toWrap.Clear();
+
+        public bool Contains(TOut item) => toWrap.Contains((TIn) Conversion.ConvertTo<TIn>(item));
+
+        public void CopyTo(TOut[] array, int arrayIndex) => toWrap.Select(item => (TOut) Conversion.ConvertTo<TOut>(item))
+                .ToList().CopyTo(array, arrayIndex);
+
+        public int Count => toWrap.Count;
+
+        public bool IsReadOnly => toWrap.IsReadOnly;
+
+        public bool Remove(TOut item) => toWrap.Remove((TIn) Conversion.ConvertTo<TIn>(item));
+
+        public IEnumerator<TOut> GetEnumerator()
+        {
+            foreach (object item in (IEnumerable) toWrap)
+                yield return (TOut) Conversion.ConvertTo<TOut>(item);
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+    }
+}
diff --git a/Parse/Internal/Utilities/IdentityEqualityComparer.cs b/Parse/Infrastructure/Utilities/IdentityEqualityComparer.cs
similarity index 73%
rename from Parse/Internal/Utilities/IdentityEqualityComparer.cs
rename to Parse/Infrastructure/Utilities/IdentityEqualityComparer.cs
index 5517cbae..6bbbc0a6 100644
--- a/Parse/Internal/Utilities/IdentityEqualityComparer.cs
+++ b/Parse/Infrastructure/Utilities/IdentityEqualityComparer.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
-namespace Parse.Common.Internal
+namespace Parse.Infrastructure.Utilities
 {
     /// <summary>
     /// An equality comparer that uses the object identity (i.e. ReferenceEquals)
@@ -12,14 +12,8 @@ namespace Parse.Common.Internal
     /// </summary>
     public class IdentityEqualityComparer<T> : IEqualityComparer<T>
     {
-        public bool Equals(T x, T y)
-        {
-            return ReferenceEquals(x, y);
-        }
+        public bool Equals(T x, T y) => ReferenceEquals(x, y);
 
-        public int GetHashCode(T obj)
-        {
-            return RuntimeHelpers.GetHashCode(obj);
-        }
+        public int GetHashCode(T obj) => RuntimeHelpers.GetHashCode(obj);
     }
 }
diff --git a/Parse/Infrastructure/Utilities/InternalExtensions.cs b/Parse/Infrastructure/Utilities/InternalExtensions.cs
new file mode 100644
index 00000000..164f2d13
--- /dev/null
+++ b/Parse/Infrastructure/Utilities/InternalExtensions.cs
@@ -0,0 +1,94 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.ExceptionServices;
+using System.Threading.Tasks;
+
+namespace Parse.Infrastructure.Utilities
+{
+    /// <summary>
+    /// Provides helper methods that allow us to use terser code elsewhere.
+    /// </summary>
+    public static class InternalExtensions
+    {
+        /// <summary>
+        /// Ensures a task (even null) is awaitable.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="task"></param>
+        /// <returns></returns>
+        public static Task<T> Safe<T>(this Task<T> task) => task ?? Task.FromResult(default(T));
+
+        /// <summary>
+        /// Ensures a task (even null) is awaitable.
+        /// </summary>
+        /// <param name="task"></param>
+        /// <returns></returns>
+        public static Task Safe(this Task task) => task ?? Task.FromResult<object>(null);
+
+        public delegate void PartialAccessor<T>(ref T arg);
+
+        public static TValue GetOrDefault<TKey, TValue>(this IDictionary<TKey, TValue> self,
+            TKey key,
+            TValue defaultValue)
+        {
+            if (self.TryGetValue(key, out TValue value))
+                return value;
+            return defaultValue;
+        }
+
+        public static bool CollectionsEqual<T>(this IEnumerable<T> a, IEnumerable<T> b) => Equals(a, b) ||
+                   a != null && b != null &&
+                   a.SequenceEqual(b);
+
+        public static Task<TResult> OnSuccess<TIn, TResult>(this Task<TIn> task, Func<Task<TIn>, TResult> continuation) => ((Task) task).OnSuccess(t => continuation((Task<TIn>) t));
+
+        public static Task OnSuccess<TIn>(this Task<TIn> task, Action<Task<TIn>> continuation) => task.OnSuccess((Func<Task<TIn>, object>) (t =>
+                                                                                                             {
+                                                                                                                 continuation(t);
+                                                                                                                 return null;
+                                                                                                             }));
+
+        public static Task<TResult> OnSuccess<TResult>(this Task task, Func<Task, TResult> continuation) => task.ContinueWith(t =>
+                                                           {
+                                                               if (t.IsFaulted)
+                                                               {
+                                                                   AggregateException ex = t.Exception.Flatten();
+                                                                   if (ex.InnerExceptions.Count == 1)
+                                                                       ExceptionDispatchInfo.Capture(ex.InnerExceptions[0]).Throw();
+                                                                   else
+                                                                       ExceptionDispatchInfo.Capture(ex).Throw();
+                                                                   // Unreachable
+                                                                   return Task.FromResult(default(TResult));
+                                                               }
+                                                               else if (t.IsCanceled)
+                                                               {
+                                                                   TaskCompletionSource<TResult> tcs = new TaskCompletionSource<TResult>();
+                                                                   tcs.SetCanceled();
+                                                                   return tcs.Task;
+                                                               }
+                                                               else
+                                                                   return Task.FromResult(continuation(t));
+                                                           }).Unwrap();
+
+        public static Task OnSuccess(this Task task, Action<Task> continuation) => task.OnSuccess((Func<Task, object>) (t =>
+                                                                                              {
+                                                                                                  continuation(t);
+                                                                                                  return null;
+                                                                                              }));
+
+        public static Task WhileAsync(Func<Task<bool>> predicate, Func<Task> body)
+        {
+            Func<Task> iterate = null;
+            iterate = () => predicate().OnSuccess(t =>
+                {
+                    if (!t.Result)
+                        return Task.FromResult(0);
+                    return body().OnSuccess(_ => iterate()).Unwrap();
+                }).Unwrap();
+            return iterate();
+        }
+    }
+}
diff --git a/Parse/Internal/Utilities/Json.cs b/Parse/Infrastructure/Utilities/JsonUtilities.cs
similarity index 92%
rename from Parse/Internal/Utilities/Json.cs
rename to Parse/Infrastructure/Utilities/JsonUtilities.cs
index 2005a14b..40c8da3c 100644
--- a/Parse/Internal/Utilities/Json.cs
+++ b/Parse/Infrastructure/Utilities/JsonUtilities.cs
@@ -3,19 +3,17 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
-namespace Parse.Common.Internal
+namespace Parse.Infrastructure.Utilities
 {
     /// <summary>
     /// A simple recursive-descent JSON Parser based on the grammar defined at http://www.json.org
     /// and http://tools.ietf.org/html/rfc4627
     /// </summary>
-    public class Json
+    public class JsonUtilities
     {
         /// <summary>
         /// Place at the start of a regex to force the match to begin wherever the search starts (i.e.
@@ -60,29 +58,21 @@ internal bool ParseObject(out object output)
                 output = null;
                 int initialCurrentIndex = CurrentIndex;
                 if (!Accept(startObject))
-                {
                     return false;
-                }
 
                 Dictionary<string, object> dict = new Dictionary<string, object> { };
                 while (true)
                 {
                     if (!ParseMember(out object pairValue))
-                    {
                         break;
-                    }
 
                     Tuple<string, object> pair = pairValue as Tuple<string, object>;
                     dict[pair.Item1] = pair.Item2;
                     if (!Accept(valueSeparator))
-                    {
                         break;
-                    }
                 }
                 if (!Accept(endObject))
-                {
                     return false;
-                }
                 output = dict;
                 return true;
             }
@@ -94,17 +84,11 @@ private bool ParseMember(out object output)
             {
                 output = null;
                 if (!ParseString(out object key))
-                {
                     return false;
-                }
                 if (!Accept(nameSeparator))
-                {
                     return false;
-                }
                 if (!ParseValue(out object value))
-                {
                     return false;
-                }
                 output = new Tuple<string, object>((string) key, value);
                 return true;
             }
@@ -116,26 +100,18 @@ internal bool ParseArray(out object output)
             {
                 output = null;
                 if (!Accept(startArray))
-                {
                     return false;
-                }
                 List<object> list = new List<object>();
                 while (true)
                 {
                     if (!ParseValue(out object value))
-                    {
                         break;
-                    }
                     list.Add(value);
                     if (!Accept(valueSeparator))
-                    {
                         break;
-                    }
                 }
                 if (!Accept(endArray))
-                {
                     return false;
-                }
                 output = list;
                 return true;
             }
@@ -174,16 +150,14 @@ private bool ParseString(out object output)
             {
                 output = null;
                 if (!Accept(stringValue, out Match m))
-                {
                     return false;
-                }
                 // handle escapes:
                 int offset = 0;
                 Group contentCapture = m.Groups["content"];
                 StringBuilder builder = new StringBuilder(contentCapture.Value);
                 foreach (Capture escape in m.Groups["escape"].Captures)
                 {
-                    int index = (escape.Index - contentCapture.Index) - offset;
+                    int index = escape.Index - contentCapture.Index - offset;
                     offset += escape.Length - 1;
                     builder.Remove(index + 1, escape.Length - 1);
                     switch (escape.Value[1])
@@ -231,9 +205,7 @@ private bool ParseNumber(out object output)
             {
                 output = null;
                 if (!Accept(numberValue, out Match m))
-                {
                     return false;
-                }
                 if (m.Groups["frac"].Length > 0 || m.Groups["exp"].Length > 0)
                 {
                     // It's a double.
@@ -254,9 +226,7 @@ private bool Accept(Regex matcher, out Match match)
             {
                 match = matcher.Match(Input, CurrentIndex);
                 if (match.Success)
-                {
                     Skip(match.Length);
-                }
                 return match.Success;
             }
 
@@ -281,7 +251,7 @@ private bool Accept(char condition)
                     ++currentStep;
                 }
 
-                bool match = (currentStep < strLen) && (InputAsArray[currentStep] == condition);
+                bool match = currentStep < strLen && InputAsArray[currentStep] == condition;
                 if (match)
                 {
                     ++step;
@@ -326,19 +296,15 @@ private bool Accept(char[] condition)
 
                 bool strMatch = true;
                 for (int i = 0; currentStep < strLen && i < condition.Length; ++i, ++currentStep)
-                {
                     if (InputAsArray[currentStep] != condition[i])
                     {
                         strMatch = false;
                         break;
                     }
-                }
 
-                bool match = (currentStep < strLen) && strMatch;
+                bool match = currentStep < strLen && strMatch;
                 if (match)
-                {
                     Skip(step + condition.Length);
-                }
                 return match;
             }
         }
@@ -356,9 +322,7 @@ public static object Parse(string input)
             if ((parser.ParseObject(out object output) ||
                 parser.ParseArray(out output)) &&
                 parser.CurrentIndex == input.Length)
-            {
                 return output;
-            }
             throw new ArgumentException("Input JSON was invalid.");
         }
 
@@ -370,13 +334,9 @@ public static object Parse(string input)
         public static string Encode(IDictionary<string, object> dict)
         {
             if (dict == null)
-            {
                 throw new ArgumentNullException();
-            }
             if (dict.Count == 0)
-            {
                 return "{}";
-            }
             StringBuilder builder = new StringBuilder("{");
             foreach (KeyValuePair<string, object> pair in dict)
             {
@@ -397,13 +357,9 @@ public static string Encode(IDictionary<string, object> dict)
         public static string Encode(IList<object> list)
         {
             if (list == null)
-            {
                 throw new ArgumentNullException();
-            }
             if (list.Count == 0)
-            {
                 return "[]";
-            }
             StringBuilder builder = new StringBuilder("[");
             foreach (object item in list)
             {
@@ -420,13 +376,9 @@ public static string Encode(IList<object> list)
         public static string Encode(object obj)
         {
             if (obj is IDictionary<string, object> dict)
-            {
                 return Encode(dict);
-            }
             if (obj is IList<object> list)
-            {
                 return Encode(list);
-            }
             if (obj is string str)
             {
                 str = escapePattern.Replace(str, m =>
@@ -454,17 +406,11 @@ public static string Encode(object obj)
                 return "\"" + str + "\"";
             }
             if (obj is null)
-            {
                 return "null";
-            }
             if (obj is bool)
-            {
                 return (bool) obj ? "true" : "false";
-            }
             if (!obj.GetType().GetTypeInfo().IsPrimitive)
-            {
                 throw new ArgumentException("Unable to encode objects of type " + obj.GetType());
-            }
             return Convert.ToString(obj, CultureInfo.InvariantCulture);
         }
     }
diff --git a/Parse/Infrastructure/Utilities/LateInitializer.cs b/Parse/Infrastructure/Utilities/LateInitializer.cs
new file mode 100644
index 00000000..f3ddd129
--- /dev/null
+++ b/Parse/Infrastructure/Utilities/LateInitializer.cs
@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Parse.Infrastructure.Utilities
+{
+    /// <summary>
+    /// A wrapper over a dictionary from value generator to value. Uses the fact that lambda expressions in a specific location are cached, so the cost of instantiating a generator delegate is only incurred once at the call site of <see cref="GetValue{TData}(Func{TData})"/> and subsequent calls look up the result of the first generation from the dictionary based on the hash of the generator delegate. This is effectively a lazy initialization mechanism that allows the member type to remain unchanged.
+    /// </summary>
+    internal class LateInitializer
+    {
+        Lazy<Dictionary<Func<object>, object>> Storage { get; set; } = new Lazy<Dictionary<Func<object>, object>> { };
+
+        public TData GetValue<TData>(Func<TData> generator)
+        {
+            lock (generator)
+            {
+                if (Storage.IsValueCreated && Storage.Value.Keys.OfType<Func<TData>>().FirstOrDefault() is { } key && Storage.Value.TryGetValue(key as Func<object>, out object data))
+                {
+                    return (TData) data;
+                }
+                else
+                {
+                    TData result = generator.Invoke();
+
+                    Storage.Value.Add(generator as Func<object>, result);
+                    return result;
+                }
+            }
+        }
+
+        public bool ClearValue<TData>()
+        {
+            lock (Storage)
+            {
+                if (Storage.IsValueCreated && Storage.Value.Keys.OfType<Func<TData>>().FirstOrDefault() is { } key)
+                {
+                    lock (key)
+                    {
+                        Storage.Value.Remove(key as Func<object>);
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        public bool SetValue<TData>(TData value, bool initialize = true)
+        {
+            lock (Storage)
+            {
+                if (Storage.IsValueCreated && Storage.Value.Keys.OfType<Func<TData>>().FirstOrDefault() is { } key)
+                {
+                    lock (key)
+                    {
+                        Storage.Value[key as Func<object>] = value;
+                        return true;
+                    }
+                }
+                else if (initialize)
+                {
+                    Storage.Value[new Func<TData>(() => value) as Func<object>] = value;
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public bool Reset()
+        {
+            lock (Storage)
+            {
+                if (Storage.IsValueCreated)
+                {
+                    Storage.Value.Clear();
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public bool Used => Storage.IsValueCreated;
+    }
+}
diff --git a/Parse/Internal/Utilities/LockSet.cs b/Parse/Infrastructure/Utilities/LockSet.cs
similarity index 96%
rename from Parse/Internal/Utilities/LockSet.cs
rename to Parse/Infrastructure/Utilities/LockSet.cs
index 03e5d549..659c538d 100644
--- a/Parse/Internal/Utilities/LockSet.cs
+++ b/Parse/Infrastructure/Utilities/LockSet.cs
@@ -4,7 +4,7 @@
 using System.Runtime.CompilerServices;
 using System.Threading;
 
-namespace Parse.Common.Internal
+namespace Parse.Infrastructure.Utilities
 {
     public class LockSet
     {
diff --git a/Parse/Infrastructure/Utilities/ReflectionUtilities.cs b/Parse/Infrastructure/Utilities/ReflectionUtilities.cs
new file mode 100644
index 00000000..b5cf9d3d
--- /dev/null
+++ b/Parse/Infrastructure/Utilities/ReflectionUtilities.cs
@@ -0,0 +1,43 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+namespace Parse.Infrastructure.Utilities
+{
+    public static class ReflectionUtilities
+    {
+        /// <summary>
+        /// Gets all of the defined constructors that aren't static on a given <see cref="Type"/> instance.
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public static IEnumerable<ConstructorInfo> GetInstanceConstructors(this Type type) => type.GetTypeInfo().DeclaredConstructors.Where(constructor => (constructor.Attributes & MethodAttributes.Static) == 0);
+
+        /// <summary>
+        /// This method helps simplify the process of getting a constructor for a type.
+        /// A method like this exists in .NET but is not allowed in a Portable Class Library,
+        /// so we've built our own.
+        /// </summary>
+        /// <param name="self"></param>
+        /// <param name="parameterTypes"></param>
+        /// <returns></returns>
+        public static ConstructorInfo FindConstructor(this Type self, params Type[] parameterTypes) => self.GetConstructors().Where(constructor => constructor.GetParameters().Select(parameter => parameter.ParameterType).SequenceEqual(parameterTypes)).SingleOrDefault();
+
+        /// <summary>
+        /// Checks if a <see cref="Type"/> instance is another <see cref="Type"/> instance wrapped with <see cref="Nullable{T}"/>.
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public static bool CheckWrappedWithNullable(this Type type) => type.IsConstructedGenericType && type.GetGenericTypeDefinition().Equals(typeof(Nullable<>));
+
+        /// <summary>
+        /// Gets the value of <see cref="ParseClassNameAttribute.ClassName"/> if the type has a custom attribute of type <see cref="ParseClassNameAttribute"/>.
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public static string GetParseClassName(this Type type) => type.GetCustomAttribute<ParseClassNameAttribute>()?.ClassName;
+    }
+}
diff --git a/Parse/Infrastructure/Utilities/SynchronizedEventHandler.cs b/Parse/Infrastructure/Utilities/SynchronizedEventHandler.cs
new file mode 100644
index 00000000..468f25ac
--- /dev/null
+++ b/Parse/Infrastructure/Utilities/SynchronizedEventHandler.cs
@@ -0,0 +1,73 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Parse.Infrastructure.Utilities
+{
+    /// <summary>
+    /// Represents an event handler that calls back from the synchronization context
+    /// that subscribed.
+    /// <typeparam name="T">Should look like an EventArgs, but may not inherit EventArgs if T is implemented by the Windows team.</typeparam>
+    /// </summary>
+    public class SynchronizedEventHandler<T>
+    {
+        LinkedList<Tuple<Delegate, TaskFactory>> Callbacks { get; } = new LinkedList<Tuple<Delegate, TaskFactory>> { };
+
+        public void Add(Delegate target)
+        {
+            lock (Callbacks)
+            {
+                TaskFactory factory = SynchronizationContext.Current is { } ? new TaskFactory(CancellationToken.None, TaskCreationOptions.None, TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.FromCurrentSynchronizationContext()) : Task.Factory;
+
+                foreach (Delegate invocation in target.GetInvocationList())
+                {
+                    Callbacks.AddLast(new Tuple<Delegate, TaskFactory>(invocation, factory));
+                }
+            }
+        }
+
+        public void Remove(Delegate target)
+        {
+            lock (Callbacks)
+            {
+                if (Callbacks.Count == 0)
+                {
+                    return;
+                }
+
+                foreach (Delegate invocation in target.GetInvocationList())
+                {
+                    LinkedListNode<Tuple<Delegate, TaskFactory>> node = Callbacks.First;
+
+                    while (node != null)
+                    {
+                        if (node.Value.Item1 == invocation)
+                        {
+                            Callbacks.Remove(node);
+                            break;
+                        }
+                        node = node.Next;
+                    }
+                }
+            }
+        }
+
+        public Task Invoke(object sender, T args)
+        {
+            IEnumerable<Tuple<Delegate, TaskFactory>> toInvoke;
+            Task<int>[] toContinue = new[] { Task.FromResult(0) };
+
+            lock (Callbacks)
+            {
+                toInvoke = Callbacks.ToList();
+            }
+
+            List<Task<object>> invocations = toInvoke.Select(callback => callback.Item2.ContinueWhenAll(toContinue, _ => callback.Item1.DynamicInvoke(sender, args))).ToList();
+            return Task.WhenAll(invocations);
+        }
+    }
+}
diff --git a/Parse/Internal/Utilities/TaskQueue.cs b/Parse/Infrastructure/Utilities/TaskQueue.cs
similarity index 86%
rename from Parse/Internal/Utilities/TaskQueue.cs
rename to Parse/Infrastructure/Utilities/TaskQueue.cs
index b39daac8..7710a071 100644
--- a/Parse/Internal/Utilities/TaskQueue.cs
+++ b/Parse/Infrastructure/Utilities/TaskQueue.cs
@@ -1,11 +1,10 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
 using System;
-using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Parse.Common.Internal
+namespace Parse.Infrastructure.Utilities
 {
     /// <summary>
     /// A helper class for enqueuing tasks
@@ -16,8 +15,7 @@ public class TaskQueue
         /// We only need to keep the tail of the queue. Cancelled tasks will
         /// just complete normally/immediately when their turn arrives.
         /// </summary>
-        private Task tail;
-        private readonly object mutex = new object();
+        Task Tail { get; set; }
 
         /// <summary>
         /// Gets a cancellable task that can be safely awaited and is dependent
@@ -31,10 +29,9 @@ public class TaskQueue
         /// <returns>A new task that should be awaited by enqueued tasks.</returns>
         private Task GetTaskToAwait(CancellationToken cancellationToken)
         {
-            lock (mutex)
+            lock (Mutex)
             {
-                Task toAwait = tail ?? Task.FromResult(true);
-                return toAwait.ContinueWith(task => { }, cancellationToken);
+                return (Tail ?? Task.FromResult(true)).ContinueWith(task => { }, cancellationToken);
             }
         }
 
@@ -54,9 +51,11 @@ public T Enqueue<T>(Func<Task, T> taskStart, CancellationToken cancellationToken
         {
             Task oldTail;
             T task;
-            lock (mutex)
+
+            lock (Mutex)
             {
-                oldTail = tail ?? Task.FromResult(true);
+                oldTail = Tail ?? Task.FromResult(true);
+
                 // The task created by taskStart is responsible for waiting the
                 // task passed to it before doing its work (this gives it an opportunity
                 // to do startup work or save state before waiting for its turn in the queue
@@ -65,11 +64,11 @@ public T Enqueue<T>(Func<Task, T> taskStart, CancellationToken cancellationToken
                 // The tail task should be dependent on the old tail as well as the newly-created
                 // task. This prevents cancellation of the new task from causing the queue to run
                 // out of order.
-                tail = Task.WhenAll(oldTail, task);
+                Tail = Task.WhenAll(oldTail, task);
             }
             return task;
         }
 
-        public object Mutex => mutex;
+        public object Mutex { get; } = new object { };
     }
 }
diff --git a/Parse/Internal/Utilities/ThreadingUtilities.cs b/Parse/Infrastructure/Utilities/ThreadingUtilities.cs
similarity index 84%
rename from Parse/Internal/Utilities/ThreadingUtilities.cs
rename to Parse/Infrastructure/Utilities/ThreadingUtilities.cs
index 5edca411..90ecd537 100644
--- a/Parse/Internal/Utilities/ThreadingUtilities.cs
+++ b/Parse/Infrastructure/Utilities/ThreadingUtilities.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
-namespace Parse.Internal.Utilities
+namespace Parse.Infrastructure.Utilities
 {
     internal static class ThreadingUtilities
     {
diff --git a/Parse/Infrastructure/Utilities/XamarinAttributes.cs b/Parse/Infrastructure/Utilities/XamarinAttributes.cs
new file mode 100644
index 00000000..108bba23
--- /dev/null
+++ b/Parse/Infrastructure/Utilities/XamarinAttributes.cs
@@ -0,0 +1,407 @@
+using System;
+using System.Collections.Generic;
+
+namespace Parse.Infrastructure.Utilities
+{
+    /// <summary>
+    /// A reimplementation of Xamarin's PreserveAttribute.
+    /// This allows us to support AOT and linking for Xamarin platforms.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.All)]
+    internal class PreserveAttribute : Attribute
+    {
+        public bool AllMembers;
+        public bool Conditional;
+    }
+
+    [AttributeUsage(AttributeTargets.All)]
+    internal class LinkerSafeAttribute : Attribute
+    {
+        public LinkerSafeAttribute() { }
+    }
+
+    [Preserve(AllMembers = true)]
+    internal class PreserveWrapperTypes
+    {
+        /// <summary>
+        /// Exists to ensure that generic types are AOT-compiled for the conversions we support.
+        /// Any new value types that we add support for will need to be registered here.
+        /// The method itself is never called, but by virtue of the Preserve attribute being set
+        /// on the class, these types will be AOT-compiled.
+        ///
+        /// This also applies to Unity.
+        /// </summary>
+        static List<object> AOTPreservations => new List<object>
+        {
+            typeof(FlexibleListWrapper<object, object>),
+            typeof(FlexibleListWrapper<object, bool>),
+            typeof(FlexibleListWrapper<object, byte>),
+            typeof(FlexibleListWrapper<object, sbyte>),
+            typeof(FlexibleListWrapper<object, short>),
+            typeof(FlexibleListWrapper<object, ushort>),
+            typeof(FlexibleListWrapper<object, int>),
+            typeof(FlexibleListWrapper<object, uint>),
+            typeof(FlexibleListWrapper<object, long>),
+            typeof(FlexibleListWrapper<object, ulong>),
+            typeof(FlexibleListWrapper<object, char>),
+            typeof(FlexibleListWrapper<object, double>),
+            typeof(FlexibleListWrapper<object, float>),
+
+            typeof(FlexibleListWrapper<bool, object>),
+            typeof(FlexibleListWrapper<bool, bool>),
+            typeof(FlexibleListWrapper<bool, byte>),
+            typeof(FlexibleListWrapper<bool, sbyte>),
+            typeof(FlexibleListWrapper<bool, short>),
+            typeof(FlexibleListWrapper<bool, ushort>),
+            typeof(FlexibleListWrapper<bool, int>),
+            typeof(FlexibleListWrapper<bool, uint>),
+            typeof(FlexibleListWrapper<bool, long>),
+            typeof(FlexibleListWrapper<bool, ulong>),
+            typeof(FlexibleListWrapper<bool, char>),
+            typeof(FlexibleListWrapper<bool, double>),
+            typeof(FlexibleListWrapper<bool, float>),
+
+            typeof(FlexibleListWrapper<byte, object>),
+            typeof(FlexibleListWrapper<byte, bool>),
+            typeof(FlexibleListWrapper<byte, byte>),
+            typeof(FlexibleListWrapper<byte, sbyte>),
+            typeof(FlexibleListWrapper<byte, short>),
+            typeof(FlexibleListWrapper<byte, ushort>),
+            typeof(FlexibleListWrapper<byte, int>),
+            typeof(FlexibleListWrapper<byte, uint>),
+            typeof(FlexibleListWrapper<byte, long>),
+            typeof(FlexibleListWrapper<byte, ulong>),
+            typeof(FlexibleListWrapper<byte, char>),
+            typeof(FlexibleListWrapper<byte, double>),
+            typeof(FlexibleListWrapper<byte, float>),
+
+            typeof(FlexibleListWrapper<sbyte, object>),
+            typeof(FlexibleListWrapper<sbyte, bool>),
+            typeof(FlexibleListWrapper<sbyte, byte>),
+            typeof(FlexibleListWrapper<sbyte, sbyte>),
+            typeof(FlexibleListWrapper<sbyte, short>),
+            typeof(FlexibleListWrapper<sbyte, ushort>),
+            typeof(FlexibleListWrapper<sbyte, int>),
+            typeof(FlexibleListWrapper<sbyte, uint>),
+            typeof(FlexibleListWrapper<sbyte, long>),
+            typeof(FlexibleListWrapper<sbyte, ulong>),
+            typeof(FlexibleListWrapper<sbyte, char>),
+            typeof(FlexibleListWrapper<sbyte, double>),
+            typeof(FlexibleListWrapper<sbyte, float>),
+
+            typeof(FlexibleListWrapper<short, object>),
+            typeof(FlexibleListWrapper<short, bool>),
+            typeof(FlexibleListWrapper<short, byte>),
+            typeof(FlexibleListWrapper<short, sbyte>),
+            typeof(FlexibleListWrapper<short, short>),
+            typeof(FlexibleListWrapper<short, ushort>),
+            typeof(FlexibleListWrapper<short, int>),
+            typeof(FlexibleListWrapper<short, uint>),
+            typeof(FlexibleListWrapper<short, long>),
+            typeof(FlexibleListWrapper<short, ulong>),
+            typeof(FlexibleListWrapper<short, char>),
+            typeof(FlexibleListWrapper<short, double>),
+            typeof(FlexibleListWrapper<short, float>),
+
+            typeof(FlexibleListWrapper<ushort, object>),
+            typeof(FlexibleListWrapper<ushort, bool>),
+            typeof(FlexibleListWrapper<ushort, byte>),
+            typeof(FlexibleListWrapper<ushort, sbyte>),
+            typeof(FlexibleListWrapper<ushort, short>),
+            typeof(FlexibleListWrapper<ushort, ushort>),
+            typeof(FlexibleListWrapper<ushort, int>),
+            typeof(FlexibleListWrapper<ushort, uint>),
+            typeof(FlexibleListWrapper<ushort, long>),
+            typeof(FlexibleListWrapper<ushort, ulong>),
+            typeof(FlexibleListWrapper<ushort, char>),
+            typeof(FlexibleListWrapper<ushort, double>),
+            typeof(FlexibleListWrapper<ushort, float>),
+
+            typeof(FlexibleListWrapper<int, object>),
+            typeof(FlexibleListWrapper<int, bool>),
+            typeof(FlexibleListWrapper<int, byte>),
+            typeof(FlexibleListWrapper<int, sbyte>),
+            typeof(FlexibleListWrapper<int, short>),
+            typeof(FlexibleListWrapper<int, ushort>),
+            typeof(FlexibleListWrapper<int, int>),
+            typeof(FlexibleListWrapper<int, uint>),
+            typeof(FlexibleListWrapper<int, long>),
+            typeof(FlexibleListWrapper<int, ulong>),
+            typeof(FlexibleListWrapper<int, char>),
+            typeof(FlexibleListWrapper<int, double>),
+            typeof(FlexibleListWrapper<int, float>),
+
+            typeof(FlexibleListWrapper<uint, object>),
+            typeof(FlexibleListWrapper<uint, bool>),
+            typeof(FlexibleListWrapper<uint, byte>),
+            typeof(FlexibleListWrapper<uint, sbyte>),
+            typeof(FlexibleListWrapper<uint, short>),
+            typeof(FlexibleListWrapper<uint, ushort>),
+            typeof(FlexibleListWrapper<uint, int>),
+            typeof(FlexibleListWrapper<uint, uint>),
+            typeof(FlexibleListWrapper<uint, long>),
+            typeof(FlexibleListWrapper<uint, ulong>),
+            typeof(FlexibleListWrapper<uint, char>),
+            typeof(FlexibleListWrapper<uint, double>),
+            typeof(FlexibleListWrapper<uint, float>),
+
+            typeof(FlexibleListWrapper<long, object>),
+            typeof(FlexibleListWrapper<long, bool>),
+            typeof(FlexibleListWrapper<long, byte>),
+            typeof(FlexibleListWrapper<long, sbyte>),
+            typeof(FlexibleListWrapper<long, short>),
+            typeof(FlexibleListWrapper<long, ushort>),
+            typeof(FlexibleListWrapper<long, int>),
+            typeof(FlexibleListWrapper<long, uint>),
+            typeof(FlexibleListWrapper<long, long>),
+            typeof(FlexibleListWrapper<long, ulong>),
+            typeof(FlexibleListWrapper<long, char>),
+            typeof(FlexibleListWrapper<long, double>),
+            typeof(FlexibleListWrapper<long, float>),
+
+            typeof(FlexibleListWrapper<ulong, object>),
+            typeof(FlexibleListWrapper<ulong, bool>),
+            typeof(FlexibleListWrapper<ulong, byte>),
+            typeof(FlexibleListWrapper<ulong, sbyte>),
+            typeof(FlexibleListWrapper<ulong, short>),
+            typeof(FlexibleListWrapper<ulong, ushort>),
+            typeof(FlexibleListWrapper<ulong, int>),
+            typeof(FlexibleListWrapper<ulong, uint>),
+            typeof(FlexibleListWrapper<ulong, long>),
+            typeof(FlexibleListWrapper<ulong, ulong>),
+            typeof(FlexibleListWrapper<ulong, char>),
+            typeof(FlexibleListWrapper<ulong, double>),
+            typeof(FlexibleListWrapper<ulong, float>),
+
+            typeof(FlexibleListWrapper<char, object>),
+            typeof(FlexibleListWrapper<char, bool>),
+            typeof(FlexibleListWrapper<char, byte>),
+            typeof(FlexibleListWrapper<char, sbyte>),
+            typeof(FlexibleListWrapper<char, short>),
+            typeof(FlexibleListWrapper<char, ushort>),
+            typeof(FlexibleListWrapper<char, int>),
+            typeof(FlexibleListWrapper<char, uint>),
+            typeof(FlexibleListWrapper<char, long>),
+            typeof(FlexibleListWrapper<char, ulong>),
+            typeof(FlexibleListWrapper<char, char>),
+            typeof(FlexibleListWrapper<char, double>),
+            typeof(FlexibleListWrapper<char, float>),
+
+            typeof(FlexibleListWrapper<double, object>),
+            typeof(FlexibleListWrapper<double, bool>),
+            typeof(FlexibleListWrapper<double, byte>),
+            typeof(FlexibleListWrapper<double, sbyte>),
+            typeof(FlexibleListWrapper<double, short>),
+            typeof(FlexibleListWrapper<double, ushort>),
+            typeof(FlexibleListWrapper<double, int>),
+            typeof(FlexibleListWrapper<double, uint>),
+            typeof(FlexibleListWrapper<double, long>),
+            typeof(FlexibleListWrapper<double, ulong>),
+            typeof(FlexibleListWrapper<double, char>),
+            typeof(FlexibleListWrapper<double, double>),
+            typeof(FlexibleListWrapper<double, float>),
+
+            typeof(FlexibleListWrapper<float, object>),
+            typeof(FlexibleListWrapper<float, bool>),
+            typeof(FlexibleListWrapper<float, byte>),
+            typeof(FlexibleListWrapper<float, sbyte>),
+            typeof(FlexibleListWrapper<float, short>),
+            typeof(FlexibleListWrapper<float, ushort>),
+            typeof(FlexibleListWrapper<float, int>),
+            typeof(FlexibleListWrapper<float, uint>),
+            typeof(FlexibleListWrapper<float, long>),
+            typeof(FlexibleListWrapper<float, ulong>),
+            typeof(FlexibleListWrapper<float, char>),
+            typeof(FlexibleListWrapper<float, double>),
+            typeof(FlexibleListWrapper<float, float>),
+
+            typeof(FlexibleListWrapper<object, DateTime>),
+            typeof(FlexibleListWrapper<DateTime, object>),
+
+            typeof(FlexibleDictionaryWrapper<object, object>),
+            typeof(FlexibleDictionaryWrapper<object, bool>),
+            typeof(FlexibleDictionaryWrapper<object, byte>),
+            typeof(FlexibleDictionaryWrapper<object, sbyte>),
+            typeof(FlexibleDictionaryWrapper<object, short>),
+            typeof(FlexibleDictionaryWrapper<object, ushort>),
+            typeof(FlexibleDictionaryWrapper<object, int>),
+            typeof(FlexibleDictionaryWrapper<object, uint>),
+            typeof(FlexibleDictionaryWrapper<object, long>),
+            typeof(FlexibleDictionaryWrapper<object, ulong>),
+            typeof(FlexibleDictionaryWrapper<object, char>),
+            typeof(FlexibleDictionaryWrapper<object, double>),
+            typeof(FlexibleDictionaryWrapper<object, float>),
+
+            typeof(FlexibleDictionaryWrapper<bool, object>),
+            typeof(FlexibleDictionaryWrapper<bool, bool>),
+            typeof(FlexibleDictionaryWrapper<bool, byte>),
+            typeof(FlexibleDictionaryWrapper<bool, sbyte>),
+            typeof(FlexibleDictionaryWrapper<bool, short>),
+            typeof(FlexibleDictionaryWrapper<bool, ushort>),
+            typeof(FlexibleDictionaryWrapper<bool, int>),
+            typeof(FlexibleDictionaryWrapper<bool, uint>),
+            typeof(FlexibleDictionaryWrapper<bool, long>),
+            typeof(FlexibleDictionaryWrapper<bool, ulong>),
+            typeof(FlexibleDictionaryWrapper<bool, char>),
+            typeof(FlexibleDictionaryWrapper<bool, double>),
+            typeof(FlexibleDictionaryWrapper<bool, float>),
+
+            typeof(FlexibleDictionaryWrapper<byte, object>),
+            typeof(FlexibleDictionaryWrapper<byte, bool>),
+            typeof(FlexibleDictionaryWrapper<byte, byte>),
+            typeof(FlexibleDictionaryWrapper<byte, sbyte>),
+            typeof(FlexibleDictionaryWrapper<byte, short>),
+            typeof(FlexibleDictionaryWrapper<byte, ushort>),
+            typeof(FlexibleDictionaryWrapper<byte, int>),
+            typeof(FlexibleDictionaryWrapper<byte, uint>),
+            typeof(FlexibleDictionaryWrapper<byte, long>),
+            typeof(FlexibleDictionaryWrapper<byte, ulong>),
+            typeof(FlexibleDictionaryWrapper<byte, char>),
+            typeof(FlexibleDictionaryWrapper<byte, double>),
+            typeof(FlexibleDictionaryWrapper<byte, float>),
+
+            typeof(FlexibleDictionaryWrapper<sbyte, object>),
+            typeof(FlexibleDictionaryWrapper<sbyte, bool>),
+            typeof(FlexibleDictionaryWrapper<sbyte, byte>),
+            typeof(FlexibleDictionaryWrapper<sbyte, sbyte>),
+            typeof(FlexibleDictionaryWrapper<sbyte, short>),
+            typeof(FlexibleDictionaryWrapper<sbyte, ushort>),
+            typeof(FlexibleDictionaryWrapper<sbyte, int>),
+            typeof(FlexibleDictionaryWrapper<sbyte, uint>),
+            typeof(FlexibleDictionaryWrapper<sbyte, long>),
+            typeof(FlexibleDictionaryWrapper<sbyte, ulong>),
+            typeof(FlexibleDictionaryWrapper<sbyte, char>),
+            typeof(FlexibleDictionaryWrapper<sbyte, double>),
+            typeof(FlexibleDictionaryWrapper<sbyte, float>),
+
+            typeof(FlexibleDictionaryWrapper<short, object>),
+            typeof(FlexibleDictionaryWrapper<short, bool>),
+            typeof(FlexibleDictionaryWrapper<short, byte>),
+            typeof(FlexibleDictionaryWrapper<short, sbyte>),
+            typeof(FlexibleDictionaryWrapper<short, short>),
+            typeof(FlexibleDictionaryWrapper<short, ushort>),
+            typeof(FlexibleDictionaryWrapper<short, int>),
+            typeof(FlexibleDictionaryWrapper<short, uint>),
+            typeof(FlexibleDictionaryWrapper<short, long>),
+            typeof(FlexibleDictionaryWrapper<short, ulong>),
+            typeof(FlexibleDictionaryWrapper<short, char>),
+            typeof(FlexibleDictionaryWrapper<short, double>),
+            typeof(FlexibleDictionaryWrapper<short, float>),
+
+            typeof(FlexibleDictionaryWrapper<ushort, object>),
+            typeof(FlexibleDictionaryWrapper<ushort, bool>),
+            typeof(FlexibleDictionaryWrapper<ushort, byte>),
+            typeof(FlexibleDictionaryWrapper<ushort, sbyte>),
+            typeof(FlexibleDictionaryWrapper<ushort, short>),
+            typeof(FlexibleDictionaryWrapper<ushort, ushort>),
+            typeof(FlexibleDictionaryWrapper<ushort, int>),
+            typeof(FlexibleDictionaryWrapper<ushort, uint>),
+            typeof(FlexibleDictionaryWrapper<ushort, long>),
+            typeof(FlexibleDictionaryWrapper<ushort, ulong>),
+            typeof(FlexibleDictionaryWrapper<ushort, char>),
+            typeof(FlexibleDictionaryWrapper<ushort, double>),
+            typeof(FlexibleDictionaryWrapper<ushort, float>),
+
+            typeof(FlexibleDictionaryWrapper<int, object>),
+            typeof(FlexibleDictionaryWrapper<int, bool>),
+            typeof(FlexibleDictionaryWrapper<int, byte>),
+            typeof(FlexibleDictionaryWrapper<int, sbyte>),
+            typeof(FlexibleDictionaryWrapper<int, short>),
+            typeof(FlexibleDictionaryWrapper<int, ushort>),
+            typeof(FlexibleDictionaryWrapper<int, int>),
+            typeof(FlexibleDictionaryWrapper<int, uint>),
+            typeof(FlexibleDictionaryWrapper<int, long>),
+            typeof(FlexibleDictionaryWrapper<int, ulong>),
+            typeof(FlexibleDictionaryWrapper<int, char>),
+            typeof(FlexibleDictionaryWrapper<int, double>),
+            typeof(FlexibleDictionaryWrapper<int, float>),
+
+            typeof(FlexibleDictionaryWrapper<uint, object>),
+            typeof(FlexibleDictionaryWrapper<uint, bool>),
+            typeof(FlexibleDictionaryWrapper<uint, byte>),
+            typeof(FlexibleDictionaryWrapper<uint, sbyte>),
+            typeof(FlexibleDictionaryWrapper<uint, short>),
+            typeof(FlexibleDictionaryWrapper<uint, ushort>),
+            typeof(FlexibleDictionaryWrapper<uint, int>),
+            typeof(FlexibleDictionaryWrapper<uint, uint>),
+            typeof(FlexibleDictionaryWrapper<uint, long>),
+            typeof(FlexibleDictionaryWrapper<uint, ulong>),
+            typeof(FlexibleDictionaryWrapper<uint, char>),
+            typeof(FlexibleDictionaryWrapper<uint, double>),
+            typeof(FlexibleDictionaryWrapper<uint, float>),
+
+            typeof(FlexibleDictionaryWrapper<long, object>),
+            typeof(FlexibleDictionaryWrapper<long, bool>),
+            typeof(FlexibleDictionaryWrapper<long, byte>),
+            typeof(FlexibleDictionaryWrapper<long, sbyte>),
+            typeof(FlexibleDictionaryWrapper<long, short>),
+            typeof(FlexibleDictionaryWrapper<long, ushort>),
+            typeof(FlexibleDictionaryWrapper<long, int>),
+            typeof(FlexibleDictionaryWrapper<long, uint>),
+            typeof(FlexibleDictionaryWrapper<long, long>),
+            typeof(FlexibleDictionaryWrapper<long, ulong>),
+            typeof(FlexibleDictionaryWrapper<long, char>),
+            typeof(FlexibleDictionaryWrapper<long, double>),
+            typeof(FlexibleDictionaryWrapper<long, float>),
+
+            typeof(FlexibleDictionaryWrapper<ulong, object>),
+            typeof(FlexibleDictionaryWrapper<ulong, bool>),
+            typeof(FlexibleDictionaryWrapper<ulong, byte>),
+            typeof(FlexibleDictionaryWrapper<ulong, sbyte>),
+            typeof(FlexibleDictionaryWrapper<ulong, short>),
+            typeof(FlexibleDictionaryWrapper<ulong, ushort>),
+            typeof(FlexibleDictionaryWrapper<ulong, int>),
+            typeof(FlexibleDictionaryWrapper<ulong, uint>),
+            typeof(FlexibleDictionaryWrapper<ulong, long>),
+            typeof(FlexibleDictionaryWrapper<ulong, ulong>),
+            typeof(FlexibleDictionaryWrapper<ulong, char>),
+            typeof(FlexibleDictionaryWrapper<ulong, double>),
+            typeof(FlexibleDictionaryWrapper<ulong, float>),
+
+            typeof(FlexibleDictionaryWrapper<char, object>),
+            typeof(FlexibleDictionaryWrapper<char, bool>),
+            typeof(FlexibleDictionaryWrapper<char, byte>),
+            typeof(FlexibleDictionaryWrapper<char, sbyte>),
+            typeof(FlexibleDictionaryWrapper<char, short>),
+            typeof(FlexibleDictionaryWrapper<char, ushort>),
+            typeof(FlexibleDictionaryWrapper<char, int>),
+            typeof(FlexibleDictionaryWrapper<char, uint>),
+            typeof(FlexibleDictionaryWrapper<char, long>),
+            typeof(FlexibleDictionaryWrapper<char, ulong>),
+            typeof(FlexibleDictionaryWrapper<char, char>),
+            typeof(FlexibleDictionaryWrapper<char, double>),
+            typeof(FlexibleDictionaryWrapper<char, float>),
+
+            typeof(FlexibleDictionaryWrapper<double, object>),
+            typeof(FlexibleDictionaryWrapper<double, bool>),
+            typeof(FlexibleDictionaryWrapper<double, byte>),
+            typeof(FlexibleDictionaryWrapper<double, sbyte>),
+            typeof(FlexibleDictionaryWrapper<double, short>),
+            typeof(FlexibleDictionaryWrapper<double, ushort>),
+            typeof(FlexibleDictionaryWrapper<double, int>),
+            typeof(FlexibleDictionaryWrapper<double, uint>),
+            typeof(FlexibleDictionaryWrapper<double, long>),
+            typeof(FlexibleDictionaryWrapper<double, ulong>),
+            typeof(FlexibleDictionaryWrapper<double, char>),
+            typeof(FlexibleDictionaryWrapper<double, double>),
+            typeof(FlexibleDictionaryWrapper<double, float>),
+
+            typeof(FlexibleDictionaryWrapper<float, object>),
+            typeof(FlexibleDictionaryWrapper<float, bool>),
+            typeof(FlexibleDictionaryWrapper<float, byte>),
+            typeof(FlexibleDictionaryWrapper<float, sbyte>),
+            typeof(FlexibleDictionaryWrapper<float, short>),
+            typeof(FlexibleDictionaryWrapper<float, ushort>),
+            typeof(FlexibleDictionaryWrapper<float, int>),
+            typeof(FlexibleDictionaryWrapper<float, uint>),
+            typeof(FlexibleDictionaryWrapper<float, long>),
+            typeof(FlexibleDictionaryWrapper<float, ulong>),
+            typeof(FlexibleDictionaryWrapper<float, char>),
+            typeof(FlexibleDictionaryWrapper<float, double>),
+            typeof(FlexibleDictionaryWrapper<float, float>),
+
+            typeof(FlexibleDictionaryWrapper<object, DateTime>),
+            typeof(FlexibleDictionaryWrapper<DateTime, object>)
+        };
+    }
+}
diff --git a/Parse/Internal/Analytics/ParseAnalyticsPlugins.cs b/Parse/Internal/Analytics/ParseAnalyticsPlugins.cs
deleted file mode 100644
index a700efb7..00000000
--- a/Parse/Internal/Analytics/ParseAnalyticsPlugins.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using Parse.Core.Internal;
-
-namespace Parse.Analytics.Internal
-{
-    public class ParseAnalyticsPlugins : IParseAnalyticsPlugins
-    {
-        private static readonly object instanceMutex = new object();
-        private static IParseAnalyticsPlugins instance;
-        public static IParseAnalyticsPlugins Instance
-        {
-            get
-            {
-                lock (instanceMutex)
-                {
-                    instance = instance ?? new ParseAnalyticsPlugins();
-                    return instance;
-                }
-            }
-            set
-            {
-                lock (instanceMutex)
-                {
-                    instance = value;
-                }
-            }
-        }
-
-        private readonly object mutex = new object();
-
-        private IParseCorePlugins corePlugins;
-        private IParseAnalyticsController analyticsController;
-
-        public void Reset()
-        {
-            lock (mutex)
-            {
-                CorePlugins = null;
-                AnalyticsController = null;
-            }
-        }
-
-        public IParseCorePlugins CorePlugins
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    corePlugins = corePlugins ?? ParseCorePlugins.Instance;
-                    return corePlugins;
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    corePlugins = value;
-                }
-            }
-        }
-
-        public IParseAnalyticsController AnalyticsController
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    analyticsController = analyticsController ?? new ParseAnalyticsController(CorePlugins.CommandRunner);
-                    return analyticsController;
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    analyticsController = value;
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Parse/Internal/Cloud/Controller/ParseCloudCodeController.cs b/Parse/Internal/Cloud/Controller/ParseCloudCodeController.cs
deleted file mode 100644
index 5248750e..00000000
--- a/Parse/Internal/Cloud/Controller/ParseCloudCodeController.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Parse.Utilities;
-using Parse.Common.Internal;
-
-namespace Parse.Core.Internal
-{
-    public class ParseCloudCodeController : IParseCloudCodeController
-    {
-        private readonly IParseCommandRunner commandRunner;
-
-        public ParseCloudCodeController(IParseCommandRunner commandRunner)
-        {
-            this.commandRunner = commandRunner;
-        }
-
-        public Task<T> CallFunctionAsync<T>(string name,
-            IDictionary<string, object> parameters,
-            string sessionToken,
-            CancellationToken cancellationToken)
-        {
-            var command = new ParseCommand(string.Format("functions/{0}", Uri.EscapeUriString(name)),
-                method: "POST",
-                sessionToken: sessionToken,
-                data: NoObjectsEncoder.Instance.Encode(parameters) as IDictionary<string, object>);
-
-            return commandRunner.RunCommandAsync(command, cancellationToken: cancellationToken).OnSuccess(t =>
-            {
-                var decoded = ParseDecoder.Instance.Decode(t.Result.Item2) as IDictionary<string, object>;
-                if (!decoded.ContainsKey("result"))
-                {
-                    return default(T);
-                }
-                return Conversion.To<T>(decoded["result"]);
-            });
-        }
-    }
-}
diff --git a/Parse/Internal/Command/ParseCommand.cs b/Parse/Internal/Command/ParseCommand.cs
deleted file mode 100644
index d63eb448..00000000
--- a/Parse/Internal/Command/ParseCommand.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using Parse.Common.Internal;
-using System.Linq;
-
-namespace Parse.Core.Internal
-{
-    /// <summary>
-    /// ParseCommand is an <see cref="HttpRequest"/> with pre-populated
-    /// headers.
-    /// </summary>
-    public class ParseCommand : HttpRequest
-    {
-        public IDictionary<string, object> DataObject { get; private set; }
-        public override Stream Data
-        {
-            get
-            {
-                if (base.Data != null)
-                {
-                    return base.Data;
-                }
-
-                return base.Data = (DataObject != null
-                  ? new MemoryStream(Encoding.UTF8.GetBytes(Json.Encode(DataObject)))
-                  : null);
-            }
-            set { base.Data = value; }
-        }
-
-        public ParseCommand(string relativeUri,
-            string method,
-            string sessionToken = null,
-            IList<KeyValuePair<string, string>> headers = null,
-            IDictionary<string, object> data = null) : this(relativeUri: relativeUri,
-                method: method,
-                sessionToken: sessionToken,
-                headers: headers,
-                stream: null,
-                contentType: data != null ? "application/json" : null)
-        {
-            DataObject = data;
-        }
-
-        public ParseCommand(string relativeUri,
-            string method,
-            string sessionToken = null,
-            IList<KeyValuePair<string, string>> headers = null,
-            Stream stream = null,
-            string contentType = null)
-        {
-            Uri = new Uri(new Uri(ParseClient.CurrentConfiguration.ServerURI), relativeUri);
-            Method = method;
-            Data = stream;
-            Headers = new List<KeyValuePair<string, string>>(headers ?? Enumerable.Empty<KeyValuePair<string, string>>());
-
-            if (!string.IsNullOrEmpty(sessionToken))
-            {
-                Headers.Add(new KeyValuePair<string, string>("X-Parse-Session-Token", sessionToken));
-            }
-            if (!string.IsNullOrEmpty(contentType))
-            {
-                Headers.Add(new KeyValuePair<string, string>("Content-Type", contentType));
-            }
-        }
-
-        public ParseCommand(ParseCommand other)
-        {
-            this.Uri = other.Uri;
-            this.Method = other.Method;
-            this.DataObject = other.DataObject;
-            this.Headers = new List<KeyValuePair<string, string>>(other.Headers);
-            this.Data = other.Data;
-        }
-    }
-}
diff --git a/Parse/Internal/Command/ParseCommandRunner.cs b/Parse/Internal/Command/ParseCommandRunner.cs
deleted file mode 100644
index ed307b65..00000000
--- a/Parse/Internal/Command/ParseCommandRunner.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-using Parse.Common.Internal;
-
-namespace Parse.Core.Internal
-{
-    /// <summary>
-    /// The command runner for all SDK operations that need to interact with the targeted deployment of Parse Server.
-    /// </summary>
-    public class ParseCommandRunner : IParseCommandRunner
-    {
-        private readonly IHttpClient httpClient;
-        private readonly IInstallationIdController installationIdController;
-
-        /// <summary>
-        /// Creates a new Parse SDK command runner.
-        /// </summary>
-        /// <param name="httpClient">The <see cref="IHttpClient"/> implementation instance to use.</param>
-        /// <param name="installationIdController">The <see cref="IInstallationIdController"/> implementation instance to use.</param>
-        public ParseCommandRunner(IHttpClient httpClient, IInstallationIdController installationIdController)
-        {
-            this.httpClient = httpClient;
-            this.installationIdController = installationIdController;
-        }
-
-        /// <summary>
-        /// Runs a specified <see cref="ParseCommand"/>.
-        /// </summary>
-        /// <param name="command">The <see cref="ParseCommand"/> to run.</param>
-        /// <param name="uploadProgress">An <see cref="IProgress{ParseUploadProgressEventArgs}"/> instance to push upload progress data to.</param>
-        /// <param name="downloadProgress">An <see cref="IProgress{ParseDownloadProgressEventArgs}"/> instance to push download progress data to.</param>
-        /// <param name="cancellationToken">An asynchronous operation cancellation token that dictates if and when the operation should be cancelled.</param>
-        /// <returns></returns>
-        public Task<Tuple<HttpStatusCode, IDictionary<string, object>>> RunCommandAsync(ParseCommand command, IProgress<ParseUploadProgressEventArgs> uploadProgress = null, IProgress<ParseDownloadProgressEventArgs> downloadProgress = null, CancellationToken cancellationToken = default)
-        {
-            return PrepareCommand(command).ContinueWith(commandTask =>
-            {
-                return httpClient.ExecuteAsync(commandTask.Result, uploadProgress, downloadProgress, cancellationToken).OnSuccess(t =>
-                {
-                    cancellationToken.ThrowIfCancellationRequested();
-
-                    Tuple<HttpStatusCode, string> response = t.Result;
-                    string contentString = response.Item2;
-                    int responseCode = (int) response.Item1;
-                    if (responseCode >= 500)
-                    {
-                        // Server error, return InternalServerError.
-                        throw new ParseException(ParseException.ErrorCode.InternalServerError, response.Item2);
-                    }
-                    else if (contentString != null)
-                    {
-                        IDictionary<string, object> contentJson = null;
-                        try
-                        {
-                            // TODO: Newer versions of Parse Server send the failure results back as HTML.
-                            contentJson = contentString.StartsWith("[")
-                                ? new Dictionary<string, object> { ["results"] = Json.Parse(contentString) }
-                                : Json.Parse(contentString) as IDictionary<string, object>;
-                        }
-                        catch (Exception e)
-                        {
-                            throw new ParseException(ParseException.ErrorCode.OtherCause, "Invalid or alternatively-formatted response recieved from server.", e);
-                        }
-                        if (responseCode < 200 || responseCode > 299)
-                        {
-                            int code = (int) (contentJson.ContainsKey("code") ? (long) contentJson["code"] : (int) ParseException.ErrorCode.OtherCause);
-                            string error = contentJson.ContainsKey("error") ?
-                                contentJson["error"] as string :
-                                contentString;
-                            throw new ParseException((ParseException.ErrorCode) code, error);
-                        }
-                        return new Tuple<HttpStatusCode, IDictionary<string, object>>(response.Item1, contentJson);
-                    }
-                    return new Tuple<HttpStatusCode, IDictionary<string, object>>(response.Item1, null);
-                });
-            }).Unwrap();
-        }
-
-        private const string revocableSessionTokentrueValue = "1";
-        private Task<ParseCommand> PrepareCommand(ParseCommand command)
-        {
-            ParseCommand newCommand = new ParseCommand(command);
-
-            Task<ParseCommand> installationIdTask = installationIdController.GetAsync().ContinueWith(t =>
-            {
-                newCommand.Headers.Add(new KeyValuePair<string, string>("X-Parse-Installation-Id", t.Result.ToString()));
-                return newCommand;
-            });
-
-            // TODO (richardross): Inject configuration instead of using shared static here.
-            ParseClient.Configuration configuration = ParseClient.CurrentConfiguration;
-            newCommand.Headers.Add(new KeyValuePair<string, string>("X-Parse-Application-Id", configuration.ApplicationID));
-            newCommand.Headers.Add(new KeyValuePair<string, string>("X-Parse-Client-Version", ParseClient.VersionString));
-
-            if (configuration.AuxiliaryHeaders != null)
-            {
-                foreach (KeyValuePair<string, string> header in configuration.AuxiliaryHeaders)
-                {
-                    newCommand.Headers.Add(header);
-                }
-            }
-
-            if (!String.IsNullOrEmpty(configuration.VersionInfo.BuildVersion))
-            {
-                newCommand.Headers.Add(new KeyValuePair<string, string>("X-Parse-App-Build-Version", configuration.VersionInfo.BuildVersion));
-            }
-            if (!String.IsNullOrEmpty(configuration.VersionInfo.DisplayVersion))
-            {
-                newCommand.Headers.Add(new KeyValuePair<string, string>("X-Parse-App-Display-Version", configuration.VersionInfo.DisplayVersion));
-            }
-            if (!String.IsNullOrEmpty(configuration.VersionInfo.OSVersion))
-            {
-                newCommand.Headers.Add(new KeyValuePair<string, string>("X-Parse-OS-Version", configuration.VersionInfo.OSVersion));
-            }
-
-            // TODO (richardross): I hate the idea of having this super tightly coupled static variable in here.
-            // Lets eventually get rid of it.
-            if (!String.IsNullOrEmpty(ParseClient.MasterKey))
-            {
-                newCommand.Headers.Add(new KeyValuePair<string, string>("X-Parse-Master-Key", ParseClient.MasterKey));
-            }
-            else
-            {
-                newCommand.Headers.Add(new KeyValuePair<string, string>("X-Parse-Windows-Key", configuration.Key));
-            }
-
-            // TODO (richardross): Inject this instead of using static here.
-            if (ParseUser.IsRevocableSessionEnabled)
-            {
-                newCommand.Headers.Add(new KeyValuePair<string, string>("X-Parse-Revocable-Session", revocableSessionTokentrueValue));
-            }
-
-            return installationIdTask;
-        }
-    }
-}
diff --git a/Parse/Internal/Config/Controller/ParseConfigController.cs b/Parse/Internal/Config/Controller/ParseConfigController.cs
deleted file mode 100644
index 44018fed..00000000
--- a/Parse/Internal/Config/Controller/ParseConfigController.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Threading.Tasks;
-using System.Threading;
-using Parse.Common.Internal;
-
-namespace Parse.Core.Internal
-{
-    /// <summary>
-    /// Config controller.
-    /// </summary>
-    internal class ParseConfigController : IParseConfigController
-    {
-        private readonly IParseCommandRunner commandRunner;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ParseConfigController"/> class.
-        /// </summary>
-        public ParseConfigController(IParseCommandRunner commandRunner, IStorageController storageController)
-        {
-            this.commandRunner = commandRunner;
-            CurrentConfigController = new ParseCurrentConfigController(storageController);
-        }
-
-        public IParseCommandRunner CommandRunner { get; internal set; }
-        public IParseCurrentConfigController CurrentConfigController { get; internal set; }
-
-        public Task<ParseConfig> FetchConfigAsync(string sessionToken, CancellationToken cancellationToken)
-        {
-            var command = new ParseCommand("config",
-                method: "GET",
-                sessionToken: sessionToken,
-                data: null);
-
-            return commandRunner.RunCommandAsync(command, cancellationToken: cancellationToken).OnSuccess(task =>
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                return new ParseConfig(task.Result.Item2);
-            }).OnSuccess(task =>
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                CurrentConfigController.SetCurrentConfigAsync(task.Result);
-                return task;
-            }).Unwrap();
-        }
-    }
-}
diff --git a/Parse/Internal/Config/Controller/ParseCurrentConfigController.cs b/Parse/Internal/Config/Controller/ParseCurrentConfigController.cs
deleted file mode 100644
index c0d432ed..00000000
--- a/Parse/Internal/Config/Controller/ParseCurrentConfigController.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Threading.Tasks;
-using System.Threading;
-using System.Collections.Generic;
-using Parse.Common.Internal;
-
-namespace Parse.Core.Internal
-{
-    /// <summary>
-    /// Parse current config controller.
-    /// </summary>
-    internal class ParseCurrentConfigController : IParseCurrentConfigController
-    {
-        private const string CurrentConfigKey = "CurrentConfig";
-
-        private readonly TaskQueue taskQueue;
-        private ParseConfig currentConfig;
-
-        private IStorageController storageController;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Parse.Core.Internal.ParseCurrentConfigController"/> class.
-        /// </summary>
-        public ParseCurrentConfigController(IStorageController storageController)
-        {
-            this.storageController = storageController;
-
-            taskQueue = new TaskQueue();
-        }
-
-        public Task<ParseConfig> GetCurrentConfigAsync()
-        {
-            return taskQueue.Enqueue(toAwait => toAwait.ContinueWith(_ =>
-            {
-                if (currentConfig == null)
-                {
-                    return storageController.LoadAsync().OnSuccess(t =>
-                    {
-                        object tmp;
-                        t.Result.TryGetValue(CurrentConfigKey, out tmp);
-
-                        string propertiesString = tmp as string;
-                        if (propertiesString != null)
-                        {
-                            var dictionary = ParseClient.DeserializeJsonString(propertiesString);
-                            currentConfig = new ParseConfig(dictionary);
-                        }
-                        else
-                        {
-                            currentConfig = new ParseConfig();
-                        }
-
-                        return currentConfig;
-                    });
-                }
-
-                return Task.FromResult(currentConfig);
-            }), CancellationToken.None).Unwrap();
-        }
-
-        public Task SetCurrentConfigAsync(ParseConfig config)
-        {
-            return taskQueue.Enqueue(toAwait => toAwait.ContinueWith(_ =>
-            {
-                currentConfig = config;
-
-                var jsonObject = ((IJsonConvertible) config).ToJSON();
-                var jsonString = ParseClient.SerializeJsonString(jsonObject);
-
-                return storageController.LoadAsync().OnSuccess(t => t.Result.AddAsync(CurrentConfigKey, jsonString));
-            }).Unwrap().Unwrap(), CancellationToken.None);
-        }
-
-        public Task ClearCurrentConfigAsync()
-        {
-            return taskQueue.Enqueue(toAwait => toAwait.ContinueWith(_ =>
-            {
-                currentConfig = null;
-
-                return storageController.LoadAsync().OnSuccess(t => t.Result.RemoveAsync(CurrentConfigKey));
-            }).Unwrap().Unwrap(), CancellationToken.None);
-        }
-
-        public Task ClearCurrentConfigInMemoryAsync()
-        {
-            return taskQueue.Enqueue(toAwait => toAwait.ContinueWith(_ =>
-            {
-                currentConfig = null;
-            }), CancellationToken.None);
-        }
-    }
-}
diff --git a/Parse/Internal/Encoding/NoObjectsEncoder.cs b/Parse/Internal/Encoding/NoObjectsEncoder.cs
deleted file mode 100644
index 92d1662e..00000000
--- a/Parse/Internal/Encoding/NoObjectsEncoder.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-
-namespace Parse.Core.Internal
-{
-    /// <summary>
-    /// A <see cref="ParseEncoder"/> that throws an exception if it attempts to encode
-    /// a <see cref="ParseObject"/>
-    /// </summary>
-    public class NoObjectsEncoder : ParseEncoder
-    {
-        // This class isn't really a Singleton, but since it has no state, it's more efficient to get
-        // the default instance.
-        private static readonly NoObjectsEncoder instance = new NoObjectsEncoder();
-        public static NoObjectsEncoder Instance
-        {
-            get
-            {
-                return instance;
-            }
-        }
-
-        protected override IDictionary<string, object> EncodeParseObject(ParseObject value)
-        {
-            throw new ArgumentException("ParseObjects not allowed here.");
-        }
-    }
-}
diff --git a/Parse/Internal/Encoding/ParseDecoder.cs b/Parse/Internal/Encoding/ParseDecoder.cs
deleted file mode 100644
index 9128e15a..00000000
--- a/Parse/Internal/Encoding/ParseDecoder.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.Globalization;
-using Parse.Utilities;
-
-namespace Parse.Core.Internal
-{
-    public class ParseDecoder
-    {
-        // This class isn't really a Singleton, but since it has no state, it's more efficient to get the default instance.
-        public static ParseDecoder Instance { get; } = new ParseDecoder();
-
-        // Prevent default constructor.
-        private ParseDecoder() { }
-
-        public object Decode(object data)
-        {
-            if (data == null)
-            {
-                return null;
-            }
-
-            var dict = data as IDictionary<string, object>;
-            if (dict != null)
-            {
-                if (dict.ContainsKey("__op"))
-                {
-                    return ParseFieldOperations.Decode(dict);
-                }
-
-                object type;
-                dict.TryGetValue("__type", out type);
-                var typeString = type as string;
-
-                if (typeString == null)
-                {
-                    var newDict = new Dictionary<string, object>();
-                    foreach (var pair in dict)
-                    {
-                        newDict[pair.Key] = Decode(pair.Value);
-                    }
-                    return newDict;
-                }
-
-                if (typeString == "Date")
-                {
-                    return ParseDate(dict["iso"] as string);
-                }
-
-                if (typeString == "Bytes")
-                {
-                    return Convert.FromBase64String(dict["base64"] as string);
-                }
-
-                if (typeString == "Pointer")
-                {
-                    return DecodePointer(dict["className"] as string, dict["objectId"] as string);
-                }
-
-                if (typeString == "File")
-                {
-                    return new ParseFile(dict["name"] as string, new Uri(dict["url"] as string));
-                }
-
-                if (typeString == "GeoPoint")
-                {
-                    return new ParseGeoPoint(Conversion.To<double>(dict["latitude"]),
-                        Conversion.To<double>(dict["longitude"]));
-                }
-
-                if (typeString == "Object")
-                {
-                    var state = ParseObjectCoder.Instance.Decode(dict, this);
-                    return ParseObject.FromState<ParseObject>(state, dict["className"] as string);
-                }
-
-                if (typeString == "Relation")
-                {
-                    return ParseRelationBase.CreateRelation(null, null, dict["className"] as string);
-                }
-
-                var converted = new Dictionary<string, object>();
-                foreach (var pair in dict)
-                {
-                    converted[pair.Key] = Decode(pair.Value);
-                }
-                return converted;
-            }
-
-            var list = data as IList<object>;
-            if (list != null)
-            {
-                return (from item in list
-                        select Decode(item)).ToList();
-            }
-
-            return data;
-        }
-
-        protected virtual object DecodePointer(string className, string objectId)
-        {
-            return ParseObject.CreateWithoutData(className, objectId);
-        }
-
-        public static DateTime ParseDate(string input)
-        {
-            // TODO(hallucinogen): Figure out if we should be more flexible with the date formats
-            // we accept.
-            return System.DateTime.ParseExact(input, ParseClient.DateFormatStrings, CultureInfo.InvariantCulture, DateTimeStyles.None);
-        }
-    }
-}
diff --git a/Parse/Internal/Encoding/ParseEncoder.cs b/Parse/Internal/Encoding/ParseEncoder.cs
deleted file mode 100644
index e414de20..00000000
--- a/Parse/Internal/Encoding/ParseEncoder.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using Parse.Utilities;
-using Parse.Common.Internal;
-
-namespace Parse.Core.Internal
-{
-    /// <summary>
-    /// A <c>ParseEncoder</c> can be used to transform objects such as <see cref="ParseObject"/> into JSON
-    /// data structures.
-    /// </summary>
-    /// <seealso cref="ParseDecoder"/>
-    public abstract class ParseEncoder
-    {
-#if UNITY
-    private static readonly bool isCompiledByIL2CPP = AppDomain.CurrentDomain.FriendlyName.Equals("IL2CPP Root Domain");
-#else
-        private static readonly bool isCompiledByIL2CPP = false;
-#endif
-
-        public static bool IsValidType(object value)
-        {
-            return value == null ||
-                ReflectionHelpers.IsPrimitive(value.GetType()) ||
-                value is string ||
-                value is ParseObject ||
-                value is ParseACL ||
-                value is ParseFile ||
-                value is ParseGeoPoint ||
-                value is ParseRelationBase ||
-                value is DateTime ||
-                value is byte[] ||
-                Conversion.As<IDictionary<string, object>>(value) != null ||
-                Conversion.As<IList<object>>(value) != null;
-        }
-
-        public object Encode(object value)
-        {
-            // If this object has a special encoding, encode it and return the
-            // encoded object. Otherwise, just return the original object.
-            if (value is DateTime)
-            {
-                return new Dictionary<string, object> {
-          {"iso", ((DateTime)value).ToString(ParseClient.DateFormatStrings.First(), CultureInfo.InvariantCulture)},
-          {"__type", "Date"}
-        };
-            }
-
-            var bytes = value as byte[];
-            if (bytes != null)
-            {
-                return new Dictionary<string, object> {
-          {"__type", "Bytes"},
-          {"base64", Convert.ToBase64String(bytes)}
-        };
-            }
-
-            var obj = value as ParseObject;
-            if (obj != null)
-            {
-                return EncodeParseObject(obj);
-            }
-
-            var jsonConvertible = value as IJsonConvertible;
-            if (jsonConvertible != null)
-            {
-                return jsonConvertible.ToJSON();
-            }
-
-            var dict = Conversion.As<IDictionary<string, object>>(value);
-            if (dict != null)
-            {
-                var json = new Dictionary<string, object>();
-                foreach (var pair in dict)
-                {
-                    json[pair.Key] = Encode(pair.Value);
-                }
-                return json;
-            }
-
-            var list = Conversion.As<IList<object>>(value);
-            if (list != null)
-            {
-                return EncodeList(list);
-            }
-
-            // TODO (hallucinogen): convert IParseFieldOperation to IJsonConvertible
-            var operation = value as IParseFieldOperation;
-            if (operation != null)
-            {
-                return operation.Encode();
-            }
-
-            return value;
-        }
-
-        protected abstract IDictionary<string, object> EncodeParseObject(ParseObject value);
-
-        private object EncodeList(IList<object> list)
-        {
-            var newArray = new List<object>();
-            // We need to explicitly cast `list` to `List<object>` rather than
-            // `IList<object>` because IL2CPP is stricter than the usual Unity AOT compiler pipeline.
-            if (isCompiledByIL2CPP && list.GetType().IsArray)
-            {
-                list = new List<object>(list);
-            }
-            foreach (var item in list)
-            {
-                if (!IsValidType(item))
-                {
-                    throw new ArgumentException("Invalid type for value in an array");
-                }
-                newArray.Add(Encode(item));
-            }
-            return newArray;
-        }
-    }
-}
diff --git a/Parse/Internal/Encoding/PointerOrLocalIdEncoder.cs b/Parse/Internal/Encoding/PointerOrLocalIdEncoder.cs
deleted file mode 100644
index d6386203..00000000
--- a/Parse/Internal/Encoding/PointerOrLocalIdEncoder.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-
-namespace Parse.Core.Internal
-{
-    /// <summary>
-    /// A <see cref="ParseEncoder"/> that encode <see cref="ParseObject"/> as pointers. If the object
-    /// does not have an <see cref="ParseObject.ObjectId"/>, uses a local id.
-    /// </summary>
-    public class PointerOrLocalIdEncoder : ParseEncoder
-    {
-        // This class isn't really a Singleton, but since it has no state, it's more efficient to get
-        // the default instance.
-        private static readonly PointerOrLocalIdEncoder instance = new PointerOrLocalIdEncoder();
-        public static PointerOrLocalIdEncoder Instance
-        {
-            get
-            {
-                return instance;
-            }
-        }
-
-        protected override IDictionary<string, object> EncodeParseObject(ParseObject value)
-        {
-            if (value.ObjectId == null)
-            {
-                // TODO (hallucinogen): handle local id. For now we throw.
-                throw new ArgumentException("Cannot create a pointer to an object without an objectId");
-            }
-
-            return new Dictionary<string, object> {
-        {"__type", "Pointer"},
-        {"className", value.ClassName},
-        {"objectId", value.ObjectId}
-      };
-        }
-    }
-}
diff --git a/Parse/Internal/File/Controller/ParseFileController.cs b/Parse/Internal/File/Controller/ParseFileController.cs
deleted file mode 100644
index 48bebd7e..00000000
--- a/Parse/Internal/File/Controller/ParseFileController.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using Parse.Common.Internal;
-
-namespace Parse.Core.Internal
-{
-    public class ParseFileController : IParseFileController
-    {
-        private readonly IParseCommandRunner commandRunner;
-
-        public ParseFileController(IParseCommandRunner commandRunner)
-        {
-            this.commandRunner = commandRunner;
-        }
-
-        public Task<FileState> SaveAsync(FileState state,
-            Stream dataStream,
-            string sessionToken,
-            IProgress<ParseUploadProgressEventArgs> progress,
-            CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (state.Url != null)
-            {
-                // !isDirty
-                return Task<FileState>.FromResult(state);
-            }
-
-            if (cancellationToken.IsCancellationRequested)
-            {
-                var tcs = new TaskCompletionSource<FileState>();
-                tcs.TrySetCanceled();
-                return tcs.Task;
-            }
-
-            var oldPosition = dataStream.Position;
-            var command = new ParseCommand("files/" + state.Name,
-                method: "POST",
-                sessionToken: sessionToken,
-                contentType: state.MimeType,
-                stream: dataStream);
-
-            return commandRunner.RunCommandAsync(command,
-                uploadProgress: progress,
-                cancellationToken: cancellationToken).OnSuccess(uploadTask =>
-                {
-                    var result = uploadTask.Result;
-                    var jsonData = result.Item2;
-                    cancellationToken.ThrowIfCancellationRequested();
-
-                    return new FileState
-                    {
-                        Name = jsonData["name"] as string,
-                        Url = new Uri(jsonData["url"] as string, UriKind.Absolute),
-                        MimeType = state.MimeType
-                    };
-                }).ContinueWith(t =>
-                {
-                    // Rewind the stream on failure or cancellation (if possible)
-                    if ((t.IsFaulted || t.IsCanceled) && dataStream.CanSeek)
-                    {
-                        dataStream.Seek(oldPosition, SeekOrigin.Begin);
-                    }
-                    return t;
-                }).Unwrap();
-        }
-    }
-}
diff --git a/Parse/Internal/File/State/FileState.cs b/Parse/Internal/File/State/FileState.cs
deleted file mode 100644
index 3c0403df..00000000
--- a/Parse/Internal/File/State/FileState.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-
-namespace Parse.Core.Internal
-{
-    public class FileState
-    {
-        private const string ParseFileSecureScheme = "https";
-        private const string ParseFileSecureDomain = "files.parsetfss.com";
-
-        public string Name { get; set; }
-        public string MimeType { get; set; }
-        public Uri Url { get; set; }
-        public Uri SecureUrl
-        {
-            get
-            {
-                Uri uri = Url;
-                if (uri != null && uri.Host == ParseFileSecureDomain)
-                {
-                    return new UriBuilder(uri)
-                    {
-                        Scheme = ParseFileSecureScheme,
-                        Port = -1, // This makes URIBuilder assign the default port for the URL scheme.
-                    }.Uri;
-                }
-                return uri;
-            }
-        }
-    }
-}
diff --git a/Parse/Internal/IParseCorePlugins.cs b/Parse/Internal/IParseCorePlugins.cs
deleted file mode 100644
index 73d8dc76..00000000
--- a/Parse/Internal/IParseCorePlugins.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using Parse.Common.Internal;
-using System;
-
-namespace Parse.Core.Internal
-{
-    public interface IParseCorePlugins
-    {
-        void Reset();
-
-        IHttpClient HttpClient { get; }
-        IParseCommandRunner CommandRunner { get; }
-        IStorageController StorageController { get; }
-
-        IParseCloudCodeController CloudCodeController { get; }
-        IParseConfigController ConfigController { get; }
-        IParseFileController FileController { get; }
-        IParseObjectController ObjectController { get; }
-        IParseQueryController QueryController { get; }
-        IParseSessionController SessionController { get; }
-        IParseUserController UserController { get; }
-        IObjectSubclassingController SubclassingController { get; }
-        IParseCurrentUserController CurrentUserController { get; }
-        IInstallationIdController InstallationIdController { get; }
-    }
-}
\ No newline at end of file
diff --git a/Parse/Internal/InstallationId/Controller/InstallationIdController.cs b/Parse/Internal/InstallationId/Controller/InstallationIdController.cs
deleted file mode 100644
index 8e033c0d..00000000
--- a/Parse/Internal/InstallationId/Controller/InstallationIdController.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using Parse.Common.Internal;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Parse.Core.Internal
-{
-    public class InstallationIdController : IInstallationIdController
-    {
-        private const string InstallationIdKey = "InstallationId";
-        private readonly object mutex = new object();
-        private Guid? installationId;
-
-        private readonly IStorageController storageController;
-        public InstallationIdController(IStorageController storageController)
-        {
-            this.storageController = storageController;
-        }
-
-        public Task SetAsync(Guid? installationId)
-        {
-            lock (mutex)
-            {
-                Task saveTask;
-
-                if (installationId == null)
-                {
-                    saveTask = storageController
-                      .LoadAsync()
-                      .OnSuccess(storage => storage.Result.RemoveAsync(InstallationIdKey))
-                      .Unwrap();
-                }
-                else
-                {
-                    saveTask = storageController
-                      .LoadAsync()
-                      .OnSuccess(storage => storage.Result.AddAsync(InstallationIdKey, installationId.ToString()))
-                      .Unwrap();
-                }
-                this.installationId = installationId;
-                return saveTask;
-            }
-        }
-
-        public Task<Guid?> GetAsync()
-        {
-            lock (mutex)
-            {
-                if (installationId != null)
-                {
-                    return Task.FromResult(installationId);
-                }
-            }
-
-            return storageController
-              .LoadAsync()
-              .OnSuccess<IStorageDictionary<string, object>, Task<Guid?>>(s =>
-              {
-                  object id;
-                  s.Result.TryGetValue(InstallationIdKey, out id);
-                  try
-                  {
-                      lock (mutex)
-                      {
-                          installationId = new Guid((string) id);
-                          return Task.FromResult(installationId);
-                      }
-                  }
-                  catch (Exception)
-                  {
-                      var newInstallationId = Guid.NewGuid();
-                      return SetAsync(newInstallationId).OnSuccess<Guid?>(_ => newInstallationId);
-                  }
-              })
-              .Unwrap();
-        }
-
-        public Task ClearAsync()
-        {
-            return SetAsync(null);
-        }
-    }
-}
diff --git a/Parse/Internal/Modules/IParseModule.cs b/Parse/Internal/Modules/IParseModule.cs
deleted file mode 100644
index 00be08d5..00000000
--- a/Parse/Internal/Modules/IParseModule.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-
-namespace Parse.Common.Internal
-{
-    public interface IParseModule
-    {
-        void OnModuleRegistered();
-        void OnParseInitialized();
-    }
-}
\ No newline at end of file
diff --git a/Parse/Internal/Modules/ParseModuleAttribute.cs b/Parse/Internal/Modules/ParseModuleAttribute.cs
deleted file mode 100644
index 0a9c93d6..00000000
--- a/Parse/Internal/Modules/ParseModuleAttribute.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-
-namespace Parse.Common.Internal
-{
-    [AttributeUsage(AttributeTargets.Assembly)]
-    public class ParseModuleAttribute : Attribute
-    {
-        /// <summary>
-        /// Instantiates a new ParseModuleAttribute.
-        /// </summary>
-        /// <param name="ModuleType">The type to which this module is applied.</param>
-        public ParseModuleAttribute(Type ModuleType)
-        {
-            this.ModuleType = ModuleType;
-        }
-
-        public Type ModuleType { get; private set; }
-    }
-}
\ No newline at end of file
diff --git a/Parse/Internal/Modules/ParseModuleController.cs b/Parse/Internal/Modules/ParseModuleController.cs
deleted file mode 100644
index 841c7403..00000000
--- a/Parse/Internal/Modules/ParseModuleController.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using AssemblyLister;
-
-namespace Parse.Common.Internal
-{
-    /// <summary>
-    /// The class which controls the loading of other ParseModules
-    /// </summary>
-    public class ParseModuleController
-    {
-        private static readonly ParseModuleController instance = new ParseModuleController();
-        public static ParseModuleController Instance
-        {
-            get { return instance; }
-        }
-
-        private readonly object mutex = new object();
-        private readonly List<IParseModule> modules = new List<IParseModule>();
-
-        private bool isParseInitialized = false;
-
-        public void RegisterModule(IParseModule module)
-        {
-            if (module == null)
-            {
-                return;
-            }
-
-            lock (mutex)
-            {
-                modules.Add(module);
-                module.OnModuleRegistered();
-
-                if (isParseInitialized)
-                {
-                    module.OnParseInitialized();
-                }
-            }
-        }
-
-        public void ScanForModules()
-        {
-            var moduleTypes = Lister.AllAssemblies
-              .SelectMany(asm => asm.GetCustomAttributes<ParseModuleAttribute>())
-              .Select(attr => attr.ModuleType)
-              .Where(type => type != null && type.GetTypeInfo().ImplementedInterfaces.Contains(typeof(IParseModule)));
-
-            lock (mutex)
-            {
-                foreach (Type moduleType in moduleTypes)
-                {
-                    try
-                    {
-                        ConstructorInfo constructor = moduleType.FindConstructor();
-                        if (constructor != null)
-                        {
-                            var module = constructor.Invoke(new object[] { }) as IParseModule;
-                            RegisterModule(module);
-                        }
-                    }
-                    catch (Exception)
-                    {
-                        // Ignore, either constructor threw or was private.
-                    }
-                }
-            }
-        }
-
-        public void Reset()
-        {
-            lock (mutex)
-            {
-                modules.Clear();
-                isParseInitialized = false;
-            }
-        }
-
-        public void ParseDidInitialize()
-        {
-            lock (mutex)
-            {
-                foreach (IParseModule module in modules)
-                {
-                    module.OnParseInitialized();
-                }
-                isParseInitialized = true;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Parse/Internal/Object/Controller/ParseObjectController.cs b/Parse/Internal/Object/Controller/ParseObjectController.cs
deleted file mode 100644
index 40356da3..00000000
--- a/Parse/Internal/Object/Controller/ParseObjectController.cs
+++ /dev/null
@@ -1,231 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Parse.Utilities;
-using Parse.Common.Internal;
-
-namespace Parse.Core.Internal
-{
-    public class ParseObjectController : IParseObjectController
-    {
-        private readonly IParseCommandRunner commandRunner;
-
-        public ParseObjectController(IParseCommandRunner commandRunner)
-        {
-            this.commandRunner = commandRunner;
-        }
-
-        public Task<IObjectState> FetchAsync(IObjectState state,
-            string sessionToken,
-            CancellationToken cancellationToken)
-        {
-            var command = new ParseCommand(string.Format("classes/{0}/{1}",
-                    Uri.EscapeDataString(state.ClassName),
-                    Uri.EscapeDataString(state.ObjectId)),
-                method: "GET",
-                sessionToken: sessionToken,
-                data: null);
-
-            return commandRunner.RunCommandAsync(command, cancellationToken: cancellationToken).OnSuccess(t =>
-            {
-                return ParseObjectCoder.Instance.Decode(t.Result.Item2, ParseDecoder.Instance);
-            });
-        }
-
-        public Task<IObjectState> SaveAsync(IObjectState state,
-            IDictionary<string, IParseFieldOperation> operations,
-            string sessionToken,
-            CancellationToken cancellationToken)
-        {
-            var objectJSON = ParseObject.ToJSONObjectForSaving(operations);
-
-            var command = new ParseCommand((state.ObjectId == null ?
-                    string.Format("classes/{0}", Uri.EscapeDataString(state.ClassName)) :
-                    string.Format("classes/{0}/{1}", Uri.EscapeDataString(state.ClassName), state.ObjectId)),
-                method: (state.ObjectId == null ? "POST" : "PUT"),
-                sessionToken: sessionToken,
-                data: objectJSON);
-
-            return commandRunner.RunCommandAsync(command, cancellationToken: cancellationToken).OnSuccess(t =>
-            {
-                var serverState = ParseObjectCoder.Instance.Decode(t.Result.Item2, ParseDecoder.Instance);
-                serverState = serverState.MutatedClone(mutableClone =>
-                {
-                    mutableClone.IsNew = t.Result.Item1 == System.Net.HttpStatusCode.Created;
-                });
-                return serverState;
-            });
-        }
-
-        public IList<Task<IObjectState>> SaveAllAsync(IList<IObjectState> states,
-            IList<IDictionary<string, IParseFieldOperation>> operationsList,
-            string sessionToken,
-            CancellationToken cancellationToken)
-        {
-
-            var requests = states
-              .Zip(operationsList, (item, ops) => new ParseCommand(
-                item.ObjectId == null
-                  ? string.Format("classes/{0}", Uri.EscapeDataString(item.ClassName))
-                  : string.Format("classes/{0}/{1}", Uri.EscapeDataString(item.ClassName), Uri.EscapeDataString(item.ObjectId)),
-                method: item.ObjectId == null ? "POST" : "PUT",
-                data: ParseObject.ToJSONObjectForSaving(ops)))
-              .ToList();
-
-            var batchTasks = ExecuteBatchRequests(requests, sessionToken, cancellationToken);
-            var stateTasks = new List<Task<IObjectState>>();
-            foreach (var task in batchTasks)
-            {
-                stateTasks.Add(task.OnSuccess(t =>
-                {
-                    return ParseObjectCoder.Instance.Decode(t.Result, ParseDecoder.Instance);
-                }));
-            }
-
-            return stateTasks;
-        }
-
-        public Task DeleteAsync(IObjectState state,
-            string sessionToken,
-            CancellationToken cancellationToken)
-        {
-            var command = new ParseCommand(string.Format("classes/{0}/{1}",
-                    state.ClassName, state.ObjectId),
-                method: "DELETE",
-                sessionToken: sessionToken,
-                data: null);
-
-            return commandRunner.RunCommandAsync(command, cancellationToken: cancellationToken);
-        }
-
-        public IList<Task> DeleteAllAsync(IList<IObjectState> states,
-            string sessionToken,
-            CancellationToken cancellationToken)
-        {
-            var requests = states
-              .Where(item => item.ObjectId != null)
-              .Select(item => new ParseCommand(
-                string.Format("classes/{0}/{1}", Uri.EscapeDataString(item.ClassName), Uri.EscapeDataString(item.ObjectId)),
-                  method: "DELETE",
-                  data: null))
-              .ToList();
-            return ExecuteBatchRequests(requests, sessionToken, cancellationToken).Cast<Task>().ToList();
-        }
-
-        // TODO (hallucinogen): move this out to a class to be used by Analytics
-        private const int MaximumBatchSize = 50;
-        internal IList<Task<IDictionary<string, object>>> ExecuteBatchRequests(IList<ParseCommand> requests,
-            string sessionToken,
-            CancellationToken cancellationToken)
-        {
-            var tasks = new List<Task<IDictionary<string, object>>>();
-            int batchSize = requests.Count;
-
-            IEnumerable<ParseCommand> remaining = requests;
-            while (batchSize > MaximumBatchSize)
-            {
-                var process = remaining.Take(MaximumBatchSize).ToList();
-                remaining = remaining.Skip(MaximumBatchSize);
-
-                tasks.AddRange(ExecuteBatchRequest(process, sessionToken, cancellationToken));
-
-                batchSize = remaining.Count();
-            }
-            tasks.AddRange(ExecuteBatchRequest(remaining.ToList(), sessionToken, cancellationToken));
-
-            return tasks;
-        }
-
-        private IList<Task<IDictionary<string, object>>> ExecuteBatchRequest(IList<ParseCommand> requests,
-            string sessionToken,
-            CancellationToken cancellationToken)
-        {
-            var tasks = new List<Task<IDictionary<string, object>>>();
-            int batchSize = requests.Count;
-            var tcss = new List<TaskCompletionSource<IDictionary<string, object>>>();
-            for (int i = 0; i < batchSize; ++i)
-            {
-                var tcs = new TaskCompletionSource<IDictionary<string, object>>();
-                tcss.Add(tcs);
-                tasks.Add(tcs.Task);
-            }
-
-            var encodedRequests = requests.Select(r =>
-            {
-                var results = new Dictionary<string, object> {
-          { "method", r.Method },
-          { "path", r.Uri.AbsolutePath },
-        };
-
-                if (r.DataObject != null)
-                {
-                    results["body"] = r.DataObject;
-                }
-                return results;
-            }).Cast<object>().ToList();
-            var command = new ParseCommand("batch",
-              method: "POST",
-              sessionToken: sessionToken,
-              data: new Dictionary<string, object> { { "requests", encodedRequests } });
-
-            commandRunner.RunCommandAsync(command, cancellationToken: cancellationToken).ContinueWith(t =>
-            {
-                if (t.IsFaulted || t.IsCanceled)
-                {
-                    foreach (var tcs in tcss)
-                    {
-                        if (t.IsFaulted)
-                        {
-                            tcs.TrySetException(t.Exception);
-                        }
-                        else if (t.IsCanceled)
-                        {
-                            tcs.TrySetCanceled();
-                        }
-                    }
-                    return;
-                }
-
-                var resultsArray = Conversion.As<IList<object>>(t.Result.Item2["results"]);
-                int resultLength = resultsArray.Count;
-                if (resultLength != batchSize)
-                {
-                    foreach (var tcs in tcss)
-                    {
-                        tcs.TrySetException(new InvalidOperationException(
-                            "Batch command result count expected: " + batchSize + " but was: " + resultLength + "."));
-                    }
-                    return;
-                }
-
-                for (int i = 0; i < batchSize; ++i)
-                {
-                    var result = resultsArray[i] as Dictionary<string, object>;
-                    var tcs = tcss[i];
-
-                    if (result.ContainsKey("success"))
-                    {
-                        tcs.TrySetResult(result["success"] as IDictionary<string, object>);
-                    }
-                    else if (result.ContainsKey("error"))
-                    {
-                        var error = result["error"] as IDictionary<string, object>;
-                        long errorCode = (long) error["code"];
-                        tcs.TrySetException(new ParseException((ParseException.ErrorCode) errorCode, error["error"] as string));
-                    }
-                    else
-                    {
-                        tcs.TrySetException(new InvalidOperationException(
-                            "Invalid batch command response."));
-                    }
-                }
-            });
-
-            return tasks;
-        }
-    }
-}
diff --git a/Parse/Internal/Object/State/MutableObjectState.cs b/Parse/Internal/Object/State/MutableObjectState.cs
deleted file mode 100644
index 4a771803..00000000
--- a/Parse/Internal/Object/State/MutableObjectState.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Linq;
-using System.Collections.Generic;
-
-namespace Parse.Core.Internal
-{
-    public class MutableObjectState : IObjectState
-    {
-        public bool IsNew { get; set; }
-        public string ClassName { get; set; }
-        public string ObjectId { get; set; }
-        public DateTime? UpdatedAt { get; set; }
-        public DateTime? CreatedAt { get; set; }
-
-        // Initialize serverData to avoid further null checking.
-        private IDictionary<string, object> serverData = new Dictionary<string, object>();
-        public IDictionary<string, object> ServerData
-        {
-            get
-            {
-                return serverData;
-            }
-
-            set
-            {
-                serverData = value;
-            }
-        }
-
-        public object this[string key]
-        {
-            get
-            {
-                return ServerData[key];
-            }
-        }
-
-        public bool ContainsKey(string key)
-        {
-            return ServerData.ContainsKey(key);
-        }
-
-        public void Apply(IDictionary<string, IParseFieldOperation> operationSet)
-        {
-            // Apply operationSet
-            foreach (var pair in operationSet)
-            {
-                object oldValue;
-                ServerData.TryGetValue(pair.Key, out oldValue);
-                var newValue = pair.Value.Apply(oldValue, pair.Key);
-                if (newValue != ParseDeleteOperation.DeleteToken)
-                {
-                    ServerData[pair.Key] = newValue;
-                }
-                else
-                {
-                    ServerData.Remove(pair.Key);
-                }
-            }
-        }
-
-        public void Apply(IObjectState other)
-        {
-            IsNew = other.IsNew;
-            if (other.ObjectId != null)
-            {
-                ObjectId = other.ObjectId;
-            }
-            if (other.UpdatedAt != null)
-            {
-                UpdatedAt = other.UpdatedAt;
-            }
-            if (other.CreatedAt != null)
-            {
-                CreatedAt = other.CreatedAt;
-            }
-
-            foreach (var pair in other)
-            {
-                ServerData[pair.Key] = pair.Value;
-            }
-        }
-
-        public IObjectState MutatedClone(Action<MutableObjectState> func)
-        {
-            var clone = MutableClone();
-            func(clone);
-            return clone;
-        }
-
-        protected virtual MutableObjectState MutableClone()
-        {
-            return new MutableObjectState
-            {
-                IsNew = IsNew,
-                ClassName = ClassName,
-                ObjectId = ObjectId,
-                CreatedAt = CreatedAt,
-                UpdatedAt = UpdatedAt,
-                ServerData = this.ToDictionary(t => t.Key, t => t.Value)
-            };
-        }
-
-        IEnumerator<KeyValuePair<string, object>> IEnumerable<KeyValuePair<string, object>>.GetEnumerator()
-        {
-            return ServerData.GetEnumerator();
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return ((IEnumerable<KeyValuePair<string, object>>) this).GetEnumerator();
-        }
-    }
-}
diff --git a/Parse/Internal/Object/Subclassing/IObjectSubclassingController.cs b/Parse/Internal/Object/Subclassing/IObjectSubclassingController.cs
deleted file mode 100644
index ab4932d0..00000000
--- a/Parse/Internal/Object/Subclassing/IObjectSubclassingController.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Parse.Core.Internal
-{
-    public interface IObjectSubclassingController
-    {
-        string GetClassName(Type type);
-        Type GetType(string className);
-
-        bool IsTypeValid(string className, Type type);
-
-        void RegisterSubclass(Type t);
-        void UnregisterSubclass(Type t);
-
-        void AddRegisterHook(Type t, Action action);
-
-        ParseObject Instantiate(string className);
-        IDictionary<string, string> GetPropertyMappings(string className);
-    }
-}
diff --git a/Parse/Internal/Object/Subclassing/ObjectSubclassInfo.cs b/Parse/Internal/Object/Subclassing/ObjectSubclassInfo.cs
deleted file mode 100644
index e117ece7..00000000
--- a/Parse/Internal/Object/Subclassing/ObjectSubclassInfo.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Reflection;
-using Parse.Common.Internal;
-
-namespace Parse.Core.Internal
-{
-    internal class ObjectSubclassInfo
-    {
-        public ObjectSubclassInfo(Type type, ConstructorInfo constructor)
-        {
-            TypeInfo = type.GetTypeInfo();
-            ClassName = GetClassName(TypeInfo);
-            Constructor = constructor;
-            PropertyMappings = ReflectionHelpers.GetProperties(type).Select(prop => Tuple.Create(prop, prop.GetCustomAttribute<ParseFieldNameAttribute>(true))).Where(t => t.Item2 != null).Select(t => Tuple.Create(t.Item1, t.Item2.FieldName)).ToDictionary(t => t.Item1.Name, t => t.Item2);
-        }
-
-        public TypeInfo TypeInfo { get; private set; }
-        public string ClassName { get; private set; }
-        public IDictionary<string, string> PropertyMappings { get; private set; }
-        private ConstructorInfo Constructor { get; set; }
-
-        public ParseObject Instantiate() => (ParseObject) Constructor.Invoke(null);
-
-        internal static string GetClassName(TypeInfo type) => type.GetCustomAttribute<ParseClassNameAttribute>()?.ClassName;
-    }
-}
diff --git a/Parse/Internal/Object/Subclassing/ObjectSubclassingController.cs b/Parse/Internal/Object/Subclassing/ObjectSubclassingController.cs
deleted file mode 100644
index af1047d0..00000000
--- a/Parse/Internal/Object/Subclassing/ObjectSubclassingController.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Threading;
-using Parse.Common.Internal;
-
-namespace Parse.Core.Internal
-{
-    internal class ObjectSubclassingController : IObjectSubclassingController
-    {
-        // Class names starting with _ are documented to be reserved. Use this one
-        // here to allow us to 'inherit' certain properties.
-        private static readonly string parseObjectClassName = "_ParseObject";
-
-        private readonly ReaderWriterLockSlim mutex;
-        private readonly IDictionary<string, ObjectSubclassInfo> registeredSubclasses;
-        private Dictionary<string, Action> registerActions;
-
-        public ObjectSubclassingController()
-        {
-            mutex = new ReaderWriterLockSlim();
-            registeredSubclasses = new Dictionary<string, ObjectSubclassInfo>();
-            registerActions = new Dictionary<string, Action>();
-
-            // Register the ParseObject subclass, so we get access to the ACL,
-            // objectId, and other ParseFieldName properties.
-            RegisterSubclass(typeof(ParseObject));
-        }
-
-        public string GetClassName(Type type) => type == typeof(ParseObject) ? parseObjectClassName : ObjectSubclassInfo.GetClassName(type.GetTypeInfo());
-
-        public Type GetType(string className)
-        {
-            mutex.EnterReadLock();
-            registeredSubclasses.TryGetValue(className, out ObjectSubclassInfo info);
-            mutex.ExitReadLock();
-
-            return info?.TypeInfo.AsType();
-        }
-
-        public bool IsTypeValid(string className, Type type)
-        {
-            mutex.EnterReadLock();
-            registeredSubclasses.TryGetValue(className, out ObjectSubclassInfo subclassInfo);
-            mutex.ExitReadLock();
-
-            return subclassInfo == null ? type == typeof(ParseObject) : subclassInfo.TypeInfo == type.GetTypeInfo();
-        }
-
-        public void RegisterSubclass(Type type)
-        {
-            TypeInfo typeInfo = type.GetTypeInfo();
-            if (!typeof(ParseObject).GetTypeInfo().IsAssignableFrom(typeInfo))
-            {
-                throw new ArgumentException("Cannot register a type that is not a subclass of ParseObject");
-            }
-
-            string className = GetClassName(type);
-
-            try
-            {
-                // Perform this as a single independent transaction, so we can never get into an
-                // intermediate state where we *theoretically* register the wrong class due to a
-                // TOCTTOU bug.
-                mutex.EnterWriteLock();
-
-                ObjectSubclassInfo previousInfo = null;
-                if (registeredSubclasses.TryGetValue(className, out previousInfo))
-                {
-                    if (typeInfo.IsAssignableFrom(previousInfo.TypeInfo))
-                    {
-                        // Previous subclass is more specific or equal to the current type, do nothing.
-                        return;
-                    }
-                    else if (previousInfo.TypeInfo.IsAssignableFrom(typeInfo))
-                    {
-                        // Previous subclass is parent of new child, fallthrough and actually register
-                        // this class.
-                        /* Do nothing */
-                    }
-                    else
-                    {
-                        throw new ArgumentException(
-                          "Tried to register both " + previousInfo.TypeInfo.FullName + " and " + typeInfo.FullName +
-                          " as the ParseObject subclass of " + className + ". Cannot determine the right class " +
-                          "to use because neither inherits from the other."
-                        );
-                    }
-                }
-
-                ConstructorInfo constructor = type.FindConstructor();
-                if (constructor == null)
-                {
-                    throw new ArgumentException("Cannot register a type that does not implement the default constructor!");
-                }
-
-                registeredSubclasses[className] = new ObjectSubclassInfo(type, constructor);
-            }
-            finally
-            {
-                mutex.ExitWriteLock();
-            }
-
-            Action toPerform;
-
-            mutex.EnterReadLock();
-            registerActions.TryGetValue(className, out toPerform);
-            mutex.ExitReadLock();
-
-            toPerform?.Invoke();
-        }
-
-        public void UnregisterSubclass(Type type)
-        {
-            mutex.EnterWriteLock();
-            registeredSubclasses.Remove(GetClassName(type));
-            mutex.ExitWriteLock();
-        }
-
-        public void AddRegisterHook(Type t, Action action)
-        {
-            mutex.EnterWriteLock();
-            registerActions.Add(GetClassName(t), action);
-            mutex.ExitWriteLock();
-        }
-
-        public ParseObject Instantiate(string className)
-        {
-            ObjectSubclassInfo info = null;
-
-            mutex.EnterReadLock();
-            registeredSubclasses.TryGetValue(className, out info);
-            mutex.ExitReadLock();
-
-            return info != null
-              ? info.Instantiate()
-              : new ParseObject(className);
-        }
-
-        public IDictionary<string, string> GetPropertyMappings(string className)
-        {
-            ObjectSubclassInfo info = null;
-            mutex.EnterReadLock();
-            registeredSubclasses.TryGetValue(className, out info);
-            if (info == null)
-            {
-                registeredSubclasses.TryGetValue(parseObjectClassName, out info);
-            }
-            mutex.ExitReadLock();
-
-            return info.PropertyMappings;
-        }
-
-    }
-}
diff --git a/Parse/Internal/Operation/ParseAddOperation.cs b/Parse/Internal/Operation/ParseAddOperation.cs
deleted file mode 100644
index efa2ae63..00000000
--- a/Parse/Internal/Operation/ParseAddOperation.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using Parse.Utilities;
-
-namespace Parse.Core.Internal
-{
-    public class ParseAddOperation : IParseFieldOperation
-    {
-        private ReadOnlyCollection<object> objects;
-        public ParseAddOperation(IEnumerable<object> objects)
-        {
-            this.objects = new ReadOnlyCollection<object>(objects.ToList());
-        }
-
-        public object Encode()
-        {
-            return new Dictionary<string, object> {
-        {"__op", "Add"},
-        {"objects", PointerOrLocalIdEncoder.Instance.Encode(objects)}
-      };
-        }
-
-        public IParseFieldOperation MergeWithPrevious(IParseFieldOperation previous)
-        {
-            if (previous == null)
-            {
-                return this;
-            }
-            if (previous is ParseDeleteOperation)
-            {
-                return new ParseSetOperation(objects.ToList());
-            }
-            if (previous is ParseSetOperation)
-            {
-                var setOp = (ParseSetOperation) previous;
-                var oldList = Conversion.To<IList<object>>(setOp.Value);
-                return new ParseSetOperation(oldList.Concat(objects).ToList());
-            }
-            if (previous is ParseAddOperation)
-            {
-                return new ParseAddOperation(((ParseAddOperation) previous).Objects.Concat(objects));
-            }
-            throw new InvalidOperationException("Operation is invalid after previous operation.");
-        }
-
-        public object Apply(object oldValue, string key)
-        {
-            if (oldValue == null)
-            {
-                return objects.ToList();
-            }
-            var oldList = Conversion.To<IList<object>>(oldValue);
-            return oldList.Concat(objects).ToList();
-        }
-
-        public IEnumerable<object> Objects
-        {
-            get
-            {
-                return objects;
-            }
-        }
-    }
-}
diff --git a/Parse/Internal/Operation/ParseAddUniqueOperation.cs b/Parse/Internal/Operation/ParseAddUniqueOperation.cs
deleted file mode 100644
index 2e269945..00000000
--- a/Parse/Internal/Operation/ParseAddUniqueOperation.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using Parse.Utilities;
-
-namespace Parse.Core.Internal
-{
-    public class ParseAddUniqueOperation : IParseFieldOperation
-    {
-        private ReadOnlyCollection<object> objects;
-        public ParseAddUniqueOperation(IEnumerable<object> objects)
-        {
-            this.objects = new ReadOnlyCollection<object>(objects.Distinct().ToList());
-        }
-
-        public object Encode()
-        {
-            return new Dictionary<string, object> {
-        {"__op", "AddUnique"},
-        {"objects", PointerOrLocalIdEncoder.Instance.Encode(objects)}
-      };
-        }
-
-        public IParseFieldOperation MergeWithPrevious(IParseFieldOperation previous)
-        {
-            if (previous == null)
-            {
-                return this;
-            }
-            if (previous is ParseDeleteOperation)
-            {
-                return new ParseSetOperation(objects.ToList());
-            }
-            if (previous is ParseSetOperation)
-            {
-                var setOp = (ParseSetOperation) previous;
-                var oldList = Conversion.To<IList<object>>(setOp.Value);
-                var result = this.Apply(oldList, null);
-                return new ParseSetOperation(result);
-            }
-            if (previous is ParseAddUniqueOperation)
-            {
-                var oldList = ((ParseAddUniqueOperation) previous).Objects;
-                return new ParseAddUniqueOperation((IList<object>) this.Apply(oldList, null));
-            }
-            throw new InvalidOperationException("Operation is invalid after previous operation.");
-        }
-
-        public object Apply(object oldValue, string key)
-        {
-            if (oldValue == null)
-            {
-                return objects.ToList();
-            }
-            var newList = Conversion.To<IList<object>>(oldValue).ToList();
-            var comparer = ParseFieldOperations.ParseObjectComparer;
-            foreach (var objToAdd in objects)
-            {
-                if (objToAdd is ParseObject)
-                {
-                    var matchedObj = newList.FirstOrDefault(listObj => comparer.Equals(objToAdd, listObj));
-                    if (matchedObj == null)
-                    {
-                        newList.Add(objToAdd);
-                    }
-                    else
-                    {
-                        var index = newList.IndexOf(matchedObj);
-                        newList[index] = objToAdd;
-                    }
-                }
-                else if (!newList.Contains<object>(objToAdd, comparer))
-                {
-                    newList.Add(objToAdd);
-                }
-            }
-            return newList;
-        }
-
-        public IEnumerable<object> Objects
-        {
-            get
-            {
-                return objects;
-            }
-        }
-    }
-}
diff --git a/Parse/Internal/Operation/ParseDeleteOperation.cs b/Parse/Internal/Operation/ParseDeleteOperation.cs
deleted file mode 100644
index f3d9fa15..00000000
--- a/Parse/Internal/Operation/ParseDeleteOperation.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System.Collections.Generic;
-
-namespace Parse.Core.Internal
-{
-    /// <summary>
-    /// An operation where a field is deleted from the object.
-    /// </summary>
-    public class ParseDeleteOperation : IParseFieldOperation
-    {
-        internal static readonly object DeleteToken = new object();
-        private static ParseDeleteOperation _Instance = new ParseDeleteOperation();
-        public static ParseDeleteOperation Instance
-        {
-            get
-            {
-                return _Instance;
-            }
-        }
-
-        private ParseDeleteOperation() { }
-        public object Encode()
-        {
-            return new Dictionary<string, object> {
-        {"__op", "Delete"}
-      };
-        }
-
-        public IParseFieldOperation MergeWithPrevious(IParseFieldOperation previous)
-        {
-            return this;
-        }
-
-        public object Apply(object oldValue, string key)
-        {
-            return DeleteToken;
-        }
-    }
-}
diff --git a/Parse/Internal/Operation/ParseIncrementOperation.cs b/Parse/Internal/Operation/ParseIncrementOperation.cs
deleted file mode 100644
index 68e59228..00000000
--- a/Parse/Internal/Operation/ParseIncrementOperation.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Parse.Core.Internal
-{
-    public class ParseIncrementOperation : IParseFieldOperation
-    {
-        private static readonly IDictionary<Tuple<Type, Type>, Func<object, object, object>> adders;
-
-        static ParseIncrementOperation()
-        {
-            // Defines adders for all of the implicit conversions: http://msdn.microsoft.com/en-US/library/y5b434w4(v=vs.80).aspx
-            adders = new Dictionary<Tuple<Type, Type>, Func<object, object, object>> {
-        {new Tuple<Type, Type>(typeof(sbyte), typeof(sbyte)), (left, right) => (sbyte)left + (sbyte)right},
-        {new Tuple<Type, Type>(typeof(sbyte), typeof(short)), (left, right) => (sbyte)left + (short)right},
-        {new Tuple<Type, Type>(typeof(sbyte), typeof(int)), (left, right) => (sbyte)left + (int)right},
-        {new Tuple<Type, Type>(typeof(sbyte), typeof(long)), (left, right) => (sbyte)left + (long)right},
-        {new Tuple<Type, Type>(typeof(sbyte), typeof(float)), (left, right) => (sbyte)left + (float)right},
-        {new Tuple<Type, Type>(typeof(sbyte), typeof(double)), (left, right) => (sbyte)left + (double)right},
-        {new Tuple<Type, Type>(typeof(sbyte), typeof(decimal)), (left, right) => (sbyte)left + (decimal)right},
-        {new Tuple<Type, Type>(typeof(byte), typeof(byte)), (left, right) => (byte)left + (byte)right},
-        {new Tuple<Type, Type>(typeof(byte), typeof(short)), (left, right) => (byte)left + (short)right},
-        {new Tuple<Type, Type>(typeof(byte), typeof(ushort)), (left, right) => (byte)left + (ushort)right},
-        {new Tuple<Type, Type>(typeof(byte), typeof(int)), (left, right) => (byte)left + (int)right},
-        {new Tuple<Type, Type>(typeof(byte), typeof(uint)), (left, right) => (byte)left + (uint)right},
-        {new Tuple<Type, Type>(typeof(byte), typeof(long)), (left, right) => (byte)left + (long)right},
-        {new Tuple<Type, Type>(typeof(byte), typeof(ulong)), (left, right) => (byte)left + (ulong)right},
-        {new Tuple<Type, Type>(typeof(byte), typeof(float)), (left, right) => (byte)left + (float)right},
-        {new Tuple<Type, Type>(typeof(byte), typeof(double)), (left, right) => (byte)left + (double)right},
-        {new Tuple<Type, Type>(typeof(byte), typeof(decimal)), (left, right) => (byte)left + (decimal)right},
-        {new Tuple<Type, Type>(typeof(short), typeof(short)), (left, right) => (short)left + (short)right},
-        {new Tuple<Type, Type>(typeof(short), typeof(int)), (left, right) => (short)left + (int)right},
-        {new Tuple<Type, Type>(typeof(short), typeof(long)), (left, right) => (short)left + (long)right},
-        {new Tuple<Type, Type>(typeof(short), typeof(float)), (left, right) => (short)left + (float)right},
-        {new Tuple<Type, Type>(typeof(short), typeof(double)), (left, right) => (short)left + (double)right},
-        {new Tuple<Type, Type>(typeof(short), typeof(decimal)), (left, right) => (short)left + (decimal)right},
-        {new Tuple<Type, Type>(typeof(ushort), typeof(ushort)), (left, right) => (ushort)left + (ushort)right},
-        {new Tuple<Type, Type>(typeof(ushort), typeof(int)), (left, right) => (ushort)left + (int)right},
-        {new Tuple<Type, Type>(typeof(ushort), typeof(uint)), (left, right) => (ushort)left + (uint)right},
-        {new Tuple<Type, Type>(typeof(ushort), typeof(long)), (left, right) => (ushort)left + (long)right},
-        {new Tuple<Type, Type>(typeof(ushort), typeof(ulong)), (left, right) => (ushort)left + (ulong)right},
-        {new Tuple<Type, Type>(typeof(ushort), typeof(float)), (left, right) => (ushort)left + (float)right},
-        {new Tuple<Type, Type>(typeof(ushort), typeof(double)), (left, right) => (ushort)left + (double)right},
-        {new Tuple<Type, Type>(typeof(ushort), typeof(decimal)), (left, right) => (ushort)left + (decimal)right},
-        {new Tuple<Type, Type>(typeof(int), typeof(int)), (left, right) => (int)left + (int)right},
-        {new Tuple<Type, Type>(typeof(int), typeof(long)), (left, right) => (int)left + (long)right},
-        {new Tuple<Type, Type>(typeof(int), typeof(float)), (left, right) => (int)left + (float)right},
-        {new Tuple<Type, Type>(typeof(int), typeof(double)), (left, right) => (int)left + (double)right},
-        {new Tuple<Type, Type>(typeof(int), typeof(decimal)), (left, right) => (int)left + (decimal)right},
-        {new Tuple<Type, Type>(typeof(uint), typeof(uint)), (left, right) => (uint)left + (uint)right},
-        {new Tuple<Type, Type>(typeof(uint), typeof(long)), (left, right) => (uint)left + (long)right},
-        {new Tuple<Type, Type>(typeof(uint), typeof(ulong)), (left, right) => (uint)left + (ulong)right},
-        {new Tuple<Type, Type>(typeof(uint), typeof(float)), (left, right) => (uint)left + (float)right},
-        {new Tuple<Type, Type>(typeof(uint), typeof(double)), (left, right) => (uint)left + (double)right},
-        {new Tuple<Type, Type>(typeof(uint), typeof(decimal)), (left, right) => (uint)left + (decimal)right},
-        {new Tuple<Type, Type>(typeof(long), typeof(long)), (left, right) => (long)left + (long)right},
-        {new Tuple<Type, Type>(typeof(long), typeof(float)), (left, right) => (long)left + (float)right},
-        {new Tuple<Type, Type>(typeof(long), typeof(double)), (left, right) => (long)left + (double)right},
-        {new Tuple<Type, Type>(typeof(long), typeof(decimal)), (left, right) => (long)left + (decimal)right},
-        {new Tuple<Type, Type>(typeof(char), typeof(char)), (left, right) => (char)left + (char)right},
-        {new Tuple<Type, Type>(typeof(char), typeof(ushort)), (left, right) => (char)left + (ushort)right},
-        {new Tuple<Type, Type>(typeof(char), typeof(int)), (left, right) => (char)left + (int)right},
-        {new Tuple<Type, Type>(typeof(char), typeof(uint)), (left, right) => (char)left + (uint)right},
-        {new Tuple<Type, Type>(typeof(char), typeof(long)), (left, right) => (char)left + (long)right},
-        {new Tuple<Type, Type>(typeof(char), typeof(ulong)), (left, right) => (char)left + (ulong)right},
-        {new Tuple<Type, Type>(typeof(char), typeof(float)), (left, right) => (char)left + (float)right},
-        {new Tuple<Type, Type>(typeof(char), typeof(double)), (left, right) => (char)left + (double)right},
-        {new Tuple<Type, Type>(typeof(char), typeof(decimal)), (left, right) => (char)left + (decimal)right},
-        {new Tuple<Type, Type>(typeof(float), typeof(float)), (left, right) => (float)left + (float)right},
-        {new Tuple<Type, Type>(typeof(float), typeof(double)), (left, right) => (float)left + (double)right},
-        {new Tuple<Type, Type>(typeof(ulong), typeof(ulong)), (left, right) => (ulong)left + (ulong)right},
-        {new Tuple<Type, Type>(typeof(ulong), typeof(float)), (left, right) => (ulong)left + (float)right},
-        {new Tuple<Type, Type>(typeof(ulong), typeof(double)), (left, right) => (ulong)left + (double)right},
-        {new Tuple<Type, Type>(typeof(ulong), typeof(decimal)), (left, right) => (ulong)left + (decimal)right},
-        {new Tuple<Type, Type>(typeof(double), typeof(double)), (left, right) => (double)left + (double)right},
-        {new Tuple<Type, Type>(typeof(decimal), typeof(decimal)), (left, right) => (decimal)left + (decimal)right}
-      };
-            // Generate the adders in the other direction
-            foreach (var pair in adders.Keys.ToList())
-            {
-                if (pair.Item1.Equals(pair.Item2))
-                {
-                    continue;
-                }
-                var reversePair = new Tuple<Type, Type>(pair.Item2, pair.Item1);
-                var func = adders[pair];
-                adders[reversePair] = (left, right) => func(right, left);
-            }
-        }
-
-        private object amount;
-
-        public ParseIncrementOperation(object amount)
-        {
-            this.amount = amount;
-        }
-
-        public object Encode()
-        {
-            return new Dictionary<string, object> {
-        {"__op", "Increment"},
-        {"amount", amount}
-      };
-        }
-
-        private static object Add(object obj1, object obj2)
-        {
-            Func<object, object, object> adder;
-            if (adders.TryGetValue(new Tuple<Type, Type>(obj1.GetType(), obj2.GetType()), out adder))
-            {
-                return adder(obj1, obj2);
-            }
-            throw new InvalidCastException("Cannot add " + obj1.GetType() + " to " + obj2.GetType());
-        }
-
-        public IParseFieldOperation MergeWithPrevious(IParseFieldOperation previous)
-        {
-            if (previous == null)
-            {
-                return this;
-            }
-            if (previous is ParseDeleteOperation)
-            {
-                return new ParseSetOperation(amount);
-            }
-            if (previous is ParseSetOperation)
-            {
-                var otherAmount = ((ParseSetOperation) previous).Value;
-                if (otherAmount is string)
-                {
-                    throw new InvalidOperationException("Cannot increment a non-number type.");
-                }
-                var myAmount = amount;
-                return new ParseSetOperation(Add(otherAmount, myAmount));
-            }
-            if (previous is ParseIncrementOperation)
-            {
-                object otherAmount = ((ParseIncrementOperation) previous).Amount;
-                object myAmount = amount;
-                return new ParseIncrementOperation(Add(otherAmount, myAmount));
-            }
-            throw new InvalidOperationException("Operation is invalid after previous operation.");
-        }
-
-        public object Apply(object oldValue, string key)
-        {
-            if (oldValue is string)
-            {
-                throw new InvalidOperationException("Cannot increment a non-number type.");
-            }
-            object otherAmount = oldValue ?? 0;
-            object myAmount = amount;
-            return Add(otherAmount, myAmount);
-        }
-
-        public object Amount
-        {
-            get
-            {
-                return amount;
-            }
-        }
-    }
-}
diff --git a/Parse/Internal/Operation/ParseRelationOperation.cs b/Parse/Internal/Operation/ParseRelationOperation.cs
deleted file mode 100644
index 4c5a16b6..00000000
--- a/Parse/Internal/Operation/ParseRelationOperation.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Parse.Core.Internal
-{
-    public class ParseRelationOperation : IParseFieldOperation
-    {
-        private readonly IList<string> adds;
-        private readonly IList<string> removes;
-        private readonly string targetClassName;
-
-        private ParseRelationOperation(IEnumerable<string> adds,
-            IEnumerable<string> removes,
-            string targetClassName)
-        {
-            this.targetClassName = targetClassName;
-            this.adds = new ReadOnlyCollection<string>(adds.ToList());
-            this.removes = new ReadOnlyCollection<string>(removes.ToList());
-        }
-
-        public ParseRelationOperation(IEnumerable<ParseObject> adds,
-            IEnumerable<ParseObject> removes)
-        {
-            adds = adds ?? new ParseObject[0];
-            removes = removes ?? new ParseObject[0];
-            this.targetClassName = adds.Concat(removes).Select(o => o.ClassName).FirstOrDefault();
-            this.adds = new ReadOnlyCollection<string>(IdsFromObjects(adds).ToList());
-            this.removes = new ReadOnlyCollection<string>(IdsFromObjects(removes).ToList());
-        }
-
-        public object Encode()
-        {
-            var adds = this.adds
-                .Select(id => PointerOrLocalIdEncoder.Instance.Encode(
-                    ParseObject.CreateWithoutData(targetClassName, id)))
-                .ToList();
-            var removes = this.removes
-                .Select(id => PointerOrLocalIdEncoder.Instance.Encode(
-                    ParseObject.CreateWithoutData(targetClassName, id)))
-                .ToList();
-            var addDict = adds.Count == 0 ? null : new Dictionary<string, object> {
-        {"__op", "AddRelation"},
-        {"objects", adds}
-      };
-            var removeDict = removes.Count == 0 ? null : new Dictionary<string, object> {
-        {"__op", "RemoveRelation"},
-        {"objects", removes}
-      };
-
-            if (addDict != null && removeDict != null)
-            {
-                return new Dictionary<string, object> {
-          {"__op", "Batch"},
-          {"ops", new[] {addDict, removeDict}}
-        };
-            }
-            return addDict ?? removeDict;
-        }
-
-        public IParseFieldOperation MergeWithPrevious(IParseFieldOperation previous)
-        {
-            if (previous == null)
-            {
-                return this;
-            }
-            if (previous is ParseDeleteOperation)
-            {
-                throw new InvalidOperationException("You can't modify a relation after deleting it.");
-            }
-            var other = previous as ParseRelationOperation;
-            if (other != null)
-            {
-                if (other.TargetClassName != TargetClassName)
-                {
-                    throw new InvalidOperationException(
-                        string.Format("Related object must be of class {0}, but {1} was passed in.",
-                            other.TargetClassName,
-                            TargetClassName));
-                }
-                var newAdd = adds.Union(other.adds.Except(removes)).ToList();
-                var newRemove = removes.Union(other.removes.Except(adds)).ToList();
-                return new ParseRelationOperation(newAdd, newRemove, TargetClassName);
-            }
-            throw new InvalidOperationException("Operation is invalid after previous operation.");
-        }
-
-        public object Apply(object oldValue, string key)
-        {
-            if (adds.Count == 0 && removes.Count == 0)
-            {
-                return null;
-            }
-            if (oldValue == null)
-            {
-                return ParseRelationBase.CreateRelation(null, key, targetClassName);
-            }
-            if (oldValue is ParseRelationBase)
-            {
-                var oldRelation = (ParseRelationBase) oldValue;
-                var oldClassName = oldRelation.TargetClassName;
-                if (oldClassName != null && oldClassName != targetClassName)
-                {
-                    throw new InvalidOperationException("Related object must be a " + oldClassName
-                        + ", but a " + targetClassName + " was passed in.");
-                }
-                oldRelation.TargetClassName = targetClassName;
-                return oldRelation;
-            }
-            throw new InvalidOperationException("Operation is invalid after previous operation.");
-        }
-
-        public string TargetClassName { get { return targetClassName; } }
-
-        private IEnumerable<string> IdsFromObjects(IEnumerable<ParseObject> objects)
-        {
-            foreach (var obj in objects)
-            {
-                if (obj.ObjectId == null)
-                {
-                    throw new ArgumentException(
-                      "You can't add an unsaved ParseObject to a relation.");
-                }
-                if (obj.ClassName != targetClassName)
-                {
-                    throw new ArgumentException(string.Format(
-                        "Tried to create a ParseRelation with 2 different types: {0} and {1}",
-                            targetClassName,
-                            obj.ClassName));
-                }
-            }
-            return objects.Select(o => o.ObjectId).Distinct();
-        }
-    }
-}
diff --git a/Parse/Internal/Operation/ParseRemoveOperation.cs b/Parse/Internal/Operation/ParseRemoveOperation.cs
deleted file mode 100644
index fdead1c6..00000000
--- a/Parse/Internal/Operation/ParseRemoveOperation.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-
-using Parse.Utilities;
-
-namespace Parse.Core.Internal
-{
-    public class ParseRemoveOperation : IParseFieldOperation
-    {
-        private ReadOnlyCollection<object> objects;
-        public ParseRemoveOperation(IEnumerable<object> objects)
-        {
-            this.objects = new ReadOnlyCollection<object>(objects.Distinct().ToList());
-        }
-
-        public object Encode()
-        {
-            return new Dictionary<string, object> {
-        {"__op", "Remove"},
-        {"objects", PointerOrLocalIdEncoder.Instance.Encode(objects)}
-      };
-        }
-
-        public IParseFieldOperation MergeWithPrevious(IParseFieldOperation previous)
-        {
-            if (previous == null)
-            {
-                return this;
-            }
-            if (previous is ParseDeleteOperation)
-            {
-                return previous;
-            }
-            if (previous is ParseSetOperation)
-            {
-                var setOp = (ParseSetOperation) previous;
-                var oldList = Conversion.As<IList<object>>(setOp.Value);
-                return new ParseSetOperation(this.Apply(oldList, null));
-            }
-            if (previous is ParseRemoveOperation)
-            {
-                var oldOp = (ParseRemoveOperation) previous;
-                return new ParseRemoveOperation(oldOp.Objects.Concat(objects));
-            }
-            throw new InvalidOperationException("Operation is invalid after previous operation.");
-        }
-
-        public object Apply(object oldValue, string key)
-        {
-            if (oldValue == null)
-            {
-                return new List<object>();
-            }
-            var oldList = Conversion.As<IList<object>>(oldValue);
-            return oldList.Except(objects, ParseFieldOperations.ParseObjectComparer).ToList();
-        }
-
-        public IEnumerable<object> Objects
-        {
-            get
-            {
-                return objects;
-            }
-        }
-    }
-}
diff --git a/Parse/Internal/ParseCorePlugins.cs b/Parse/Internal/ParseCorePlugins.cs
deleted file mode 100644
index 49980780..00000000
--- a/Parse/Internal/ParseCorePlugins.cs
+++ /dev/null
@@ -1,323 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Parse.Common.Internal;
-using Parse.Core.Internal;
-
-#if DEBUG
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Parse.Test")]
-#endif
-
-namespace Parse.Core.Internal
-{
-    public class ParseCorePlugins : IParseCorePlugins
-    {
-        private static readonly object instanceMutex = new object();
-        private static IParseCorePlugins instance;
-        public static IParseCorePlugins Instance
-        {
-            get
-            {
-                lock (instanceMutex)
-                {
-                    return instance = instance ?? new ParseCorePlugins();
-                }
-            }
-            set
-            {
-                lock (instanceMutex)
-                {
-                    instance = value;
-                }
-            }
-        }
-
-        private readonly object mutex = new object();
-
-        #region Server Controllers
-
-        private IHttpClient httpClient;
-        private IParseCommandRunner commandRunner;
-        private IStorageController storageController;
-
-        private IParseCloudCodeController cloudCodeController;
-        private IParseConfigController configController;
-        private IParseFileController fileController;
-        private IParseObjectController objectController;
-        private IParseQueryController queryController;
-        private IParseSessionController sessionController;
-        private IParseUserController userController;
-        private IObjectSubclassingController subclassingController;
-
-        #endregion
-
-        #region Current Instance Controller
-
-        private IParseCurrentUserController currentUserController;
-        private IInstallationIdController installationIdController;
-
-        #endregion
-
-        public void Reset()
-        {
-            lock (mutex)
-            {
-                HttpClient = null;
-                CommandRunner = null;
-                StorageController = null;
-
-                CloudCodeController = null;
-                FileController = null;
-                ObjectController = null;
-                SessionController = null;
-                UserController = null;
-                SubclassingController = null;
-
-                CurrentUserController = null;
-                InstallationIdController = null;
-            }
-        }
-
-        public IHttpClient HttpClient
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    return httpClient = httpClient ?? new HttpClient();
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    httpClient = value;
-                }
-            }
-        }
-
-        public IParseCommandRunner CommandRunner
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    return commandRunner = commandRunner ?? new ParseCommandRunner(HttpClient, InstallationIdController);
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    commandRunner = value;
-                }
-            }
-        }
-
-        public IStorageController StorageController
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    return storageController = storageController ?? new StorageController();
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    storageController = value;
-                }
-            }
-        }
-
-        public IParseCloudCodeController CloudCodeController
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    return cloudCodeController = cloudCodeController ?? new ParseCloudCodeController(CommandRunner);
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    cloudCodeController = value;
-                }
-            }
-        }
-
-        public IParseFileController FileController
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    return fileController = fileController ?? new ParseFileController(CommandRunner);
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    fileController = value;
-                }
-            }
-        }
-
-        public IParseConfigController ConfigController
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    return configController ?? (configController = new ParseConfigController(CommandRunner, StorageController));
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    configController = value;
-                }
-            }
-        }
-
-        public IParseObjectController ObjectController
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    return objectController = objectController ?? new ParseObjectController(CommandRunner);
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    objectController = value;
-                }
-            }
-        }
-
-        public IParseQueryController QueryController
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    return queryController ?? (queryController = new ParseQueryController(CommandRunner));
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    queryController = value;
-                }
-            }
-        }
-
-        public IParseSessionController SessionController
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    return sessionController = sessionController ?? new ParseSessionController(CommandRunner);
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    sessionController = value;
-                }
-            }
-        }
-
-        public IParseUserController UserController
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    return (userController = userController ?? new ParseUserController(CommandRunner));
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    userController = value;
-                }
-            }
-        }
-
-        public IParseCurrentUserController CurrentUserController
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    return currentUserController = currentUserController ?? new ParseCurrentUserController(StorageController);
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    currentUserController = value;
-                }
-            }
-        }
-
-        public IObjectSubclassingController SubclassingController
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    if (subclassingController == null)
-                    {
-                        subclassingController = new ObjectSubclassingController();
-                        subclassingController.AddRegisterHook(typeof(ParseUser), () => CurrentUserController.ClearFromMemory());
-                    }
-                    return subclassingController;
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    subclassingController = value;
-                }
-            }
-        }
-
-        public IInstallationIdController InstallationIdController
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    return installationIdController = installationIdController ?? new InstallationIdController(StorageController);
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    installationIdController = value;
-                }
-            }
-        }
-    }
-}
diff --git a/Parse/Internal/Push/Controller/ParsePushChannelsController.cs b/Parse/Internal/Push/Controller/ParsePushChannelsController.cs
deleted file mode 100644
index c002d254..00000000
--- a/Parse/Internal/Push/Controller/ParsePushChannelsController.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Threading.Tasks;
-using System.Collections.Generic;
-using System.Threading;
-
-namespace Parse.Push.Internal
-{
-    internal class ParsePushChannelsController : IParsePushChannelsController
-    {
-        public Task SubscribeAsync(IEnumerable<string> channels, CancellationToken cancellationToken)
-        {
-            ParseInstallation installation = ParseInstallation.CurrentInstallation;
-            installation.AddRangeUniqueToList("channels", channels);
-            return installation.SaveAsync(cancellationToken);
-        }
-
-        public Task UnsubscribeAsync(IEnumerable<string> channels, CancellationToken cancellationToken)
-        {
-            ParseInstallation installation = ParseInstallation.CurrentInstallation;
-            installation.RemoveAllFromList("channels", channels);
-            return installation.SaveAsync(cancellationToken);
-        }
-    }
-}
diff --git a/Parse/Internal/Push/Controller/ParsePushController.cs b/Parse/Internal/Push/Controller/ParsePushController.cs
deleted file mode 100644
index 6d8da23a..00000000
--- a/Parse/Internal/Push/Controller/ParsePushController.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Threading.Tasks;
-using System.Threading;
-using System.Collections.Generic;
-using Parse.Common.Internal;
-using Parse.Core.Internal;
-
-namespace Parse.Push.Internal
-{
-    internal class ParsePushController : IParsePushController
-    {
-        private readonly IParseCommandRunner commandRunner;
-        private readonly IParseCurrentUserController currentUserController;
-
-        public ParsePushController(IParseCommandRunner commandRunner, IParseCurrentUserController currentUserController)
-        {
-            this.commandRunner = commandRunner;
-            this.currentUserController = currentUserController;
-        }
-
-        public Task SendPushNotificationAsync(IPushState state, CancellationToken cancellationToken)
-        {
-            return currentUserController.GetCurrentSessionTokenAsync(cancellationToken).OnSuccess(sessionTokenTask =>
-            {
-                var command = new ParseCommand("push",
-                    method: "POST",
-                    sessionToken: sessionTokenTask.Result,
-                    data: ParsePushEncoder.Instance.Encode(state));
-
-                return commandRunner.RunCommandAsync(command, cancellationToken: cancellationToken);
-            }).Unwrap();
-        }
-    }
-}
diff --git a/Parse/Internal/Push/DeviceInfo/DeviceInfoController.cs b/Parse/Internal/Push/DeviceInfo/DeviceInfoController.cs
deleted file mode 100644
index d402f41c..00000000
--- a/Parse/Internal/Push/DeviceInfo/DeviceInfoController.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace Parse.Push.Internal
-{
-
-    /// <summary>
-    /// Controls the device information.
-    /// </summary>
-    public class DeviceInfoController : IDeviceInfoController
-    {
-        /// <summary>
-        /// The device platform that the app is currently running on.
-        /// </summary>
-        public string DeviceType { get; } = Environment.OSVersion.ToString();
-
-        /// <summary>
-        /// The active time zone on the device that the app is currently running on.
-        /// </summary>
-        public string DeviceTimeZone => TimeZoneInfo.Local.StandardName;
-
-        /// <summary>
-        /// The version number of the application.
-        /// </summary>
-        public string AppBuildVersion { get; } = System.Reflection.Assembly.GetEntryAssembly().GetName().Version.Build.ToString();
-
-        // TODO: Verify if this means Parse appId or just a unique identifier.
-
-        /// <summary>
-        /// The identifier of the application
-        /// </summary>
-        public string AppIdentifier => AppDomain.CurrentDomain.FriendlyName;
-
-        /// <summary>
-        /// The name of the current application.
-        /// </summary>
-        public string AppName { get; } = System.Reflection.Assembly.GetEntryAssembly().GetName().Name;
-
-        public Task ExecuteParseInstallationSaveHookAsync(ParseInstallation installation) => Task.FromResult<object>(null);
-
-        public void Initialize() { }
-    }
-}
\ No newline at end of file
diff --git a/Parse/Internal/Push/DeviceInfo/IDeviceInfoController.cs b/Parse/Internal/Push/DeviceInfo/IDeviceInfoController.cs
deleted file mode 100644
index 2e5f4c7b..00000000
--- a/Parse/Internal/Push/DeviceInfo/IDeviceInfoController.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace Parse.Push.Internal
-{
-    public interface IDeviceInfoController
-    {
-        string DeviceType { get; }
-        string DeviceTimeZone { get; }
-        string AppBuildVersion { get; }
-        string AppIdentifier { get; }
-        string AppName { get; }
-
-
-        /// <summary>
-        /// Executes platform specific hook that mutate the installation based on
-        /// the device platforms.
-        /// </summary>
-        /// <param name="installation">Installation to be mutated.</param>
-        /// <returns></returns>
-        Task ExecuteParseInstallationSaveHookAsync(ParseInstallation installation);
-
-        void Initialize();
-    }
-}
diff --git a/Parse/Internal/Push/IParsePushPlugins.cs b/Parse/Internal/Push/IParsePushPlugins.cs
deleted file mode 100644
index 0b0ba3e6..00000000
--- a/Parse/Internal/Push/IParsePushPlugins.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using Parse.Core.Internal;
-
-namespace Parse.Push.Internal
-{
-    public interface IParsePushPlugins
-    {
-        void Reset();
-
-        IParseCorePlugins CorePlugins { get; }
-        IParsePushChannelsController PushChannelsController { get; }
-        IParsePushController PushController { get; }
-        IParseCurrentInstallationController CurrentInstallationController { get; }
-        IDeviceInfoController DeviceInfoController { get; }
-    }
-}
\ No newline at end of file
diff --git a/Parse/Internal/Push/Installation/Coder/ParseInstallationCoder.cs b/Parse/Internal/Push/Installation/Coder/ParseInstallationCoder.cs
deleted file mode 100644
index c0024012..00000000
--- a/Parse/Internal/Push/Installation/Coder/ParseInstallationCoder.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using Parse;
-using Parse.Core.Internal;
-
-namespace Parse.Push.Internal
-{
-    public class ParseInstallationCoder : IParseInstallationCoder
-    {
-        private static readonly ParseInstallationCoder instance = new ParseInstallationCoder();
-        public static ParseInstallationCoder Instance
-        {
-            get
-            {
-                return instance;
-            }
-        }
-        private const string ISO8601Format = "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fff'Z'";
-
-        public IDictionary<string, object> Encode(ParseInstallation installation)
-        {
-            var state = installation.GetState();
-            var data = PointerOrLocalIdEncoder.Instance.Encode(state.ToDictionary(x => x.Key, x => x.Value)) as IDictionary<string, object>;
-            data["objectId"] = state.ObjectId;
-            if (state.CreatedAt != null)
-            {
-                data["createdAt"] = state.CreatedAt.Value.ToString(ISO8601Format);
-            }
-            if (state.UpdatedAt != null)
-            {
-                data["updatedAt"] = state.UpdatedAt.Value.ToString(ISO8601Format);
-            }
-            return data;
-        }
-
-        public ParseInstallation Decode(IDictionary<string, object> data)
-        {
-            var state = ParseObjectCoder.Instance.Decode(data, ParseDecoder.Instance);
-            return ParseObjectExtensions.FromState<ParseInstallation>(state, "_Installation");
-        }
-    }
-}
\ No newline at end of file
diff --git a/Parse/Internal/Push/Installation/Controller/ParseCurrentInstallationController.cs b/Parse/Internal/Push/Installation/Controller/ParseCurrentInstallationController.cs
deleted file mode 100644
index aab0c16e..00000000
--- a/Parse/Internal/Push/Installation/Controller/ParseCurrentInstallationController.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using Parse.Common.Internal;
-using Parse.Core.Internal;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Parse.Push.Internal
-{
-    internal class ParseCurrentInstallationController : IParseCurrentInstallationController
-    {
-        private const string ParseInstallationKey = "CurrentInstallation";
-
-        private readonly object mutex = new object();
-        private readonly TaskQueue taskQueue = new TaskQueue();
-        private readonly IInstallationIdController installationIdController;
-        private readonly IStorageController storageController;
-        private readonly IParseInstallationCoder installationCoder;
-
-        public ParseCurrentInstallationController(IInstallationIdController installationIdController, IStorageController storageController, IParseInstallationCoder installationCoder)
-        {
-            this.installationIdController = installationIdController;
-            this.storageController = storageController;
-            this.installationCoder = installationCoder;
-        }
-
-        private ParseInstallation currentInstallation;
-        internal ParseInstallation CurrentInstallation
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    return currentInstallation;
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    currentInstallation = value;
-                }
-            }
-        }
-
-        public Task SetAsync(ParseInstallation installation, CancellationToken cancellationToken)
-        {
-            return taskQueue.Enqueue(toAwait =>
-            {
-                return toAwait.ContinueWith(_ =>
-                {
-                    Task saveTask = storageController.LoadAsync().OnSuccess(storage =>
-                    {
-                        if (installation == null)
-                        {
-                            return storage.Result.RemoveAsync(ParseInstallationKey);
-                        }
-                        else
-                        {
-                            var data = installationCoder.Encode(installation);
-                            return storage.Result.AddAsync(ParseInstallationKey, Json.Encode(data));
-                        }
-                    }).Unwrap();
-
-                    CurrentInstallation = installation;
-                    return saveTask;
-                }).Unwrap();
-            }, cancellationToken);
-        }
-
-        public Task<ParseInstallation> GetAsync(CancellationToken cancellationToken)
-        {
-            ParseInstallation cachedCurrent;
-            cachedCurrent = CurrentInstallation;
-
-            if (cachedCurrent != null)
-            {
-                return Task<ParseInstallation>.FromResult(cachedCurrent);
-            }
-
-            return taskQueue.Enqueue(toAwait =>
-            {
-                return toAwait.ContinueWith(_ =>
-                {
-                    return storageController.LoadAsync().OnSuccess(stroage =>
-                    {
-                        Task fetchTask;
-                        object temp;
-                        stroage.Result.TryGetValue(ParseInstallationKey, out temp);
-                        var installationDataString = temp as string;
-                        ParseInstallation installation = null;
-                        if (installationDataString != null)
-                        {
-                            var installationData = Json.Parse(installationDataString) as IDictionary<string, object>;
-                            installation = installationCoder.Decode(installationData);
-
-                            fetchTask = Task.FromResult<object>(null);
-                        }
-                        else
-                        {
-                            installation = ParseObject.Create<ParseInstallation>();
-                            fetchTask = installationIdController.GetAsync().ContinueWith(t =>
-                            {
-                                installation.SetIfDifferent("installationId", t.Result.ToString());
-                            });
-                        }
-
-                        CurrentInstallation = installation;
-                        return fetchTask.ContinueWith(t => installation);
-                    });
-                }).Unwrap().Unwrap();
-            }, cancellationToken);
-        }
-
-        public Task<bool> ExistsAsync(CancellationToken cancellationToken)
-        {
-            if (CurrentInstallation != null)
-            {
-                return Task<bool>.FromResult(true);
-            }
-
-            return taskQueue.Enqueue(toAwait =>
-            {
-                return toAwait.ContinueWith(_ =>
-                {
-                    return storageController.LoadAsync().OnSuccess(s => s.Result.ContainsKey(ParseInstallationKey));
-                }).Unwrap();
-            }, cancellationToken);
-        }
-
-        public bool IsCurrent(ParseInstallation installation)
-        {
-            return CurrentInstallation == installation;
-        }
-
-        public void ClearFromMemory()
-        {
-            CurrentInstallation = null;
-        }
-
-        public void ClearFromDisk()
-        {
-            ClearFromMemory();
-
-            taskQueue.Enqueue(toAwait =>
-            {
-                return toAwait.ContinueWith(_ =>
-                {
-                    return storageController.LoadAsync().OnSuccess(storage => storage.Result.RemoveAsync(ParseInstallationKey));
-                }).Unwrap().Unwrap();
-            }, CancellationToken.None);
-        }
-    }
-}
diff --git a/Parse/Internal/Push/ParsePushModule.cs b/Parse/Internal/Push/ParsePushModule.cs
deleted file mode 100644
index fd107f4c..00000000
--- a/Parse/Internal/Push/ParsePushModule.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Parse.Common.Internal;
-using Parse.Core.Internal;
-using System;
-
-namespace Parse.Push.Internal
-{
-    public class ParsePushModule : IParseModule
-    {
-        public void OnModuleRegistered()
-        {
-        }
-
-        public void OnParseInitialized()
-        {
-            ParseObject.RegisterSubclass<ParseInstallation>();
-
-            ParseCorePlugins.Instance.SubclassingController.AddRegisterHook(typeof(ParseInstallation), () =>
-            {
-                ParsePushPlugins.Instance.CurrentInstallationController.ClearFromMemory();
-            });
-
-            ParsePushPlugins.Instance.DeviceInfoController.Initialize();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Parse/Internal/Push/ParsePushPlugins.cs b/Parse/Internal/Push/ParsePushPlugins.cs
deleted file mode 100644
index aab2f0cb..00000000
--- a/Parse/Internal/Push/ParsePushPlugins.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-using Parse.Core.Internal;
-
-namespace Parse.Push.Internal
-{
-    public class ParsePushPlugins : IParsePushPlugins
-    {
-        private static readonly object instanceMutex = new object();
-        private static IParsePushPlugins instance;
-        public static IParsePushPlugins Instance
-        {
-            get
-            {
-                instance = instance ?? new ParsePushPlugins();
-                return instance;
-            }
-            set
-            {
-                lock (instanceMutex)
-                {
-                    instance = value;
-                }
-            }
-        }
-
-        private readonly object mutex = new object();
-
-        private IParseCorePlugins corePlugins;
-        private IParsePushChannelsController pushChannelsController;
-        private IParsePushController pushController;
-        private IParseCurrentInstallationController currentInstallationController;
-        private IDeviceInfoController deviceInfoController;
-
-        public void Reset()
-        {
-            lock (mutex)
-            {
-                CorePlugins = null;
-                PushChannelsController = null;
-                PushController = null;
-                CurrentInstallationController = null;
-                DeviceInfoController = null;
-            }
-        }
-
-        public IParseCorePlugins CorePlugins
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    corePlugins = corePlugins ?? ParseCorePlugins.Instance;
-                    return corePlugins;
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    corePlugins = value;
-                }
-            }
-        }
-
-        public IParsePushChannelsController PushChannelsController
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    pushChannelsController = pushChannelsController ?? new ParsePushChannelsController();
-                    return pushChannelsController;
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    pushChannelsController = value;
-                }
-            }
-        }
-
-        public IParsePushController PushController
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    pushController = pushController ?? new ParsePushController(CorePlugins.CommandRunner, CorePlugins.CurrentUserController);
-                    return pushController;
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    pushController = value;
-                }
-            }
-        }
-
-        public IParseCurrentInstallationController CurrentInstallationController
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    currentInstallationController = currentInstallationController ?? new ParseCurrentInstallationController(
-                      CorePlugins.InstallationIdController, CorePlugins.StorageController, ParseInstallationCoder.Instance
-                    );
-                    return currentInstallationController;
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    currentInstallationController = value;
-                }
-            }
-        }
-
-        public IDeviceInfoController DeviceInfoController
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    deviceInfoController = deviceInfoController ?? new DeviceInfoController();
-                    return deviceInfoController;
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    deviceInfoController = value;
-                }
-            }
-        }
-    }
-}
diff --git a/Parse/Internal/Push/State/MutablePushState.cs b/Parse/Internal/Push/State/MutablePushState.cs
deleted file mode 100644
index 9ffe47b1..00000000
--- a/Parse/Internal/Push/State/MutablePushState.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using Parse.Common.Internal;
-
-namespace Parse.Push.Internal
-{
-    public class MutablePushState : IPushState
-    {
-        public ParseQuery<ParseInstallation> Query { get; set; }
-        public IEnumerable<string> Channels { get; set; }
-        public DateTime? Expiration { get; set; }
-        public TimeSpan? ExpirationInterval { get; set; }
-        public DateTime? PushTime { get; set; }
-        public IDictionary<string, object> Data { get; set; }
-        public string Alert { get; set; }
-
-        public IPushState MutatedClone(Action<MutablePushState> func)
-        {
-            MutablePushState clone = MutableClone();
-            func(clone);
-            return clone;
-        }
-
-        protected virtual MutablePushState MutableClone()
-        {
-            return new MutablePushState
-            {
-                Query = Query,
-                Channels = Channels == null ? null : new List<string>(Channels),
-                Expiration = Expiration,
-                ExpirationInterval = ExpirationInterval,
-                PushTime = PushTime,
-                Data = Data == null ? null : new Dictionary<string, object>(Data),
-                Alert = Alert
-            };
-        }
-
-        public override bool Equals(object obj)
-        {
-            if (obj == null || !(obj is MutablePushState))
-            {
-                return false;
-            }
-
-            var other = obj as MutablePushState;
-            return Object.Equals(this.Query, other.Query) &&
-                   this.Channels.CollectionsEqual(other.Channels) &&
-                   Object.Equals(this.Expiration, other.Expiration) &&
-                   Object.Equals(this.ExpirationInterval, other.ExpirationInterval) &&
-                   Object.Equals(this.PushTime, other.PushTime) &&
-                   this.Data.CollectionsEqual(other.Data) &&
-                   Object.Equals(this.Alert, other.Alert);
-        }
-
-        public override int GetHashCode()
-        {
-            // TODO (richardross): Implement this.
-            return 0;
-        }
-    }
-}
diff --git a/Parse/Internal/Query/Controller/ParseQueryController.cs b/Parse/Internal/Query/Controller/ParseQueryController.cs
deleted file mode 100644
index b8ffd10f..00000000
--- a/Parse/Internal/Query/Controller/ParseQueryController.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Threading;
-using System.Threading.Tasks;
-using Parse.Common.Internal;
-
-namespace Parse.Core.Internal
-{
-    internal class ParseQueryController : IParseQueryController
-    {
-        private readonly IParseCommandRunner commandRunner;
-
-        public ParseQueryController(IParseCommandRunner commandRunner) => this.commandRunner = commandRunner;
-
-        public Task<IEnumerable<IObjectState>> FindAsync<T>(ParseQuery<T> query, ParseUser user, CancellationToken cancellationToken) where T : ParseObject => FindAsync(query.ClassName, query.BuildParameters(), user?.SessionToken, cancellationToken).OnSuccess(t => (from item in t.Result["results"] as IList<object> select ParseObjectCoder.Instance.Decode(item as IDictionary<string, object>, ParseDecoder.Instance)));
-
-        public Task<int> CountAsync<T>(ParseQuery<T> query, ParseUser user, CancellationToken cancellationToken) where T : ParseObject
-        {
-            var parameters = query.BuildParameters();
-            parameters["limit"] = 0;
-            parameters["count"] = 1;
-
-            return FindAsync(query.ClassName, parameters, user?.SessionToken, cancellationToken).OnSuccess(t => Convert.ToInt32(t.Result["count"]));
-        }
-
-        public Task<IObjectState> FirstAsync<T>(ParseQuery<T> query, ParseUser user, CancellationToken cancellationToken) where T : ParseObject
-        {
-            var parameters = query.BuildParameters();
-            parameters["limit"] = 1;
-
-            return FindAsync(query.ClassName, parameters, user?.SessionToken, cancellationToken).OnSuccess(t => (t.Result["results"] as IList<object>).FirstOrDefault() as IDictionary<string, object> is Dictionary<string, object> item && item != null ? ParseObjectCoder.Instance.Decode(item, ParseDecoder.Instance) : null);
-        }
-
-        private Task<IDictionary<string, object>> FindAsync(string className, IDictionary<string, object> parameters, string sessionToken, CancellationToken cancellationToken) => commandRunner.RunCommandAsync(new ParseCommand($"classes/{Uri.EscapeDataString(className)}?{ParseClient.BuildQueryString(parameters)}", method: "GET", sessionToken: sessionToken, data: null), cancellationToken: cancellationToken).OnSuccess(t => t.Result.Item2);
-    }
-}
diff --git a/Parse/Internal/Session/Controller/ParseSessionController.cs b/Parse/Internal/Session/Controller/ParseSessionController.cs
deleted file mode 100644
index 25b48917..00000000
--- a/Parse/Internal/Session/Controller/ParseSessionController.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Parse.Common.Internal;
-
-namespace Parse.Core.Internal
-{
-    public class ParseSessionController : IParseSessionController
-    {
-        private readonly IParseCommandRunner commandRunner;
-
-        public ParseSessionController(IParseCommandRunner commandRunner)
-        {
-            this.commandRunner = commandRunner;
-        }
-
-        public Task<IObjectState> GetSessionAsync(string sessionToken, CancellationToken cancellationToken)
-        {
-            var command = new ParseCommand("sessions/me",
-                method: "GET",
-                sessionToken: sessionToken,
-                data: null);
-
-            return commandRunner.RunCommandAsync(command, cancellationToken: cancellationToken).OnSuccess(t =>
-            {
-                return ParseObjectCoder.Instance.Decode(t.Result.Item2, ParseDecoder.Instance);
-            });
-        }
-
-        public Task RevokeAsync(string sessionToken, CancellationToken cancellationToken)
-        {
-            var command = new ParseCommand("logout",
-                method: "POST",
-                sessionToken: sessionToken,
-                data: new Dictionary<string, object>());
-
-            return commandRunner.RunCommandAsync(command, cancellationToken: cancellationToken);
-        }
-
-        public Task<IObjectState> UpgradeToRevocableSessionAsync(string sessionToken, CancellationToken cancellationToken)
-        {
-            var command = new ParseCommand("upgradeToRevocableSession",
-                method: "POST",
-                sessionToken: sessionToken,
-                data: new Dictionary<string, object>());
-
-            return commandRunner.RunCommandAsync(command, cancellationToken: cancellationToken).OnSuccess(t =>
-            {
-                return ParseObjectCoder.Instance.Decode(t.Result.Item2, ParseDecoder.Instance);
-            });
-        }
-
-        public bool IsRevocableSessionToken(string sessionToken)
-        {
-            return sessionToken.Contains("r:");
-        }
-    }
-}
diff --git a/Parse/Internal/Storage/Controller/IStorageController.cs b/Parse/Internal/Storage/Controller/IStorageController.cs
deleted file mode 100644
index f76e4584..00000000
--- a/Parse/Internal/Storage/Controller/IStorageController.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Parse.Common.Internal
-{
-    /// <summary>
-    /// An abstraction for accessing persistent storage in the Parse SDK.
-    /// </summary>
-    public interface IStorageController
-    {
-        /// <summary>
-        /// Load the contents of this storage controller asynchronously.
-        /// </summary>
-        /// <returns></returns>
-        Task<IStorageDictionary<string, object>> LoadAsync();
-
-        /// <summary>
-        /// Overwrites the contents of this storage controller asynchronously.
-        /// </summary>
-        /// <param name="contents"></param>
-        /// <returns></returns>
-        Task<IStorageDictionary<string, object>> SaveAsync(IDictionary<string, object> contents);
-    }
-
-    /// <summary>
-    /// An interface for a dictionary that is persisted to disk asynchronously.
-    /// </summary>
-    /// <typeparam name="TKey">They key type of the dictionary.</typeparam>
-    /// <typeparam name="TValue">The value type of the dictionary.</typeparam>
-    public interface IStorageDictionary<TKey, TValue> : IEnumerable<KeyValuePair<TKey, TValue>>
-    {
-        int Count { get; }
-        TValue this[TKey key] { get; }
-
-        IEnumerable<TKey> Keys { get; }
-        IEnumerable<TValue> Values { get; }
-
-        bool ContainsKey(TKey key);
-        bool TryGetValue(TKey key, out TValue value);
-
-        /// <summary>
-        /// Adds a key to this dictionary, and saves it asynchronously.
-        /// </summary>
-        /// <param name="key">The key to insert.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <returns></returns>
-        Task AddAsync(TKey key, TValue value);
-
-        /// <summary>
-        /// Removes a key from this dictionary, and saves it asynchronously.
-        /// </summary>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        Task RemoveAsync(TKey key);
-    }
-}
\ No newline at end of file
diff --git a/Parse/Internal/Storage/Controller/StorageController.cs b/Parse/Internal/Storage/Controller/StorageController.cs
deleted file mode 100644
index 9a159d8b..00000000
--- a/Parse/Internal/Storage/Controller/StorageController.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.Linq;
-using System.Collections.Generic;
-using System.Threading;
-using System.IO;
-using Parse.Internal.Utilities;
-
-namespace Parse.Common.Internal
-{
-    /// <summary>
-    /// Implements `IStorageController` for PCL targets, based off of PCLStorage.
-    /// </summary>
-    public class StorageController : IStorageController
-    {
-        private class StorageDictionary : IStorageDictionary<string, object>
-        {
-            private object mutex;
-            private Dictionary<string, object> dictionary;
-            private FileInfo file;
-
-            public StorageDictionary(FileInfo file)
-            {
-                this.file = file;
-
-                mutex = new object();
-                dictionary = new Dictionary<string, object>();
-            }
-
-            internal Task SaveAsync()
-            {
-                string json;
-                lock (mutex)
-                    json = Json.Encode(dictionary);
-
-                return file.WriteToAsync(json);
-            }
-
-            internal Task LoadAsync()
-            {
-                return file.ReadAllTextAsync().ContinueWith(t =>
-                {
-                    string text = t.Result;
-                    Dictionary<string, object> result = null;
-                    try
-                    {
-                        result = Json.Parse(text) as Dictionary<string, object>;
-                    }
-                    catch (Exception)
-                    {
-                        // Do nothing, JSON error. Probaby was empty string.
-                    }
-
-                    lock (mutex)
-                    {
-                        dictionary = result ?? new Dictionary<string, object>();
-                    }
-                });
-            }
-
-            internal void Update(IDictionary<string, object> contents)
-            {
-                lock (mutex)
-                {
-                    dictionary = contents.ToDictionary(p => p.Key, p => p.Value);
-                }
-            }
-
-            public Task AddAsync(string key, object value)
-            {
-                lock (mutex)
-                {
-                    dictionary[key] = value;
-                }
-                return SaveAsync();
-            }
-
-            public Task RemoveAsync(string key)
-            {
-                lock (mutex)
-                {
-                    dictionary.Remove(key);
-                }
-                return SaveAsync();
-            }
-
-            public bool ContainsKey(string key)
-            {
-                lock (mutex)
-                {
-                    return dictionary.ContainsKey(key);
-                }
-            }
-
-            public IEnumerable<string> Keys
-            {
-                get { lock (mutex) { return dictionary.Keys; } }
-            }
-
-            public bool TryGetValue(string key, out object value)
-            {
-                lock (mutex)
-                {
-                    return dictionary.TryGetValue(key, out value);
-                }
-            }
-
-            public IEnumerable<object> Values
-            {
-                get { lock (mutex) { return dictionary.Values; } }
-            }
-
-            public object this[string key]
-            {
-                get { lock (mutex) { return dictionary[key]; } }
-            }
-
-            public int Count
-            {
-                get { lock (mutex) { return dictionary.Count; } }
-            }
-
-            public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
-            {
-                lock (mutex)
-                {
-                    return dictionary.GetEnumerator();
-                }
-            }
-
-            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-            {
-                lock (mutex)
-                {
-                    return dictionary.GetEnumerator();
-                }
-            }
-        }
-
-        FileInfo File { get; }
-        StorageDictionary Storage { get; set; }
-        TaskQueue Queue { get; } = new TaskQueue { };
-
-        /// <summary>
-        /// Creates a Parse storage controller and attempts to extract a previously created settings storage file from the persistent storage location.
-        /// </summary>
-        public StorageController() => Storage = new StorageDictionary(File = StorageManager.PersistentStorageFileWrapper);
-
-        /// <summary>
-        /// Creates a Parse storage controller with the provided <paramref name="file"/> wrapper.
-        /// </summary>
-        /// <param name="file">The file wrapper that the storage controller instance should target</param>
-        public StorageController(FileInfo file) => File = file;
-
-        /// <summary>
-        /// Loads a settings dictionary from the file wrapped by <see cref="File"/>.
-        /// </summary>
-        /// <returns>A storage dictionary containing the deserialized content of the storage file targeted by the <see cref="StorageController"/> instance</returns>
-        public Task<IStorageDictionary<string, object>> LoadAsync()
-        {
-            // check if storage dictionary is already created from the controllers file (create if not)
-            if (Storage == null)
-                Storage = new StorageDictionary(File);
-            // load storage dictionary content async and return the resulting dictionary type
-            return Queue.Enqueue(toAwait => toAwait.ContinueWith(_ => Storage.LoadAsync().OnSuccess(__ => Storage as IStorageDictionary<string, object>)).Unwrap(), CancellationToken.None);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="contents"></param>
-        /// <returns></returns>
-        public Task<IStorageDictionary<string, object>> SaveAsync(IDictionary<string, object> contents) => Queue.Enqueue(toAwait => toAwait.ContinueWith(_ =>
-        {
-            (Storage ?? (Storage = new StorageDictionary(File))).Update(contents);
-            return Storage.SaveAsync().OnSuccess(__ => Storage as IStorageDictionary<string, object>);
-        }).Unwrap());
-    }
-}
diff --git a/Parse/Internal/User/Controller/IParseUserController.cs b/Parse/Internal/User/Controller/IParseUserController.cs
deleted file mode 100644
index ff90feb8..00000000
--- a/Parse/Internal/User/Controller/IParseUserController.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Parse.Core.Internal
-{
-    public interface IParseUserController
-    {
-        Task<IObjectState> SignUpAsync(IObjectState state,
-            IDictionary<string, IParseFieldOperation> operations,
-            CancellationToken cancellationToken);
-
-        Task<IObjectState> LogInAsync(string username,
-            string password,
-            CancellationToken cancellationToken);
-
-        Task<IObjectState> LogInAsync(string authType,
-            IDictionary<string, object> data,
-            CancellationToken cancellationToken);
-
-        Task<IObjectState> GetUserAsync(string sessionToken, CancellationToken cancellationToken);
-
-        Task RequestPasswordResetAsync(string email, CancellationToken cancellationToken);
-    }
-}
diff --git a/Parse/Internal/User/Controller/ParseCurrentUserController.cs b/Parse/Internal/User/Controller/ParseCurrentUserController.cs
deleted file mode 100644
index f0c92109..00000000
--- a/Parse/Internal/User/Controller/ParseCurrentUserController.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Globalization;
-using System.Threading;
-using System.Threading.Tasks;
-using Parse.Common.Internal;
-
-namespace Parse.Core.Internal
-{
-    public class ParseCurrentUserController : IParseCurrentUserController
-    {
-        private readonly object mutex = new object();
-        private readonly TaskQueue taskQueue = new TaskQueue();
-
-        private IStorageController storageController;
-
-        public ParseCurrentUserController(IStorageController storageController)
-        {
-            this.storageController = storageController;
-        }
-
-        private ParseUser currentUser;
-        public ParseUser CurrentUser
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    return currentUser;
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    currentUser = value;
-                }
-            }
-        }
-
-        public Task SetAsync(ParseUser user, CancellationToken cancellationToken)
-        {
-            return taskQueue.Enqueue(toAwait =>
-            {
-                return toAwait.ContinueWith(_ =>
-                {
-                    Task saveTask = null;
-                    if (user == null)
-                    {
-                        saveTask = storageController
-                          .LoadAsync()
-                          .OnSuccess(t => t.Result.RemoveAsync("CurrentUser"))
-                          .Unwrap();
-                    }
-                    else
-                    {
-                        // TODO (hallucinogen): we need to use ParseCurrentCoder instead of this janky encoding
-                        var data = user.ServerDataToJSONObjectForSerialization();
-                        data["objectId"] = user.ObjectId;
-                        if (user.CreatedAt != null)
-                        {
-                            data["createdAt"] = user.CreatedAt.Value.ToString(ParseClient.DateFormatStrings.First(),
-                              CultureInfo.InvariantCulture);
-                        }
-                        if (user.UpdatedAt != null)
-                        {
-                            data["updatedAt"] = user.UpdatedAt.Value.ToString(ParseClient.DateFormatStrings.First(),
-                              CultureInfo.InvariantCulture);
-                        }
-
-                        saveTask = storageController
-                          .LoadAsync()
-                          .OnSuccess(t => t.Result.AddAsync("CurrentUser", Json.Encode(data)))
-                          .Unwrap();
-                    }
-                    CurrentUser = user;
-
-                    return saveTask;
-                }).Unwrap();
-            }, cancellationToken);
-        }
-
-        public Task<ParseUser> GetAsync(CancellationToken cancellationToken)
-        {
-            ParseUser cachedCurrent;
-
-            lock (mutex)
-            {
-                cachedCurrent = CurrentUser;
-            }
-
-            if (cachedCurrent != null)
-            {
-                return Task<ParseUser>.FromResult(cachedCurrent);
-            }
-
-            return taskQueue.Enqueue(toAwait =>
-            {
-                return toAwait.ContinueWith(_ =>
-                {
-                    return storageController.LoadAsync().OnSuccess(t =>
-                    {
-                        object temp;
-                        t.Result.TryGetValue("CurrentUser", out temp);
-                        var userDataString = temp as string;
-                        ParseUser user = null;
-                        if (userDataString != null)
-                        {
-                            var userData = Json.Parse(userDataString) as IDictionary<string, object>;
-                            var state = ParseObjectCoder.Instance.Decode(userData, ParseDecoder.Instance);
-                            user = ParseObject.FromState<ParseUser>(state, "_User");
-                        }
-
-                        CurrentUser = user;
-                        return user;
-                    });
-                }).Unwrap();
-            }, cancellationToken);
-        }
-
-        public Task<bool> ExistsAsync(CancellationToken cancellationToken)
-        {
-            if (CurrentUser != null)
-            {
-                return Task<bool>.FromResult(true);
-            }
-
-            return taskQueue.Enqueue(toAwait =>
-            {
-                return toAwait.ContinueWith(_ =>
-                  storageController.LoadAsync().OnSuccess(t => t.Result.ContainsKey("CurrentUser"))
-                ).Unwrap();
-            }, cancellationToken);
-        }
-
-        public bool IsCurrent(ParseUser user)
-        {
-            lock (mutex)
-            {
-                return CurrentUser == user;
-            }
-        }
-
-        public void ClearFromMemory()
-        {
-            CurrentUser = null;
-        }
-
-        public void ClearFromDisk()
-        {
-            lock (mutex)
-            {
-                ClearFromMemory();
-
-                taskQueue.Enqueue(toAwait =>
-                {
-                    return toAwait.ContinueWith(_ =>
-                    {
-                        return storageController.LoadAsync().OnSuccess(t => t.Result.RemoveAsync("CurrentUser"));
-                    }).Unwrap().Unwrap();
-                }, CancellationToken.None);
-            }
-        }
-
-        public Task<string> GetCurrentSessionTokenAsync(CancellationToken cancellationToken)
-        {
-            return GetAsync(cancellationToken).OnSuccess(t =>
-            {
-                var user = t.Result;
-                return user == null ? null : user.SessionToken;
-            });
-        }
-
-        public Task LogOutAsync(CancellationToken cancellationToken)
-        {
-            return taskQueue.Enqueue(toAwait =>
-            {
-                return toAwait.ContinueWith(_ => GetAsync(cancellationToken)).Unwrap().OnSuccess(t =>
-                {
-                    ClearFromDisk();
-                });
-            }, cancellationToken);
-        }
-    }
-}
diff --git a/Parse/Internal/User/Controller/ParseUserController.cs b/Parse/Internal/User/Controller/ParseUserController.cs
deleted file mode 100644
index 3451b63d..00000000
--- a/Parse/Internal/User/Controller/ParseUserController.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Parse.Common.Internal;
-
-namespace Parse.Core.Internal
-{
-    public class ParseUserController : IParseUserController
-    {
-        private readonly IParseCommandRunner commandRunner;
-
-        public ParseUserController(IParseCommandRunner commandRunner)
-        {
-            this.commandRunner = commandRunner;
-        }
-
-        public Task<IObjectState> SignUpAsync(IObjectState state,
-            IDictionary<string, IParseFieldOperation> operations,
-            CancellationToken cancellationToken)
-        {
-            var objectJSON = ParseObject.ToJSONObjectForSaving(operations);
-
-            var command = new ParseCommand("classes/_User",
-                method: "POST",
-                data: objectJSON);
-
-            return commandRunner.RunCommandAsync(command, cancellationToken: cancellationToken).OnSuccess(t =>
-            {
-                var serverState = ParseObjectCoder.Instance.Decode(t.Result.Item2, ParseDecoder.Instance);
-                serverState = serverState.MutatedClone(mutableClone =>
-                {
-                    mutableClone.IsNew = true;
-                });
-                return serverState;
-            });
-        }
-
-        public Task<IObjectState> LogInAsync(string username,
-            string password,
-            CancellationToken cancellationToken)
-        {
-            var data = new Dictionary<string, object>{
-        {"username", username},
-        {"password", password}
-      };
-
-            var command = new ParseCommand(string.Format("login?{0}", ParseClient.BuildQueryString(data)),
-                method: "GET",
-                data: null);
-
-            return commandRunner.RunCommandAsync(command, cancellationToken: cancellationToken).OnSuccess(t =>
-            {
-                var serverState = ParseObjectCoder.Instance.Decode(t.Result.Item2, ParseDecoder.Instance);
-                serverState = serverState.MutatedClone(mutableClone =>
-                {
-                    mutableClone.IsNew = t.Result.Item1 == System.Net.HttpStatusCode.Created;
-                });
-                return serverState;
-            });
-        }
-
-        public Task<IObjectState> LogInAsync(string authType,
-            IDictionary<string, object> data,
-            CancellationToken cancellationToken)
-        {
-            var authData = new Dictionary<string, object>();
-            authData[authType] = data;
-
-            var command = new ParseCommand("users",
-                method: "POST",
-                data: new Dictionary<string, object> {
-            {"authData", authData}
-                });
-
-            return commandRunner.RunCommandAsync(command, cancellationToken: cancellationToken).OnSuccess(t =>
-            {
-                var serverState = ParseObjectCoder.Instance.Decode(t.Result.Item2, ParseDecoder.Instance);
-                serverState = serverState.MutatedClone(mutableClone =>
-                {
-                    mutableClone.IsNew = t.Result.Item1 == System.Net.HttpStatusCode.Created;
-                });
-                return serverState;
-            });
-        }
-
-        public Task<IObjectState> GetUserAsync(string sessionToken, CancellationToken cancellationToken)
-        {
-            var command = new ParseCommand("users/me",
-                method: "GET",
-                sessionToken: sessionToken,
-                data: null);
-
-            return commandRunner.RunCommandAsync(command, cancellationToken: cancellationToken).OnSuccess(t =>
-            {
-                return ParseObjectCoder.Instance.Decode(t.Result.Item2, ParseDecoder.Instance);
-            });
-        }
-
-        public Task RequestPasswordResetAsync(string email, CancellationToken cancellationToken)
-        {
-            var command = new ParseCommand("requestPasswordReset",
-                method: "POST",
-                data: new Dictionary<string, object> {
-            {"email", email}
-                });
-
-            return commandRunner.RunCommandAsync(command, cancellationToken: cancellationToken);
-        }
-    }
-}
diff --git a/Parse/Internal/Utilities/FlexibleDictionaryWrapper.cs b/Parse/Internal/Utilities/FlexibleDictionaryWrapper.cs
deleted file mode 100644
index 0a155c76..00000000
--- a/Parse/Internal/Utilities/FlexibleDictionaryWrapper.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System.Collections.Generic;
-using System.Linq;
-using Parse.Utilities;
-
-namespace Parse.Common.Internal
-{
-    /// <summary>
-    /// Provides a Dictionary implementation that can delegate to any other
-    /// dictionary, regardless of its value type. Used for coercion of
-    /// dictionaries when returning them to users.
-    /// </summary>
-    /// <typeparam name="TOut">The resulting type of value in the dictionary.</typeparam>
-    /// <typeparam name="TIn">The original type of value in the dictionary.</typeparam>
-    [Preserve(AllMembers = true, Conditional = false)]
-    public class FlexibleDictionaryWrapper<TOut, TIn> : IDictionary<string, TOut>
-    {
-        private readonly IDictionary<string, TIn> toWrap;
-        public FlexibleDictionaryWrapper(IDictionary<string, TIn> toWrap)
-        {
-            this.toWrap = toWrap;
-        }
-
-        public void Add(string key, TOut value)
-        {
-            toWrap.Add(key, (TIn) Conversion.ConvertTo<TIn>(value));
-        }
-
-        public bool ContainsKey(string key)
-        {
-            return toWrap.ContainsKey(key);
-        }
-
-        public ICollection<string> Keys
-        {
-            get { return toWrap.Keys; }
-        }
-
-        public bool Remove(string key)
-        {
-            return toWrap.Remove(key);
-        }
-
-        public bool TryGetValue(string key, out TOut value)
-        {
-            TIn outValue;
-            bool result = toWrap.TryGetValue(key, out outValue);
-            value = (TOut) Conversion.ConvertTo<TOut>(outValue);
-            return result;
-        }
-
-        public ICollection<TOut> Values
-        {
-            get
-            {
-                return toWrap.Values
-                    .Select(item => (TOut) Conversion.ConvertTo<TOut>(item)).ToList();
-            }
-        }
-
-        public TOut this[string key]
-        {
-            get
-            {
-                return (TOut) Conversion.ConvertTo<TOut>(toWrap[key]);
-            }
-            set
-            {
-                toWrap[key] = (TIn) Conversion.ConvertTo<TIn>(value);
-            }
-        }
-
-        public void Add(KeyValuePair<string, TOut> item)
-        {
-            toWrap.Add(new KeyValuePair<string, TIn>(item.Key,
-                (TIn) Conversion.ConvertTo<TIn>(item.Value)));
-        }
-
-        public void Clear()
-        {
-            toWrap.Clear();
-        }
-
-        public bool Contains(KeyValuePair<string, TOut> item)
-        {
-            return toWrap.Contains(new KeyValuePair<string, TIn>(item.Key,
-                (TIn) Conversion.ConvertTo<TIn>(item.Value)));
-        }
-
-        public void CopyTo(KeyValuePair<string, TOut>[] array, int arrayIndex)
-        {
-            var converted = from pair in toWrap
-                            select new KeyValuePair<string, TOut>(pair.Key,
-                                (TOut) Conversion.ConvertTo<TOut>(pair.Value));
-            converted.ToList().CopyTo(array, arrayIndex);
-        }
-
-        public int Count
-        {
-            get { return toWrap.Count; }
-        }
-
-        public bool IsReadOnly
-        {
-            get { return toWrap.IsReadOnly; }
-        }
-
-        public bool Remove(KeyValuePair<string, TOut> item)
-        {
-            return toWrap.Remove(new KeyValuePair<string, TIn>(item.Key,
-                (TIn) Conversion.ConvertTo<TIn>(item.Value)));
-        }
-
-        public IEnumerator<KeyValuePair<string, TOut>> GetEnumerator()
-        {
-            foreach (var pair in toWrap)
-            {
-                yield return new KeyValuePair<string, TOut>(pair.Key,
-                    (TOut) Conversion.ConvertTo<TOut>(pair.Value));
-            }
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return this.GetEnumerator();
-        }
-    }
-}
diff --git a/Parse/Internal/Utilities/FlexibleListWrapper.cs b/Parse/Internal/Utilities/FlexibleListWrapper.cs
deleted file mode 100644
index 8fc5afef..00000000
--- a/Parse/Internal/Utilities/FlexibleListWrapper.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using Parse.Utilities;
-
-namespace Parse.Common.Internal
-{
-    /// <summary>
-    /// Provides a List implementation that can delegate to any other
-    /// list, regardless of its value type. Used for coercion of
-    /// lists when returning them to users.
-    /// </summary>
-    /// <typeparam name="TOut">The resulting type of value in the list.</typeparam>
-    /// <typeparam name="TIn">The original type of value in the list.</typeparam>
-    [Preserve(AllMembers = true, Conditional = false)]
-    public class FlexibleListWrapper<TOut, TIn> : IList<TOut>
-    {
-        private IList<TIn> toWrap;
-        public FlexibleListWrapper(IList<TIn> toWrap)
-        {
-            this.toWrap = toWrap;
-        }
-
-        public int IndexOf(TOut item)
-        {
-            return toWrap.IndexOf((TIn) Conversion.ConvertTo<TIn>(item));
-        }
-
-        public void Insert(int index, TOut item)
-        {
-            toWrap.Insert(index, (TIn) Conversion.ConvertTo<TIn>(item));
-        }
-
-        public void RemoveAt(int index)
-        {
-            toWrap.RemoveAt(index);
-        }
-
-        public TOut this[int index]
-        {
-            get
-            {
-                return (TOut) Conversion.ConvertTo<TOut>(toWrap[index]);
-            }
-            set
-            {
-                toWrap[index] = (TIn) Conversion.ConvertTo<TIn>(value);
-            }
-        }
-
-        public void Add(TOut item)
-        {
-            toWrap.Add((TIn) Conversion.ConvertTo<TIn>(item));
-        }
-
-        public void Clear()
-        {
-            toWrap.Clear();
-        }
-
-        public bool Contains(TOut item)
-        {
-            return toWrap.Contains((TIn) Conversion.ConvertTo<TIn>(item));
-        }
-
-        public void CopyTo(TOut[] array, int arrayIndex)
-        {
-            toWrap.Select(item => (TOut) Conversion.ConvertTo<TOut>(item))
-                .ToList().CopyTo(array, arrayIndex);
-        }
-
-        public int Count
-        {
-            get { return toWrap.Count; }
-        }
-
-        public bool IsReadOnly
-        {
-            get { return toWrap.IsReadOnly; }
-        }
-
-        public bool Remove(TOut item)
-        {
-            return toWrap.Remove((TIn) Conversion.ConvertTo<TIn>(item));
-        }
-
-        public IEnumerator<TOut> GetEnumerator()
-        {
-            foreach (var item in (IEnumerable) toWrap)
-            {
-                yield return (TOut) Conversion.ConvertTo<TOut>(item);
-            }
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return this.GetEnumerator();
-        }
-    }
-}
diff --git a/Parse/Internal/Utilities/InternalExtensions.cs b/Parse/Internal/Utilities/InternalExtensions.cs
deleted file mode 100644
index 02466211..00000000
--- a/Parse/Internal/Utilities/InternalExtensions.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.ExceptionServices;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Parse.Common.Internal
-{
-    /// <summary>
-    /// Provides helper methods that allow us to use terser code elsewhere.
-    /// </summary>
-    public static class InternalExtensions
-    {
-        /// <summary>
-        /// Ensures a task (even null) is awaitable.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="task"></param>
-        /// <returns></returns>
-        public static Task<T> Safe<T>(this Task<T> task)
-        {
-            return task ?? Task.FromResult<T>(default(T));
-        }
-
-        /// <summary>
-        /// Ensures a task (even null) is awaitable.
-        /// </summary>
-        /// <param name="task"></param>
-        /// <returns></returns>
-        public static Task Safe(this Task task)
-        {
-            return task ?? Task.FromResult<object>(null);
-        }
-
-        public delegate void PartialAccessor<T>(ref T arg);
-
-        public static TValue GetOrDefault<TKey, TValue>(this IDictionary<TKey, TValue> self,
-            TKey key,
-            TValue defaultValue)
-        {
-            TValue value;
-            if (self.TryGetValue(key, out value))
-            {
-                return value;
-            }
-            return defaultValue;
-        }
-
-        public static bool CollectionsEqual<T>(this IEnumerable<T> a, IEnumerable<T> b)
-        {
-            return Object.Equals(a, b) ||
-                   (a != null && b != null &&
-                   a.SequenceEqual(b));
-        }
-
-        public static Task<TResult> OnSuccess<TIn, TResult>(this Task<TIn> task,
-            Func<Task<TIn>, TResult> continuation)
-        {
-            return ((Task) task).OnSuccess(t => continuation((Task<TIn>) t));
-        }
-
-        public static Task OnSuccess<TIn>(this Task<TIn> task, Action<Task<TIn>> continuation)
-        {
-            return task.OnSuccess((Func<Task<TIn>, object>) (t =>
-             {
-                 continuation(t);
-                 return null;
-             }));
-        }
-
-        public static Task<TResult> OnSuccess<TResult>(this Task task,
-            Func<Task, TResult> continuation)
-        {
-            return task.ContinueWith(t =>
-            {
-                if (t.IsFaulted)
-                {
-                    var ex = t.Exception.Flatten();
-                    if (ex.InnerExceptions.Count == 1)
-                    {
-                        ExceptionDispatchInfo.Capture(ex.InnerExceptions[0]).Throw();
-                    }
-                    else
-                    {
-                        ExceptionDispatchInfo.Capture(ex).Throw();
-                    }
-                    // Unreachable
-                    return Task.FromResult(default(TResult));
-                }
-                else if (t.IsCanceled)
-                {
-                    var tcs = new TaskCompletionSource<TResult>();
-                    tcs.SetCanceled();
-                    return tcs.Task;
-                }
-                else
-                {
-                    return Task.FromResult(continuation(t));
-                }
-            }).Unwrap();
-        }
-
-        public static Task OnSuccess(this Task task, Action<Task> continuation)
-        {
-            return task.OnSuccess((Func<Task, object>) (t =>
-             {
-                 continuation(t);
-                 return null;
-             }));
-        }
-
-        public static Task WhileAsync(Func<Task<bool>> predicate, Func<Task> body)
-        {
-            Func<Task> iterate = null;
-            iterate = () =>
-            {
-                return predicate().OnSuccess(t =>
-                {
-                    if (!t.Result)
-                    {
-                        return Task.FromResult(0);
-                    }
-                    return body().OnSuccess(_ => iterate()).Unwrap();
-                }).Unwrap();
-            };
-            return iterate();
-        }
-    }
-}
diff --git a/Parse/Internal/Utilities/ParseConfigExtensions.cs b/Parse/Internal/Utilities/ParseConfigExtensions.cs
deleted file mode 100644
index 8e1a3072..00000000
--- a/Parse/Internal/Utilities/ParseConfigExtensions.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-
-namespace Parse.Core.Internal
-{
-    /// <summary>
-    /// So here's the deal. We have a lot of internal APIs for ParseObject, ParseUser, etc.
-    ///
-    /// These cannot be 'internal' anymore if we are fully modularizing things out, because
-    /// they are no longer a part of the same library, especially as we create things like
-    /// Installation inside push library.
-    ///
-    /// So this class contains a bunch of extension methods that can live inside another
-    /// namespace, which 'wrap' the intenral APIs that already exist.
-    /// </summary>
-    public static class ParseConfigExtensions
-    {
-        public static ParseConfig Create(IDictionary<string, object> fetchedConfig)
-        {
-            return new ParseConfig(fetchedConfig);
-        }
-    }
-}
diff --git a/Parse/Internal/Utilities/ParseObjectExtensions.cs b/Parse/Internal/Utilities/ParseObjectExtensions.cs
deleted file mode 100644
index 9436a542..00000000
--- a/Parse/Internal/Utilities/ParseObjectExtensions.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-
-namespace Parse.Core.Internal
-{
-    /// <summary>
-    /// So here's the deal. We have a lot of internal APIs for ParseObject, ParseUser, etc.
-    ///
-    /// These cannot be 'internal' anymore if we are fully modularizing things out, because
-    /// they are no longer a part of the same library, especially as we create things like
-    /// Installation inside push library.
-    ///
-    /// So this class contains a bunch of extension methods that can live inside another
-    /// namespace, which 'wrap' the intenral APIs that already exist.
-    /// </summary>
-    public static class ParseObjectExtensions
-    {
-        public static T FromState<T>(IObjectState state, string defaultClassName) where T : ParseObject
-        {
-            return ParseObject.FromState<T>(state, defaultClassName);
-        }
-
-        public static IObjectState GetState(this ParseObject obj)
-        {
-            return obj.State;
-        }
-
-        public static void HandleFetchResult(this ParseObject obj, IObjectState serverState)
-        {
-            obj.HandleFetchResult(serverState);
-        }
-
-        public static IDictionary<string, IParseFieldOperation> GetCurrentOperations(this ParseObject obj)
-        {
-            return obj.CurrentOperations;
-        }
-
-        public static IEnumerable<object> DeepTraversal(object root, bool traverseParseObjects = false, bool yieldRoot = false)
-        {
-            return ParseObject.DeepTraversal(root, traverseParseObjects, yieldRoot);
-        }
-
-        public static void SetIfDifferent<T>(this ParseObject obj, string key, T value)
-        {
-            obj.SetIfDifferent<T>(key, value);
-        }
-
-        public static IDictionary<string, object> ServerDataToJSONObjectForSerialization(this ParseObject obj)
-        {
-            return obj.ServerDataToJSONObjectForSerialization();
-        }
-
-        public static void Set(this ParseObject obj, string key, object value)
-        {
-            obj.Set(key, value);
-        }
-    }
-}
diff --git a/Parse/Internal/Utilities/ParseQueryExtensions.cs b/Parse/Internal/Utilities/ParseQueryExtensions.cs
deleted file mode 100644
index 112c1dd8..00000000
--- a/Parse/Internal/Utilities/ParseQueryExtensions.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-
-namespace Parse.Core.Internal
-{
-    /// <summary>
-    /// So here's the deal. We have a lot of internal APIs for ParseObject, ParseUser, etc.
-    ///
-    /// These cannot be 'internal' anymore if we are fully modularizing things out, because
-    /// they are no longer a part of the same library, especially as we create things like
-    /// Installation inside push library.
-    ///
-    /// So this class contains a bunch of extension methods that can live inside another
-    /// namespace, which 'wrap' the intenral APIs that already exist.
-    /// </summary>
-    public static class ParseQueryExtensions
-    {
-        public static string GetClassName<T>(this ParseQuery<T> query) where T : ParseObject
-        {
-            return query.ClassName;
-        }
-
-        public static IDictionary<string, object> BuildParameters<T>(this ParseQuery<T> query) where T : ParseObject
-        {
-            return query.BuildParameters(false);
-        }
-
-        public static object GetConstraint<T>(this ParseQuery<T> query, string key) where T : ParseObject
-        {
-            return query.GetConstraint(key);
-        }
-    }
-}
diff --git a/Parse/Internal/Utilities/ParseUserExtensions.cs b/Parse/Internal/Utilities/ParseUserExtensions.cs
deleted file mode 100644
index e8fc4ede..00000000
--- a/Parse/Internal/Utilities/ParseUserExtensions.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Parse.Core.Internal
-{
-    /// <summary>
-    /// So here's the deal. We have a lot of internal APIs for ParseObject, ParseUser, etc.
-    ///
-    /// These cannot be 'internal' anymore if we are fully modularizing things out, because
-    /// they are no longer a part of the same library, especially as we create things like
-    /// Installation inside push library.
-    ///
-    /// So this class contains a bunch of extension methods that can live inside another
-    /// namespace, which 'wrap' the intenral APIs that already exist.
-    /// </summary>
-    public static class ParseUserExtensions
-    {
-        public static IDictionary<string, IDictionary<string, object>> GetAuthData(this ParseUser user)
-        {
-            return user.AuthData;
-        }
-
-        public static Task UnlinkFromAsync(this ParseUser user, string authType, CancellationToken cancellationToken)
-        {
-            return user.UnlinkFromAsync(authType, cancellationToken);
-        }
-
-        public static Task<ParseUser> LogInWithAsync(string authType, CancellationToken cancellationToken)
-        {
-            return ParseUser.LogInWithAsync(authType, cancellationToken);
-        }
-
-        public static Task<ParseUser> LogInWithAsync(string authType, IDictionary<string, object> data, CancellationToken cancellationToken)
-        {
-            return ParseUser.LogInWithAsync(authType, data, cancellationToken);
-        }
-
-        public static Task LinkWithAsync(this ParseUser user, string authType, CancellationToken cancellationToken)
-        {
-            return user.LinkWithAsync(authType, cancellationToken);
-        }
-
-        public static Task LinkWithAsync(this ParseUser user, string authType, IDictionary<string, object> data, CancellationToken cancellationToken)
-        {
-            return user.LinkWithAsync(authType, data, cancellationToken);
-        }
-
-        public static Task UpgradeToRevocableSessionAsync(this ParseUser user, CancellationToken cancellationToken)
-        {
-            return user.UpgradeToRevocableSessionAsync(cancellationToken);
-        }
-    }
-}
diff --git a/Parse/Internal/Utilities/ReflectionHelpers.cs b/Parse/Internal/Utilities/ReflectionHelpers.cs
deleted file mode 100644
index 6008ce25..00000000
--- a/Parse/Internal/Utilities/ReflectionHelpers.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Reflection;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Parse.Common.Internal
-{
-    public static class ReflectionHelpers
-    {
-        public static IEnumerable<PropertyInfo> GetProperties(Type type)
-        {
-#if MONO || UNITY
-      return type.GetProperties();
-#else
-            return type.GetRuntimeProperties();
-#endif
-        }
-
-        public static MethodInfo GetMethod(Type type, string name, Type[] parameters)
-        {
-#if MONO || UNITY
-      return type.GetMethod(name, parameters);
-#else
-            return type.GetRuntimeMethod(name, parameters);
-#endif
-        }
-
-        public static bool IsPrimitive(Type type)
-        {
-#if MONO || UNITY
-			return type.IsPrimitive;
-#else
-            return type.GetTypeInfo().IsPrimitive;
-#endif
-        }
-
-        public static IEnumerable<Type> GetInterfaces(Type type)
-        {
-#if MONO || UNITY
-      return type.GetInterfaces();
-#else
-            return type.GetTypeInfo().ImplementedInterfaces;
-#endif
-        }
-
-        public static bool IsConstructedGenericType(Type type)
-        {
-#if UNITY
-      return type.IsGenericType && !type.IsGenericTypeDefinition;
-#else
-            return type.IsConstructedGenericType;
-#endif
-        }
-
-        public static IEnumerable<ConstructorInfo> GetConstructors(Type type)
-        {
-#if UNITY
-      BindingFlags searchFlags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
-      return type.GetConstructors(searchFlags);
-#else
-            return type.GetTypeInfo().DeclaredConstructors
-              .Where(c => (c.Attributes & MethodAttributes.Static) == 0);
-#endif
-        }
-
-        public static Type[] GetGenericTypeArguments(Type type)
-        {
-#if UNITY
-      return type.GetGenericArguments();
-#else
-            return type.GenericTypeArguments;
-#endif
-        }
-
-        public static PropertyInfo GetProperty(Type type, string name)
-        {
-#if MONO || UNITY
-      return type.GetProperty(name);
-#else
-            return type.GetRuntimeProperty(name);
-#endif
-        }
-
-        /// <summary>
-        /// This method helps simplify the process of getting a constructor for a type.
-        /// A method like this exists in .NET but is not allowed in a Portable Class Library,
-        /// so we've built our own.
-        /// </summary>
-        /// <param name="self"></param>
-        /// <param name="parameterTypes"></param>
-        /// <returns></returns>
-        public static ConstructorInfo FindConstructor(this Type self, params Type[] parameterTypes)
-        {
-            var constructors =
-              from constructor in GetConstructors(self)
-              let parameters = constructor.GetParameters()
-              let types = from p in parameters select p.ParameterType
-              where types.SequenceEqual(parameterTypes)
-              select constructor;
-            return constructors.SingleOrDefault();
-        }
-
-        public static bool IsNullable(Type t)
-        {
-            bool isGeneric;
-#if UNITY
-      isGeneric = t.IsGenericType && !t.IsGenericTypeDefinition;
-#else
-            isGeneric = t.IsConstructedGenericType;
-#endif
-            return isGeneric && t.GetGenericTypeDefinition().Equals(typeof(Nullable<>));
-        }
-
-        public static IEnumerable<T> GetCustomAttributes<T>(this Assembly assembly) where T : Attribute
-        {
-#if UNITY
-      return assembly.GetCustomAttributes(typeof(T), false).Select(attr => attr as T);
-#else
-            return CustomAttributeExtensions.GetCustomAttributes<T>(assembly);
-#endif
-        }
-    }
-}
diff --git a/Parse/Internal/Utilities/StorageManager.cs b/Parse/Internal/Utilities/StorageManager.cs
deleted file mode 100644
index a921c4fd..00000000
--- a/Parse/Internal/Utilities/StorageManager.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Parse.Internal.Utilities
-{
-    /// <summary>
-    /// A collection of utility methods and properties for writing to the app-specific persistent storage folder.
-    /// </summary>
-    internal static class StorageManager
-    {
-        static StorageManager() => AppDomain.CurrentDomain.ProcessExit += (_, __) => { if (new FileInfo(FallbackPersistentStorageFilePath) is FileInfo file && file.Exists) file.Delete(); };
-
-        /// <summary>
-        /// The path to a persistent user-specific storage location specific to the final client assembly of the Parse library.
-        /// </summary>
-        public static string PersistentStorageFilePath => Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), ParseClient.CurrentConfiguration.StorageConfiguration?.RelativeStorageFilePath ?? FallbackPersistentStorageFilePath));
-
-        /// <summary>
-        /// Gets the calculated persistent storage file fallback path for this app execution.
-        /// </summary>
-        public static string FallbackPersistentStorageFilePath { get; } = ParseClient.Configuration.IdentifierBasedStorageConfiguration.Fallback.RelativeStorageFilePath;
-
-        /// <summary>
-        /// Asynchronously writes the provided little-endian 16-bit character string <paramref name="content"/> to the file wrapped by the provided <see cref="FileInfo"/> instance.
-        /// </summary>
-        /// <param name="file">The <see cref="FileInfo"/> instance wrapping the target file that is to be written to</param>
-        /// <param name="content">The little-endian 16-bit Unicode character string (UTF-16) that is to be written to the <paramref name="file"/></param>
-        /// <returns>A task that completes once the write operation to the <paramref name="file"/> completes</returns>
-        public static async Task WriteToAsync(this FileInfo file, string content)
-        {
-            using (FileStream stream = new FileStream(Path.GetFullPath(file.FullName), FileMode.Create, FileAccess.Write, FileShare.Read, 4096, FileOptions.SequentialScan | FileOptions.Asynchronous))
-            {
-                byte[] data = Encoding.Unicode.GetBytes(content);
-                await stream.WriteAsync(data, 0, data.Length);
-            }
-        }
-
-        /// <summary>
-        /// Asynchronously read all of the little-endian 16-bit character units (UTF-16) contained within the file wrapped by the provided <see cref="FileInfo"/> instance.
-        /// </summary>
-        /// <param name="file">The <see cref="FileInfo"/> instance wrapping the target file that string content is to be read from</param>
-        /// <returns>A task that should contain the little-endian 16-bit character string (UTF-16) extracted from the <paramref name="file"/> if the read completes successfully</returns>
-        public static async Task<string> ReadAllTextAsync(this FileInfo file)
-        {
-            using (StreamReader reader = new StreamReader(file.OpenRead(), Encoding.Unicode))
-                return await reader.ReadToEndAsync();
-        }
-
-        /// <summary>
-        /// Gets or creates the file pointed to by <see cref="PersistentStorageFilePath"/> and returns it's wrapper as a <see cref="FileInfo"/> instance.
-        /// </summary>
-        public static FileInfo PersistentStorageFileWrapper
-        {
-            get
-            {
-                Directory.CreateDirectory(PersistentStorageFilePath.Substring(0, PersistentStorageFilePath.LastIndexOf(Path.DirectorySeparatorChar)));
-
-                FileInfo file = new FileInfo(PersistentStorageFilePath);
-                if (!file.Exists)
-                    using (file.Create())
-                        ; // Hopefully the JIT doesn't no-op this. The behaviour of the "using" clause should dictate how the stream is closed, to make sure it happens properly.
-
-                return file;
-            }
-        }
-
-        /// <summary>
-        /// Gets the file wrapper for the specified <paramref name="path"/>.
-        /// </summary>
-        /// <param name="path">The relative path to the target file</param>
-        /// <returns>An instance of <see cref="FileInfo"/> wrapping the the <paramref name="path"/> value</returns>
-        public static FileInfo GetWrapperForRelativePersistentStorageFilePath(string path)
-        {
-            path = Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), path));
-
-            Directory.CreateDirectory(path.Substring(0, path.LastIndexOf(Path.DirectorySeparatorChar)));
-            return new FileInfo(path);
-        }
-
-        public static async Task TransferAsync(string originFilePath, string targetFilePath)
-        {
-            if (!String.IsNullOrWhiteSpace(originFilePath) && !String.IsNullOrWhiteSpace(targetFilePath) && new FileInfo(originFilePath) is FileInfo originFile && originFile.Exists && new FileInfo(targetFilePath) is FileInfo targetFile)
-                using (StreamWriter writer = new StreamWriter(targetFile.OpenWrite(), Encoding.Unicode))
-                using (StreamReader reader = new StreamReader(originFile.OpenRead(), Encoding.Unicode))
-                    await writer.WriteAsync(await reader.ReadToEndAsync());
-        }
-    }
-}
diff --git a/Parse/Internal/Utilities/SynchronizedEventHandler.cs b/Parse/Internal/Utilities/SynchronizedEventHandler.cs
deleted file mode 100644
index 30f8f081..00000000
--- a/Parse/Internal/Utilities/SynchronizedEventHandler.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Parse.Common.Internal
-{
-    /// <summary>
-    /// Represents an event handler that calls back from the synchronization context
-    /// that subscribed.
-    /// <typeparam name="T">Should look like an EventArgs, but may not inherit EventArgs if T is implemented by the Windows team.</typeparam>
-    /// </summary>
-    public class SynchronizedEventHandler<T>
-    {
-        private LinkedList<Tuple<Delegate, TaskFactory>> delegates =
-            new LinkedList<Tuple<Delegate, TaskFactory>>();
-        public void Add(Delegate del)
-        {
-            lock (delegates)
-            {
-                TaskFactory factory;
-                if (SynchronizationContext.Current != null)
-                {
-                    factory =
-                        new TaskFactory(CancellationToken.None,
-                            TaskCreationOptions.None,
-                            TaskContinuationOptions.ExecuteSynchronously,
-                            TaskScheduler.FromCurrentSynchronizationContext());
-                }
-                else
-                {
-                    factory = Task.Factory;
-                }
-                foreach (var d in del.GetInvocationList())
-                {
-                    delegates.AddLast(new Tuple<Delegate, TaskFactory>(d, factory));
-                }
-            }
-        }
-
-        public void Remove(Delegate del)
-        {
-            lock (delegates)
-            {
-                if (delegates.Count == 0)
-                {
-                    return;
-                }
-                foreach (var d in del.GetInvocationList())
-                {
-                    var node = delegates.First;
-                    while (node != null)
-                    {
-                        if (node.Value.Item1 == d)
-                        {
-                            delegates.Remove(node);
-                            break;
-                        }
-                        node = node.Next;
-                    }
-                }
-            }
-        }
-
-        public Task Invoke(object sender, T args)
-        {
-            IEnumerable<Tuple<Delegate, TaskFactory>> toInvoke;
-            var toContinue = new[] { Task.FromResult(0) };
-            lock (delegates)
-            {
-                toInvoke = delegates.ToList();
-            }
-            var invocations = toInvoke
-                .Select(p => p.Item2.ContinueWhenAll(toContinue,
-                    _ => p.Item1.DynamicInvoke(sender, args)))
-                .ToList();
-            return Task.WhenAll(invocations);
-        }
-    }
-}
diff --git a/Parse/Internal/Utilities/XamarinAttributes.cs b/Parse/Internal/Utilities/XamarinAttributes.cs
deleted file mode 100644
index d7930b06..00000000
--- a/Parse/Internal/Utilities/XamarinAttributes.cs
+++ /dev/null
@@ -1,409 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Parse.Common.Internal
-{
-    /// <summary>
-    /// A reimplementation of Xamarin's PreserveAttribute.
-    /// This allows us to support AOT and linking for Xamarin platforms.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.All)]
-    internal class PreserveAttribute : Attribute
-    {
-        public bool AllMembers;
-        public bool Conditional;
-    }
-
-    [AttributeUsage(AttributeTargets.All)]
-    internal class LinkerSafeAttribute : Attribute
-    {
-        public LinkerSafeAttribute() { }
-    }
-
-    [Preserve(AllMembers = true)]
-    internal class PreserveWrapperTypes
-    {
-        /// <summary>
-        /// Exists to ensure that generic types are AOT-compiled for the conversions we support.
-        /// Any new value types that we add support for will need to be registered here.
-        /// The method itself is never called, but by virtue of the Preserve attribute being set
-        /// on the class, these types will be AOT-compiled.
-        ///
-        /// This also applies to Unity.
-        /// </summary>
-        private static List<object> CreateWrapperTypes()
-        {
-            return new List<object> {
-                typeof(FlexibleListWrapper<object, object>),
-                typeof(FlexibleListWrapper<object, bool>),
-                typeof(FlexibleListWrapper<object, byte>),
-                typeof(FlexibleListWrapper<object, sbyte>),
-                typeof(FlexibleListWrapper<object, short>),
-                typeof(FlexibleListWrapper<object, ushort>),
-                typeof(FlexibleListWrapper<object, int>),
-                typeof(FlexibleListWrapper<object, uint>),
-                typeof(FlexibleListWrapper<object, long>),
-                typeof(FlexibleListWrapper<object, ulong>),
-                typeof(FlexibleListWrapper<object, char>),
-                typeof(FlexibleListWrapper<object, double>),
-                typeof(FlexibleListWrapper<object, float>),
-
-                typeof(FlexibleListWrapper<bool, object>),
-                typeof(FlexibleListWrapper<bool, bool>),
-                typeof(FlexibleListWrapper<bool, byte>),
-                typeof(FlexibleListWrapper<bool, sbyte>),
-                typeof(FlexibleListWrapper<bool, short>),
-                typeof(FlexibleListWrapper<bool, ushort>),
-                typeof(FlexibleListWrapper<bool, int>),
-                typeof(FlexibleListWrapper<bool, uint>),
-                typeof(FlexibleListWrapper<bool, long>),
-                typeof(FlexibleListWrapper<bool, ulong>),
-                typeof(FlexibleListWrapper<bool, char>),
-                typeof(FlexibleListWrapper<bool, double>),
-                typeof(FlexibleListWrapper<bool, float>),
-
-                typeof(FlexibleListWrapper<byte, object>),
-                typeof(FlexibleListWrapper<byte, bool>),
-                typeof(FlexibleListWrapper<byte, byte>),
-                typeof(FlexibleListWrapper<byte, sbyte>),
-                typeof(FlexibleListWrapper<byte, short>),
-                typeof(FlexibleListWrapper<byte, ushort>),
-                typeof(FlexibleListWrapper<byte, int>),
-                typeof(FlexibleListWrapper<byte, uint>),
-                typeof(FlexibleListWrapper<byte, long>),
-                typeof(FlexibleListWrapper<byte, ulong>),
-                typeof(FlexibleListWrapper<byte, char>),
-                typeof(FlexibleListWrapper<byte, double>),
-                typeof(FlexibleListWrapper<byte, float>),
-
-                typeof(FlexibleListWrapper<sbyte, object>),
-                typeof(FlexibleListWrapper<sbyte, bool>),
-                typeof(FlexibleListWrapper<sbyte, byte>),
-                typeof(FlexibleListWrapper<sbyte, sbyte>),
-                typeof(FlexibleListWrapper<sbyte, short>),
-                typeof(FlexibleListWrapper<sbyte, ushort>),
-                typeof(FlexibleListWrapper<sbyte, int>),
-                typeof(FlexibleListWrapper<sbyte, uint>),
-                typeof(FlexibleListWrapper<sbyte, long>),
-                typeof(FlexibleListWrapper<sbyte, ulong>),
-                typeof(FlexibleListWrapper<sbyte, char>),
-                typeof(FlexibleListWrapper<sbyte, double>),
-                typeof(FlexibleListWrapper<sbyte, float>),
-
-                typeof(FlexibleListWrapper<short, object>),
-                typeof(FlexibleListWrapper<short, bool>),
-                typeof(FlexibleListWrapper<short, byte>),
-                typeof(FlexibleListWrapper<short, sbyte>),
-                typeof(FlexibleListWrapper<short, short>),
-                typeof(FlexibleListWrapper<short, ushort>),
-                typeof(FlexibleListWrapper<short, int>),
-                typeof(FlexibleListWrapper<short, uint>),
-                typeof(FlexibleListWrapper<short, long>),
-                typeof(FlexibleListWrapper<short, ulong>),
-                typeof(FlexibleListWrapper<short, char>),
-                typeof(FlexibleListWrapper<short, double>),
-                typeof(FlexibleListWrapper<short, float>),
-
-                typeof(FlexibleListWrapper<ushort, object>),
-                typeof(FlexibleListWrapper<ushort, bool>),
-                typeof(FlexibleListWrapper<ushort, byte>),
-                typeof(FlexibleListWrapper<ushort, sbyte>),
-                typeof(FlexibleListWrapper<ushort, short>),
-                typeof(FlexibleListWrapper<ushort, ushort>),
-                typeof(FlexibleListWrapper<ushort, int>),
-                typeof(FlexibleListWrapper<ushort, uint>),
-                typeof(FlexibleListWrapper<ushort, long>),
-                typeof(FlexibleListWrapper<ushort, ulong>),
-                typeof(FlexibleListWrapper<ushort, char>),
-                typeof(FlexibleListWrapper<ushort, double>),
-                typeof(FlexibleListWrapper<ushort, float>),
-
-                typeof(FlexibleListWrapper<int, object>),
-                typeof(FlexibleListWrapper<int, bool>),
-                typeof(FlexibleListWrapper<int, byte>),
-                typeof(FlexibleListWrapper<int, sbyte>),
-                typeof(FlexibleListWrapper<int, short>),
-                typeof(FlexibleListWrapper<int, ushort>),
-                typeof(FlexibleListWrapper<int, int>),
-                typeof(FlexibleListWrapper<int, uint>),
-                typeof(FlexibleListWrapper<int, long>),
-                typeof(FlexibleListWrapper<int, ulong>),
-                typeof(FlexibleListWrapper<int, char>),
-                typeof(FlexibleListWrapper<int, double>),
-                typeof(FlexibleListWrapper<int, float>),
-
-                typeof(FlexibleListWrapper<uint, object>),
-                typeof(FlexibleListWrapper<uint, bool>),
-                typeof(FlexibleListWrapper<uint, byte>),
-                typeof(FlexibleListWrapper<uint, sbyte>),
-                typeof(FlexibleListWrapper<uint, short>),
-                typeof(FlexibleListWrapper<uint, ushort>),
-                typeof(FlexibleListWrapper<uint, int>),
-                typeof(FlexibleListWrapper<uint, uint>),
-                typeof(FlexibleListWrapper<uint, long>),
-                typeof(FlexibleListWrapper<uint, ulong>),
-                typeof(FlexibleListWrapper<uint, char>),
-                typeof(FlexibleListWrapper<uint, double>),
-                typeof(FlexibleListWrapper<uint, float>),
-
-                typeof(FlexibleListWrapper<long, object>),
-                typeof(FlexibleListWrapper<long, bool>),
-                typeof(FlexibleListWrapper<long, byte>),
-                typeof(FlexibleListWrapper<long, sbyte>),
-                typeof(FlexibleListWrapper<long, short>),
-                typeof(FlexibleListWrapper<long, ushort>),
-                typeof(FlexibleListWrapper<long, int>),
-                typeof(FlexibleListWrapper<long, uint>),
-                typeof(FlexibleListWrapper<long, long>),
-                typeof(FlexibleListWrapper<long, ulong>),
-                typeof(FlexibleListWrapper<long, char>),
-                typeof(FlexibleListWrapper<long, double>),
-                typeof(FlexibleListWrapper<long, float>),
-
-                typeof(FlexibleListWrapper<ulong, object>),
-                typeof(FlexibleListWrapper<ulong, bool>),
-                typeof(FlexibleListWrapper<ulong, byte>),
-                typeof(FlexibleListWrapper<ulong, sbyte>),
-                typeof(FlexibleListWrapper<ulong, short>),
-                typeof(FlexibleListWrapper<ulong, ushort>),
-                typeof(FlexibleListWrapper<ulong, int>),
-                typeof(FlexibleListWrapper<ulong, uint>),
-                typeof(FlexibleListWrapper<ulong, long>),
-                typeof(FlexibleListWrapper<ulong, ulong>),
-                typeof(FlexibleListWrapper<ulong, char>),
-                typeof(FlexibleListWrapper<ulong, double>),
-                typeof(FlexibleListWrapper<ulong, float>),
-
-                typeof(FlexibleListWrapper<char, object>),
-                typeof(FlexibleListWrapper<char, bool>),
-                typeof(FlexibleListWrapper<char, byte>),
-                typeof(FlexibleListWrapper<char, sbyte>),
-                typeof(FlexibleListWrapper<char, short>),
-                typeof(FlexibleListWrapper<char, ushort>),
-                typeof(FlexibleListWrapper<char, int>),
-                typeof(FlexibleListWrapper<char, uint>),
-                typeof(FlexibleListWrapper<char, long>),
-                typeof(FlexibleListWrapper<char, ulong>),
-                typeof(FlexibleListWrapper<char, char>),
-                typeof(FlexibleListWrapper<char, double>),
-                typeof(FlexibleListWrapper<char, float>),
-
-                typeof(FlexibleListWrapper<double, object>),
-                typeof(FlexibleListWrapper<double, bool>),
-                typeof(FlexibleListWrapper<double, byte>),
-                typeof(FlexibleListWrapper<double, sbyte>),
-                typeof(FlexibleListWrapper<double, short>),
-                typeof(FlexibleListWrapper<double, ushort>),
-                typeof(FlexibleListWrapper<double, int>),
-                typeof(FlexibleListWrapper<double, uint>),
-                typeof(FlexibleListWrapper<double, long>),
-                typeof(FlexibleListWrapper<double, ulong>),
-                typeof(FlexibleListWrapper<double, char>),
-                typeof(FlexibleListWrapper<double, double>),
-                typeof(FlexibleListWrapper<double, float>),
-
-                typeof(FlexibleListWrapper<float, object>),
-                typeof(FlexibleListWrapper<float, bool>),
-                typeof(FlexibleListWrapper<float, byte>),
-                typeof(FlexibleListWrapper<float, sbyte>),
-                typeof(FlexibleListWrapper<float, short>),
-                typeof(FlexibleListWrapper<float, ushort>),
-                typeof(FlexibleListWrapper<float, int>),
-                typeof(FlexibleListWrapper<float, uint>),
-                typeof(FlexibleListWrapper<float, long>),
-                typeof(FlexibleListWrapper<float, ulong>),
-                typeof(FlexibleListWrapper<float, char>),
-                typeof(FlexibleListWrapper<float, double>),
-                typeof(FlexibleListWrapper<float, float>),
-
-                typeof(FlexibleListWrapper<object, DateTime>),
-                typeof(FlexibleListWrapper<DateTime, object>),
-
-                typeof(FlexibleDictionaryWrapper<object, object>),
-                typeof(FlexibleDictionaryWrapper<object, bool>),
-                typeof(FlexibleDictionaryWrapper<object, byte>),
-                typeof(FlexibleDictionaryWrapper<object, sbyte>),
-                typeof(FlexibleDictionaryWrapper<object, short>),
-                typeof(FlexibleDictionaryWrapper<object, ushort>),
-                typeof(FlexibleDictionaryWrapper<object, int>),
-                typeof(FlexibleDictionaryWrapper<object, uint>),
-                typeof(FlexibleDictionaryWrapper<object, long>),
-                typeof(FlexibleDictionaryWrapper<object, ulong>),
-                typeof(FlexibleDictionaryWrapper<object, char>),
-                typeof(FlexibleDictionaryWrapper<object, double>),
-                typeof(FlexibleDictionaryWrapper<object, float>),
-
-                typeof(FlexibleDictionaryWrapper<bool, object>),
-                typeof(FlexibleDictionaryWrapper<bool, bool>),
-                typeof(FlexibleDictionaryWrapper<bool, byte>),
-                typeof(FlexibleDictionaryWrapper<bool, sbyte>),
-                typeof(FlexibleDictionaryWrapper<bool, short>),
-                typeof(FlexibleDictionaryWrapper<bool, ushort>),
-                typeof(FlexibleDictionaryWrapper<bool, int>),
-                typeof(FlexibleDictionaryWrapper<bool, uint>),
-                typeof(FlexibleDictionaryWrapper<bool, long>),
-                typeof(FlexibleDictionaryWrapper<bool, ulong>),
-                typeof(FlexibleDictionaryWrapper<bool, char>),
-                typeof(FlexibleDictionaryWrapper<bool, double>),
-                typeof(FlexibleDictionaryWrapper<bool, float>),
-
-                typeof(FlexibleDictionaryWrapper<byte, object>),
-                typeof(FlexibleDictionaryWrapper<byte, bool>),
-                typeof(FlexibleDictionaryWrapper<byte, byte>),
-                typeof(FlexibleDictionaryWrapper<byte, sbyte>),
-                typeof(FlexibleDictionaryWrapper<byte, short>),
-                typeof(FlexibleDictionaryWrapper<byte, ushort>),
-                typeof(FlexibleDictionaryWrapper<byte, int>),
-                typeof(FlexibleDictionaryWrapper<byte, uint>),
-                typeof(FlexibleDictionaryWrapper<byte, long>),
-                typeof(FlexibleDictionaryWrapper<byte, ulong>),
-                typeof(FlexibleDictionaryWrapper<byte, char>),
-                typeof(FlexibleDictionaryWrapper<byte, double>),
-                typeof(FlexibleDictionaryWrapper<byte, float>),
-
-                typeof(FlexibleDictionaryWrapper<sbyte, object>),
-                typeof(FlexibleDictionaryWrapper<sbyte, bool>),
-                typeof(FlexibleDictionaryWrapper<sbyte, byte>),
-                typeof(FlexibleDictionaryWrapper<sbyte, sbyte>),
-                typeof(FlexibleDictionaryWrapper<sbyte, short>),
-                typeof(FlexibleDictionaryWrapper<sbyte, ushort>),
-                typeof(FlexibleDictionaryWrapper<sbyte, int>),
-                typeof(FlexibleDictionaryWrapper<sbyte, uint>),
-                typeof(FlexibleDictionaryWrapper<sbyte, long>),
-                typeof(FlexibleDictionaryWrapper<sbyte, ulong>),
-                typeof(FlexibleDictionaryWrapper<sbyte, char>),
-                typeof(FlexibleDictionaryWrapper<sbyte, double>),
-                typeof(FlexibleDictionaryWrapper<sbyte, float>),
-
-                typeof(FlexibleDictionaryWrapper<short, object>),
-                typeof(FlexibleDictionaryWrapper<short, bool>),
-                typeof(FlexibleDictionaryWrapper<short, byte>),
-                typeof(FlexibleDictionaryWrapper<short, sbyte>),
-                typeof(FlexibleDictionaryWrapper<short, short>),
-                typeof(FlexibleDictionaryWrapper<short, ushort>),
-                typeof(FlexibleDictionaryWrapper<short, int>),
-                typeof(FlexibleDictionaryWrapper<short, uint>),
-                typeof(FlexibleDictionaryWrapper<short, long>),
-                typeof(FlexibleDictionaryWrapper<short, ulong>),
-                typeof(FlexibleDictionaryWrapper<short, char>),
-                typeof(FlexibleDictionaryWrapper<short, double>),
-                typeof(FlexibleDictionaryWrapper<short, float>),
-
-                typeof(FlexibleDictionaryWrapper<ushort, object>),
-                typeof(FlexibleDictionaryWrapper<ushort, bool>),
-                typeof(FlexibleDictionaryWrapper<ushort, byte>),
-                typeof(FlexibleDictionaryWrapper<ushort, sbyte>),
-                typeof(FlexibleDictionaryWrapper<ushort, short>),
-                typeof(FlexibleDictionaryWrapper<ushort, ushort>),
-                typeof(FlexibleDictionaryWrapper<ushort, int>),
-                typeof(FlexibleDictionaryWrapper<ushort, uint>),
-                typeof(FlexibleDictionaryWrapper<ushort, long>),
-                typeof(FlexibleDictionaryWrapper<ushort, ulong>),
-                typeof(FlexibleDictionaryWrapper<ushort, char>),
-                typeof(FlexibleDictionaryWrapper<ushort, double>),
-                typeof(FlexibleDictionaryWrapper<ushort, float>),
-
-                typeof(FlexibleDictionaryWrapper<int, object>),
-                typeof(FlexibleDictionaryWrapper<int, bool>),
-                typeof(FlexibleDictionaryWrapper<int, byte>),
-                typeof(FlexibleDictionaryWrapper<int, sbyte>),
-                typeof(FlexibleDictionaryWrapper<int, short>),
-                typeof(FlexibleDictionaryWrapper<int, ushort>),
-                typeof(FlexibleDictionaryWrapper<int, int>),
-                typeof(FlexibleDictionaryWrapper<int, uint>),
-                typeof(FlexibleDictionaryWrapper<int, long>),
-                typeof(FlexibleDictionaryWrapper<int, ulong>),
-                typeof(FlexibleDictionaryWrapper<int, char>),
-                typeof(FlexibleDictionaryWrapper<int, double>),
-                typeof(FlexibleDictionaryWrapper<int, float>),
-
-                typeof(FlexibleDictionaryWrapper<uint, object>),
-                typeof(FlexibleDictionaryWrapper<uint, bool>),
-                typeof(FlexibleDictionaryWrapper<uint, byte>),
-                typeof(FlexibleDictionaryWrapper<uint, sbyte>),
-                typeof(FlexibleDictionaryWrapper<uint, short>),
-                typeof(FlexibleDictionaryWrapper<uint, ushort>),
-                typeof(FlexibleDictionaryWrapper<uint, int>),
-                typeof(FlexibleDictionaryWrapper<uint, uint>),
-                typeof(FlexibleDictionaryWrapper<uint, long>),
-                typeof(FlexibleDictionaryWrapper<uint, ulong>),
-                typeof(FlexibleDictionaryWrapper<uint, char>),
-                typeof(FlexibleDictionaryWrapper<uint, double>),
-                typeof(FlexibleDictionaryWrapper<uint, float>),
-
-                typeof(FlexibleDictionaryWrapper<long, object>),
-                typeof(FlexibleDictionaryWrapper<long, bool>),
-                typeof(FlexibleDictionaryWrapper<long, byte>),
-                typeof(FlexibleDictionaryWrapper<long, sbyte>),
-                typeof(FlexibleDictionaryWrapper<long, short>),
-                typeof(FlexibleDictionaryWrapper<long, ushort>),
-                typeof(FlexibleDictionaryWrapper<long, int>),
-                typeof(FlexibleDictionaryWrapper<long, uint>),
-                typeof(FlexibleDictionaryWrapper<long, long>),
-                typeof(FlexibleDictionaryWrapper<long, ulong>),
-                typeof(FlexibleDictionaryWrapper<long, char>),
-                typeof(FlexibleDictionaryWrapper<long, double>),
-                typeof(FlexibleDictionaryWrapper<long, float>),
-
-                typeof(FlexibleDictionaryWrapper<ulong, object>),
-                typeof(FlexibleDictionaryWrapper<ulong, bool>),
-                typeof(FlexibleDictionaryWrapper<ulong, byte>),
-                typeof(FlexibleDictionaryWrapper<ulong, sbyte>),
-                typeof(FlexibleDictionaryWrapper<ulong, short>),
-                typeof(FlexibleDictionaryWrapper<ulong, ushort>),
-                typeof(FlexibleDictionaryWrapper<ulong, int>),
-                typeof(FlexibleDictionaryWrapper<ulong, uint>),
-                typeof(FlexibleDictionaryWrapper<ulong, long>),
-                typeof(FlexibleDictionaryWrapper<ulong, ulong>),
-                typeof(FlexibleDictionaryWrapper<ulong, char>),
-                typeof(FlexibleDictionaryWrapper<ulong, double>),
-                typeof(FlexibleDictionaryWrapper<ulong, float>),
-
-                typeof(FlexibleDictionaryWrapper<char, object>),
-                typeof(FlexibleDictionaryWrapper<char, bool>),
-                typeof(FlexibleDictionaryWrapper<char, byte>),
-                typeof(FlexibleDictionaryWrapper<char, sbyte>),
-                typeof(FlexibleDictionaryWrapper<char, short>),
-                typeof(FlexibleDictionaryWrapper<char, ushort>),
-                typeof(FlexibleDictionaryWrapper<char, int>),
-                typeof(FlexibleDictionaryWrapper<char, uint>),
-                typeof(FlexibleDictionaryWrapper<char, long>),
-                typeof(FlexibleDictionaryWrapper<char, ulong>),
-                typeof(FlexibleDictionaryWrapper<char, char>),
-                typeof(FlexibleDictionaryWrapper<char, double>),
-                typeof(FlexibleDictionaryWrapper<char, float>),
-
-                typeof(FlexibleDictionaryWrapper<double, object>),
-                typeof(FlexibleDictionaryWrapper<double, bool>),
-                typeof(FlexibleDictionaryWrapper<double, byte>),
-                typeof(FlexibleDictionaryWrapper<double, sbyte>),
-                typeof(FlexibleDictionaryWrapper<double, short>),
-                typeof(FlexibleDictionaryWrapper<double, ushort>),
-                typeof(FlexibleDictionaryWrapper<double, int>),
-                typeof(FlexibleDictionaryWrapper<double, uint>),
-                typeof(FlexibleDictionaryWrapper<double, long>),
-                typeof(FlexibleDictionaryWrapper<double, ulong>),
-                typeof(FlexibleDictionaryWrapper<double, char>),
-                typeof(FlexibleDictionaryWrapper<double, double>),
-                typeof(FlexibleDictionaryWrapper<double, float>),
-
-                typeof(FlexibleDictionaryWrapper<float, object>),
-                typeof(FlexibleDictionaryWrapper<float, bool>),
-                typeof(FlexibleDictionaryWrapper<float, byte>),
-                typeof(FlexibleDictionaryWrapper<float, sbyte>),
-                typeof(FlexibleDictionaryWrapper<float, short>),
-                typeof(FlexibleDictionaryWrapper<float, ushort>),
-                typeof(FlexibleDictionaryWrapper<float, int>),
-                typeof(FlexibleDictionaryWrapper<float, uint>),
-                typeof(FlexibleDictionaryWrapper<float, long>),
-                typeof(FlexibleDictionaryWrapper<float, ulong>),
-                typeof(FlexibleDictionaryWrapper<float, char>),
-                typeof(FlexibleDictionaryWrapper<float, double>),
-                typeof(FlexibleDictionaryWrapper<float, float>),
-
-                typeof(FlexibleDictionaryWrapper<object, DateTime>),
-                typeof(FlexibleDictionaryWrapper<DateTime, object>),
-            };
-        }
-    }
-}
diff --git a/Parse/Parse.csproj b/Parse/Parse.csproj
index 08e95b3c..e2d9d5b9 100644
--- a/Parse/Parse.csproj
+++ b/Parse/Parse.csproj
@@ -3,8 +3,7 @@
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
         <DocumentationFile>bin\Release\netstandard2.0\Parse.xml</DocumentationFile>
-        <Version>2.0.0-develop</Version>
-        <AssemblyVersion>2.0.0</AssemblyVersion>
+        <Version>2.0.0-develop-0001</Version>
         <LangVersion>latest</LangVersion>
         
         <Authors>Parse</Authors>
@@ -13,7 +12,7 @@
         <PackageIconUrl>https://raw.githubusercontent.com/parse-community/parse-community.github.io/master/img/favicon/favicon-194x194.png</PackageIconUrl>
         <RepositoryType>GitHub</RepositoryType>
         <Description>This is the official package for the Parse .NET Standard SDK. Add a cloud backend to any platform supporting .NET Standard 2.0 with this simple-to-use SDK.</Description>
-        <Copyright>Copyright © Parse 2018. All rights reserved.</Copyright>
+        <Copyright>Copyright © Parse 2020. All rights reserved.</Copyright>
 
         <PackageTags>Parse;netstandard2.0;parse-platform;backend;sdk;netstandard;app</PackageTags>
         <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
@@ -24,4 +23,19 @@
         <PackageReference Include="OpenCover" Version="4.6.519" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Compile Update="Resources.Designer.cs">
+        <DesignTime>True</DesignTime>
+        <AutoGen>True</AutoGen>
+        <DependentUpon>Resources.resx</DependentUpon>
+      </Compile>
+    </ItemGroup>
+
+    <ItemGroup>
+      <EmbeddedResource Update="Resources.resx">
+        <Generator>ResXFileCodeGenerator</Generator>
+        <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      </EmbeddedResource>
+    </ItemGroup>
+
 </Project>
diff --git a/Parse/Internal/Analytics/Controller/ParseAnalyticsController.cs b/Parse/Platform/Analytics/ParseAnalyticsController.cs
similarity index 73%
rename from Parse/Internal/Analytics/Controller/ParseAnalyticsController.cs
rename to Parse/Platform/Analytics/ParseAnalyticsController.cs
index 9840f1ba..1a6a36c5 100644
--- a/Parse/Internal/Analytics/Controller/ParseAnalyticsController.cs
+++ b/Parse/Platform/Analytics/ParseAnalyticsController.cs
@@ -4,16 +4,20 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Parse.Core.Internal;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Abstractions.Platform.Analytics;
+using Parse.Infrastructure.Data;
+using Parse.Infrastructure.Execution;
 
-namespace Parse.Analytics.Internal
+namespace Parse.Platform.Analytics
 {
     /// <summary>
     /// The controller for the Parse Analytics API.
     /// </summary>
     public class ParseAnalyticsController : IParseAnalyticsController
     {
-        private IParseCommandRunner Runner { get; }
+        IParseCommandRunner Runner { get; }
 
         /// <summary>
         /// Creates an instance of the Parse Analytics API controller.
@@ -29,20 +33,20 @@ public class ParseAnalyticsController : IParseAnalyticsController
         /// <param name="sessionToken">The session token for the event.</param>
         /// <param name="cancellationToken">The asynchonous cancellation token.</param>
         /// <returns>A <see cref="Task"/> that will complete successfully once the event has been set to be tracked.</returns>
-        public Task TrackEventAsync(string name, IDictionary<string, string> dimensions, string sessionToken, CancellationToken cancellationToken)
+        public Task TrackEventAsync(string name, IDictionary<string, string> dimensions, string sessionToken, IServiceHub serviceHub, CancellationToken cancellationToken = default)
         {
             IDictionary<string, object> data = new Dictionary<string, object>
             {
                 ["at"] = DateTime.Now,
-                ["name"] = name,
+                [nameof(name)] = name,
             };
 
             if (dimensions != null)
             {
-                data["dimensions"] = dimensions;
+                data[nameof(dimensions)] = dimensions;
             }
 
-            return Runner.RunCommandAsync(new ParseCommand("events/" + name, "POST", sessionToken, data: PointerOrLocalIdEncoder.Instance.Encode(data) as IDictionary<string, object>), cancellationToken: cancellationToken);
+            return Runner.RunCommandAsync(new ParseCommand($"events/{name}", "POST", sessionToken, data: PointerOrLocalIdEncoder.Instance.Encode(data, serviceHub) as IDictionary<string, object>), cancellationToken: cancellationToken);
         }
 
         /// <summary>
@@ -52,16 +56,14 @@ public Task TrackEventAsync(string name, IDictionary<string, string> dimensions,
         /// <param name="sessionToken">The token of the current session.</param>
         /// <param name="cancellationToken">The asynchronous cancellation token.</param>
         /// <returns>A <see cref="Task"/> the will complete successfully once app openings for the target push notification have been set to be tracked.</returns>
-        public Task TrackAppOpenedAsync(string pushHash, string sessionToken, CancellationToken cancellationToken)
+        public Task TrackAppOpenedAsync(string pushHash, string sessionToken, IServiceHub serviceHub, CancellationToken cancellationToken = default)
         {
             IDictionary<string, object> data = new Dictionary<string, object> { ["at"] = DateTime.Now };
 
             if (pushHash != null)
-            {
                 data["push_hash"] = pushHash;
-            }
 
-            return Runner.RunCommandAsync(new ParseCommand("events/AppOpened", "POST", sessionToken, data: PointerOrLocalIdEncoder.Instance.Encode(data) as IDictionary<string, object>), cancellationToken: cancellationToken);
+            return Runner.RunCommandAsync(new ParseCommand("events/AppOpened", "POST", sessionToken, data: PointerOrLocalIdEncoder.Instance.Encode(data, serviceHub) as IDictionary<string, object>), cancellationToken: cancellationToken);
         }
     }
 }
diff --git a/Parse/Platform/Cloud/ParseCloudCodeController.cs b/Parse/Platform/Cloud/ParseCloudCodeController.cs
new file mode 100644
index 00000000..2eeef0cf
--- /dev/null
+++ b/Parse/Platform/Cloud/ParseCloudCodeController.cs
@@ -0,0 +1,31 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure.Data;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Cloud;
+using Parse.Infrastructure.Utilities;
+using Parse.Infrastructure.Data;
+using Parse.Infrastructure.Execution;
+
+namespace Parse.Platform.Cloud
+{
+    public class ParseCloudCodeController : IParseCloudCodeController
+    {
+        IParseCommandRunner CommandRunner { get; }
+
+        IParseDataDecoder Decoder { get; }
+
+        public ParseCloudCodeController(IParseCommandRunner commandRunner, IParseDataDecoder decoder) => (CommandRunner, Decoder) = (commandRunner, decoder);
+
+        public Task<T> CallFunctionAsync<T>(string name, IDictionary<string, object> parameters, string sessionToken, IServiceHub serviceHub, CancellationToken cancellationToken = default) => CommandRunner.RunCommandAsync(new ParseCommand($"functions/{Uri.EscapeUriString(name)}", method: "POST", sessionToken: sessionToken, data: NoObjectsEncoder.Instance.Encode(parameters, serviceHub) as IDictionary<string, object>), cancellationToken: cancellationToken).OnSuccess(task =>
+        {
+            IDictionary<string, object> decoded = Decoder.Decode(task.Result.Item2, serviceHub) as IDictionary<string, object>;
+            return !decoded.ContainsKey("result") ? default : Conversion.To<T>(decoded["result"]);
+        });
+    }
+}
diff --git a/Parse/Platform/Configuration/ParseConfiguration.cs b/Parse/Platform/Configuration/ParseConfiguration.cs
new file mode 100644
index 00000000..67ccd10b
--- /dev/null
+++ b/Parse/Platform/Configuration/ParseConfiguration.cs
@@ -0,0 +1,80 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System.Collections.Generic;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Data;
+using Parse.Infrastructure.Data;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse.Platform.Configuration
+{
+    /// <summary>
+    /// The ParseConfig is a representation of the remote configuration object,
+    /// that enables you to add things like feature gating, a/b testing or simple "Message of the day".
+    /// </summary>
+    public class ParseConfiguration : IJsonConvertible
+    {
+        IDictionary<string, object> Properties { get; } = new Dictionary<string, object> { };
+
+        IServiceHub Services { get; }
+
+        internal ParseConfiguration(IServiceHub serviceHub) => Services = serviceHub;
+
+        ParseConfiguration(IDictionary<string, object> properties, IServiceHub serviceHub) : this(serviceHub) => Properties = properties;
+
+        internal static ParseConfiguration Create(IDictionary<string, object> configurationData, IParseDataDecoder decoder, IServiceHub serviceHub) => new ParseConfiguration(decoder.Decode(configurationData["params"], serviceHub) as IDictionary<string, object>, serviceHub);
+
+        /// <summary>
+        /// Gets a value for the key of a particular type.
+        /// </summary>
+        /// <typeparam name="T">The type to convert the value to. Supported types are
+        /// ParseObject and its descendents, Parse types such as ParseRelation and ParseGeopoint,
+        /// primitive types,IList&lt;T&gt;, IDictionary&lt;string, T&gt; and strings.</typeparam>
+        /// <param name="key">The key of the element to get.</param>
+        /// <exception cref="KeyNotFoundException">The property is retrieved
+        /// and <paramref name="key"/> is not found.</exception>
+        /// <exception cref="System.FormatException">The property under this <paramref name="key"/>
+        /// key was found, but of a different type.</exception>
+        public T Get<T>(string key) => Conversion.To<T>(Properties[key]);
+
+        /// <summary>
+        /// Populates result with the value for the key, if possible.
+        /// </summary>
+        /// <typeparam name="T">The desired type for the value.</typeparam>
+        /// <param name="key">The key to retrieve a value for.</param>
+        /// <param name="result">The value for the given key, converted to the
+        /// requested type, or null if unsuccessful.</param>
+        /// <returns>true if the lookup and conversion succeeded, otherwise false.</returns>
+        public bool TryGetValue<T>(string key, out T result)
+        {
+            if (Properties.ContainsKey(key))
+                try
+                {
+                    T temp = Conversion.To<T>(Properties[key]);
+                    result = temp;
+                    return true;
+                }
+                catch
+                {
+                    // Could not convert, do nothing.
+                }
+
+            result = default;
+            return false;
+        }
+
+        /// <summary>
+        /// Gets a value on the config.
+        /// </summary>
+        /// <param name="key">The key for the parameter.</param>
+        /// <exception cref="KeyNotFoundException">The property is
+        /// retrieved and <paramref name="key"/> is not found.</exception>
+        /// <returns>The value for the key.</returns>
+        virtual public object this[string key] => Properties[key];
+
+        IDictionary<string, object> IJsonConvertible.ConvertToJSON() => new Dictionary<string, object>
+        {
+            ["params"] = NoObjectsEncoder.Instance.Encode(Properties, Services)
+        };
+    }
+}
diff --git a/Parse/Platform/Configuration/ParseConfigurationController.cs b/Parse/Platform/Configuration/ParseConfigurationController.cs
new file mode 100644
index 00000000..7cfe3d1e
--- /dev/null
+++ b/Parse/Platform/Configuration/ParseConfigurationController.cs
@@ -0,0 +1,47 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure.Data;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Configuration;
+using Parse.Infrastructure.Utilities;
+using Parse;
+using Parse.Infrastructure.Execution;
+
+namespace Parse.Platform.Configuration
+{
+    /// <summary>
+    /// Config controller.
+    /// </summary>
+    internal class ParseConfigurationController : IParseConfigurationController
+    {
+        IParseCommandRunner CommandRunner { get; }
+
+        IParseDataDecoder Decoder { get; }
+
+        public IParseCurrentConfigurationController CurrentConfigurationController { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ParseConfigurationController"/> class.
+        /// </summary>
+        public ParseConfigurationController(IParseCommandRunner commandRunner, ICacheController storageController, IParseDataDecoder decoder)
+        {
+            CommandRunner = commandRunner;
+            CurrentConfigurationController = new ParseCurrentConfigurationController(storageController, decoder);
+            Decoder = decoder;
+        }
+
+        public Task<ParseConfiguration> FetchConfigAsync(string sessionToken, IServiceHub serviceHub, CancellationToken cancellationToken = default) => CommandRunner.RunCommandAsync(new ParseCommand("config", method: "GET", sessionToken: sessionToken, data: default), cancellationToken: cancellationToken).OnSuccess(task =>
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            return Decoder.BuildConfiguration(task.Result.Item2, serviceHub);
+        }).OnSuccess(task =>
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+            CurrentConfigurationController.SetCurrentConfigAsync(task.Result);
+            return task;
+        }).Unwrap();
+    }
+}
diff --git a/Parse/Platform/Configuration/ParseCurrentConfigurationController.cs b/Parse/Platform/Configuration/ParseCurrentConfigurationController.cs
new file mode 100644
index 00000000..de21b64e
--- /dev/null
+++ b/Parse/Platform/Configuration/ParseCurrentConfigurationController.cs
@@ -0,0 +1,57 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure.Data;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Configuration;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse.Platform.Configuration
+{
+    /// <summary>
+    /// Parse current config controller.
+    /// </summary>
+    internal class ParseCurrentConfigurationController : IParseCurrentConfigurationController
+    {
+        static string CurrentConfigurationKey { get; } = "CurrentConfig";
+
+        TaskQueue TaskQueue { get; }
+
+        ParseConfiguration CurrentConfiguration { get; set; }
+
+        ICacheController StorageController { get; }
+
+        IParseDataDecoder Decoder { get; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ParseCurrentConfigurationController"/> class.
+        /// </summary>
+        public ParseCurrentConfigurationController(ICacheController storageController, IParseDataDecoder decoder)
+        {
+            StorageController = storageController;
+            Decoder = decoder;
+            TaskQueue = new TaskQueue { };
+        }
+
+        public Task<ParseConfiguration> GetCurrentConfigAsync(IServiceHub serviceHub) => TaskQueue.Enqueue(toAwait => toAwait.ContinueWith(_ => CurrentConfiguration is { } ? Task.FromResult(CurrentConfiguration) : StorageController.LoadAsync().OnSuccess(task =>
+        {
+            task.Result.TryGetValue(CurrentConfigurationKey, out object data);
+            return CurrentConfiguration = data is string { } configuration ? Decoder.BuildConfiguration(ParseClient.DeserializeJsonString(configuration), serviceHub) : new ParseConfiguration(serviceHub);
+        })), CancellationToken.None).Unwrap();
+
+        public Task SetCurrentConfigAsync(ParseConfiguration target) => TaskQueue.Enqueue(toAwait => toAwait.ContinueWith(_ =>
+        {
+            CurrentConfiguration = target;
+            return StorageController.LoadAsync().OnSuccess(task => task.Result.AddAsync(CurrentConfigurationKey, ParseClient.SerializeJsonString(((IJsonConvertible) target).ConvertToJSON())));
+        }).Unwrap().Unwrap(), CancellationToken.None);
+
+        public Task ClearCurrentConfigAsync() => TaskQueue.Enqueue(toAwait => toAwait.ContinueWith(_ =>
+        {
+            CurrentConfiguration = null;
+            return StorageController.LoadAsync().OnSuccess(task => task.Result.RemoveAsync(CurrentConfigurationKey));
+        }).Unwrap().Unwrap(), CancellationToken.None);
+
+        public Task ClearCurrentConfigInMemoryAsync() => TaskQueue.Enqueue(toAwait => toAwait.ContinueWith(_ => CurrentConfiguration = null), CancellationToken.None);
+    }
+}
diff --git a/Parse/Platform/Files/FileState.cs b/Parse/Platform/Files/FileState.cs
new file mode 100644
index 00000000..9cebbc76
--- /dev/null
+++ b/Parse/Platform/Files/FileState.cs
@@ -0,0 +1,32 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+
+namespace Parse.Platform.Files
+{
+    public class FileState
+    {
+        static string SecureHyperTextTransferScheme { get; } = "https";
+
+        public string Name { get; set; }
+
+        public string MediaType { get; set; }
+
+        public Uri Location { get; set; }
+
+        public Uri SecureLocation => Location switch
+        {
+#warning Investigate if the first branch of this swhich expression should be removed or an explicit failure case when not testing.
+
+            { Host: "files.parsetfss.com" } location => new UriBuilder(location)
+            {
+                Scheme = SecureHyperTextTransferScheme,
+
+                // This makes URIBuilder assign the default port for the URL scheme.
+
+                Port = -1,
+            }.Uri,
+            _ => Location
+        };
+    }
+}
diff --git a/Parse/Public/ParseFile.cs b/Parse/Platform/Files/ParseFile.cs
similarity index 62%
rename from Parse/Public/ParseFile.cs
rename to Parse/Platform/Files/ParseFile.cs
index 7928ba5f..4d7602bb 100644
--- a/Parse/Public/ParseFile.cs
+++ b/Parse/Platform/Files/ParseFile.cs
@@ -1,16 +1,47 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
-using Parse.Core.Internal;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
-using Parse.Common.Internal;
+using Parse.Abstractions.Infrastructure;
+using Parse.Infrastructure.Utilities;
+using Parse.Platform.Files;
 
 namespace Parse
 {
+    public static class FileServiceExtensions
+    {
+        /// <summary>
+        /// Saves the file to the Parse cloud.
+        /// </summary>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public static Task SaveFileAsync(this IServiceHub serviceHub, ParseFile file, CancellationToken cancellationToken = default) => serviceHub.SaveFileAsync(file, default, cancellationToken);
+
+        /// <summary>
+        /// Saves the file to the Parse cloud.
+        /// </summary>
+        /// <param name="progress">The progress callback.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public static Task SaveFileAsync(this IServiceHub serviceHub, ParseFile file, IProgress<IDataTransferLevel> progress, CancellationToken cancellationToken = default) => file.TaskQueue.Enqueue(toAwait => serviceHub.FileController.SaveAsync(file.State, file.DataStream, serviceHub.GetCurrentSessionToken(), progress, cancellationToken), cancellationToken).OnSuccess(task => file.State = task.Result);
+
+#warning Make serviceHub null by default once dependents properly inject it when needed.
+
+        /// <summary>
+        /// Saves the file to the Parse cloud.
+        /// </summary>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public static Task SaveAsync(this ParseFile file, IServiceHub serviceHub, CancellationToken cancellationToken = default) => serviceHub.SaveFileAsync(file, cancellationToken);
+
+        /// <summary>
+        /// Saves the file to the Parse cloud.
+        /// </summary>
+        /// <param name="progress">The progress callback.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public static Task SaveAsync(this ParseFile file, IServiceHub serviceHub, IProgress<IDataTransferLevel> progress, CancellationToken cancellationToken = default) => serviceHub.SaveFileAsync(file, progress, cancellationToken);
+    }
+
     /// <summary>
     /// ParseFile is a local representation of a file that is saved to the Parse cloud.
     /// </summary>
@@ -29,21 +60,22 @@ namespace Parse
     /// </example>
     public class ParseFile : IJsonConvertible
     {
-        private FileState state;
-        private readonly Stream dataStream;
-        private readonly TaskQueue taskQueue = new TaskQueue();
+        internal FileState State { get; set; }
+
+        internal Stream DataStream { get; }
+
+        internal TaskQueue TaskQueue { get; } = new TaskQueue { };
 
         #region Constructor
 
-        internal ParseFile(string name, Uri uri, string mimeType = null)
+#warning Make IServiceHub optionally null once all dependents are injecting it if necessary.
+
+        internal ParseFile(string name, Uri uri, string mimeType = null) => State = new FileState
         {
-            state = new FileState
-            {
-                Name = name,
-                Url = uri,
-                MimeType = mimeType
-            };
-        }
+            Name = name,
+            Location = uri,
+            MediaType = mimeType
+        };
 
         /// <summary>
         /// Creates a new file from a byte array and a name.
@@ -54,8 +86,7 @@ internal ParseFile(string name, Uri uri, string mimeType = null)
         /// <param name="data">The file's data.</param>
         /// <param name="mimeType">To specify the content-type used when uploading the
         /// file, provide this parameter.</param>
-        public ParseFile(string name, byte[] data, string mimeType = null)
-          : this(name, new MemoryStream(data), mimeType) { }
+        public ParseFile(string name, byte[] data, string mimeType = null) : this(name, new MemoryStream(data), mimeType) { }
 
         /// <summary>
         /// Creates a new file from a stream and a name.
@@ -68,12 +99,13 @@ public ParseFile(string name, byte[] data, string mimeType = null)
         /// file, provide this parameter.</param>
         public ParseFile(string name, Stream data, string mimeType = null)
         {
-            state = new FileState
+            State = new FileState
             {
                 Name = name,
-                MimeType = mimeType
+                MediaType = mimeType
             };
-            this.dataStream = data;
+
+            DataStream = data;
         }
 
         #endregion
@@ -83,121 +115,44 @@ public ParseFile(string name, Stream data, string mimeType = null)
         /// <summary>
         /// Gets whether the file still needs to be saved.
         /// </summary>
-        public bool IsDirty
-        {
-            get
-            {
-                return state.Url == null;
-            }
-        }
+        public bool IsDirty => State.Location == null;
 
         /// <summary>
         /// Gets the name of the file. Before save is called, this is the filename given by
         /// the user. After save is called, that name gets prefixed with a unique identifier.
         /// </summary>
         [ParseFieldName("name")]
-        public string Name
-        {
-            get
-            {
-                return state.Name;
-            }
-        }
+        public string Name => State.Name;
 
         /// <summary>
         /// Gets the MIME type of the file. This is either passed in to the constructor or
         /// inferred from the file extension. "unknown/unknown" will be used if neither is
         /// available.
         /// </summary>
-        public string MimeType
-        {
-            get
-            {
-                return state.MimeType;
-            }
-        }
+        public string MimeType => State.MediaType;
 
         /// <summary>
         /// Gets the url of the file. It is only available after you save the file or after
         /// you get the file from a <see cref="ParseObject"/>.
         /// </summary>
         [ParseFieldName("url")]
-        public Uri Url
-        {
-            get
-            {
-                return state.SecureUrl;
-            }
-        }
-
-        internal static IParseFileController FileController
-        {
-            get
-            {
-                return ParseCorePlugins.Instance.FileController;
-            }
-        }
+        public Uri Url => State.SecureLocation;
 
         #endregion
 
-        IDictionary<string, object> IJsonConvertible.ToJSON()
+        IDictionary<string, object> IJsonConvertible.ConvertToJSON()
         {
-            if (this.IsDirty)
+            if (IsDirty)
             {
-                throw new InvalidOperationException(
-                  "ParseFile must be saved before it can be serialized.");
+                throw new InvalidOperationException("ParseFile must be saved before it can be serialized.");
             }
-            return new Dictionary<string, object> {
-        {"__type", "File"},
-        {"name", Name},
-        {"url", Url.AbsoluteUri}
-      };
-        }
-
-        #region Save
-
-        /// <summary>
-        /// Saves the file to the Parse cloud.
-        /// </summary>
-        public Task SaveAsync()
-        {
-            return SaveAsync(null, CancellationToken.None);
-        }
-
-        /// <summary>
-        /// Saves the file to the Parse cloud.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        public Task SaveAsync(CancellationToken cancellationToken)
-        {
-            return SaveAsync(null, cancellationToken);
-        }
 
-        /// <summary>
-        /// Saves the file to the Parse cloud.
-        /// </summary>
-        /// <param name="progress">The progress callback.</param>
-        public Task SaveAsync(IProgress<ParseUploadProgressEventArgs> progress)
-        {
-            return SaveAsync(progress, CancellationToken.None);
-        }
-
-        /// <summary>
-        /// Saves the file to the Parse cloud.
-        /// </summary>
-        /// <param name="progress">The progress callback.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        public Task SaveAsync(IProgress<ParseUploadProgressEventArgs> progress,
-            CancellationToken cancellationToken)
-        {
-            return taskQueue.Enqueue(
-                toAwait => FileController.SaveAsync(state, dataStream, ParseUser.CurrentSessionToken, progress, cancellationToken), cancellationToken)
-            .OnSuccess(t =>
+            return new Dictionary<string, object>
             {
-                state = t.Result;
-            });
+                ["__type"] = "File",
+                ["name"] = Name,
+                ["url"] = Url.AbsoluteUri
+            };
         }
-
-        #endregion
     }
 }
diff --git a/Parse/Platform/Files/ParseFileController.cs b/Parse/Platform/Files/ParseFileController.cs
new file mode 100644
index 00000000..4f4ff0eb
--- /dev/null
+++ b/Parse/Platform/Files/ParseFileController.cs
@@ -0,0 +1,58 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Abstractions.Platform.Files;
+using Parse.Infrastructure.Execution;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse.Platform.Files
+{
+    public class ParseFileController : IParseFileController
+    {
+        IParseCommandRunner CommandRunner { get; }
+
+        public ParseFileController(IParseCommandRunner commandRunner) => CommandRunner = commandRunner;
+
+        public Task<FileState> SaveAsync(FileState state, Stream dataStream, string sessionToken, IProgress<IDataTransferLevel> progress, CancellationToken cancellationToken = default)
+        {
+            if (state.Location != null)
+                // !isDirty
+
+                return Task.FromResult(state);
+
+            if (cancellationToken.IsCancellationRequested)
+                return Task.FromCanceled<FileState>(cancellationToken);
+
+            long oldPosition = dataStream.Position;
+
+            return CommandRunner.RunCommandAsync(new ParseCommand($"files/{state.Name}", method: "POST", sessionToken: sessionToken, contentType: state.MediaType, stream: dataStream), uploadProgress: progress, cancellationToken: cancellationToken).OnSuccess(uploadTask =>
+            {
+                Tuple<HttpStatusCode, IDictionary<string, object>> result = uploadTask.Result;
+                IDictionary<string, object> jsonData = result.Item2;
+                cancellationToken.ThrowIfCancellationRequested();
+
+                return new FileState
+                {
+                    Name = jsonData["name"] as string,
+                    Location = new Uri(jsonData["url"] as string, UriKind.Absolute),
+                    MediaType = state.MediaType
+                };
+            }).ContinueWith(task =>
+            {
+                // Rewind the stream on failure or cancellation (if possible).
+
+                if ((task.IsFaulted || task.IsCanceled) && dataStream.CanSeek)
+                    dataStream.Seek(oldPosition, SeekOrigin.Begin);
+
+                return task;
+            }).Unwrap();
+        }
+    }
+}
diff --git a/Parse/Platform/Installations/ParseCurrentInstallationController.cs b/Parse/Platform/Installations/ParseCurrentInstallationController.cs
new file mode 100644
index 00000000..c9b0f0fd
--- /dev/null
+++ b/Parse/Platform/Installations/ParseCurrentInstallationController.cs
@@ -0,0 +1,107 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Installations;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse.Platform.Installations
+{
+    internal class ParseCurrentInstallationController : IParseCurrentInstallationController
+    {
+        static string ParseInstallationKey { get; } = nameof(CurrentInstallation);
+
+        object Mutex { get; } = new object { };
+
+        TaskQueue TaskQueue { get; } = new TaskQueue { };
+
+        IParseInstallationController InstallationController { get; }
+
+        ICacheController StorageController { get; }
+
+        IParseInstallationCoder InstallationCoder { get; }
+
+        IParseObjectClassController ClassController { get; }
+
+        public ParseCurrentInstallationController(IParseInstallationController installationIdController, ICacheController storageController, IParseInstallationCoder installationCoder, IParseObjectClassController classController)
+        {
+            InstallationController = installationIdController;
+            StorageController = storageController;
+            InstallationCoder = installationCoder;
+            ClassController = classController;
+        }
+
+        ParseInstallation CurrentInstallationValue { get; set; }
+
+        internal ParseInstallation CurrentInstallation
+        {
+            get
+            {
+                lock (Mutex)
+                {
+                    return CurrentInstallationValue;
+                }
+            }
+            set
+            {
+                lock (Mutex)
+                {
+                    CurrentInstallationValue = value;
+                }
+            }
+        }
+
+        public Task SetAsync(ParseInstallation installation, CancellationToken cancellationToken) => TaskQueue.Enqueue(toAwait => toAwait.ContinueWith(_ =>
+        {
+            Task saveTask = StorageController.LoadAsync().OnSuccess(storage => installation is { } ? storage.Result.AddAsync(ParseInstallationKey, JsonUtilities.Encode(InstallationCoder.Encode(installation))) : storage.Result.RemoveAsync(ParseInstallationKey)).Unwrap();
+            CurrentInstallation = installation;
+
+            return saveTask;
+        }).Unwrap(), cancellationToken);
+
+        public Task<ParseInstallation> GetAsync(IServiceHub serviceHub, CancellationToken cancellationToken = default)
+        {
+            ParseInstallation cachedCurrent;
+            cachedCurrent = CurrentInstallation;
+
+            return cachedCurrent is { } ? Task.FromResult(cachedCurrent) : TaskQueue.Enqueue(toAwait => toAwait.ContinueWith(_ => StorageController.LoadAsync().OnSuccess(stroage =>
+            {
+                Task fetchTask;
+                stroage.Result.TryGetValue(ParseInstallationKey, out object temp);
+                ParseInstallation installation = default;
+
+                if (temp is string installationDataString)
+                {
+                    IDictionary<string, object> installationData = JsonUtilities.Parse(installationDataString) as IDictionary<string, object>;
+                    installation = InstallationCoder.Decode(installationData, serviceHub);
+
+                    fetchTask = Task.FromResult<object>(null);
+                }
+                else
+                {
+                    installation = ClassController.CreateObject<ParseInstallation>(serviceHub);
+                    fetchTask = InstallationController.GetAsync().ContinueWith(t => installation.SetIfDifferent("installationId", t.Result.ToString()));
+                }
+
+                CurrentInstallation = installation;
+                return fetchTask.ContinueWith(task => installation);
+            })).Unwrap().Unwrap(), cancellationToken);
+        }
+
+        public Task<bool> ExistsAsync(CancellationToken cancellationToken) => CurrentInstallation is { } ? Task.FromResult(true) : TaskQueue.Enqueue(toAwait => toAwait.ContinueWith(_ => StorageController.LoadAsync().OnSuccess(storageTask => storageTask.Result.ContainsKey(ParseInstallationKey))).Unwrap(), cancellationToken);
+
+        public bool IsCurrent(ParseInstallation installation) => CurrentInstallation == installation;
+
+        public void ClearFromMemory() => CurrentInstallation = default;
+
+        public void ClearFromDisk()
+        {
+            ClearFromMemory();
+
+            TaskQueue.Enqueue(toAwait => toAwait.ContinueWith(_ => StorageController.LoadAsync().OnSuccess(storage => storage.Result.RemoveAsync(ParseInstallationKey))).Unwrap().Unwrap(), CancellationToken.None);
+        }
+    }
+}
diff --git a/Parse/Platform/Installations/ParseInstallation.cs b/Parse/Platform/Installations/ParseInstallation.cs
new file mode 100644
index 00000000..b42401b2
--- /dev/null
+++ b/Parse/Platform/Installations/ParseInstallation.cs
@@ -0,0 +1,347 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse
+{
+    /// <summary>
+    ///  Represents this app installed on this device. Use this class to track information you want
+    ///  to sample from (i.e. if you update a field on app launch, you can issue a query to see
+    ///  the number of devices which were active in the last N hours).
+    /// </summary>
+    [ParseClassName("_Installation")]
+    public partial class ParseInstallation : ParseObject
+    {
+        static HashSet<string> ImmutableKeys { get; } = new HashSet<string> { "deviceType", "deviceUris", "installationId", "timeZone", "localeIdentifier", "parseVersion", "appName", "appIdentifier", "appVersion", "pushType" };
+
+        /// <summary>
+        /// Constructs a new ParseInstallation. Generally, you should not need to construct
+        /// ParseInstallations yourself. Instead use <see cref="CurrentInstallation"/>.
+        /// </summary>
+        public ParseInstallation() : base() { }
+
+        /// <summary>
+        /// A GUID that uniquely names this app installed on this device.
+        /// </summary>
+        [ParseFieldName("installationId")]
+        public Guid InstallationId
+        {
+            get
+            {
+                string installationIdString = GetProperty<string>(nameof(InstallationId));
+                Guid? installationId = null;
+
+                try
+                {
+                    installationId = new Guid(installationIdString);
+                }
+                catch (Exception)
+                {
+                    // Do nothing.
+                }
+
+                return installationId.Value;
+            }
+            internal set
+            {
+                Guid installationId = value;
+                SetProperty(installationId.ToString(), nameof(InstallationId));
+            }
+        }
+
+        /// <summary>
+        /// The runtime target of this installation object.
+        /// </summary>
+        [ParseFieldName("deviceType")]
+        public string DeviceType
+        {
+            get => GetProperty<string>(nameof(DeviceType));
+            internal set => SetProperty(value, nameof(DeviceType));
+        }
+
+        /// <summary>
+        /// The user-friendly display name of this application.
+        /// </summary>
+        [ParseFieldName("appName")]
+        public string AppName
+        {
+            get => GetProperty<string>(nameof(AppName));
+            internal set => SetProperty(value, nameof(AppName));
+        }
+
+        /// <summary>
+        /// A version string consisting of Major.Minor.Build.Revision.
+        /// </summary>
+        [ParseFieldName("appVersion")]
+        public string AppVersion
+        {
+            get => GetProperty<string>(nameof(AppVersion));
+            internal set => SetProperty(value, nameof(AppVersion));
+        }
+
+        /// <summary>
+        /// The system-dependent unique identifier of this installation. This identifier should be
+        /// sufficient to distinctly name an app on stores which may allow multiple apps with the
+        /// same display name.
+        /// </summary>
+        [ParseFieldName("appIdentifier")]
+        public string AppIdentifier
+        {
+            get => GetProperty<string>(nameof(AppIdentifier));
+            internal set => SetProperty(value, nameof(AppIdentifier));
+        }
+
+        /// <summary>
+        /// The time zone in which this device resides. This string is in the tz database format
+        /// Parse uses for local-time pushes. Due to platform restrictions, the mapping is less
+        /// granular on Windows than it may be on other systems. E.g. The zones
+        /// America/Vancouver America/Dawson America/Whitehorse, America/Tijuana, PST8PDT, and
+        /// America/Los_Angeles are all reported as America/Los_Angeles.
+        /// </summary>
+        [ParseFieldName("timeZone")]
+        public string TimeZone
+        {
+            get => GetProperty<string>(nameof(TimeZone));
+            private set => SetProperty(value, nameof(TimeZone));
+        }
+
+        /// <summary>
+        /// The users locale. This field gets automatically populated by the SDK.
+        /// Can be null (Parse Push uses default language in this case).
+        /// </summary>
+        [ParseFieldName("localeIdentifier")]
+        public string LocaleIdentifier
+        {
+            get => GetProperty<string>(nameof(LocaleIdentifier));
+            private set => SetProperty(value, nameof(LocaleIdentifier));
+        }
+
+        /// <summary>
+        /// Gets the locale identifier in the format: [language code]-[COUNTRY CODE].
+        /// </summary>
+        /// <returns>The locale identifier in the format: [language code]-[COUNTRY CODE].</returns>
+        private string GetLocaleIdentifier()
+        {
+            string languageCode = null;
+            string countryCode = null;
+
+            if (CultureInfo.CurrentCulture != null)
+            {
+                languageCode = CultureInfo.CurrentCulture.TwoLetterISOLanguageName;
+            }
+            if (RegionInfo.CurrentRegion != null)
+            {
+                countryCode = RegionInfo.CurrentRegion.TwoLetterISORegionName;
+            }
+            if (String.IsNullOrEmpty(countryCode))
+            {
+                return languageCode;
+            }
+            else
+            {
+                return String.Format("{0}-{1}", languageCode, countryCode);
+            }
+        }
+
+        /// <summary>
+        /// The version of the Parse SDK used to build this application.
+        /// </summary>
+        [ParseFieldName("parseVersion")]
+        public Version ParseVersion
+        {
+            get
+            {
+                string versionString = GetProperty<string>(nameof(ParseVersion));
+                Version version = null;
+                try
+                {
+                    version = new Version(versionString);
+                }
+                catch (Exception)
+                {
+                    // Do nothing.
+                }
+
+                return version;
+            }
+            private set
+            {
+                Version version = value;
+                SetProperty(version.ToString(), nameof(ParseVersion));
+            }
+        }
+
+        /// <summary>
+        /// A sequence of arbitrary strings which are used to identify this installation for push notifications.
+        /// By convention, the empty string is known as the "Broadcast" channel.
+        /// </summary>
+        [ParseFieldName("channels")]
+        public IList<string> Channels
+        {
+            get => GetProperty<IList<string>>(nameof(Channels));
+            set => SetProperty(value, nameof(Channels));
+        }
+
+        protected override bool CheckKeyMutable(string key) => !ImmutableKeys.Contains(key);
+
+        protected override Task SaveAsync(Task toAwait, CancellationToken cancellationToken)
+        {
+            Task platformHookTask = null;
+
+            if (Services.CurrentInstallationController.IsCurrent(this))
+            {
+                SetIfDifferent("deviceType", Services.MetadataController.EnvironmentData.Platform);
+                SetIfDifferent("timeZone", Services.MetadataController.EnvironmentData.TimeZone);
+                SetIfDifferent("localeIdentifier", GetLocaleIdentifier());
+                SetIfDifferent("parseVersion", ParseClient.Version);
+                SetIfDifferent("appVersion", Services.MetadataController.HostManifestData.Version);
+                SetIfDifferent("appIdentifier", Services.MetadataController.HostManifestData.Identifier);
+                SetIfDifferent("appName", Services.MetadataController.HostManifestData.Name);
+
+#warning InstallationDataFinalizer needs to be injected here somehow or removed.
+
+                //platformHookTask = Client.InstallationDataFinalizer.FinalizeAsync(this);
+            }
+
+            return platformHookTask.Safe().OnSuccess(_ => base.SaveAsync(toAwait, cancellationToken)).Unwrap().OnSuccess(_ => Services.CurrentInstallationController.IsCurrent(this) ? Task.CompletedTask : Services.CurrentInstallationController.SetAsync(this, cancellationToken)).Unwrap();
+        }
+
+        /// <summary>
+        /// This mapping of Windows names to a standard everyone else uses is maintained
+        /// by the Unicode consortium, which makes this officially the first helpful
+        /// interaction between Unicode and Microsoft.
+        /// Unfortunately this is a little lossy in that we only store the first mapping in each zone because
+        /// Microsoft does not give us more granular location information.
+        /// Built from http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/zone_tzid.html
+        /// </summary>
+        internal static Dictionary<string, string> TimeZoneNameMap { get; } = new Dictionary<string, string>
+        {
+            ["Dateline Standard Time"] = "Etc/GMT+12",
+            ["UTC-11"] = "Etc/GMT+11",
+            ["Hawaiian Standard Time"] = "Pacific/Honolulu",
+            ["Alaskan Standard Time"] = "America/Anchorage",
+            ["Pacific Standard Time (Mexico)"] = "America/Santa_Isabel",
+            ["Pacific Standard Time"] = "America/Los_Angeles",
+            ["US Mountain Standard Time"] = "America/Phoenix",
+            ["Mountain Standard Time (Mexico)"] = "America/Chihuahua",
+            ["Mountain Standard Time"] = "America/Denver",
+            ["Central America Standard Time"] = "America/Guatemala",
+            ["Central Standard Time"] = "America/Chicago",
+            ["Central Standard Time (Mexico)"] = "America/Mexico_City",
+            ["Canada Central Standard Time"] = "America/Regina",
+            ["SA Pacific Standard Time"] = "America/Bogota",
+            ["Eastern Standard Time"] = "America/New_York",
+            ["US Eastern Standard Time"] = "America/Indianapolis",
+            ["Venezuela Standard Time"] = "America/Caracas",
+            ["Paraguay Standard Time"] = "America/Asuncion",
+            ["Atlantic Standard Time"] = "America/Halifax",
+            ["Central Brazilian Standard Time"] = "America/Cuiaba",
+            ["SA Western Standard Time"] = "America/La_Paz",
+            ["Pacific SA Standard Time"] = "America/Santiago",
+            ["Newfoundland Standard Time"] = "America/St_Johns",
+            ["E. South America Standard Time"] = "America/Sao_Paulo",
+            ["Argentina Standard Time"] = "America/Buenos_Aires",
+            ["SA Eastern Standard Time"] = "America/Cayenne",
+            ["Greenland Standard Time"] = "America/Godthab",
+            ["Montevideo Standard Time"] = "America/Montevideo",
+            ["Bahia Standard Time"] = "America/Bahia",
+            ["UTC-02"] = "Etc/GMT+2",
+            ["Azores Standard Time"] = "Atlantic/Azores",
+            ["Cape Verde Standard Time"] = "Atlantic/Cape_Verde",
+            ["Morocco Standard Time"] = "Africa/Casablanca",
+            ["UTC"] = "Etc/GMT",
+            ["GMT Standard Time"] = "Europe/London",
+            ["Greenwich Standard Time"] = "Atlantic/Reykjavik",
+            ["W. Europe Standard Time"] = "Europe/Berlin",
+            ["Central Europe Standard Time"] = "Europe/Budapest",
+            ["Romance Standard Time"] = "Europe/Paris",
+            ["Central European Standard Time"] = "Europe/Warsaw",
+            ["W. Central Africa Standard Time"] = "Africa/Lagos",
+            ["Namibia Standard Time"] = "Africa/Windhoek",
+            ["GTB Standard Time"] = "Europe/Bucharest",
+            ["Middle East Standard Time"] = "Asia/Beirut",
+            ["Egypt Standard Time"] = "Africa/Cairo",
+            ["Syria Standard Time"] = "Asia/Damascus",
+            ["E. Europe Standard Time"] = "Asia/Nicosia",
+            ["South Africa Standard Time"] = "Africa/Johannesburg",
+            ["FLE Standard Time"] = "Europe/Kiev",
+            ["Turkey Standard Time"] = "Europe/Istanbul",
+            ["Israel Standard Time"] = "Asia/Jerusalem",
+            ["Jordan Standard Time"] = "Asia/Amman",
+            ["Arabic Standard Time"] = "Asia/Baghdad",
+            ["Kaliningrad Standard Time"] = "Europe/Kaliningrad",
+            ["Arab Standard Time"] = "Asia/Riyadh",
+            ["E. Africa Standard Time"] = "Africa/Nairobi",
+            ["Iran Standard Time"] = "Asia/Tehran",
+            ["Arabian Standard Time"] = "Asia/Dubai",
+            ["Azerbaijan Standard Time"] = "Asia/Baku",
+            ["Russian Standard Time"] = "Europe/Moscow",
+            ["Mauritius Standard Time"] = "Indian/Mauritius",
+            ["Georgian Standard Time"] = "Asia/Tbilisi",
+            ["Caucasus Standard Time"] = "Asia/Yerevan",
+            ["Afghanistan Standard Time"] = "Asia/Kabul",
+            ["Pakistan Standard Time"] = "Asia/Karachi",
+            ["West Asia Standard Time"] = "Asia/Tashkent",
+            ["India Standard Time"] = "Asia/Calcutta",
+            ["Sri Lanka Standard Time"] = "Asia/Colombo",
+            ["Nepal Standard Time"] = "Asia/Katmandu",
+            ["Central Asia Standard Time"] = "Asia/Almaty",
+            ["Bangladesh Standard Time"] = "Asia/Dhaka",
+            ["Ekaterinburg Standard Time"] = "Asia/Yekaterinburg",
+            ["Myanmar Standard Time"] = "Asia/Rangoon",
+            ["SE Asia Standard Time"] = "Asia/Bangkok",
+            ["N. Central Asia Standard Time"] = "Asia/Novosibirsk",
+            ["China Standard Time"] = "Asia/Shanghai",
+            ["North Asia Standard Time"] = "Asia/Krasnoyarsk",
+            ["Singapore Standard Time"] = "Asia/Singapore",
+            ["W. Australia Standard Time"] = "Australia/Perth",
+            ["Taipei Standard Time"] = "Asia/Taipei",
+            ["Ulaanbaatar Standard Time"] = "Asia/Ulaanbaatar",
+            ["North Asia East Standard Time"] = "Asia/Irkutsk",
+            ["Tokyo Standard Time"] = "Asia/Tokyo",
+            ["Korea Standard Time"] = "Asia/Seoul",
+            ["Cen. Australia Standard Time"] = "Australia/Adelaide",
+            ["AUS Central Standard Time"] = "Australia/Darwin",
+            ["E. Australia Standard Time"] = "Australia/Brisbane",
+            ["AUS Eastern Standard Time"] = "Australia/Sydney",
+            ["West Pacific Standard Time"] = "Pacific/Port_Moresby",
+            ["Tasmania Standard Time"] = "Australia/Hobart",
+            ["Yakutsk Standard Time"] = "Asia/Yakutsk",
+            ["Central Pacific Standard Time"] = "Pacific/Guadalcanal",
+            ["Vladivostok Standard Time"] = "Asia/Vladivostok",
+            ["New Zealand Standard Time"] = "Pacific/Auckland",
+            ["UTC+12"] = "Etc/GMT-12",
+            ["Fiji Standard Time"] = "Pacific/Fiji",
+            ["Magadan Standard Time"] = "Asia/Magadan",
+            ["Tonga Standard Time"] = "Pacific/Tongatapu",
+            ["Samoa Standard Time"] = "Pacific/Apia"
+        };
+
+        /// <summary>
+        /// This is a mapping of odd TimeZone offsets to their respective IANA codes across the world.
+        /// This list was compiled from painstakingly pouring over the information available at
+        /// https://en.wikipedia.org/wiki/List_of_tz_database_time_zones.
+        /// </summary>
+        internal static Dictionary<TimeSpan, string> TimeZoneOffsetMap { get; } = new Dictionary<TimeSpan, string>
+        {
+            [new TimeSpan(12, 45, 0)] = "Pacific/Chatham",
+            [new TimeSpan(10, 30, 0)] = "Australia/Lord_Howe",
+            [new TimeSpan(9, 30, 0)] = "Australia/Adelaide",
+            [new TimeSpan(8, 45, 0)] = "Australia/Eucla",
+            [new TimeSpan(8, 30, 0)] = "Asia/Pyongyang", // Parse in North Korea confirmed.
+            [new TimeSpan(6, 30, 0)] = "Asia/Rangoon",
+            [new TimeSpan(5, 45, 0)] = "Asia/Kathmandu",
+            [new TimeSpan(5, 30, 0)] = "Asia/Colombo",
+            [new TimeSpan(4, 30, 0)] = "Asia/Kabul",
+            [new TimeSpan(3, 30, 0)] = "Asia/Tehran",
+            [new TimeSpan(-3, 30, 0)] = "America/St_Johns",
+            [new TimeSpan(-4, 30, 0)] = "America/Caracas",
+            [new TimeSpan(-9, 30, 0)] = "Pacific/Marquesas",
+        };
+    }
+}
diff --git a/Parse/Platform/Installations/ParseInstallationCoder.cs b/Parse/Platform/Installations/ParseInstallationCoder.cs
new file mode 100644
index 00000000..25263db6
--- /dev/null
+++ b/Parse/Platform/Installations/ParseInstallationCoder.cs
@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using System.Linq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Data;
+using Parse.Abstractions.Platform.Installations;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Infrastructure.Data;
+
+namespace Parse.Platform.Installations
+{
+    public class ParseInstallationCoder : IParseInstallationCoder
+    {
+        IParseDataDecoder Decoder { get; }
+
+        IParseObjectClassController ClassController { get; }
+
+        public ParseInstallationCoder(IParseDataDecoder decoder, IParseObjectClassController classController) => (Decoder, ClassController) = (decoder, classController);
+
+        public IDictionary<string, object> Encode(ParseInstallation installation)
+        {
+            IObjectState state = installation.State;
+            IDictionary<string, object> data = PointerOrLocalIdEncoder.Instance.Encode(state.ToDictionary(pair => pair.Key, pair => pair.Value), installation.Services) as IDictionary<string, object>;
+
+            data["objectId"] = state.ObjectId;
+
+            // The following operations use the date and time serialization format defined by ISO standard 8601.
+
+            if (state.CreatedAt is { })
+                data["createdAt"] = state.CreatedAt.Value.ToString(ParseClient.DateFormatStrings[0]);
+
+            if (state.UpdatedAt is { })
+                data["updatedAt"] = state.UpdatedAt.Value.ToString(ParseClient.DateFormatStrings[0]);
+
+            return data;
+        }
+
+        public ParseInstallation Decode(IDictionary<string, object> data, IServiceHub serviceHub) => ClassController.GenerateObjectFromState<ParseInstallation>(ParseObjectCoder.Instance.Decode(data, Decoder, serviceHub), "_Installation", serviceHub);
+    }
+}
\ No newline at end of file
diff --git a/Parse/Platform/Installations/ParseInstallationController.cs b/Parse/Platform/Installations/ParseInstallationController.cs
new file mode 100644
index 00000000..80e0fc14
--- /dev/null
+++ b/Parse/Platform/Installations/ParseInstallationController.cs
@@ -0,0 +1,62 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Installations;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse.Platform.Installations
+{
+    public class ParseInstallationController : IParseInstallationController
+    {
+        static string InstallationIdKey { get; } = "InstallationId";
+
+        object Mutex { get; } = new object { };
+
+        Guid? InstallationId { get; set; }
+
+        ICacheController StorageController { get; }
+
+        public ParseInstallationController(ICacheController storageController) => StorageController = storageController;
+
+        public Task SetAsync(Guid? installationId)
+        {
+            lock (Mutex)
+            {
+#warning Should refactor here if this operates correctly.
+
+                Task saveTask = installationId is { } ? StorageController.LoadAsync().OnSuccess(storage => storage.Result.AddAsync(InstallationIdKey, installationId.ToString())).Unwrap() : StorageController.LoadAsync().OnSuccess(storage => storage.Result.RemoveAsync(InstallationIdKey)).Unwrap();
+
+                InstallationId = installationId;
+                return saveTask;
+            }
+        }
+
+        public Task<Guid?> GetAsync()
+        {
+            lock (Mutex)
+                if (InstallationId is { })
+                    return Task.FromResult(InstallationId);
+
+            return StorageController.LoadAsync().OnSuccess(storageTask =>
+            {
+                storageTask.Result.TryGetValue(InstallationIdKey, out object id);
+
+                try
+                {
+                    lock (Mutex)
+                        return Task.FromResult(InstallationId = new Guid(id as string));
+                }
+                catch (Exception)
+                {
+                    Guid newInstallationId = Guid.NewGuid();
+                    return SetAsync(newInstallationId).OnSuccess<Guid?>(_ => newInstallationId);
+                }
+            })
+            .Unwrap();
+        }
+
+        public Task ClearAsync() => SetAsync(null);
+    }
+}
diff --git a/Parse/Platform/Installations/ParseInstallationDataFinalizer.cs b/Parse/Platform/Installations/ParseInstallationDataFinalizer.cs
new file mode 100644
index 00000000..4f6d335f
--- /dev/null
+++ b/Parse/Platform/Installations/ParseInstallationDataFinalizer.cs
@@ -0,0 +1,15 @@
+using System.Threading.Tasks;
+using Parse.Abstractions.Platform.Installations;
+
+namespace Parse.Platform.Installations
+{
+    /// <summary>
+    /// Controls the device information.
+    /// </summary>
+    public class ParseInstallationDataFinalizer : IParseInstallationDataFinalizer
+    {
+        public Task FinalizeAsync(ParseInstallation installation) => Task.FromResult<object>(null);
+
+        public void Initialize() { }
+    }
+}
\ No newline at end of file
diff --git a/Parse/Public/ParseGeoDistance.cs b/Parse/Platform/Location/ParseGeoDistance.cs
similarity index 73%
rename from Parse/Public/ParseGeoDistance.cs
rename to Parse/Platform/Location/ParseGeoDistance.cs
index 75b55bfd..33f31fc4 100644
--- a/Parse/Public/ParseGeoDistance.cs
+++ b/Parse/Platform/Location/ParseGeoDistance.cs
@@ -15,10 +15,7 @@ public struct ParseGeoDistance
         /// </summary>
         /// <param name="radians">The distance in radians.</param>
         public ParseGeoDistance(double radians)
-          : this()
-        {
-            Radians = radians;
-        }
+          : this() => Radians = radians;
 
         /// <summary>
         /// Gets the distance in radians.
@@ -28,53 +25,32 @@ public ParseGeoDistance(double radians)
         /// <summary>
         /// Gets the distance in miles.
         /// </summary>
-        public double Miles
-        {
-            get
-            {
-                return Radians * EarthMeanRadiusMiles;
-            }
-        }
+        public double Miles => Radians * EarthMeanRadiusMiles;
 
         /// <summary>
         /// Gets the distance in kilometers.
         /// </summary>
-        public double Kilometers
-        {
-            get
-            {
-                return Radians * EarthMeanRadiusKilometers;
-            }
-        }
+        public double Kilometers => Radians * EarthMeanRadiusKilometers;
 
         /// <summary>
         /// Gets a ParseGeoDistance from a number of miles.
         /// </summary>
         /// <param name="miles">The number of miles.</param>
         /// <returns>A ParseGeoDistance for the given number of miles.</returns>
-        public static ParseGeoDistance FromMiles(double miles)
-        {
-            return new ParseGeoDistance(miles / EarthMeanRadiusMiles);
-        }
+        public static ParseGeoDistance FromMiles(double miles) => new ParseGeoDistance(miles / EarthMeanRadiusMiles);
 
         /// <summary>
         /// Gets a ParseGeoDistance from a number of kilometers.
         /// </summary>
         /// <param name="kilometers">The number of kilometers.</param>
         /// <returns>A ParseGeoDistance for the given number of kilometers.</returns>
-        public static ParseGeoDistance FromKilometers(double kilometers)
-        {
-            return new ParseGeoDistance(kilometers / EarthMeanRadiusKilometers);
-        }
+        public static ParseGeoDistance FromKilometers(double kilometers) => new ParseGeoDistance(kilometers / EarthMeanRadiusKilometers);
 
         /// <summary>
         /// Gets a ParseGeoDistance from a number of radians.
         /// </summary>
         /// <param name="radians">The number of radians.</param>
         /// <returns>A ParseGeoDistance for the given number of radians.</returns>
-        public static ParseGeoDistance FromRadians(double radians)
-        {
-            return new ParseGeoDistance(radians);
-        }
+        public static ParseGeoDistance FromRadians(double radians) => new ParseGeoDistance(radians);
     }
 }
diff --git a/Parse/Public/ParseGeoPoint.cs b/Parse/Platform/Location/ParseGeoPoint.cs
similarity index 89%
rename from Parse/Public/ParseGeoPoint.cs
rename to Parse/Platform/Location/ParseGeoPoint.cs
index 65f59555..eead203a 100644
--- a/Parse/Public/ParseGeoPoint.cs
+++ b/Parse/Platform/Location/ParseGeoPoint.cs
@@ -2,8 +2,7 @@
 
 using System;
 using System.Collections.Generic;
-using Parse.Core.Internal;
-using Parse.Common.Internal;
+using Parse.Abstractions.Infrastructure;
 
 namespace Parse
 {
@@ -35,10 +34,7 @@ public ParseGeoPoint(double latitude, double longitude)
         /// </summary>
         public double Latitude
         {
-            get
-            {
-                return latitude;
-            }
+            get => latitude;
             set
             {
                 if (value > 90 || value < -90)
@@ -57,10 +53,7 @@ public double Latitude
         /// </summary>
         public double Longitude
         {
-            get
-            {
-                return longitude;
-            }
+            get => longitude;
             set
             {
                 if (value > 180 || value < -180)
@@ -97,13 +90,10 @@ public ParseGeoDistance DistanceTo(ParseGeoPoint point)
             return new ParseGeoDistance(2 * Math.Asin(Math.Sqrt(a)));
         }
 
-        IDictionary<string, object> IJsonConvertible.ToJSON()
-        {
-            return new Dictionary<string, object> {
+        IDictionary<string, object> IJsonConvertible.ConvertToJSON() => new Dictionary<string, object> {
         {"__type", "GeoPoint"},
-        {"latitude", Latitude},
-        {"longitude", Longitude}
+        {nameof(latitude), Latitude},
+        {nameof(longitude), Longitude}
       };
-        }
     }
 }
diff --git a/Parse/Platform/Objects/MutableObjectState.cs b/Parse/Platform/Objects/MutableObjectState.cs
new file mode 100644
index 00000000..f8ad5bd9
--- /dev/null
+++ b/Parse/Platform/Objects/MutableObjectState.cs
@@ -0,0 +1,75 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Parse.Abstractions.Infrastructure.Control;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Infrastructure.Control;
+
+namespace Parse.Platform.Objects
+{
+    public class MutableObjectState : IObjectState
+    {
+        public bool IsNew { get; set; }
+        public string ClassName { get; set; }
+        public string ObjectId { get; set; }
+        public DateTime? UpdatedAt { get; set; }
+        public DateTime? CreatedAt { get; set; }
+
+        public IDictionary<string, object> ServerData { get; set; } = new Dictionary<string, object> { };
+
+        public object this[string key] => ServerData[key];
+
+        public bool ContainsKey(string key) => ServerData.ContainsKey(key);
+
+        public void Apply(IDictionary<string, IParseFieldOperation> operationSet)
+        {
+            // Apply operationSet
+            foreach (KeyValuePair<string, IParseFieldOperation> pair in operationSet)
+            {
+                ServerData.TryGetValue(pair.Key, out object oldValue);
+                object newValue = pair.Value.Apply(oldValue, pair.Key);
+                if (newValue != ParseDeleteOperation.Token)
+                    ServerData[pair.Key] = newValue;
+                else
+                    ServerData.Remove(pair.Key);
+            }
+        }
+
+        public void Apply(IObjectState other)
+        {
+            IsNew = other.IsNew;
+            if (other.ObjectId != null)
+                ObjectId = other.ObjectId;
+            if (other.UpdatedAt != null)
+                UpdatedAt = other.UpdatedAt;
+            if (other.CreatedAt != null)
+                CreatedAt = other.CreatedAt;
+
+            foreach (KeyValuePair<string, object> pair in other)
+                ServerData[pair.Key] = pair.Value;
+        }
+
+        public IObjectState MutatedClone(Action<MutableObjectState> func)
+        {
+            MutableObjectState clone = MutableClone();
+            func(clone);
+            return clone;
+        }
+
+        protected virtual MutableObjectState MutableClone() => new MutableObjectState
+        {
+            IsNew = IsNew,
+            ClassName = ClassName,
+            ObjectId = ObjectId,
+            CreatedAt = CreatedAt,
+            UpdatedAt = UpdatedAt,
+            ServerData = this.ToDictionary(t => t.Key, t => t.Value)
+        };
+
+        IEnumerator<KeyValuePair<string, object>> IEnumerable<KeyValuePair<string, object>>.GetEnumerator() => ServerData.GetEnumerator();
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => ((IEnumerable<KeyValuePair<string, object>>) this).GetEnumerator();
+    }
+}
diff --git a/Parse/Platform/Objects/ParseObject.cs b/Parse/Platform/Objects/ParseObject.cs
new file mode 100644
index 00000000..dea9db3e
--- /dev/null
+++ b/Parse/Platform/Objects/ParseObject.cs
@@ -0,0 +1,1126 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Internal;
+using Parse.Infrastructure.Control;
+using Parse.Abstractions.Infrastructure.Control;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Infrastructure.Utilities;
+using Parse.Platform.Objects;
+using Parse.Infrastructure.Data;
+
+namespace Parse
+{
+    /// <summary>
+    /// The ParseObject is a local representation of data that can be saved and
+    /// retrieved from the Parse cloud.</summary>
+    /// <remarks>
+    /// <para>
+    /// The basic workflow for creating new data is to construct a new ParseObject,
+    /// use the indexer to fill it with data, and then use SaveAsync() to persist to the
+    /// database.
+    /// </para>
+    /// <para>
+    /// The basic workflow for accessing existing data is to use a ParseQuery
+    /// to specify which existing data to retrieve.
+    /// </para>
+    /// </remarks>
+    public class ParseObject : IEnumerable<KeyValuePair<string, object>>, INotifyPropertyChanged
+    {
+        internal static string AutoClassName { get; } = "_Automatic";
+
+        internal static ThreadLocal<bool> CreatingPointer { get; } = new ThreadLocal<bool>(() => false);
+
+        internal TaskQueue TaskQueue { get; } = new TaskQueue { };
+
+        /// <summary>
+        /// The <see cref="ParseClient"/> instance being targeted. This should generally not be set except when an object is being constructed, as otherwise race conditions may occur. The preferred method to set this property is via calling <see cref="Bind(IServiceHub)"/>.
+        /// </summary>
+        public IServiceHub Services { get; set; }
+
+        /// <summary>
+        /// Constructs a new ParseObject with no data in it. A ParseObject constructed in this way will
+        /// not have an ObjectId and will not persist to the database until <see cref="SaveAsync(CancellationToken)"/>
+        /// is called.
+        /// </summary>
+        /// <remarks>
+        /// Class names must be alphanumerical plus underscore, and start with a letter. It is recommended
+        /// to name classes in PascalCase.
+        /// </remarks>
+        /// <param name="className">The className for this ParseObject.</param>
+        /// <param name="serviceHub">The <see cref="IServiceHub"/> implementation instance to target for any resources. This paramater can be effectively set after construction via <see cref="Bind(IServiceHub)"/>.</param>
+        public ParseObject(string className, IServiceHub serviceHub = default)
+        {
+            // We use a ThreadLocal rather than passing a parameter so that createWithoutData can do the
+            // right thing with subclasses. It's ugly and terrible, but it does provide the development
+            // experience we generally want, so... yeah. Sorry to whomever has to deal with this in the
+            // future. I pinky-swear we won't make a habit of this -- you believe me, don't you?
+
+            bool isPointer = CreatingPointer.Value;
+            CreatingPointer.Value = false;
+
+            if (AutoClassName.Equals(className ?? throw new ArgumentException("You must specify a Parse class name when creating a new ParseObject.")))
+            {
+                className = GetType().GetParseClassName();
+            }
+
+            // Technically, an exception should be thrown here for when both serviceHub and ParseClient.Instance is null, but it is not possible because ParseObjectClass.Constructor for derived classes is a reference to this constructor, and it will be called with a null serviceHub, then Bind will be called on the constructed object, so this needs to fail softly, unfortunately.
+            // Services = ... ?? throw new InvalidOperationException("A ParseClient needs to be initialized as the configured default instance before any ParseObjects can be instantiated.")
+
+            if ((Services = serviceHub ?? ParseClient.Instance) is { })
+            {
+                // If this is supposed to be created by a factory but wasn't, throw an exception.
+
+                if (!Services.ClassController.GetClassMatch(className, GetType()))
+                {
+                    throw new ArgumentException("You must create this type of ParseObject using ParseObject.Create() or the proper subclass.");
+                }
+            }
+
+            State = new MutableObjectState { ClassName = className };
+            OnPropertyChanged(nameof(ClassName));
+
+            OperationSetQueue.AddLast(new Dictionary<string, IParseFieldOperation>());
+
+            if (!isPointer)
+            {
+                Fetched = true;
+                IsDirty = true;
+
+                SetDefaultValues();
+            }
+            else
+            {
+                IsDirty = false;
+                Fetched = false;
+            }
+        }
+
+        #region ParseObject Creation
+
+        /// <summary>
+        /// Constructor for use in ParseObject subclasses. Subclasses must specify a ParseClassName attribute. Subclasses that do not implement a constructor accepting <see cref="IServiceHub"/> will need to be bond to an implementation instance via <see cref="Bind(IServiceHub)"/> after construction.
+        /// </summary>
+        protected ParseObject(IServiceHub serviceHub = default) : this(AutoClassName, serviceHub) { }
+
+        /// <summary>
+        /// Attaches the given <see cref="IServiceHub"/> implementation instance to this <see cref="ParseObject"/> or <see cref="ParseObject"/>-derived class instance.
+        /// </summary>
+        /// <param name="serviceHub">The serviceHub to use for all operations.</param>
+        /// <returns>The instance which was mutated.</returns>
+        public ParseObject Bind(IServiceHub serviceHub) => (Instance: this, Services = serviceHub).Instance;
+
+        /// <summary>
+        /// Occurs when a property value changes.
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged
+        {
+            add
+            {
+                PropertyChangedHandler.Add(value);
+            }
+            remove
+            {
+                PropertyChangedHandler.Remove(value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the ParseACL governing this object.
+        /// </summary>
+        [ParseFieldName("ACL")]
+        public ParseACL ACL
+        {
+            get => GetProperty<ParseACL>(default, nameof(ACL));
+            set => SetProperty(value, nameof(ACL));
+        }
+
+        /// <summary>
+        /// Gets the class name for the ParseObject.
+        /// </summary>
+        public string ClassName => State.ClassName;
+
+        /// <summary>
+        /// Gets the first time this object was saved as the server sees it, so that if you create a
+        /// ParseObject, then wait a while, and then call <see cref="SaveAsync()"/>, the
+        /// creation time will be the time of the first <see cref="SaveAsync()"/> call rather than
+        /// the time the object was created locally.
+        /// </summary>
+        [ParseFieldName("createdAt")]
+        public DateTime? CreatedAt => State.CreatedAt;
+
+        /// <summary>
+        /// Gets whether the ParseObject has been fetched.
+        /// </summary>
+        public bool IsDataAvailable
+        {
+            get
+            {
+                lock (Mutex)
+                {
+                    return Fetched;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Indicates whether this ParseObject has unsaved changes.
+        /// </summary>
+        public bool IsDirty
+        {
+            get
+            {
+                lock (Mutex)
+                {
+                    return CheckIsDirty(true);
+                }
+            }
+            internal set
+            {
+                lock (Mutex)
+                {
+                    Dirty = value;
+                    OnPropertyChanged(nameof(IsDirty));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Returns true if this object was created by the Parse server when the
+        /// object might have already been there (e.g. in the case of a Facebook
+        /// login)
+        /// </summary>
+        public bool IsNew
+        {
+            get => State.IsNew;
+            internal set
+            {
+                MutateState(mutableClone => mutableClone.IsNew = value);
+                OnPropertyChanged(nameof(IsNew));
+            }
+        }
+
+        /// <summary>
+        /// Gets a set view of the keys contained in this object. This does not include createdAt,
+        /// updatedAt, or objectId. It does include things like username and ACL.
+        /// </summary>
+        public ICollection<string> Keys
+        {
+            get
+            {
+                lock (Mutex)
+                {
+                    return EstimatedData.Keys;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the object id. An object id is assigned as soon as an object is
+        /// saved to the server. The combination of a <see cref="ClassName"/> and an
+        /// <see cref="ObjectId"/> uniquely identifies an object in your application.
+        /// </summary>
+        [ParseFieldName("objectId")]
+        public string ObjectId
+        {
+            get => State.ObjectId;
+            set
+            {
+                IsDirty = true;
+                SetObjectIdInternal(value);
+            }
+        }
+
+        /// <summary>
+        /// Gets the last time this object was updated as the server sees it, so that if you make changes
+        /// to a ParseObject, then wait a while, and then call <see cref="SaveAsync()"/>, the updated time
+        /// will be the time of the <see cref="SaveAsync()"/> call rather than the time the object was
+        /// changed locally.
+        /// </summary>
+        [ParseFieldName("updatedAt")]
+        public DateTime? UpdatedAt => State.UpdatedAt;
+
+        public IDictionary<string, IParseFieldOperation> CurrentOperations
+        {
+            get
+            {
+                lock (Mutex)
+                {
+                    return OperationSetQueue.Last.Value;
+                }
+            }
+        }
+
+        internal object Mutex { get; } = new object { };
+
+        public IObjectState State { get; private set; }
+
+        internal bool CanBeSerialized
+        {
+            get
+            {
+                // This method is only used for batching sets of objects for saveAll
+                // and when saving children automatically. Since it's only used to
+                // determine whether or not save should be called on them, it only
+                // needs to examine their current values, so we use estimatedData.
+
+                lock (Mutex)
+                {
+                    return Services.CanBeSerializedAsValue(EstimatedData);
+                }
+            }
+        }
+
+        bool Dirty { get; set; }
+
+        internal IDictionary<string, object> EstimatedData { get; } = new Dictionary<string, object> { };
+
+        internal bool Fetched { get; set; }
+
+        bool HasDirtyChildren
+        {
+            get
+            {
+                lock (Mutex)
+                {
+                    return FindUnsavedChildren().FirstOrDefault() != null;
+                }
+            }
+        }
+
+        LinkedList<IDictionary<string, IParseFieldOperation>> OperationSetQueue { get; } = new LinkedList<IDictionary<string, IParseFieldOperation>>();
+
+        SynchronizedEventHandler<PropertyChangedEventArgs> PropertyChangedHandler { get; } = new SynchronizedEventHandler<PropertyChangedEventArgs>();
+
+        /// <summary>
+        /// Gets or sets a value on the object. It is recommended to name
+        /// keys in partialCamelCaseLikeThis.
+        /// </summary>
+        /// <param name="key">The key for the object. Keys must be alphanumeric plus underscore
+        /// and start with a letter.</param>
+        /// <exception cref="KeyNotFoundException">The property is
+        /// retrieved and <paramref name="key"/> is not found.</exception>
+        /// <returns>The value for the key.</returns>
+        virtual public object this[string key]
+        {
+            get
+            {
+                lock (Mutex)
+                {
+                    CheckGetAccess(key);
+                    object value = EstimatedData[key];
+
+                    // A relation may be deserialized without a parent or key. Either way,
+                    // make sure it's consistent.
+
+                    if (value is ParseRelationBase relation)
+                    {
+                        relation.EnsureParentAndKey(this, key);
+                    }
+
+                    return value;
+                }
+            }
+            set
+            {
+                lock (Mutex)
+                {
+                    CheckKeyIsMutable(key);
+                    Set(key, value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Adds a value for the given key, throwing an Exception if the key
+        /// already has a value.
+        /// </summary>
+        /// <remarks>
+        /// This allows you to use collection initialization syntax when creating ParseObjects,
+        /// such as:
+        /// <code>
+        /// var obj = new ParseObject("MyType")
+        /// {
+        ///     {"name", "foo"},
+        ///     {"count", 10},
+        ///     {"found", false}
+        /// };
+        /// </code>
+        /// </remarks>
+        /// <param name="key">The key for which a value should be set.</param>
+        /// <param name="value">The value for the key.</param>
+        public void Add(string key, object value)
+        {
+            lock (Mutex)
+            {
+                if (ContainsKey(key))
+                {
+                    throw new ArgumentException("Key already exists", key);
+                }
+
+                this[key] = value;
+            }
+        }
+
+        /// <summary>
+        /// Atomically adds objects to the end of the list associated with the given key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="values">The objects to add.</param>
+        public void AddRangeToList<T>(string key, IEnumerable<T> values)
+        {
+            lock (Mutex)
+            {
+                CheckKeyIsMutable(key);
+                PerformOperation(key, new ParseAddOperation(values.Cast<object>()));
+            }
+        }
+
+        /// <summary>
+        /// Atomically adds objects to the end of the list associated with the given key,
+        /// only if they are not already present in the list. The position of the inserts are not
+        /// guaranteed.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="values">The objects to add.</param>
+        public void AddRangeUniqueToList<T>(string key, IEnumerable<T> values)
+        {
+            lock (Mutex)
+            {
+                CheckKeyIsMutable(key);
+                PerformOperation(key, new ParseAddUniqueOperation(values.Cast<object>()));
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Atomically adds an object to the end of the list associated with the given key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="value">The object to add.</param>
+        public void AddToList(string key, object value) => AddRangeToList(key, new[] { value });
+
+        /// <summary>
+        /// Atomically adds an object to the end of the list associated with the given key,
+        /// only if it is not already present in the list. The position of the insert is not
+        /// guaranteed.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="value">The object to add.</param>
+        public void AddUniqueToList(string key, object value) => AddRangeUniqueToList(key, new object[] { value });
+
+        /// <summary>
+        /// Returns whether this object has a particular key.
+        /// </summary>
+        /// <param name="key">The key to check for</param>
+        public bool ContainsKey(string key)
+        {
+            lock (Mutex)
+            {
+                return EstimatedData.ContainsKey(key);
+            }
+        }
+
+        /// <summary>
+        /// Deletes this object on the server.
+        /// </summary>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public Task DeleteAsync(CancellationToken cancellationToken = default) => TaskQueue.Enqueue(toAwait => DeleteAsync(toAwait, cancellationToken), cancellationToken);
+
+        /// <summary>
+        /// Gets a value for the key of a particular type.
+        /// <typeparam name="T">The type to convert the value to. Supported types are
+        /// ParseObject and its descendents, Parse types such as ParseRelation and ParseGeopoint,
+        /// primitive types,IList&lt;T&gt;, IDictionary&lt;string, T&gt;, and strings.</typeparam>
+        /// <param name="key">The key of the element to get.</param>
+        /// <exception cref="KeyNotFoundException">The property is
+        /// retrieved and <paramref name="key"/> is not found.</exception>
+        /// </summary>
+        public T Get<T>(string key) => Conversion.To<T>(this[key]);
+
+        /// <summary>
+        /// Access or create a Relation value for a key.
+        /// </summary>
+        /// <typeparam name="T">The type of object to create a relation for.</typeparam>
+        /// <param name="key">The key for the relation field.</param>
+        /// <returns>A ParseRelation for the key.</returns>
+        public ParseRelation<T> GetRelation<T>(string key) where T : ParseObject
+        {
+            // All the sanity checking is done when add or remove is called.
+
+            TryGetValue(key, out ParseRelation<T> relation);
+            return relation ?? new ParseRelation<T>(this, key);
+        }
+
+        /// <summary>
+        /// A helper function for checking whether two ParseObjects point to
+        /// the same object in the cloud.
+        /// </summary>
+        public bool HasSameId(ParseObject other)
+        {
+            lock (Mutex)
+            {
+                return other is { } && Equals(ClassName, other.ClassName) && Equals(ObjectId, other.ObjectId);
+            }
+        }
+
+        #region Atomic Increment
+
+        /// <summary>
+        /// Atomically increments the given key by 1.
+        /// </summary>
+        /// <param name="key">The key to increment.</param>
+        public void Increment(string key) => Increment(key, 1);
+
+        /// <summary>
+        /// Atomically increments the given key by the given number.
+        /// </summary>
+        /// <param name="key">The key to increment.</param>
+        /// <param name="amount">The amount to increment by.</param>
+        public void Increment(string key, long amount)
+        {
+            lock (Mutex)
+            {
+                CheckKeyIsMutable(key);
+                PerformOperation(key, new ParseIncrementOperation(amount));
+            }
+        }
+
+        /// <summary>
+        /// Atomically increments the given key by the given number.
+        /// </summary>
+        /// <param name="key">The key to increment.</param>
+        /// <param name="amount">The amount to increment by.</param>
+        public void Increment(string key, double amount)
+        {
+            lock (Mutex)
+            {
+                CheckKeyIsMutable(key);
+                PerformOperation(key, new ParseIncrementOperation(amount));
+            }
+        }
+
+        /// <summary>
+        /// Indicates whether key is unsaved for this ParseObject.
+        /// </summary>
+        /// <param name="key">The key to check for.</param>
+        /// <returns><c>true</c> if the key has been altered and not saved yet, otherwise
+        /// <c>false</c>.</returns>
+        public bool IsKeyDirty(string key)
+        {
+            lock (Mutex)
+            {
+                return CurrentOperations.ContainsKey(key);
+            }
+        }
+
+        /// <summary>
+        /// Removes a key from the object's data if it exists.
+        /// </summary>
+        /// <param name="key">The key to remove.</param>
+        public virtual void Remove(string key)
+        {
+            lock (Mutex)
+            {
+                CheckKeyIsMutable(key);
+                PerformOperation(key, ParseDeleteOperation.Instance);
+            }
+        }
+
+        /// <summary>
+        /// Atomically removes all instances of the objects in <paramref name="values"/>
+        /// from the list associated with the given key.
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="values">The objects to remove.</param>
+        public void RemoveAllFromList<T>(string key, IEnumerable<T> values)
+        {
+            lock (Mutex)
+            {
+                CheckKeyIsMutable(key);
+                PerformOperation(key, new ParseRemoveOperation(values.Cast<object>()));
+            }
+        }
+
+        /// <summary>
+        /// Clears any changes to this object made since the last call to <see cref="SaveAsync()"/>.
+        /// </summary>
+        public void Revert()
+        {
+            lock (Mutex)
+            {
+                if (CurrentOperations.Count > 0)
+                {
+                    CurrentOperations.Clear();
+                    RebuildEstimatedData();
+                    OnPropertyChanged(nameof(IsDirty));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Saves this object to the server.
+        /// </summary>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public Task SaveAsync(CancellationToken cancellationToken = default) => TaskQueue.Enqueue(toAwait => SaveAsync(toAwait, cancellationToken), cancellationToken);
+
+        /// <summary>
+        /// Populates result with the value for the key, if possible.
+        /// </summary>
+        /// <typeparam name="T">The desired type for the value.</typeparam>
+        /// <param name="key">The key to retrieve a value for.</param>
+        /// <param name="result">The value for the given key, converted to the
+        /// requested type, or null if unsuccessful.</param>
+        /// <returns>true if the lookup and conversion succeeded, otherwise
+        /// false.</returns>
+        public bool TryGetValue<T>(string key, out T result)
+        {
+            lock (Mutex)
+            {
+                if (ContainsKey(key))
+                {
+                    try
+                    {
+                        T temp = Conversion.To<T>(this[key]);
+                        result = temp;
+                        return true;
+                    }
+                    catch
+                    {
+                        result = default;
+                        return false;
+                    }
+                }
+
+                result = default;
+                return false;
+            }
+        }
+
+        #endregion
+
+        #region Delete Object
+
+        internal Task DeleteAsync(Task toAwait, CancellationToken cancellationToken)
+        {
+            if (ObjectId == null)
+            {
+                return Task.FromResult(0);
+            }
+
+            string sessionToken = Services.GetCurrentSessionToken();
+
+            return toAwait.OnSuccess(_ => Services.ObjectController.DeleteAsync(State, sessionToken, cancellationToken)).Unwrap().OnSuccess(_ => IsDirty = true);
+        }
+
+        internal virtual Task<ParseObject> FetchAsyncInternal(Task toAwait, CancellationToken cancellationToken) => toAwait.OnSuccess(_ => ObjectId == null ? throw new InvalidOperationException("Cannot refresh an object that hasn't been saved to the server.") : Services.ObjectController.FetchAsync(State, Services.GetCurrentSessionToken(), Services, cancellationToken)).Unwrap().OnSuccess(task =>
+        {
+            HandleFetchResult(task.Result);
+            return this;
+        });
+
+        #endregion
+
+        #region Fetch Object(s)
+
+        /// <summary>
+        /// Fetches this object with the data from the server.
+        /// </summary>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        internal Task<ParseObject> FetchAsyncInternal(CancellationToken cancellationToken) => TaskQueue.Enqueue(toAwait => FetchAsyncInternal(toAwait, cancellationToken), cancellationToken);
+
+        internal Task<ParseObject> FetchIfNeededAsyncInternal(Task toAwait, CancellationToken cancellationToken) => !IsDataAvailable ? FetchAsyncInternal(toAwait, cancellationToken) : Task.FromResult(this);
+
+        /// <summary>
+        /// If this ParseObject has not been fetched (i.e. <see cref="IsDataAvailable"/> returns
+        /// false), fetches this object with the data from the server.
+        /// </summary>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        internal Task<ParseObject> FetchIfNeededAsyncInternal(CancellationToken cancellationToken) => TaskQueue.Enqueue(toAwait => FetchIfNeededAsyncInternal(toAwait, cancellationToken), cancellationToken);
+
+        internal void HandleFailedSave(IDictionary<string, IParseFieldOperation> operationsBeforeSave)
+        {
+            lock (Mutex)
+            {
+                LinkedListNode<IDictionary<string, IParseFieldOperation>> opNode = OperationSetQueue.Find(operationsBeforeSave);
+                IDictionary<string, IParseFieldOperation> nextOperations = opNode.Next.Value;
+                bool wasDirty = nextOperations.Count > 0;
+                OperationSetQueue.Remove(opNode);
+
+                // Merge the data from the failed save into the next save.
+
+                foreach (KeyValuePair<string, IParseFieldOperation> pair in operationsBeforeSave)
+                {
+                    IParseFieldOperation operation1 = pair.Value;
+
+                    nextOperations.TryGetValue(pair.Key, out IParseFieldOperation operation2);
+                    nextOperations[pair.Key] = operation2 is { } ? operation2.MergeWithPrevious(operation1) : operation1;
+                }
+
+                if (!wasDirty && nextOperations == CurrentOperations && operationsBeforeSave.Count > 0)
+                {
+                    OnPropertyChanged(nameof(IsDirty));
+                }
+            }
+        }
+
+        public virtual void HandleFetchResult(IObjectState serverState)
+        {
+            lock (Mutex)
+            {
+                MergeFromServer(serverState);
+            }
+        }
+
+        internal virtual void HandleSave(IObjectState serverState)
+        {
+            lock (Mutex)
+            {
+                IDictionary<string, IParseFieldOperation> operationsBeforeSave = OperationSetQueue.First.Value;
+                OperationSetQueue.RemoveFirst();
+
+                // Merge the data from the save and the data from the server into serverData.
+
+                MutateState(mutableClone => mutableClone.Apply(operationsBeforeSave));
+                MergeFromServer(serverState);
+            }
+        }
+
+        internal void MergeFromObject(ParseObject other)
+        {
+            // If they point to the same instance, we don't need to merge
+
+            lock (Mutex)
+            {
+                if (this == other)
+                {
+                    return;
+                }
+            }
+
+            // Clear out any changes on this object.
+
+            if (OperationSetQueue.Count != 1)
+            {
+                throw new InvalidOperationException("Attempt to MergeFromObject during save.");
+            }
+
+            OperationSetQueue.Clear();
+
+            foreach (IDictionary<string, IParseFieldOperation> operationSet in other.OperationSetQueue)
+            {
+                OperationSetQueue.AddLast(operationSet.ToDictionary(entry => entry.Key, entry => entry.Value));
+            }
+
+            lock (Mutex)
+            {
+                State = other.State;
+            }
+
+            RebuildEstimatedData();
+        }
+
+        internal virtual void MergeFromServer(IObjectState serverState)
+        {
+            // Make a new serverData with fetched values.
+
+            Dictionary<string, object> newServerData = serverState.ToDictionary(t => t.Key, t => t.Value);
+
+            lock (Mutex)
+            {
+                // Trigger handler based on serverState
+
+                if (serverState.ObjectId != null)
+                {
+                    // If the objectId is being merged in, consider this object to be fetched.
+
+                    Fetched = true;
+                    OnPropertyChanged(nameof(IsDataAvailable));
+                }
+
+                if (serverState.UpdatedAt != null)
+                {
+                    OnPropertyChanged(nameof(UpdatedAt));
+                }
+
+                if (serverState.CreatedAt != null)
+                {
+                    OnPropertyChanged(nameof(CreatedAt));
+                }
+
+                // We cache the fetched object because subsequent Save operation might flush the fetched objects into Pointers.
+
+                IDictionary<string, ParseObject> fetchedObject = CollectFetchedObjects();
+
+                foreach (KeyValuePair<string, object> pair in serverState)
+                {
+                    object value = pair.Value;
+
+                    if (value is ParseObject)
+                    {
+                        // Resolve fetched object.
+
+                        ParseObject entity = value as ParseObject;
+
+                        if (fetchedObject.ContainsKey(entity.ObjectId))
+                        {
+                            value = fetchedObject[entity.ObjectId];
+                        }
+                    }
+                    newServerData[pair.Key] = value;
+                }
+
+                IsDirty = false;
+                MutateState(mutableClone => mutableClone.Apply(serverState.MutatedClone(mutableClone => mutableClone.ServerData = newServerData)));
+            }
+        }
+
+        internal void MutateState(Action<MutableObjectState> mutator)
+        {
+            lock (Mutex)
+            {
+                State = State.MutatedClone(mutator);
+
+                // Refresh the estimated data.
+
+                RebuildEstimatedData();
+            }
+        }
+
+        /// <summary>
+        /// Override to run validations on key/value pairs. Make sure to still
+        /// call the base version.
+        /// </summary>
+        internal virtual void OnSettingValue(ref string key, ref object value)
+        {
+            if (key is null)
+            {
+                throw new ArgumentNullException(nameof(key));
+            }
+        }
+
+        /// <summary>
+        /// PerformOperation is like setting a value at an index, but instead of
+        /// just taking a new value, it takes a ParseFieldOperation that modifies the value.
+        /// </summary>
+        internal void PerformOperation(string key, IParseFieldOperation operation)
+        {
+            lock (Mutex)
+            {
+                EstimatedData.TryGetValue(key, out object oldValue);
+                object newValue = operation.Apply(oldValue, key);
+
+                if (newValue != ParseDeleteOperation.Token)
+                {
+                    EstimatedData[key] = newValue;
+                }
+                else
+                {
+                    EstimatedData.Remove(key);
+                }
+
+                bool wasDirty = CurrentOperations.Count > 0;
+                CurrentOperations.TryGetValue(key, out IParseFieldOperation oldOperation);
+                IParseFieldOperation newOperation = operation.MergeWithPrevious(oldOperation);
+                CurrentOperations[key] = newOperation;
+
+                if (!wasDirty)
+                {
+                    OnPropertyChanged(nameof(IsDirty));
+                }
+
+                OnFieldsChanged(new[] { key });
+            }
+        }
+
+        /// <summary>
+        /// Regenerates the estimatedData map from the serverData and operations.
+        /// </summary>
+        internal void RebuildEstimatedData()
+        {
+            lock (Mutex)
+            {
+                EstimatedData.Clear();
+
+                foreach (KeyValuePair<string, object> item in State)
+                {
+                    EstimatedData.Add(item);
+                }
+                foreach (IDictionary<string, IParseFieldOperation> operations in OperationSetQueue)
+                {
+                    ApplyOperations(operations, EstimatedData);
+                }
+
+                // We've just applied a bunch of operations to estimatedData which
+                // may have changed all of its keys. Notify of all keys and properties
+                // mapped to keys being changed.
+
+                OnFieldsChanged(default);
+            }
+        }
+
+        public IDictionary<string, object> ServerDataToJSONObjectForSerialization() => PointerOrLocalIdEncoder.Instance.Encode(State.ToDictionary(pair => pair.Key, pair => pair.Value), Services) as IDictionary<string, object>;
+
+        /// <summary>
+        /// Perform Set internally which is not gated by mutability check.
+        /// </summary>
+        /// <param name="key">key for the object.</param>
+        /// <param name="value">the value for the key.</param>
+        public void Set(string key, object value)
+        {
+            lock (Mutex)
+            {
+                OnSettingValue(ref key, ref value);
+
+                if (!ParseDataEncoder.Validate(value))
+                {
+                    throw new ArgumentException("Invalid type for value: " + value.GetType().ToString());
+                }
+
+                PerformOperation(key, new ParseSetOperation(value));
+            }
+        }
+
+        /// <summary>
+        /// Allows subclasses to set values for non-pointer construction.
+        /// </summary>
+        internal virtual void SetDefaultValues() { }
+
+        public void SetIfDifferent<T>(string key, T value)
+        {
+            bool hasCurrent = TryGetValue(key, out T current);
+
+            if (value == null)
+            {
+                if (hasCurrent)
+                {
+                    PerformOperation(key, ParseDeleteOperation.Instance);
+                }
+                return;
+            }
+
+            if (!hasCurrent || !value.Equals(current))
+            {
+                Set(key, value);
+            }
+        }
+
+        #endregion
+
+        #region Save Object(s)
+
+        /// <summary>
+        /// Pushes new operations onto the queue and returns the current set of operations.
+        /// </summary>
+        internal IDictionary<string, IParseFieldOperation> StartSave()
+        {
+            lock (Mutex)
+            {
+                IDictionary<string, IParseFieldOperation> currentOperations = CurrentOperations;
+                OperationSetQueue.AddLast(new Dictionary<string, IParseFieldOperation>());
+                OnPropertyChanged(nameof(IsDirty));
+                return currentOperations;
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Gets the value of a property based upon its associated ParseFieldName attribute.
+        /// </summary>
+        /// <returns>The value of the property.</returns>
+        /// <param name="propertyName">The name of the property.</param>
+        /// <typeparam name="T">The return type of the property.</typeparam>
+        protected T GetProperty<T>([CallerMemberName] string propertyName = null) => GetProperty(default(T), propertyName);
+
+        /// <summary>
+        /// Gets the value of a property based upon its associated ParseFieldName attribute.
+        /// </summary>
+        /// <returns>The value of the property.</returns>
+        /// <param name="defaultValue">The value to return if the property is not present on the ParseObject.</param>
+        /// <param name="propertyName">The name of the property.</param>
+        /// <typeparam name="T">The return type of the property.</typeparam>
+        protected T GetProperty<T>(T defaultValue, [CallerMemberName] string propertyName = null) => TryGetValue(Services.GetFieldForPropertyName(ClassName, propertyName), out T result) ? result : defaultValue;
+
+        /// <summary>
+        /// Gets a relation for a property based upon its associated ParseFieldName attribute.
+        /// </summary>
+        /// <returns>The ParseRelation for the property.</returns>
+        /// <param name="propertyName">The name of the property.</param>
+        /// <typeparam name="T">The ParseObject subclass type of the ParseRelation.</typeparam>
+        protected ParseRelation<T> GetRelationProperty<T>([CallerMemberName] string propertyName = null) where T : ParseObject => GetRelation<T>(Services.GetFieldForPropertyName(ClassName, propertyName));
+
+        protected virtual bool CheckKeyMutable(string key) => true;
+
+        /// <summary>
+        /// Raises change notifications for all properties associated with the given
+        /// field names. If fieldNames is null, this will notify for all known field-linked
+        /// properties (e.g. this happens when we recalculate all estimated data from scratch)
+        /// </summary>
+        protected void OnFieldsChanged(IEnumerable<string> fields)
+        {
+            IDictionary<string, string> mappings = Services.ClassController.GetPropertyMappings(ClassName);
+
+            foreach (string property in mappings is { } ? fields is { } ? from mapping in mappings join field in fields on mapping.Value equals field select mapping.Key : mappings.Keys : Enumerable.Empty<string>())
+            {
+                OnPropertyChanged(property);
+            }
+
+            OnPropertyChanged("Item[]");
+        }
+
+        /// <summary>
+        /// Raises change notifications for a property. Passing null or the empty string
+        /// notifies the binding framework that all properties/indexes have changed.
+        /// Passing "Item[]" tells the binding framework that all indexed values
+        /// have changed (but not all properties)
+        /// </summary>
+        protected void OnPropertyChanged([CallerMemberName] string propertyName = null) => PropertyChangedHandler.Invoke(this, new PropertyChangedEventArgs(propertyName));
+
+        protected virtual Task SaveAsync(Task toAwait, CancellationToken cancellationToken)
+        {
+            IDictionary<string, IParseFieldOperation> currentOperations = null;
+
+            if (!IsDirty)
+            {
+                return Task.CompletedTask;
+            }
+
+            Task deepSaveTask;
+            string sessionToken;
+
+            lock (Mutex)
+            {
+                // Get the JSON representation of the object.
+
+                currentOperations = StartSave();
+                sessionToken = Services.GetCurrentSessionToken();
+                deepSaveTask = Services.DeepSaveAsync(EstimatedData, sessionToken, cancellationToken);
+            }
+
+            return deepSaveTask.OnSuccess(_ => toAwait).Unwrap().OnSuccess(_ => Services.ObjectController.SaveAsync(State, currentOperations, sessionToken, Services, cancellationToken)).Unwrap().ContinueWith(task =>
+            {
+                if (task.IsFaulted || task.IsCanceled)
+                {
+                    HandleFailedSave(currentOperations);
+                }
+                else
+                {
+                    HandleSave(task.Result);
+                }
+
+                return task;
+            }).Unwrap();
+        }
+
+        /// <summary>
+        /// Sets the value of a property based upon its associated ParseFieldName attribute.
+        /// </summary>
+        /// <param name="value">The new value.</param>
+        /// <param name="propertyName">The name of the property.</param>
+        /// <typeparam name="T">The type for the property.</typeparam>
+        protected void SetProperty<T>(T value, [CallerMemberName] string propertyName = null) => this[Services.GetFieldForPropertyName(ClassName, propertyName)] = value;
+
+        void ApplyOperations(IDictionary<string, IParseFieldOperation> operations, IDictionary<string, object> map)
+        {
+            lock (Mutex)
+            {
+                foreach (KeyValuePair<string, IParseFieldOperation> pair in operations)
+                {
+                    map.TryGetValue(pair.Key, out object oldValue);
+                    object newValue = pair.Value.Apply(oldValue, pair.Key);
+
+                    if (newValue != ParseDeleteOperation.Token)
+                    {
+                        map[pair.Key] = newValue;
+                    }
+                    else
+                    {
+                        map.Remove(pair.Key);
+                    }
+                }
+            }
+        }
+
+        void CheckGetAccess(string key)
+        {
+            lock (Mutex)
+            {
+                if (!CheckIsDataAvailable(key))
+                {
+                    throw new InvalidOperationException("ParseObject has no data for this key. Call FetchIfNeededAsync() to get the data.");
+                }
+            }
+        }
+
+        bool CheckIsDataAvailable(string key)
+        {
+            lock (Mutex)
+            {
+                return IsDataAvailable || EstimatedData.ContainsKey(key);
+            }
+        }
+
+        internal bool CheckIsDirty(bool considerChildren)
+        {
+            lock (Mutex)
+            {
+                return Dirty || CurrentOperations.Count > 0 || considerChildren && HasDirtyChildren;
+            }
+        }
+
+        void CheckKeyIsMutable(string key)
+        {
+            if (!CheckKeyMutable(key))
+            {
+                throw new InvalidOperationException($@"Cannot change the ""{key}"" property of a ""{ClassName}"" object.");
+            }
+        }
+
+        /// <summary>
+        /// Deep traversal of this object to grab a copy of any object referenced by this object.
+        /// These instances may have already been fetched, and we don't want to lose their data when
+        /// refreshing or saving.
+        /// </summary>
+        /// <returns>Map of objectId to ParseObject which have been fetched.</returns>
+        IDictionary<string, ParseObject> CollectFetchedObjects() => Services.TraverseObjectDeep(EstimatedData).OfType<ParseObject>().Where(o => o.ObjectId != null && o.IsDataAvailable).GroupBy(o => o.ObjectId).ToDictionary(group => group.Key, group => group.Last());
+
+        IEnumerable<ParseObject> FindUnsavedChildren() => Services.TraverseObjectDeep(EstimatedData).OfType<ParseObject>().Where(o => o.IsDirty);
+
+        IEnumerator<KeyValuePair<string, object>> IEnumerable<KeyValuePair<string, object>>.GetEnumerator()
+        {
+            lock (Mutex)
+            {
+                return EstimatedData.GetEnumerator();
+            }
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            lock (Mutex)
+            {
+                return ((IEnumerable<KeyValuePair<string, object>>) this).GetEnumerator();
+            }
+        }
+        /// <summary>
+        /// Sets the objectId without marking dirty.
+        /// </summary>
+        /// <param name="objectId">The new objectId</param>
+        void SetObjectIdInternal(string objectId)
+        {
+            lock (Mutex)
+            {
+                MutateState(mutableClone => mutableClone.ObjectId = objectId);
+                OnPropertyChanged(nameof(ObjectId));
+            }
+        }
+    }
+}
diff --git a/Parse/Platform/Objects/ParseObjectClass.cs b/Parse/Platform/Objects/ParseObjectClass.cs
new file mode 100644
index 00000000..c7137fa0
--- /dev/null
+++ b/Parse/Platform/Objects/ParseObjectClass.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Parse.Abstractions.Internal;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse.Platform.Objects
+{
+    internal class ParseObjectClass
+    {
+        public ParseObjectClass(Type type, ConstructorInfo constructor)
+        {
+            TypeInfo = type.GetTypeInfo();
+            DeclaredName = TypeInfo.GetParseClassName();
+            Constructor = Constructor = constructor;
+            PropertyMappings = type.GetProperties().Select(property => (Property: property, FieldNameAttribute: property.GetCustomAttribute<ParseFieldNameAttribute>(true))).Where(set => set.FieldNameAttribute is { }).ToDictionary(set => set.Property.Name, set => set.FieldNameAttribute.FieldName);
+        }
+
+        public TypeInfo TypeInfo { get; }
+
+        public string DeclaredName { get; }
+
+        public IDictionary<string, string> PropertyMappings { get; }
+
+        public ParseObject Instantiate() => Constructor.Invoke(default) as ParseObject;
+
+        ConstructorInfo Constructor { get; }
+    }
+}
diff --git a/Parse/Platform/Objects/ParseObjectClassController.cs b/Parse/Platform/Objects/ParseObjectClassController.cs
new file mode 100644
index 00000000..13cf1b15
--- /dev/null
+++ b/Parse/Platform/Objects/ParseObjectClassController.cs
@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Threading;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse.Platform.Objects
+{
+    internal class ParseObjectClassController : IParseObjectClassController
+    {
+        // Class names starting with _ are documented to be reserved. Use this one here to allow us to "inherit" certain properties.
+        static string ReservedParseObjectClassName { get; } = "_ParseObject";
+
+        ReaderWriterLockSlim Mutex { get; } = new ReaderWriterLockSlim { };
+
+        IDictionary<string, ParseObjectClass> Classes { get; } = new Dictionary<string, ParseObjectClass> { };
+
+        Dictionary<string, Action> RegisterActions { get; set; } = new Dictionary<string, Action> { };
+
+        public ParseObjectClassController() => AddValid(typeof(ParseObject));
+
+        public string GetClassName(Type type) => type == typeof(ParseObject) ? ReservedParseObjectClassName : type.GetParseClassName();
+
+        public Type GetType(string className)
+        {
+            Mutex.EnterReadLock();
+            Classes.TryGetValue(className, out ParseObjectClass info);
+            Mutex.ExitReadLock();
+
+            return info?.TypeInfo.AsType();
+        }
+
+        public bool GetClassMatch(string className, Type type)
+        {
+            Mutex.EnterReadLock();
+            Classes.TryGetValue(className, out ParseObjectClass subclassInfo);
+            Mutex.ExitReadLock();
+
+            return subclassInfo is { } ? subclassInfo.TypeInfo == type.GetTypeInfo() : type == typeof(ParseObject);
+        }
+
+        public void AddValid(Type type)
+        {
+            TypeInfo typeInfo = type.GetTypeInfo();
+
+            if (!typeof(ParseObject).GetTypeInfo().IsAssignableFrom(typeInfo))
+                throw new ArgumentException("Cannot register a type that is not a subclass of ParseObject");
+
+            string className = GetClassName(type);
+
+            try
+            {
+                // Perform this as a single independent transaction, so we can never get into an
+                // intermediate state where we *theoretically* register the wrong class due to a
+                // TOCTTOU bug.
+
+                Mutex.EnterWriteLock();
+
+                if (Classes.TryGetValue(className, out ParseObjectClass previousInfo))
+                    if (typeInfo.IsAssignableFrom(previousInfo.TypeInfo))
+                        // Previous subclass is more specific or equal to the current type, do nothing.
+
+                        return;
+                    else if (previousInfo.TypeInfo.IsAssignableFrom(typeInfo))
+                    {
+                        // Previous subclass is parent of new child, fallthrough and actually register this class.
+                        /* Do nothing */
+                    }
+                    else
+                        throw new ArgumentException($"Tried to register both {previousInfo.TypeInfo.FullName} and {typeInfo.FullName} as the ParseObject subclass of {className}. Cannot determine the right class to use because neither inherits from the other.");
+
+#warning Constructor detection may erroneously find a constructor which should not be used.
+
+                ConstructorInfo constructor = type.FindConstructor() ?? type.FindConstructor(typeof(string), typeof(IServiceHub));
+
+                if (constructor is null)
+                    throw new ArgumentException("Cannot register a type that does not implement the default constructor!");
+
+                Classes[className] = new ParseObjectClass(type, constructor);
+            }
+            finally
+            {
+                Mutex.ExitWriteLock();
+            }
+
+            Mutex.EnterReadLock();
+            RegisterActions.TryGetValue(className, out Action toPerform);
+            Mutex.ExitReadLock();
+
+            toPerform?.Invoke();
+        }
+
+        public void RemoveClass(Type type)
+        {
+            Mutex.EnterWriteLock();
+            Classes.Remove(GetClassName(type));
+            Mutex.ExitWriteLock();
+        }
+
+        public void AddRegisterHook(Type type, Action action)
+        {
+            Mutex.EnterWriteLock();
+            RegisterActions.Add(GetClassName(type), action);
+            Mutex.ExitWriteLock();
+        }
+
+        public ParseObject Instantiate(string className, IServiceHub serviceHub)
+        {
+            Mutex.EnterReadLock();
+            Classes.TryGetValue(className, out ParseObjectClass info);
+            Mutex.ExitReadLock();
+
+            return info is { } ? info.Instantiate().Bind(serviceHub) : new ParseObject(className, serviceHub);
+        }
+
+        public IDictionary<string, string> GetPropertyMappings(string className)
+        {
+            Mutex.EnterReadLock();
+            Classes.TryGetValue(className, out ParseObjectClass info);
+
+            if (info is null)
+                Classes.TryGetValue(ReservedParseObjectClassName, out info);
+
+            Mutex.ExitReadLock();
+            return info.PropertyMappings;
+        }
+
+        bool SDKClassesAdded { get; set; }
+
+        // ALTERNATE NAME: AddObject, AddType, AcknowledgeType, CatalogType
+
+        public void AddIntrinsic()
+        {
+            if (!(SDKClassesAdded, SDKClassesAdded = true).SDKClassesAdded)
+            {
+                AddValid(typeof(ParseUser));
+                AddValid(typeof(ParseRole));
+                AddValid(typeof(ParseSession));
+                AddValid(typeof(ParseInstallation));
+            }
+        }
+    }
+}
diff --git a/Parse/Platform/Objects/ParseObjectController.cs b/Parse/Platform/Objects/ParseObjectController.cs
new file mode 100644
index 00000000..62363e3f
--- /dev/null
+++ b/Parse/Platform/Objects/ParseObjectController.cs
@@ -0,0 +1,148 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure.Control;
+using Parse.Abstractions.Infrastructure.Data;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Infrastructure.Utilities;
+using Parse.Infrastructure;
+using Parse.Abstractions.Internal;
+using Parse.Infrastructure.Execution;
+using Parse.Infrastructure.Data;
+
+namespace Parse.Platform.Objects
+{
+    public class ParseObjectController : IParseObjectController
+    {
+        IParseCommandRunner CommandRunner { get; }
+
+        IParseDataDecoder Decoder { get; }
+
+        IServerConnectionData ServerConnectionData { get; }
+
+        public ParseObjectController(IParseCommandRunner commandRunner, IParseDataDecoder decoder, IServerConnectionData serverConnectionData) => (CommandRunner, Decoder, ServerConnectionData) = (commandRunner, decoder, serverConnectionData);
+
+        public Task<IObjectState> FetchAsync(IObjectState state, string sessionToken, IServiceHub serviceHub, CancellationToken cancellationToken = default)
+        {
+            ParseCommand command = new ParseCommand($"classes/{Uri.EscapeDataString(state.ClassName)}/{Uri.EscapeDataString(state.ObjectId)}", method: "GET", sessionToken: sessionToken, data: default);
+            return CommandRunner.RunCommandAsync(command, cancellationToken: cancellationToken).OnSuccess(task => ParseObjectCoder.Instance.Decode(task.Result.Item2, Decoder, serviceHub));
+        }
+
+        public Task<IObjectState> SaveAsync(IObjectState state, IDictionary<string, IParseFieldOperation> operations, string sessionToken, IServiceHub serviceHub, CancellationToken cancellationToken = default)
+        {
+            ParseCommand command = new ParseCommand(state.ObjectId == null ? $"classes/{Uri.EscapeDataString(state.ClassName)}" : $"classes/{Uri.EscapeDataString(state.ClassName)}/{state.ObjectId}", method: state.ObjectId is null ? "POST" : "PUT", sessionToken: sessionToken, data: serviceHub.GenerateJSONObjectForSaving(operations));
+            return CommandRunner.RunCommandAsync(command, cancellationToken: cancellationToken).OnSuccess(task => ParseObjectCoder.Instance.Decode(task.Result.Item2, Decoder, serviceHub).MutatedClone(mutableClone => mutableClone.IsNew = task.Result.Item1 == System.Net.HttpStatusCode.Created));
+        }
+
+        public IList<Task<IObjectState>> SaveAllAsync(IList<IObjectState> states, IList<IDictionary<string, IParseFieldOperation>> operationsList, string sessionToken, IServiceHub serviceHub, CancellationToken cancellationToken = default) => ExecuteBatchRequests(states.Zip(operationsList, (item, operations) => new ParseCommand(item.ObjectId is null ? $"classes/{Uri.EscapeDataString(item.ClassName)}" : $"classes/{Uri.EscapeDataString(item.ClassName)}/{Uri.EscapeDataString(item.ObjectId)}", method: item.ObjectId is null ? "POST" : "PUT", data: serviceHub.GenerateJSONObjectForSaving(operations))).ToList(), sessionToken, cancellationToken).Select(task => task.OnSuccess(task => ParseObjectCoder.Instance.Decode(task.Result, Decoder, serviceHub))).ToList();
+
+        public Task DeleteAsync(IObjectState state, string sessionToken, CancellationToken cancellationToken = default) => CommandRunner.RunCommandAsync(new ParseCommand($"classes/{state.ClassName}/{state.ObjectId}", method: "DELETE", sessionToken: sessionToken, data: null), cancellationToken: cancellationToken);
+
+        public IList<Task> DeleteAllAsync(IList<IObjectState> states, string sessionToken, CancellationToken cancellationToken = default) => ExecuteBatchRequests(states.Where(item => item.ObjectId is { }).Select(item => new ParseCommand($"classes/{Uri.EscapeDataString(item.ClassName)}/{Uri.EscapeDataString(item.ObjectId)}", method: "DELETE", data: default)).ToList(), sessionToken, cancellationToken).Cast<Task>().ToList();
+
+        int MaximumBatchSize { get; } = 50;
+
+        // TODO (hallucinogen): move this out to a class to be used by Analytics
+
+        internal IList<Task<IDictionary<string, object>>> ExecuteBatchRequests(IList<ParseCommand> requests, string sessionToken, CancellationToken cancellationToken = default)
+        {
+            List<Task<IDictionary<string, object>>> tasks = new List<Task<IDictionary<string, object>>>();
+            int batchSize = requests.Count;
+
+            IEnumerable<ParseCommand> remaining = requests;
+
+            while (batchSize > MaximumBatchSize)
+            {
+                List<ParseCommand> process = remaining.Take(MaximumBatchSize).ToList();
+
+                remaining = remaining.Skip(MaximumBatchSize);
+                tasks.AddRange(ExecuteBatchRequest(process, sessionToken, cancellationToken));
+                batchSize = remaining.Count();
+            }
+
+            tasks.AddRange(ExecuteBatchRequest(remaining.ToList(), sessionToken, cancellationToken));
+            return tasks;
+        }
+
+        IList<Task<IDictionary<string, object>>> ExecuteBatchRequest(IList<ParseCommand> requests, string sessionToken, CancellationToken cancellationToken = default)
+        {
+            int batchSize = requests.Count;
+
+            List<Task<IDictionary<string, object>>> tasks = new List<Task<IDictionary<string, object>>> { };
+            List<TaskCompletionSource<IDictionary<string, object>>> completionSources = new List<TaskCompletionSource<IDictionary<string, object>>> { };
+
+            for (int i = 0; i < batchSize; ++i)
+            {
+                TaskCompletionSource<IDictionary<string, object>> tcs = new TaskCompletionSource<IDictionary<string, object>>();
+
+                completionSources.Add(tcs);
+                tasks.Add(tcs.Task);
+            }
+
+            List<object> encodedRequests = requests.Select(request =>
+            {
+                Dictionary<string, object> results = new Dictionary<string, object>
+                {
+                    ["method"] = request.Method,
+                    ["path"] = request is { Path: { }, Resource: { } } ? request.Target.AbsolutePath : new Uri(new Uri(ServerConnectionData.ServerURI), request.Path).AbsolutePath,
+                };
+
+                if (request.DataObject != null)
+                    results["body"] = request.DataObject;
+
+                return results;
+            }).Cast<object>().ToList();
+
+            ParseCommand command = new ParseCommand("batch", method: "POST", sessionToken: sessionToken, data: new Dictionary<string, object> { [nameof(requests)] = encodedRequests });
+
+            CommandRunner.RunCommandAsync(command, cancellationToken: cancellationToken).ContinueWith(task =>
+            {
+                if (task.IsFaulted || task.IsCanceled)
+                {
+                    foreach (TaskCompletionSource<IDictionary<string, object>> tcs in completionSources)
+                        if (task.IsFaulted)
+                            tcs.TrySetException(task.Exception);
+                        else if (task.IsCanceled)
+                            tcs.TrySetCanceled();
+
+                    return;
+                }
+
+                IList<object> resultsArray = Conversion.As<IList<object>>(task.Result.Item2["results"]);
+                int resultLength = resultsArray.Count;
+
+                if (resultLength != batchSize)
+                {
+                    foreach (TaskCompletionSource<IDictionary<string, object>> completionSource in completionSources)
+                        completionSource.TrySetException(new InvalidOperationException($"Batch command result count expected: {batchSize} but was: {resultLength}."));
+
+                    return;
+                }
+
+                for (int i = 0; i < batchSize; ++i)
+                {
+                    Dictionary<string, object> result = resultsArray[i] as Dictionary<string, object>;
+                    TaskCompletionSource<IDictionary<string, object>> target = completionSources[i];
+
+                    if (result.ContainsKey("success"))
+                        target.TrySetResult(result["success"] as IDictionary<string, object>);
+                    else if (result.ContainsKey("error"))
+                    {
+                        IDictionary<string, object> error = result["error"] as IDictionary<string, object>;
+                        target.TrySetException(new ParseFailureException((ParseFailureException.ErrorCode) (long) error["code"], error[nameof(error)] as string));
+                    }
+                    else
+                        target.TrySetException(new InvalidOperationException("Invalid batch command response."));
+                }
+            });
+
+            return tasks;
+        }
+    }
+}
diff --git a/Parse/Platform/ParseClient.cs b/Parse/Platform/ParseClient.cs
new file mode 100644
index 00000000..68535c72
--- /dev/null
+++ b/Parse/Platform/ParseClient.cs
@@ -0,0 +1,153 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Parse.Abstractions.Infrastructure;
+using Parse.Infrastructure.Utilities;
+using Parse.Infrastructure;
+
+#if DEBUG
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Parse.Tests")]
+#endif
+
+namespace Parse
+{
+    /// <summary>
+    /// ParseClient contains static functions that handle global
+    /// configuration for the Parse library.
+    /// </summary>
+    public class ParseClient : CustomServiceHub, IServiceHubComposer
+    {
+        /// <summary>
+        /// Contains, in order, the official ISO date and time format strings, and two modified versions that account for the possibility that the server-side string processing mechanism removed trailing zeroes.
+        /// </summary>
+        internal static string[] DateFormatStrings { get; } =
+        {
+            "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fff'Z'",
+            "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ff'Z'",
+            "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'f'Z'",
+        };
+
+        /// <summary>
+        /// Gets whether or not the assembly using the Parse SDK was compiled by IL2CPP.
+        /// </summary>
+        public static bool IL2CPPCompiled { get; set; } = AppDomain.CurrentDomain?.FriendlyName?.Equals("IL2CPP Root Domain") == true;
+
+        /// <summary>
+        /// The configured default instance of <see cref="ParseClient"/> to use.
+        /// </summary>
+        public static ParseClient Instance { get; private set; }
+
+        internal static string Version => typeof(ParseClient)?.Assembly?.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? typeof(ParseClient)?.Assembly?.GetName()?.Version?.ToString();
+
+        /// <summary>
+        /// Services that provide essential functionality.
+        /// </summary>
+        public override IServiceHub Services { get; internal set; }
+
+        // TODO: Implement IServiceHubMutator in all IServiceHub-implementing classes in Parse.Library and possibly require all implementations to do so as an efficiency improvement over instantiating an OrchestrationServiceHub, only for another one to be possibly instantiated when configurators are specified.
+
+        /// <summary>
+        /// Creates a new <see cref="ParseClient"/> and authenticates it as belonging to your application. This class is a hub for interacting with the SDK. The recommended way to use this class on client applications is to instantiate it, then call <see cref="Publicize"/> on it in your application entry point. This allows you to access <see cref="Instance"/>.
+        /// </summary>
+        /// <param name="applicationID">The Application ID provided in the Parse dashboard.</param>
+        /// <param name="serverURI">The server URI provided in the Parse dashboard.</param>
+        /// <param name="key">The .NET Key provided in the Parse dashboard.</param>
+        /// <param name="serviceHub">A service hub to override internal services and thereby make the Parse SDK operate in a custom manner.</param>
+        /// <param name="configurators">A set of <see cref="IServiceHubMutator"/> implementation instances to tweak the behaviour of the SDK.</param>
+        public ParseClient(string applicationID, string serverURI, string key, IServiceHub serviceHub = default, params IServiceHubMutator[] configurators) : this(new ServerConnectionData { ApplicationID = applicationID, ServerURI = serverURI, Key = key }, serviceHub, configurators) { }
+
+        /// <summary>
+        /// Creates a new <see cref="ParseClient"/> and authenticates it as belonging to your application. This class is a hub for interacting with the SDK. The recommended way to use this class on client applications is to instantiate it, then call <see cref="Publicize"/> on it in your application entry point. This allows you to access <see cref="Instance"/>.
+        /// </summary>
+        /// <param name="configuration">The configuration to initialize Parse with.</param>
+        /// <param name="serviceHub">A service hub to override internal services and thereby make the Parse SDK operate in a custom manner.</param>
+        /// <param name="configurators">A set of <see cref="IServiceHubMutator"/> implementation instances to tweak the behaviour of the SDK.</param>
+        public ParseClient(IServerConnectionData configuration, IServiceHub serviceHub = default, params IServiceHubMutator[] configurators)
+        {
+            Services = serviceHub is { } ? new OrchestrationServiceHub { Custom = serviceHub, Default = new ServiceHub { ServerConnectionData = GenerateServerConnectionData() } } : new ServiceHub { ServerConnectionData = GenerateServerConnectionData() } as IServiceHub;
+
+            IServerConnectionData GenerateServerConnectionData() => configuration switch
+            {
+                null => throw new ArgumentNullException(nameof(configuration)),
+                ServerConnectionData { Test: true, ServerURI: { } } data => data,
+                ServerConnectionData { Test: true } data => new ServerConnectionData
+                {
+                    ApplicationID = data.ApplicationID,
+                    Headers = data.Headers,
+                    MasterKey = data.MasterKey,
+                    Test = data.Test,
+                    Key = data.Key,
+                    ServerURI = "https://api.parse.com/1/"
+                },
+                { ServerURI: "https://api.parse.com/1/" } => throw new InvalidOperationException("Since the official parse server has shut down, you must specify a URI that points to a hosted instance."),
+                { ApplicationID: { }, ServerURI: { }, Key: { } } data => data,
+                _ => throw new InvalidOperationException("The IServerConnectionData implementation instance provided to the ParseClient constructor must be populated with the information needed to connect to a Parse server instance.")
+            };
+
+            if (configurators is { Length: int length } && length > 0)
+            {
+                Services = serviceHub switch
+                {
+                    IMutableServiceHub { } mutableServiceHub => BuildHub((Hub: mutableServiceHub, mutableServiceHub.ServerConnectionData = serviceHub.ServerConnectionData ?? Services.ServerConnectionData).Hub, Services, configurators),
+                    { } => BuildHub(default, Services, configurators)
+                };
+            }
+
+            Services.ClassController.AddIntrinsic();
+        }
+
+        /// <summary>
+        /// Initializes a <see cref="ParseClient"/> instance using the <see cref="IServiceHub.Cloner"/> set on the <see cref="Instance"/>'s <see cref="Services"/> <see cref="IServiceHub"/> implementation instance.
+        /// </summary>
+        public ParseClient() => Services = (Instance ?? throw new InvalidOperationException("A ParseClient instance with an initializer service must first be publicized in order for the default constructor to be used.")).Services.Cloner.BuildHub(Instance.Services, this);
+
+        /// <summary>
+        /// Sets this <see cref="ParseClient"/> instance as the template to create new instances from.
+        /// </summary>
+        ///// <param name="publicize">Declares that the current <see cref="ParseClient"/> instance should be the publicly-accesible <see cref="Instance"/>.</param>
+        public void Publicize()
+        {
+            lock (Mutex)
+            {
+                Instance = this;
+            }
+        }
+
+        static object Mutex { get; } = new object { };
+
+        internal static string BuildQueryString(IDictionary<string, object> parameters) => String.Join("&", (from pair in parameters let valueString = pair.Value as string select $"{Uri.EscapeDataString(pair.Key)}={Uri.EscapeDataString(String.IsNullOrEmpty(valueString) ? JsonUtilities.Encode(pair.Value) : valueString)}").ToArray());
+
+        internal static IDictionary<string, string> DecodeQueryString(string queryString)
+        {
+            Dictionary<string, string> query = new Dictionary<string, string> { };
+
+            foreach (string pair in queryString.Split('&'))
+            {
+                string[] parts = pair.Split(new char[] { '=' }, 2);
+                query[parts[0]] = parts.Length == 2 ? Uri.UnescapeDataString(parts[1].Replace("+", " ")) : null;
+            }
+
+            return query;
+        }
+
+        internal static IDictionary<string, object> DeserializeJsonString(string jsonData) => JsonUtilities.Parse(jsonData) as IDictionary<string, object>;
+
+        internal static string SerializeJsonString(IDictionary<string, object> jsonData) => JsonUtilities.Encode(jsonData);
+
+        public IServiceHub BuildHub(IMutableServiceHub target = default, IServiceHub extension = default, params IServiceHubMutator[] configurators)
+        {
+            OrchestrationServiceHub orchestrationServiceHub = new OrchestrationServiceHub { Custom = target ??= new MutableServiceHub { }, Default = extension ?? new ServiceHub { } };
+
+            foreach (IServiceHubMutator mutator in configurators.Where(configurator => configurator.Valid))
+            {
+                mutator.Mutate(ref target, orchestrationServiceHub);
+                orchestrationServiceHub.Custom = target;
+            }
+
+            return orchestrationServiceHub;
+        }
+    }
+}
diff --git a/Parse/Platform/Push/MutablePushState.cs b/Parse/Platform/Push/MutablePushState.cs
new file mode 100644
index 00000000..0b942b4f
--- /dev/null
+++ b/Parse/Platform/Push/MutablePushState.cs
@@ -0,0 +1,57 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using Parse.Abstractions.Platform.Push;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse.Platform.Push
+{
+    public class MutablePushState : IPushState
+    {
+        public ParseQuery<ParseInstallation> Query { get; set; }
+        public IEnumerable<string> Channels { get; set; }
+        public DateTime? Expiration { get; set; }
+        public TimeSpan? ExpirationInterval { get; set; }
+        public DateTime? PushTime { get; set; }
+        public IDictionary<string, object> Data { get; set; }
+        public string Alert { get; set; }
+
+        public IPushState MutatedClone(Action<MutablePushState> func)
+        {
+            MutablePushState clone = MutableClone();
+            func(clone);
+            return clone;
+        }
+
+        protected virtual MutablePushState MutableClone() => new MutablePushState
+        {
+            Query = Query,
+            Channels = Channels == null ? null : new List<string>(Channels),
+            Expiration = Expiration,
+            ExpirationInterval = ExpirationInterval,
+            PushTime = PushTime,
+            Data = Data == null ? null : new Dictionary<string, object>(Data),
+            Alert = Alert
+        };
+
+        public override bool Equals(object obj)
+        {
+            if (obj == null || !(obj is MutablePushState))
+                return false;
+
+            MutablePushState other = obj as MutablePushState;
+            return Equals(Query, other.Query) &&
+                   Channels.CollectionsEqual(other.Channels) &&
+                   Equals(Expiration, other.Expiration) &&
+                   Equals(ExpirationInterval, other.ExpirationInterval) &&
+                   Equals(PushTime, other.PushTime) &&
+                   Data.CollectionsEqual(other.Data) &&
+                   Equals(Alert, other.Alert);
+        }
+
+        public override int GetHashCode() =>
+            // TODO (richardross): Implement this.
+            0;
+    }
+}
diff --git a/Parse/Platform/Push/ParsePush.cs b/Parse/Platform/Push/ParsePush.cs
new file mode 100644
index 00000000..3c8f57d6
--- /dev/null
+++ b/Parse/Platform/Push/ParsePush.cs
@@ -0,0 +1,216 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Push;
+using Parse.Platform.Push;
+
+namespace Parse
+{
+    /// <summary>
+    ///  A utility class for sending and receiving push notifications.
+    /// </summary>
+    public partial class ParsePush
+    {
+        object Mutex { get; } = new object { };
+
+        IPushState State { get; set; }
+
+        IServiceHub Services { get; }
+
+#warning Make default(IServiceHub) the default value of serviceHub once all dependents properly inject it.
+
+        /// <summary>
+        /// Creates a push which will target every device. The Data field must be set before calling SendAsync.
+        /// </summary>
+        public ParsePush(IServiceHub serviceHub)
+        {
+            Services = serviceHub ?? ParseClient.Instance;
+            State = new MutablePushState { Query = Services.GetInstallationQuery() };
+        }
+
+        #region Properties
+
+        /// <summary>
+        /// An installation query that specifies which installations should receive
+        /// this push.
+        /// This should not be used in tandem with Channels.
+        /// </summary>
+        public ParseQuery<ParseInstallation> Query
+        {
+            get => State.Query;
+            set => MutateState(state =>
+            {
+                if (state.Channels is { } && value is { } && value.GetConstraint("channels") is { })
+                {
+                    throw new InvalidOperationException("A push may not have both Channels and a Query with a channels constraint.");
+                }
+
+                state.Query = value;
+            });
+        }
+
+        /// <summary>
+        /// A short-hand to set a query which only discriminates on the channels to which a device is subscribed.
+        /// This is shorthand for:
+        ///
+        /// <code>
+        /// var push = new Push();
+        /// push.Query = ParseInstallation.Query.WhereKeyContainedIn("channels", channels);
+        /// </code>
+        ///
+        /// This cannot be used in tandem with Query.
+        /// </summary>
+        public IEnumerable<string> Channels
+        {
+            get => State.Channels;
+            set => MutateState(state =>
+            {
+                if (value is { } && state.Query is { } && state.Query.GetConstraint("channels") is { })
+                {
+                    throw new InvalidOperationException("A push may not have both Channels and a Query with a channels constraint.");
+                }
+
+                state.Channels = value;
+            });
+        }
+
+        /// <summary>
+        /// The time at which this push will expire. This should not be used in tandem with ExpirationInterval.
+        /// </summary>
+        public DateTime? Expiration
+        {
+            get => State.Expiration;
+            set => MutateState(state =>
+            {
+                if (state.ExpirationInterval is { })
+                {
+                    throw new InvalidOperationException("Cannot set Expiration after setting ExpirationInterval.");
+                }
+
+                state.Expiration = value;
+            });
+        }
+
+        /// <summary>
+        /// The time at which this push will be sent.
+        /// </summary>
+        public DateTime? PushTime
+        {
+            get => State.PushTime;
+            set => MutateState(state =>
+            {
+                DateTime now = DateTime.Now;
+
+                if (value < now || value > now.AddDays(14))
+                {
+                    throw new InvalidOperationException("Cannot set PushTime in the past or more than two weeks later than now.");
+                }
+
+                state.PushTime = value;
+            });
+        }
+
+        /// <summary>
+        /// The time from initial schedul when this push will expire. This should not be used in tandem with Expiration.
+        /// </summary>
+        public TimeSpan? ExpirationInterval
+        {
+            get => State.ExpirationInterval;
+            set => MutateState(state =>
+            {
+                if (state.Expiration is { })
+                {
+                    throw new InvalidOperationException("Cannot set ExpirationInterval after setting Expiration.");
+                }
+
+                state.ExpirationInterval = value;
+            });
+        }
+
+        /// <summary>
+        /// The contents of this push. Some keys have special meaning. A full list of pre-defined
+        /// keys can be found in the Parse Push Guide. The following keys affect WinRT devices.
+        /// Keys which do not start with x-winrt- can be prefixed with x-winrt- to specify an
+        /// override only sent to winrt devices.
+        /// alert: the body of the alert text.
+        /// title: The title of the text.
+        /// x-winrt-payload: A full XML payload to be sent to WinRT installations instead of
+        ///      the auto-layout.
+        /// This should not be used in tandem with Alert.
+        /// </summary>
+        public IDictionary<string, object> Data
+        {
+            get => State.Data;
+            set => MutateState(state =>
+            {
+                if (state.Alert is { } && value is { })
+                {
+                    throw new InvalidOperationException("A push may not have both an Alert and Data.");
+                }
+
+                state.Data = value;
+            });
+        }
+
+        /// <summary>
+        /// A convenience method which sets Data to a dictionary with alert as its only field. Equivalent to
+        ///
+        /// <code>
+        /// Data = new Dictionary&lt;string, object&gt; {{"alert", alert}};
+        /// </code>
+        ///
+        /// This should not be used in tandem with Data.
+        /// </summary>
+        public string Alert
+        {
+            get => State.Alert;
+            set => MutateState(state =>
+            {
+                if (state.Data is { } && value is { })
+                {
+                    throw new InvalidOperationException("A push may not have both an Alert and Data.");
+                }
+
+                state.Alert = value;
+            });
+        }
+
+        #endregion
+
+        internal IDictionary<string, object> Encode() => ParsePushEncoder.Instance.Encode(State);
+
+        void MutateState(Action<MutablePushState> func)
+        {
+            lock (Mutex)
+            {
+                State = State.MutatedClone(func);
+            }
+        }
+
+        #region Sending Push
+
+        /// <summary>
+        /// Request a push to be sent. When this task completes, Parse has successfully acknowledged a request
+        /// to send push notifications but has not necessarily finished sending all notifications
+        /// requested. The current status of recent push notifications can be seen in your Push Notifications
+        /// console on http://parse.com
+        /// </summary>
+        /// <returns>A Task for continuation.</returns>
+        public Task SendAsync() => SendAsync(CancellationToken.None);
+
+        /// <summary>
+        /// Request a push to be sent. When this task completes, Parse has successfully acknowledged a request
+        /// to send push notifications but has not necessarily finished sending all notifications
+        /// requested. The current status of recent push notifications can be seen in your Push Notifications
+        /// console on http://parse.com
+        /// </summary>
+        /// <param name="cancellationToken">CancellationToken to cancel the current operation.</param>
+        public Task SendAsync(CancellationToken cancellationToken) => Services.PushController.SendPushNotificationAsync(State, Services, cancellationToken);
+
+        #endregion
+    }
+}
diff --git a/Parse/Platform/Push/ParsePushChannelsController.cs b/Parse/Platform/Push/ParsePushChannelsController.cs
new file mode 100644
index 00000000..58377658
--- /dev/null
+++ b/Parse/Platform/Push/ParsePushChannelsController.cs
@@ -0,0 +1,32 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Parse;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Installations;
+using Parse.Abstractions.Platform.Push;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse.Platform.Push
+{
+    internal class ParsePushChannelsController : IParsePushChannelsController
+    {
+        IParseCurrentInstallationController CurrentInstallationController { get; }
+
+        public ParsePushChannelsController(IParseCurrentInstallationController currentInstallationController) => CurrentInstallationController = currentInstallationController;
+
+        public Task SubscribeAsync(IEnumerable<string> channels, IServiceHub serviceHub, CancellationToken cancellationToken = default) => CurrentInstallationController.GetAsync(serviceHub, cancellationToken).OnSuccess(task =>
+        {
+            task.Result.AddRangeUniqueToList(nameof(channels), channels);
+            return task.Result.SaveAsync(cancellationToken);
+        }).Unwrap();
+
+        public Task UnsubscribeAsync(IEnumerable<string> channels, IServiceHub serviceHub, CancellationToken cancellationToken = default) => CurrentInstallationController.GetAsync(serviceHub, cancellationToken).OnSuccess(task =>
+        {
+            task.Result.RemoveAllFromList(nameof(channels), channels);
+            return task.Result.SaveAsync(cancellationToken);
+        }).Unwrap();
+    }
+}
diff --git a/Parse/Platform/Push/ParsePushController.cs b/Parse/Platform/Push/ParsePushController.cs
new file mode 100644
index 00000000..52b912b4
--- /dev/null
+++ b/Parse/Platform/Push/ParsePushController.cs
@@ -0,0 +1,28 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Abstractions.Platform.Push;
+using Parse.Abstractions.Platform.Users;
+using Parse.Infrastructure.Execution;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse.Platform.Push
+{
+    internal class ParsePushController : IParsePushController
+    {
+        IParseCommandRunner CommandRunner { get; }
+
+        IParseCurrentUserController CurrentUserController { get; }
+
+        public ParsePushController(IParseCommandRunner commandRunner, IParseCurrentUserController currentUserController)
+        {
+            CommandRunner = commandRunner;
+            CurrentUserController = currentUserController;
+        }
+
+        public Task SendPushNotificationAsync(IPushState state, IServiceHub serviceHub, CancellationToken cancellationToken = default) => CurrentUserController.GetCurrentSessionTokenAsync(serviceHub, cancellationToken).OnSuccess(sessionTokenTask => CommandRunner.RunCommandAsync(new ParseCommand("push", method: "POST", sessionToken: sessionTokenTask.Result, data: ParsePushEncoder.Instance.Encode(state)), cancellationToken: cancellationToken)).Unwrap();
+    }
+}
diff --git a/Parse/Internal/Push/Coder/ParsePushEncoder.cs b/Parse/Platform/Push/ParsePushEncoder.cs
similarity index 58%
rename from Parse/Internal/Push/Coder/ParsePushEncoder.cs
rename to Parse/Platform/Push/ParsePushEncoder.cs
index f010ae41..a739df75 100644
--- a/Parse/Internal/Push/Coder/ParsePushEncoder.cs
+++ b/Parse/Platform/Push/ParsePushEncoder.cs
@@ -1,59 +1,51 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
 using System;
-using System.Linq;
 using System.Collections.Generic;
-using Parse.Common.Internal;
-using Parse.Core.Internal;
+using Parse.Abstractions.Platform.Push;
+using Parse.Infrastructure.Utilities;
 
-namespace Parse.Push.Internal
+namespace Parse.Platform.Push
 {
     public class ParsePushEncoder
     {
-        private static readonly ParsePushEncoder instance = new ParsePushEncoder();
-        public static ParsePushEncoder Instance
-        {
-            get
-            {
-                return instance;
-            }
-        }
+        public static ParsePushEncoder Instance { get; } = new ParsePushEncoder { };
 
         private ParsePushEncoder() { }
 
         public IDictionary<string, object> Encode(IPushState state)
         {
-            if (state.Alert == null && state.Data == null)
-            {
+            if (state.Alert is null && state.Data is null)
                 throw new InvalidOperationException("A push must have either an Alert or Data");
-            }
-            if (state.Channels == null && state.Query == null)
-            {
+
+            if (state.Channels is null && state.Query is null)
                 throw new InvalidOperationException("A push must have either Channels or a Query");
-            }
 
-            var data = state.Data ?? new Dictionary<string, object> { { "alert", state.Alert } };
-            var query = state.Query ?? ParseInstallation.Query;
-            if (state.Channels != null)
+            IDictionary<string, object> data = state.Data ?? new Dictionary<string, object>
             {
+                ["alert"] = state.Alert
+            };
+
+#warning Verify that it is fine to instantiate a ParseQuery<ParseInstallation> here with a default(IServiceHub).
+
+            ParseQuery<ParseInstallation> query = state.Query ?? new ParseQuery<ParseInstallation>(default, "_Installation") { };
+
+            if (state.Channels != null)
                 query = query.WhereContainedIn("channels", state.Channels);
-            }
-            var payload = new Dictionary<string, object> {
-        { "data", data },
-        { "where", query.BuildParameters().GetOrDefault("where", new Dictionary<string, object>()) },
-      };
-            if (state.Expiration.HasValue)
+
+            Dictionary<string, object> payload = new Dictionary<string, object>
             {
+                [nameof(data)] = data,
+                ["where"] = query.BuildParameters().GetOrDefault("where", new Dictionary<string, object> { }),
+            };
+
+            if (state.Expiration.HasValue)
                 payload["expiration_time"] = state.Expiration.Value.ToString("yyyy-MM-ddTHH:mm:ssZ");
-            }
             else if (state.ExpirationInterval.HasValue)
-            {
                 payload["expiration_interval"] = state.ExpirationInterval.Value.TotalSeconds;
-            }
+
             if (state.PushTime.HasValue)
-            {
                 payload["push_time"] = state.PushTime.Value.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ");
-            }
 
             return payload;
         }
diff --git a/Parse/Public/ParsePushNotificationEventArgs.cs b/Parse/Platform/Push/ParsePushNotificationEvent.cs
similarity index 60%
rename from Parse/Public/ParsePushNotificationEventArgs.cs
rename to Parse/Platform/Push/ParsePushNotificationEvent.cs
index a4fdd065..6e82c6bb 100644
--- a/Parse/Public/ParsePushNotificationEventArgs.cs
+++ b/Parse/Platform/Push/ParsePushNotificationEvent.cs
@@ -1,45 +1,40 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
-using Parse.Common.Internal;
 using System;
 using System.Collections.Generic;
+using Parse.Infrastructure.Utilities;
 
-namespace Parse
+namespace Parse.Platform.Push
 {
     /// <summary>
     /// A wrapper around Parse push notification payload.
     /// </summary>
-    public class ParsePushNotificationEventArgs : EventArgs
+    public class ParsePushNotificationEvent : EventArgs
     {
-        internal ParsePushNotificationEventArgs(IDictionary<string, object> payload)
+        internal ParsePushNotificationEvent(IDictionary<string, object> content)
         {
-            Payload = payload;
-
-#if !IOS
-            StringPayload = Json.Encode(payload);
-#endif
+            Content = content;
+            TextContent = JsonUtilities.Encode(content);
         }
 
         // TODO: (richardross) investigate this.
         // Obj-C type -> .NET type is impossible to do flawlessly (especially
         // on NSNumber). We can't transform NSDictionary into string because of this reason.
-#if !IOS
-        internal ParsePushNotificationEventArgs(string stringPayload)
-        {
-            StringPayload = stringPayload;
 
-            Payload = Json.Parse(stringPayload) as IDictionary<string, object>;
+        internal ParsePushNotificationEvent(string stringPayload)
+        {
+            TextContent = stringPayload;
+            Content = JsonUtilities.Parse(stringPayload) as IDictionary<string, object>;
         }
-#endif
 
         /// <summary>
         /// The payload of the push notification as <c>IDictionary</c>.
         /// </summary>
-        public IDictionary<string, object> Payload { get; internal set; }
+        public IDictionary<string, object> Content { get; internal set; }
 
         /// <summary>
         /// The payload of the push notification as <c>string</c>.
         /// </summary>
-        public string StringPayload { get; internal set; }
+        public string TextContent { get; internal set; }
     }
 }
diff --git a/Parse/Public/ParseQuery.cs b/Parse/Platform/Queries/ParseQuery.cs
similarity index 74%
rename from Parse/Public/ParseQuery.cs
rename to Parse/Platform/Queries/ParseQuery.cs
index 7ea296a1..babad75d 100644
--- a/Parse/Public/ParseQuery.cs
+++ b/Parse/Platform/Queries/ParseQuery.cs
@@ -1,16 +1,17 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
-using Parse.Core.Internal;
-using Parse.Common.Internal;
-using System.Net.WebSockets;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Infrastructure;
+using Parse.Infrastructure.Data;
+using Parse.Infrastructure.Utilities;
 
 namespace Parse
 {
@@ -29,7 +30,7 @@ namespace Parse
     /// </code>
     ///
     /// A ParseQuery can also be used to retrieve a single object whose id is known,
-    /// through the <see cref="GetAsync(string)"/> method. For example, this sample code
+    /// through the <see cref="GetAsync(String)"/> method. For example, this sample code
     /// fetches an object of class <c>"MyClass"</c> and id <c>myId</c>.
     ///
     /// <code>
@@ -48,106 +49,145 @@ namespace Parse
     /// </example>
     public class ParseQuery<T> where T : ParseObject
     {
-        private readonly string className;
-        private readonly Dictionary<string, object> where;
-        private readonly ReadOnlyCollection<string> orderBy;
-        private readonly ReadOnlyCollection<string> includes;
-        private readonly ReadOnlyCollection<string> selectedKeys;
-        private readonly String redirectClassNameForKey;
-        private readonly int? skip;
-        private readonly int? limit;
+        /// <summary>
+        /// Serialized <see langword="where"/> clauses.
+        /// </summary>
+        Dictionary<string, object> Filters { get; }
+
+        /// <summary>
+        /// Serialized <see langword="orderby"/> clauses.
+        /// </summary>
+        ReadOnlyCollection<string> Orderings { get; }
+
+        /// <summary>
+        /// Serialized related data query merging request (data inclusion) clauses.
+        /// </summary>
+        ReadOnlyCollection<string> Includes { get; }
+
+        /// <summary>
+        /// Serialized key selections.
+        /// </summary>
+        ReadOnlyCollection<string> KeySelections { get; }
+
+        string RedirectClassNameForKey { get; }
+
+        int? SkipAmount { get; }
 
-        internal string ClassName => className;
+        int? LimitAmount { get; }
 
-        internal static IParseQueryController QueryController => ParseCorePlugins.Instance.QueryController;
+        internal string ClassName { get; }
 
-        internal static IObjectSubclassingController SubclassingController => ParseCorePlugins.Instance.SubclassingController;
+        internal IServiceHub Services { get; }
 
         /// <summary>
         /// Private constructor for composition of queries. A source query is required,
         /// but the remaining values can be null if they won't be changed in this
         /// composition.
         /// </summary>
-        private ParseQuery(ParseQuery<T> source, IDictionary<string, object> where = null, IEnumerable<string> replacementOrderBy = null, IEnumerable<string> thenBy = null, int? skip = null, int? limit = null, IEnumerable<string> includes = null, IEnumerable<string> selectedKeys = null, String redirectClassNameForKey = null)
+        internal ParseQuery(ParseQuery<T> source, IDictionary<string, object> where = null, IEnumerable<string> replacementOrderBy = null, IEnumerable<string> thenBy = null, int? skip = null, int? limit = null, IEnumerable<string> includes = null, IEnumerable<string> selectedKeys = null, string redirectClassNameForKey = null)
         {
             if (source == null)
-                throw new ArgumentNullException("source");
-
-            className = source.className;
-            this.where = source.where;
-            orderBy = replacementOrderBy is null ? source.orderBy : new ReadOnlyCollection<string>(replacementOrderBy.ToList());
-            this.skip = skip is null ? source.skip : (source.skip ?? 0) + skip; // 0 could be handled differently from null
-            this.limit = limit ?? source.limit;
-            this.includes = source.includes;
-            this.selectedKeys = source.selectedKeys;
-            this.redirectClassNameForKey = redirectClassNameForKey ?? source.redirectClassNameForKey;
-
-            if (thenBy != null)
             {
-                List<string> newOrderBy = new List<string>(orderBy ?? throw new ArgumentException("You must call OrderBy before calling ThenBy."));
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            Services = source.Services;
+            ClassName = source.ClassName;
+            Filters = source.Filters;
+            Orderings = replacementOrderBy is null ? source.Orderings : new ReadOnlyCollection<string>(replacementOrderBy.ToList());
+
+            // 0 could be handled differently from null.
+
+            SkipAmount = skip is null ? source.SkipAmount : (source.SkipAmount ?? 0) + skip;
+            LimitAmount = limit ?? source.LimitAmount;
+            Includes = source.Includes;
+            KeySelections = source.KeySelections;
+            RedirectClassNameForKey = redirectClassNameForKey ?? source.RedirectClassNameForKey;
+
+            if (thenBy is { })
+            {
+                List<string> newOrderBy = new List<string>(Orderings ?? throw new ArgumentException("You must call OrderBy before calling ThenBy."));
 
                 newOrderBy.AddRange(thenBy);
-                orderBy = new ReadOnlyCollection<string>(newOrderBy);
+                Orderings = new ReadOnlyCollection<string>(newOrderBy);
             }
-            
+
             // Remove duplicates.
-            if (orderBy != null)
-                orderBy = new ReadOnlyCollection<string>(new HashSet<string>(orderBy).ToList());
 
-            if (where != null)
-                this.where = new Dictionary<string, object>(MergeWhereClauses(where));
+            if (Orderings is { })
+            {
+                Orderings = new ReadOnlyCollection<string>(new HashSet<string>(Orderings).ToList());
+            }
 
-            if (includes != null)
-                this.includes = new ReadOnlyCollection<string>(MergeIncludes(includes).ToList());
+            if (where is { })
+            {
+                Filters = new Dictionary<string, object>(MergeWhereClauses(where));
+            }
 
-            if (selectedKeys != null)
-                this.selectedKeys = new ReadOnlyCollection<string>(MergeSelectedKeys(selectedKeys).ToList());
+            if (includes is { })
+            {
+                Includes = new ReadOnlyCollection<string>(MergeIncludes(includes).ToList());
+            }
+
+            if (selectedKeys is { })
+            {
+                KeySelections = new ReadOnlyCollection<string>(MergeSelectedKeys(selectedKeys).ToList());
+            }
         }
 
-        private HashSet<string> MergeIncludes(IEnumerable<string> includes)
+        HashSet<string> MergeIncludes(IEnumerable<string> includes)
         {
-            if (this.includes == null)
+            if (Includes is null)
+            {
                 return new HashSet<string>(includes);
-            HashSet<string> newIncludes = new HashSet<string>(this.includes);
+            }
+
+            HashSet<string> newIncludes = new HashSet<string>(Includes);
+
             foreach (string item in includes)
+            {
                 newIncludes.Add(item);
+            }
+
             return newIncludes;
         }
 
-        private HashSet<string> MergeSelectedKeys(IEnumerable<string> selectedKeys)
-        {
-            if (this.selectedKeys == null)
-                return new HashSet<string>(selectedKeys);
-            HashSet<string> newSelectedKeys = new HashSet<string>(this.selectedKeys);
-            foreach (string item in selectedKeys)
-                newSelectedKeys.Add(item);
-            return newSelectedKeys;
-        }
+        HashSet<string> MergeSelectedKeys(IEnumerable<string> selectedKeys) => new HashSet<string>((KeySelections ?? Enumerable.Empty<string>()).Concat(selectedKeys));
 
-        private IDictionary<string, object> MergeWhereClauses(IDictionary<string, object> where)
+        IDictionary<string, object> MergeWhereClauses(IDictionary<string, object> where)
         {
-            if (this.where == null)
+            if (Filters is null)
+            {
                 return where;
-            var newWhere = new Dictionary<string, object>(this.where);
-            foreach (var pair in where)
+            }
+
+            Dictionary<string, object> newWhere = new Dictionary<string, object>(Filters);
+            foreach (KeyValuePair<string, object> pair in where)
             {
-                var condition = pair.Value as IDictionary<string, object>;
                 if (newWhere.ContainsKey(pair.Key))
                 {
-                    var oldCondition = newWhere[pair.Key] as IDictionary<string, object>;
-                    if (oldCondition == null || condition == null)
+                    if (!(newWhere[pair.Key] is IDictionary<string, object> oldCondition) || !(pair.Value is IDictionary<string, object> condition))
+                    {
                         throw new ArgumentException("More than one where clause for the given key provided.");
-                    var newCondition = new Dictionary<string, object>(oldCondition);
-                    foreach (var conditionPair in condition)
+                    }
+
+                    Dictionary<string, object> newCondition = new Dictionary<string, object>(oldCondition);
+                    foreach (KeyValuePair<string, object> conditionPair in condition)
                     {
                         if (newCondition.ContainsKey(conditionPair.Key))
+                        {
                             throw new ArgumentException("More than one condition for the given key provided.");
+                        }
+
                         newCondition[conditionPair.Key] = conditionPair.Value;
                     }
+
                     newWhere[pair.Key] = newCondition;
                 }
                 else
+                {
                     newWhere[pair.Key] = pair.Value;
+                }
             }
             return newWhere;
         }
@@ -155,41 +195,14 @@ private IDictionary<string, object> MergeWhereClauses(IDictionary<string, object
         /// <summary>
         /// Constructs a query based upon the ParseObject subclass used as the generic parameter for the ParseQuery.
         /// </summary>
-        public ParseQuery() : this(SubclassingController.GetClassName(typeof(T))) { }
+        public ParseQuery(IServiceHub serviceHub) : this(serviceHub, serviceHub.ClassController.GetClassName(typeof(T))) { }
 
         /// <summary>
         /// Constructs a query. A default query with no further parameters will retrieve
         /// all <see cref="ParseObject"/>s of the provided class.
         /// </summary>
         /// <param name="className">The name of the class to retrieve ParseObjects for.</param>
-        public ParseQuery(string className) => this.className = className ?? throw new ArgumentNullException("className", "Must specify a ParseObject class name when creating a ParseQuery.");
-
-        /// <summary>
-        /// Constructs a query that is the or of the given queries.
-        /// </summary>
-        /// <param name="queries">The list of ParseQueries to 'or' together.</param>
-        /// <returns>A ParseQquery that is the 'or' of the passed in queries.</returns>
-        public static ParseQuery<T> Or(IEnumerable<ParseQuery<T>> queries)
-        {
-            string className = null;
-            var orValue = new List<IDictionary<string, object>>();
-            // We need to cast it to non-generic IEnumerable because of AOT-limitation
-            var nonGenericQueries = (IEnumerable) queries;
-            foreach (var obj in nonGenericQueries)
-            {
-                var q = obj as ParseQuery<T>;
-                if (className != null && q.className != className)
-                    throw new ArgumentException("All of the queries in an or query must be on the same class.");
-                className = q.className;
-                var parameters = q.BuildParameters();
-                if (parameters.Count == 0)
-                    continue;
-                if (!parameters.TryGetValue("where", out object where) || parameters.Count > 1)
-                    throw new ArgumentException("None of the queries in an or query can have non-filtering clauses");
-                orValue.Add(where as IDictionary<string, object>);
-            }
-            return new ParseQuery<T>(new ParseQuery<T>(className), where: new Dictionary<string, object> { { "$or", orValue } });
-        }
+        public ParseQuery(IServiceHub serviceHub, string className) => (ClassName, Services) = (className ?? throw new ArgumentNullException(nameof(className), "Must specify a ParseObject class name when creating a ParseQuery."), serviceHub);
 
         #region Order By
 
@@ -270,7 +283,7 @@ public static ParseQuery<T> Or(IEnumerable<ParseQuery<T>> queries)
         /// <returns>A new query with the additional constraint.</returns>
         public ParseQuery<T> Limit(int count) => new ParseQuery<T>(this, limit: count);
 
-        internal ParseQuery<T> RedirectClassName(String key) => new ParseQuery<T>(this, redirectClassNameForKey: key);
+        internal ParseQuery<T> RedirectClassName(string key) => new ParseQuery<T>(this, redirectClassNameForKey: key);
 
         #region Where
 
@@ -431,7 +444,17 @@ public static ParseQuery<T> Or(IEnumerable<ParseQuery<T>> queries)
         /// <param name="keyInQuery">The key in the objects from the subquery to look in.</param>
         /// <param name="query">The subquery to run</param>
         /// <returns>A new query with the additional constraint.</returns>
-        public ParseQuery<T> WhereMatchesKeyInQuery<TOther>(string key, string keyInQuery, ParseQuery<TOther> query) where TOther : ParseObject => new ParseQuery<T>(this, where: new Dictionary<string, object> { { key, new Dictionary<string, object> { { "$select", new Dictionary<string, object> { { "query", query.BuildParameters(true) }, { "key", keyInQuery } } } } } });
+        public ParseQuery<T> WhereMatchesKeyInQuery<TOther>(string key, string keyInQuery, ParseQuery<TOther> query) where TOther : ParseObject => new ParseQuery<T>(this, where: new Dictionary<string, object>
+        {
+            [key] = new Dictionary<string, object>
+            {
+                ["$select"] = new Dictionary<string, object>
+                {
+                    [nameof(query)] = query.BuildParameters(true),
+                    [nameof(key)] = keyInQuery
+                }
+            }
+        });
 
         /// <summary>
         /// Adds a constraint to the query that requires a particular key's value
@@ -441,7 +464,17 @@ public static ParseQuery<T> Or(IEnumerable<ParseQuery<T>> queries)
         /// <param name="keyInQuery">The key in the objects from the subquery to look in.</param>
         /// <param name="query">The subquery to run</param>
         /// <returns>A new query with the additional constraint.</returns>
-        public ParseQuery<T> WhereDoesNotMatchesKeyInQuery<TOther>(string key, string keyInQuery, ParseQuery<TOther> query) where TOther : ParseObject => new ParseQuery<T>(this, where: new Dictionary<string, object> { { key, new Dictionary<string, object> { { "$dontSelect", new Dictionary<string, object> { { "query", query.BuildParameters(true) }, { "key", keyInQuery } } } } } });
+        public ParseQuery<T> WhereDoesNotMatchesKeyInQuery<TOther>(string key, string keyInQuery, ParseQuery<TOther> query) where TOther : ParseObject => new ParseQuery<T>(this, where: new Dictionary<string, object>
+        {
+            [key] = new Dictionary<string, object>
+            {
+                ["$dontSelect"] = new Dictionary<string, object>
+                {
+                    [nameof(query)] = query.BuildParameters(true),
+                    [nameof(key)] = keyInQuery
+                }
+            }
+        });
 
         /// <summary>
         /// Adds a constraint to the query that requires that a particular key's value
@@ -451,7 +484,13 @@ public static ParseQuery<T> Or(IEnumerable<ParseQuery<T>> queries)
         /// <param name="key">The key to check.</param>
         /// <param name="query">The query that the value should match.</param>
         /// <returns>A new query with the additional constraint.</returns>
-        public ParseQuery<T> WhereMatchesQuery<TOther>(string key, ParseQuery<TOther> query) where TOther : ParseObject => new ParseQuery<T>(this, where: new Dictionary<string, object> { { key, new Dictionary<string, object> { { "$inQuery", query.BuildParameters(true) } } } });
+        public ParseQuery<T> WhereMatchesQuery<TOther>(string key, ParseQuery<TOther> query) where TOther : ParseObject => new ParseQuery<T>(this, where: new Dictionary<string, object>
+        {
+            [key] = new Dictionary<string, object>
+            {
+                ["$inQuery"] = query.BuildParameters(true)
+            }
+        });
 
         /// <summary>
         /// Adds a proximity-based constraint for finding objects with keys whose GeoPoint
@@ -460,7 +499,13 @@ public static ParseQuery<T> Or(IEnumerable<ParseQuery<T>> queries)
         /// <param name="key">The key that the ParseGeoPoint is stored in.</param>
         /// <param name="point">The reference ParseGeoPoint.</param>
         /// <returns>A new query with the additional constraint.</returns>
-        public ParseQuery<T> WhereNear(string key, ParseGeoPoint point) => new ParseQuery<T>(this, where: new Dictionary<string, object> { { key, new Dictionary<string, object> { { "$nearSphere", point } } } });
+        public ParseQuery<T> WhereNear(string key, ParseGeoPoint point) => new ParseQuery<T>(this, where: new Dictionary<string, object>
+        {
+            [key] = new Dictionary<string, object>
+            {
+                ["$nearSphere"] = point
+            }
+        });
 
         /// <summary>
         /// Adds a constraint to the query that requires a particular key's value to be
@@ -469,7 +514,13 @@ public static ParseQuery<T> Or(IEnumerable<ParseQuery<T>> queries)
         /// <param name="key">The key to check.</param>
         /// <param name="values">The values that will match.</param>
         /// <returns>A new query with the additional constraint.</returns>
-        public ParseQuery<T> WhereNotContainedIn<TIn>(string key, IEnumerable<TIn> values) => new ParseQuery<T>(this, where: new Dictionary<string, object> { { key, new Dictionary<string, object> { { "$nin", values.ToList() } } } });
+        public ParseQuery<T> WhereNotContainedIn<TIn>(string key, IEnumerable<TIn> values) => new ParseQuery<T>(this, where: new Dictionary<string, object>
+        {
+            [key] = new Dictionary<string, object>
+            {
+                ["$nin"] = values.ToList()
+            }
+        });
 
         /// <summary>
         /// Adds a constraint to the query that requires a particular key's value not
@@ -478,7 +529,13 @@ public static ParseQuery<T> Or(IEnumerable<ParseQuery<T>> queries)
         /// <param name="key">The key to check.</param>
         /// <param name="value">The value that that must not be equalled.</param>
         /// <returns>A new query with the additional constraint.</returns>
-        public ParseQuery<T> WhereNotEqualTo(string key, object value) => new ParseQuery<T>(this, where: new Dictionary<string, object> { { key, new Dictionary<string, object> { { "$ne", value } } } });
+        public ParseQuery<T> WhereNotEqualTo(string key, object value) => new ParseQuery<T>(this, where: new Dictionary<string, object>
+        {
+            [key] = new Dictionary<string, object>
+            {
+                ["$ne"] = value
+            }
+        });
 
         /// <summary>
         /// Adds a constraint for finding string values that start with the provided string.
@@ -487,7 +544,13 @@ public static ParseQuery<T> Or(IEnumerable<ParseQuery<T>> queries)
         /// <param name="key">The key that the string to match is stored in.</param>
         /// <param name="suffix">The substring that the value must start with.</param>
         /// <returns>A new query with the additional constraint.</returns>
-        public ParseQuery<T> WhereStartsWith(string key, string suffix) => new ParseQuery<T>(this, where: new Dictionary<string, object> { { key, new Dictionary<string, object> { { "$regex", "^" + RegexQuote(suffix) } } } });
+        public ParseQuery<T> WhereStartsWith(string key, string suffix) => new ParseQuery<T>(this, where: new Dictionary<string, object>
+        {
+            [key] = new Dictionary<string, object>
+            {
+                ["$regex"] = $"^{RegexQuote(suffix)}"
+            }
+        });
 
         /// <summary>
         /// Add a constraint to the query that requires a particular key's coordinates to be
@@ -497,7 +560,20 @@ public static ParseQuery<T> Or(IEnumerable<ParseQuery<T>> queries)
         /// <param name="southwest">The lower-left inclusive corner of the box.</param>
         /// <param name="northeast">The upper-right inclusive corner of the box.</param>
         /// <returns>A new query with the additional constraint.</returns>
-        public ParseQuery<T> WhereWithinGeoBox(string key, ParseGeoPoint southwest, ParseGeoPoint northeast) => new ParseQuery<T>(this, where: new Dictionary<string, object> { { key, new Dictionary<string, object> { { "$within", new Dictionary<string, object> { { "$box", new[] { southwest, northeast } } } } } } });
+        public ParseQuery<T> WhereWithinGeoBox(string key, ParseGeoPoint southwest, ParseGeoPoint northeast) => new ParseQuery<T>(this, where: new Dictionary<string, object>
+        {
+            [key] = new Dictionary<string, object>
+            {
+                ["$within"] = new Dictionary<string, object>
+                {
+                    ["$box"] = new[]
+                    {
+                        southwest,
+                        northeast
+                    }
+                }
+            }
+        });
 
         /// <summary>
         /// Adds a proximity-based constraint for finding objects with keys whose GeoPoint
@@ -507,9 +583,22 @@ public static ParseQuery<T> Or(IEnumerable<ParseQuery<T>> queries)
         /// <param name="point">The reference ParseGeoPoint.</param>
         /// <param name="maxDistance">The maximum distance (in radians) of results to return.</param>
         /// <returns>A new query with the additional constraint.</returns>
-        public ParseQuery<T> WhereWithinDistance(string key, ParseGeoPoint point, ParseGeoDistance maxDistance) => new ParseQuery<T>(WhereNear(key, point), where: new Dictionary<string, object> { { key, new Dictionary<string, object> { { "$maxDistance", maxDistance.Radians } } } });
+        public ParseQuery<T> WhereWithinDistance(string key, ParseGeoPoint point, ParseGeoDistance maxDistance) => new ParseQuery<T>(WhereNear(key, point), where: new Dictionary<string, object>
+        {
+            [key] = new Dictionary<string, object>
+            {
+                ["$maxDistance"] = maxDistance.Radians
+            }
+        });
 
-        internal ParseQuery<T> WhereRelatedTo(ParseObject parent, string key) => new ParseQuery<T>(this, where: new Dictionary<string, object> { { "$relatedTo", new Dictionary<string, object> { { "object", parent }, { "key", key } } } });
+        internal ParseQuery<T> WhereRelatedTo(ParseObject parent, string key) => new ParseQuery<T>(this, where: new Dictionary<string, object>
+        {
+            ["$relatedTo"] = new Dictionary<string, object>
+            {
+                ["object"] = parent,
+                [nameof(key)] = key
+            }
+        });
 
         #endregion
 
@@ -527,7 +616,7 @@ public static ParseQuery<T> Or(IEnumerable<ParseQuery<T>> queries)
         public Task<IEnumerable<T>> FindAsync(CancellationToken cancellationToken)
         {
             EnsureNotInstallationQuery();
-            return QueryController.FindAsync(this, ParseUser.CurrentUser, cancellationToken).OnSuccess(t => from state in t.Result select ParseObject.FromState<T>(state, ClassName));
+            return Services.QueryController.FindAsync(this, Services.GetCurrentUser(), cancellationToken).OnSuccess(task => from state in task.Result select Services.GenerateObjectFromState<T>(state, ClassName));
         }
 
         /// <summary>
@@ -544,14 +633,14 @@ public Task<IEnumerable<T>> FindAsync(CancellationToken cancellationToken)
         public Task<T> FirstOrDefaultAsync(CancellationToken cancellationToken)
         {
             EnsureNotInstallationQuery();
-            return QueryController.FirstAsync(this, ParseUser.CurrentUser, cancellationToken).OnSuccess(t => t.Result is IObjectState state && state != null ? ParseObject.FromState<T>(state, ClassName) : default(T));
+            return Services.QueryController.FirstAsync(this, Services.GetCurrentUser(), cancellationToken).OnSuccess(task => task.Result is IObjectState state && state is { } ? Services.GenerateObjectFromState<T>(state, ClassName) : default);
         }
 
         /// <summary>
         /// Retrieves at most one ParseObject that satisfies this query.
         /// </summary>
         /// <returns>A single ParseObject that satisfies this query.</returns>
-        /// <exception cref="ParseException">If no results match the query.</exception>
+        /// <exception cref="ParseFailureException">If no results match the query.</exception>
         public Task<T> FirstAsync() => FirstAsync(CancellationToken.None);
 
         /// <summary>
@@ -559,8 +648,8 @@ public Task<T> FirstOrDefaultAsync(CancellationToken cancellationToken)
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>A single ParseObject that satisfies this query.</returns>
-        /// <exception cref="ParseException">If no results match the query.</exception>
-        public Task<T> FirstAsync(CancellationToken cancellationToken) => FirstOrDefaultAsync(cancellationToken).OnSuccess(t => t.Result ?? throw new ParseException(ParseException.ErrorCode.ObjectNotFound, "No results matched the query."));
+        /// <exception cref="ParseFailureException">If no results match the query.</exception>
+        public Task<T> FirstAsync(CancellationToken cancellationToken) => FirstOrDefaultAsync(cancellationToken).OnSuccess(task => task.Result ?? throw new ParseFailureException(ParseFailureException.ErrorCode.ObjectNotFound, "No results matched the query."));
 
         /// <summary>
         /// Counts the number of objects that match this query.
@@ -576,7 +665,7 @@ public Task<T> FirstOrDefaultAsync(CancellationToken cancellationToken)
         public Task<int> CountAsync(CancellationToken cancellationToken)
         {
             EnsureNotInstallationQuery();
-            return QueryController.CountAsync(this, ParseUser.CurrentUser, cancellationToken);
+            return Services.QueryController.CountAsync(this, Services.GetCurrentUser(), cancellationToken);
         }
 
         /// <summary>
@@ -596,38 +685,38 @@ public Task<int> CountAsync(CancellationToken cancellationToken)
         /// <returns>The ParseObject for the given objectId.</returns>
         public Task<T> GetAsync(string objectId, CancellationToken cancellationToken)
         {
-            ParseQuery<T> singleItemQuery = new ParseQuery<T>(className).WhereEqualTo("objectId", objectId);
-            singleItemQuery = new ParseQuery<T>(singleItemQuery, includes: includes, selectedKeys: selectedKeys, limit: 1);
-            return singleItemQuery.FindAsync(cancellationToken).OnSuccess(t => t.Result.FirstOrDefault() ?? throw new ParseException(ParseException.ErrorCode.ObjectNotFound, "Object with the given objectId not found."));
+            ParseQuery<T> singleItemQuery = new ParseQuery<T>(Services, ClassName).WhereEqualTo(nameof(objectId), objectId);
+            singleItemQuery = new ParseQuery<T>(singleItemQuery, includes: Includes, selectedKeys: KeySelections, limit: 1);
+            return singleItemQuery.FindAsync(cancellationToken).OnSuccess(t => t.Result.FirstOrDefault() ?? throw new ParseFailureException(ParseFailureException.ErrorCode.ObjectNotFound, "Object with the given objectId not found."));
         }
 
-        internal object GetConstraint(string key) => where?.GetOrDefault(key, null);
+        internal object GetConstraint(string key) => Filters?.GetOrDefault(key, null);
 
         internal IDictionary<string, object> BuildParameters(bool includeClassName = false)
         {
             Dictionary<string, object> result = new Dictionary<string, object>();
-            if (where != null)
-                result["where"] = PointerOrLocalIdEncoder.Instance.Encode(where);
-            if (orderBy != null)
-                result["order"] = string.Join(",", orderBy.ToArray());
-            if (skip != null)
-                result["skip"] = skip.Value;
-            if (limit != null)
-                result["limit"] = limit.Value;
-            if (includes != null)
-                result["include"] = string.Join(",", includes.ToArray());
-            if (selectedKeys != null)
-                result["keys"] = string.Join(",", selectedKeys.ToArray());
+            if (Filters != null)
+                result["where"] = PointerOrLocalIdEncoder.Instance.Encode(Filters, Services);
+            if (Orderings != null)
+                result["order"] = String.Join(",", Orderings.ToArray());
+            if (SkipAmount != null)
+                result["skip"] = SkipAmount.Value;
+            if (LimitAmount != null)
+                result["limit"] = LimitAmount.Value;
+            if (Includes != null)
+                result["include"] = String.Join(",", Includes.ToArray());
+            if (KeySelections != null)
+                result["keys"] = String.Join(",", KeySelections.ToArray());
             if (includeClassName)
-                result["className"] = className;
-            if (redirectClassNameForKey != null)
-                result["redirectClassNameForKey"] = redirectClassNameForKey;
+                result["className"] = ClassName;
+            if (RedirectClassNameForKey != null)
+                result["redirectClassNameForKey"] = RedirectClassNameForKey;
             return result;
         }
 
-        private string RegexQuote(string input) => "\\Q" + input.Replace("\\E", "\\E\\\\E\\Q") + "\\E";
+        string RegexQuote(string input) => "\\Q" + input.Replace("\\E", "\\E\\\\E\\Q") + "\\E";
 
-        private string GetRegexOptions(Regex regex, string modifiers)
+        string GetRegexOptions(Regex regex, string modifiers)
         {
             string result = modifiers ?? "";
             if (regex.Options.HasFlag(RegexOptions.IgnoreCase) && !modifiers.Contains("i"))
@@ -637,20 +726,27 @@ private string GetRegexOptions(Regex regex, string modifiers)
             return result;
         }
 
-        private IDictionary<string, object> EncodeRegex(Regex regex, string modifiers)
+        IDictionary<string, object> EncodeRegex(Regex regex, string modifiers)
         {
-            var options = GetRegexOptions(regex, modifiers);
-            var dict = new Dictionary<string, object> { ["$regex"] = regex.ToString() };
-            if (!string.IsNullOrEmpty(options))
+            string options = GetRegexOptions(regex, modifiers);
+            Dictionary<string, object> dict = new Dictionary<string, object> { ["$regex"] = regex.ToString() };
+
+            if (!String.IsNullOrEmpty(options))
+            {
                 dict["$options"] = options;
+            }
+
             return dict;
         }
 
-        private void EnsureNotInstallationQuery()
+        void EnsureNotInstallationQuery()
         {
             // The ParseInstallation class is not accessible from this project; using string literal.
-            if (className.Equals("_Installation"))
+
+            if (ClassName.Equals("_Installation"))
+            {
                 throw new InvalidOperationException("Cannot directly query the Installation class.");
+            }
         }
 
         /// <summary>
@@ -658,16 +754,14 @@ private void EnsureNotInstallationQuery()
         /// </summary>
         /// <param name="obj">The object to compare with the current object.</param>
         /// <returns><c>true</c> if the specified object is equal to the current object; otherwise, <c>false</c></returns>
-        public override bool Equals(object obj) => obj == null || !(obj is ParseQuery<T> other) ? false : Equals(className, other.ClassName) && where.CollectionsEqual(other.where) && orderBy.CollectionsEqual(other.orderBy) && includes.CollectionsEqual(other.includes) && selectedKeys.CollectionsEqual(other.selectedKeys) && Equals(skip, other.skip) && Equals(limit, other.limit);
+        public override bool Equals(object obj) => obj == null || !(obj is ParseQuery<T> other) ? false : Equals(ClassName, other.ClassName) && Filters.CollectionsEqual(other.Filters) && Orderings.CollectionsEqual(other.Orderings) && Includes.CollectionsEqual(other.Includes) && KeySelections.CollectionsEqual(other.KeySelections) && Equals(SkipAmount, other.SkipAmount) && Equals(LimitAmount, other.LimitAmount);
 
         /// <summary>
         /// Serves as the default hash function.
         /// </summary>
         /// <returns>A hash code for the current object.</returns>
-        public override int GetHashCode()
-        {
+        public override int GetHashCode() =>
             // TODO (richardross): Implement this.
-            return 0;
-        }
+            0;
     }
 }
diff --git a/Parse/Platform/Queries/ParseQueryController.cs b/Parse/Platform/Queries/ParseQueryController.cs
new file mode 100644
index 00000000..cc5d775c
--- /dev/null
+++ b/Parse/Platform/Queries/ParseQueryController.cs
@@ -0,0 +1,50 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure.Data;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Abstractions.Platform.Queries;
+using Parse.Infrastructure.Data;
+using Parse.Infrastructure.Execution;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse.Platform.Queries
+{
+    /// <summary>
+    /// A straightforward implementation of <see cref="IParseQueryController"/> that uses <see cref="ParseObject.Services"/> to decode raw server data when needed.
+    /// </summary>
+    internal class ParseQueryController : IParseQueryController
+    {
+        IParseCommandRunner CommandRunner { get; }
+
+        IParseDataDecoder Decoder { get; }
+
+        public ParseQueryController(IParseCommandRunner commandRunner, IParseDataDecoder decoder) => (CommandRunner, Decoder) = (commandRunner, decoder);
+
+        public Task<IEnumerable<IObjectState>> FindAsync<T>(ParseQuery<T> query, ParseUser user, CancellationToken cancellationToken = default) where T : ParseObject => FindAsync(query.ClassName, query.BuildParameters(), user?.SessionToken, cancellationToken).OnSuccess(t => (from item in t.Result["results"] as IList<object> select ParseObjectCoder.Instance.Decode(item as IDictionary<string, object>, Decoder, user.Services)));
+
+        public Task<int> CountAsync<T>(ParseQuery<T> query, ParseUser user, CancellationToken cancellationToken = default) where T : ParseObject
+        {
+            IDictionary<string, object> parameters = query.BuildParameters();
+            parameters["limit"] = 0;
+            parameters["count"] = 1;
+
+            return FindAsync(query.ClassName, parameters, user?.SessionToken, cancellationToken).OnSuccess(task => Convert.ToInt32(task.Result["count"]));
+        }
+
+        public Task<IObjectState> FirstAsync<T>(ParseQuery<T> query, ParseUser user, CancellationToken cancellationToken = default) where T : ParseObject
+        {
+            IDictionary<string, object> parameters = query.BuildParameters();
+            parameters["limit"] = 1;
+
+            return FindAsync(query.ClassName, parameters, user?.SessionToken, cancellationToken).OnSuccess(task => (task.Result["results"] as IList<object>).FirstOrDefault() as IDictionary<string, object> is Dictionary<string, object> item && item != null ? ParseObjectCoder.Instance.Decode(item, Decoder, user.Services) : null);
+        }
+
+        Task<IDictionary<string, object>> FindAsync(string className, IDictionary<string, object> parameters, string sessionToken, CancellationToken cancellationToken = default) => CommandRunner.RunCommandAsync(new ParseCommand($"classes/{Uri.EscapeDataString(className)}?{ParseClient.BuildQueryString(parameters)}", method: "GET", sessionToken: sessionToken, data: null), cancellationToken: cancellationToken).OnSuccess(t => t.Result.Item2);
+    }
+}
diff --git a/Parse/Platform/Relations/ParseRelation.cs b/Parse/Platform/Relations/ParseRelation.cs
new file mode 100644
index 00000000..d25c5a25
--- /dev/null
+++ b/Parse/Platform/Relations/ParseRelation.cs
@@ -0,0 +1,108 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq.Expressions;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Infrastructure.Control;
+
+namespace Parse
+{
+    public static class RelationServiceExtensions
+    {
+        /// <summary>
+        /// Produces the proper ParseRelation&lt;T&gt; instance for the given classname.
+        /// </summary>
+        internal static ParseRelationBase CreateRelation(this IServiceHub serviceHub, ParseObject parent, string key, string targetClassName) => serviceHub.ClassController.CreateRelation(parent, key, targetClassName);
+
+        internal static ParseRelationBase CreateRelation(this IParseObjectClassController classController, ParseObject parent, string key, string targetClassName)
+        {
+            Expression<Func<ParseRelation<ParseObject>>> createRelationExpr = () => CreateRelation<ParseObject>(parent, key, targetClassName);
+            return (createRelationExpr.Body as MethodCallExpression).Method.GetGenericMethodDefinition().MakeGenericMethod(classController.GetType(targetClassName) ?? typeof(ParseObject)).Invoke(default, new object[] { parent, key, targetClassName }) as ParseRelationBase;
+        }
+
+        static ParseRelation<T> CreateRelation<T>(ParseObject parent, string key, string targetClassName) where T : ParseObject => new ParseRelation<T>(parent, key, targetClassName);
+    }
+
+    /// <summary>
+    /// A common base class for ParseRelations.
+    /// </summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public abstract class ParseRelationBase : IJsonConvertible
+    {
+        ParseObject Parent { get; set; }
+
+        string Key { get; set; }
+
+        internal ParseRelationBase(ParseObject parent, string key) => EnsureParentAndKey(parent, key);
+
+        internal ParseRelationBase(ParseObject parent, string key, string targetClassName) : this(parent, key) => TargetClassName = targetClassName;
+
+        internal void EnsureParentAndKey(ParseObject parent, string key)
+        {
+            Parent ??= parent;
+            Key ??= key;
+
+            Debug.Assert(Parent == parent, "Relation retrieved from two different objects");
+            Debug.Assert(Key == key, "Relation retrieved from two different keys");
+        }
+
+        internal void Add(ParseObject entity)
+        {
+            ParseRelationOperation change = new ParseRelationOperation(Parent.Services.ClassController, new[] { entity }, default);
+
+            Parent.PerformOperation(Key, change);
+            TargetClassName = change.TargetClassName;
+        }
+
+        internal void Remove(ParseObject entity)
+        {
+            ParseRelationOperation change = new ParseRelationOperation(Parent.Services.ClassController, default, new[] { entity });
+
+            Parent.PerformOperation(Key, change);
+            TargetClassName = change.TargetClassName;
+        }
+
+        IDictionary<string, object> IJsonConvertible.ConvertToJSON() => new Dictionary<string, object>
+        {
+            ["__type"] = "Relation",
+            ["className"] = TargetClassName
+        };
+
+        internal ParseQuery<T> GetQuery<T>() where T : ParseObject => TargetClassName is { } ? new ParseQuery<T>(Parent.Services, TargetClassName).WhereRelatedTo(Parent, Key) : new ParseQuery<T>(Parent.Services, Parent.ClassName).RedirectClassName(Key).WhereRelatedTo(Parent, Key);
+
+        internal string TargetClassName { get; set; }
+    }
+
+    /// <summary>
+    /// Provides access to all of the children of a many-to-many relationship. Each instance of
+    /// ParseRelation is associated with a particular parent and key.
+    /// </summary>
+    /// <typeparam name="T">The type of the child objects.</typeparam>
+    public sealed class ParseRelation<T> : ParseRelationBase where T : ParseObject
+    {
+        internal ParseRelation(ParseObject parent, string key) : base(parent, key) { }
+
+        internal ParseRelation(ParseObject parent, string key, string targetClassName) : base(parent, key, targetClassName) { }
+
+        /// <summary>
+        /// Adds an object to this relation. The object must already have been saved.
+        /// </summary>
+        /// <param name="obj">The object to add.</param>
+        public void Add(T obj) => base.Add(obj);
+
+        /// <summary>
+        /// Removes an object from this relation. The object must already have been saved.
+        /// </summary>
+        /// <param name="obj">The object to remove.</param>
+        public void Remove(T obj) => base.Remove(obj);
+
+        /// <summary>
+        /// Gets a query that can be used to query the objects in this relation.
+        /// </summary>
+        public ParseQuery<T> Query => GetQuery<T>();
+    }
+}
diff --git a/Parse/Public/ParseRole.cs b/Parse/Platform/Roles/ParseRole.cs
similarity index 75%
rename from Parse/Public/ParseRole.cs
rename to Parse/Platform/Roles/ParseRole.cs
index 28d2c79a..b978fff1 100644
--- a/Parse/Public/ParseRole.cs
+++ b/Parse/Platform/Roles/ParseRole.cs
@@ -1,12 +1,7 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
-using Parse.Core.Internal;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
 namespace Parse
 {
@@ -35,8 +30,7 @@ public ParseRole() : base() { }
         /// </summary>
         /// <param name="name">The name of the role to create.</param>
         /// <param name="acl">The ACL for this role. Roles must have an ACL.</param>
-        public ParseRole(string name, ParseACL acl)
-          : this()
+        public ParseRole(string name, ParseACL acl) : this()
         {
             Name = name;
             ACL = acl;
@@ -48,8 +42,8 @@ public ParseRole(string name, ParseACL acl)
         [ParseFieldName("name")]
         public string Name
         {
-            get { return GetProperty<string>("Name"); }
-            set { SetProperty(value, "Name"); }
+            get => GetProperty<string>(nameof(Name));
+            set => SetProperty(value, nameof(Name));
         }
 
         /// <summary>
@@ -59,10 +53,7 @@ public string Name
         /// add or remove child users from the role through this relation.
         /// </summary>
         [ParseFieldName("users")]
-        public ParseRelation<ParseUser> Users
-        {
-            get { return GetRelationProperty<ParseUser>("Users"); }
-        }
+        public ParseRelation<ParseUser> Users => GetRelationProperty<ParseUser>("Users");
 
         /// <summary>
         /// Gets the <see cref="ParseRelation{ParseRole}"/> for the <see cref="ParseRole"/>s that are
@@ -71,10 +62,7 @@ public ParseRelation<ParseUser> Users
         /// add or remove child roles from the role through this relation.
         /// </summary>
         [ParseFieldName("roles")]
-        public ParseRelation<ParseRole> Roles
-        {
-            get { return GetRelationProperty<ParseRole>("Roles"); }
-        }
+        public ParseRelation<ParseRole> Roles => GetRelationProperty<ParseRole>("Roles");
 
         internal override void OnSettingValue(ref string key, ref object value)
         {
@@ -88,26 +76,13 @@ internal override void OnSettingValue(ref string key, ref object value)
                 }
                 if (!(value is string))
                 {
-                    throw new ArgumentException("A role's name must be a string.", "value");
+                    throw new ArgumentException("A role's name must be a string.", nameof(value));
                 }
                 if (!namePattern.IsMatch((string) value))
                 {
-                    throw new ArgumentException(
-                        "A role's name can only contain alphanumeric characters, _, -, and spaces.",
-                        "value");
+                    throw new ArgumentException("A role's name can only contain alphanumeric characters, _, -, and spaces.", nameof(value));
                 }
             }
         }
-
-        /// <summary>
-        /// Gets a <see cref="ParseQuery{ParseRole}"/> over the Role collection.
-        /// </summary>
-        public static ParseQuery<ParseRole> Query
-        {
-            get
-            {
-                return new ParseQuery<ParseRole>();
-            }
-        }
     }
 }
diff --git a/Parse/Public/ParseACL.cs b/Parse/Platform/Security/ParseACL.cs
similarity index 98%
rename from Parse/Public/ParseACL.cs
rename to Parse/Platform/Security/ParseACL.cs
index 88c98a4d..432eb721 100644
--- a/Parse/Public/ParseACL.cs
+++ b/Parse/Platform/Security/ParseACL.cs
@@ -3,8 +3,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Parse.Core.Internal;
-using Parse.Common.Internal;
+using Parse.Abstractions.Internal;
+using Parse.Abstractions.Infrastructure;
 
 namespace Parse
 {
@@ -53,7 +53,7 @@ public ParseACL(ParseUser owner)
             SetWriteAccess(owner, true);
         }
 
-        IDictionary<string, object> IJsonConvertible.ToJSON()
+        IDictionary<string, object> IJsonConvertible.ConvertToJSON()
         {
             Dictionary<string, object> result = new Dictionary<string, object>();
             foreach (string user in readers.Union(writers))
diff --git a/Parse/Platform/Sessions/ParseSession.cs b/Parse/Platform/Sessions/ParseSession.cs
new file mode 100644
index 00000000..b53923eb
--- /dev/null
+++ b/Parse/Platform/Sessions/ParseSession.cs
@@ -0,0 +1,23 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System.Collections.Generic;
+
+namespace Parse
+{
+    /// <summary>
+    /// Represents a session of a user for a Parse application.
+    /// </summary>
+    [ParseClassName("_Session")]
+    public class ParseSession : ParseObject
+    {
+        static HashSet<string> ImmutableKeys { get; } = new HashSet<string> { "sessionToken", "createdWith", "restricted", "user", "expiresAt", "installationId" };
+
+        protected override bool CheckKeyMutable(string key) => !ImmutableKeys.Contains(key);
+
+        /// <summary>
+        /// Gets the session token for a user, if they are logged in.
+        /// </summary>
+        [ParseFieldName("sessionToken")]
+        public string SessionToken => GetProperty<string>(default, "SessionToken");
+    }
+}
diff --git a/Parse/Platform/Sessions/ParseSessionController.cs b/Parse/Platform/Sessions/ParseSessionController.cs
new file mode 100644
index 00000000..5f729045
--- /dev/null
+++ b/Parse/Platform/Sessions/ParseSessionController.cs
@@ -0,0 +1,33 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure.Data;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Sessions;
+using Parse.Infrastructure.Utilities;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Infrastructure.Execution;
+using Parse.Infrastructure.Data;
+
+namespace Parse.Platform.Sessions
+{
+    public class ParseSessionController : IParseSessionController
+    {
+        IParseCommandRunner CommandRunner { get; }
+
+        IParseDataDecoder Decoder { get; }
+
+        public ParseSessionController(IParseCommandRunner commandRunner, IParseDataDecoder decoder) => (CommandRunner, Decoder) = (commandRunner, decoder);
+
+        public Task<IObjectState> GetSessionAsync(string sessionToken, IServiceHub serviceHub, CancellationToken cancellationToken = default) => CommandRunner.RunCommandAsync(new ParseCommand("sessions/me", method: "GET", sessionToken: sessionToken, data: null), cancellationToken: cancellationToken).OnSuccess(task => ParseObjectCoder.Instance.Decode(task.Result.Item2, Decoder, serviceHub));
+
+        public Task RevokeAsync(string sessionToken, CancellationToken cancellationToken = default) => CommandRunner.RunCommandAsync(new ParseCommand("logout", method: "POST", sessionToken: sessionToken, data: new Dictionary<string, object> { }), cancellationToken: cancellationToken);
+
+        public Task<IObjectState> UpgradeToRevocableSessionAsync(string sessionToken, IServiceHub serviceHub, CancellationToken cancellationToken = default) => CommandRunner.RunCommandAsync(new ParseCommand("upgradeToRevocableSession", method: "POST", sessionToken: sessionToken, data: new Dictionary<string, object>()), cancellationToken: cancellationToken).OnSuccess(task => ParseObjectCoder.Instance.Decode(task.Result.Item2, Decoder, serviceHub));
+
+        public bool IsRevocableSessionToken(string sessionToken) => sessionToken.Contains("r:");
+    }
+}
diff --git a/Parse/Platform/Users/ParseCurrentUserController.cs b/Parse/Platform/Users/ParseCurrentUserController.cs
new file mode 100644
index 00000000..680110a5
--- /dev/null
+++ b/Parse/Platform/Users/ParseCurrentUserController.cs
@@ -0,0 +1,116 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure.Data;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Abstractions.Platform.Users;
+using Parse.Infrastructure.Utilities;
+using Parse.Infrastructure.Data;
+
+namespace Parse.Platform.Users
+{
+#warning This class needs to be rewritten (PCuUsC).
+
+    public class ParseCurrentUserController : IParseCurrentUserController
+    {
+        object Mutex { get; } = new object { };
+
+        TaskQueue TaskQueue { get; } = new TaskQueue { };
+
+        ICacheController StorageController { get; }
+
+        IParseObjectClassController ClassController { get; }
+
+        IParseDataDecoder Decoder { get; }
+
+        public ParseCurrentUserController(ICacheController storageController, IParseObjectClassController classController, IParseDataDecoder decoder) => (StorageController, ClassController, Decoder) = (storageController, classController, decoder);
+
+        ParseUser currentUser;
+        public ParseUser CurrentUser
+        {
+            get
+            {
+                lock (Mutex)
+                    return currentUser;
+            }
+            set
+            {
+                lock (Mutex)
+                    currentUser = value;
+            }
+        }
+
+        public Task SetAsync(ParseUser user, CancellationToken cancellationToken) => TaskQueue.Enqueue(toAwait => toAwait.ContinueWith(_ =>
+        {
+            Task saveTask = default;
+
+            if (user is null)
+                saveTask = StorageController.LoadAsync().OnSuccess(task => task.Result.RemoveAsync(nameof(CurrentUser))).Unwrap();
+            else
+            {
+                // TODO (hallucinogen): we need to use ParseCurrentCoder instead of this janky encoding
+
+                IDictionary<string, object> data = user.ServerDataToJSONObjectForSerialization();
+                data["objectId"] = user.ObjectId;
+
+                if (user.CreatedAt != null)
+                    data["createdAt"] = user.CreatedAt.Value.ToString(ParseClient.DateFormatStrings.First(), CultureInfo.InvariantCulture);
+                if (user.UpdatedAt != null)
+                    data["updatedAt"] = user.UpdatedAt.Value.ToString(ParseClient.DateFormatStrings.First(), CultureInfo.InvariantCulture);
+
+                saveTask = StorageController.LoadAsync().OnSuccess(task => task.Result.AddAsync(nameof(CurrentUser), JsonUtilities.Encode(data))).Unwrap();
+            }
+
+            CurrentUser = user;
+            return saveTask;
+        }).Unwrap(), cancellationToken);
+
+        public Task<ParseUser> GetAsync(IServiceHub serviceHub, CancellationToken cancellationToken = default)
+        {
+            ParseUser cachedCurrent;
+
+            lock (Mutex)
+                cachedCurrent = CurrentUser;
+
+            return cachedCurrent is { } ? Task.FromResult(cachedCurrent) : TaskQueue.Enqueue(toAwait => toAwait.ContinueWith(_ => StorageController.LoadAsync().OnSuccess(task =>
+            {
+                task.Result.TryGetValue(nameof(CurrentUser), out object data);
+                ParseUser user = default;
+
+                if (data is string { } serialization)
+                    user = ClassController.GenerateObjectFromState<ParseUser>(ParseObjectCoder.Instance.Decode(JsonUtilities.Parse(serialization) as IDictionary<string, object>, Decoder, serviceHub), "_User", serviceHub);
+
+                return CurrentUser = user;
+            })).Unwrap(), cancellationToken);
+        }
+
+        public Task<bool> ExistsAsync(CancellationToken cancellationToken) => CurrentUser is { } ? Task.FromResult(true) : TaskQueue.Enqueue(toAwait => toAwait.ContinueWith(_ => StorageController.LoadAsync().OnSuccess(t => t.Result.ContainsKey(nameof(CurrentUser)))).Unwrap(), cancellationToken);
+
+        public bool IsCurrent(ParseUser user)
+        {
+            lock (Mutex)
+                return CurrentUser == user;
+        }
+
+        public void ClearFromMemory() => CurrentUser = default;
+
+        public void ClearFromDisk()
+        {
+            lock (Mutex)
+            {
+                ClearFromMemory();
+
+                TaskQueue.Enqueue(toAwait => toAwait.ContinueWith(_ => StorageController.LoadAsync().OnSuccess(t => t.Result.RemoveAsync(nameof(CurrentUser)))).Unwrap().Unwrap(), CancellationToken.None);
+            }
+        }
+
+        public Task<string> GetCurrentSessionTokenAsync(IServiceHub serviceHub, CancellationToken cancellationToken = default) => GetAsync(serviceHub, cancellationToken).OnSuccess(task => task.Result?.SessionToken);
+
+        public Task LogOutAsync(IServiceHub serviceHub, CancellationToken cancellationToken = default) => TaskQueue.Enqueue(toAwait => toAwait.ContinueWith(_ => GetAsync(serviceHub, cancellationToken)).Unwrap().OnSuccess(task => ClearFromDisk()), cancellationToken);
+    }
+}
diff --git a/Parse/Platform/Users/ParseUser.cs b/Parse/Platform/Users/ParseUser.cs
new file mode 100644
index 00000000..365fa2c5
--- /dev/null
+++ b/Parse/Platform/Users/ParseUser.cs
@@ -0,0 +1,329 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure.Control;
+using Parse.Abstractions.Platform.Authentication;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse
+{
+    /// <summary>
+    /// Represents a user for a Parse application.
+    /// </summary>
+    [ParseClassName("_User")]
+    public class ParseUser : ParseObject
+    {
+        /// <summary>
+        /// Whether the ParseUser has been authenticated on this device. Only an authenticated
+        /// ParseUser can be saved and deleted.
+        /// </summary>
+        public bool IsAuthenticated
+        {
+            get
+            {
+                lock (Mutex)
+                {
+                    return SessionToken is { } && Services.GetCurrentUser() is { } user && user.ObjectId == ObjectId;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Removes a key from the object's data if it exists.
+        /// </summary>
+        /// <param name="key">The key to remove.</param>
+        /// <exception cref="ArgumentException">Cannot remove the username key.</exception>
+        public override void Remove(string key)
+        {
+            if (key == "username")
+            {
+                throw new InvalidOperationException("Cannot remove the username key.");
+            }
+
+            base.Remove(key);
+        }
+
+        protected override bool CheckKeyMutable(string key) => !ImmutableKeys.Contains(key);
+
+        internal override void HandleSave(IObjectState serverState)
+        {
+            base.HandleSave(serverState);
+
+            SynchronizeAllAuthData();
+            CleanupAuthData();
+
+            MutateState(mutableClone => mutableClone.ServerData.Remove("password"));
+        }
+
+        public string SessionToken => State.ContainsKey("sessionToken") ? State["sessionToken"] as string : null;
+
+        internal Task SetSessionTokenAsync(string newSessionToken) => SetSessionTokenAsync(newSessionToken, CancellationToken.None);
+
+        internal Task SetSessionTokenAsync(string newSessionToken, CancellationToken cancellationToken)
+        {
+            MutateState(mutableClone => mutableClone.ServerData["sessionToken"] = newSessionToken);
+            return Services.SaveCurrentUserAsync(this);
+        }
+
+        /// <summary>
+        /// Gets or sets the username.
+        /// </summary>
+        [ParseFieldName("username")]
+        public string Username
+        {
+            get => GetProperty<string>(null, nameof(Username));
+            set => SetProperty(value, nameof(Username));
+        }
+
+        /// <summary>
+        /// Sets the password.
+        /// </summary>
+        [ParseFieldName("password")]
+        public string Password
+        {
+            get => GetProperty<string>(null, nameof(Password));
+            set => SetProperty(value, nameof(Password));
+        }
+
+        /// <summary>
+        /// Sets the email address.
+        /// </summary>
+        [ParseFieldName("email")]
+        public string Email
+        {
+            get => GetProperty<string>(null, nameof(Email));
+            set => SetProperty(value, nameof(Email));
+        }
+
+        internal Task SignUpAsync(Task toAwait, CancellationToken cancellationToken)
+        {
+            if (AuthData == null)
+            {
+                // TODO (hallucinogen): make an Extension of Task to create Task with exception/canceled.
+                if (String.IsNullOrEmpty(Username))
+                {
+                    TaskCompletionSource<object> tcs = new TaskCompletionSource<object>();
+                    tcs.TrySetException(new InvalidOperationException("Cannot sign up user with an empty name."));
+                    return tcs.Task;
+                }
+                if (String.IsNullOrEmpty(Password))
+                {
+                    TaskCompletionSource<object> tcs = new TaskCompletionSource<object>();
+                    tcs.TrySetException(new InvalidOperationException("Cannot sign up user with an empty password."));
+                    return tcs.Task;
+                }
+            }
+            if (!String.IsNullOrEmpty(ObjectId))
+            {
+                TaskCompletionSource<object> tcs = new TaskCompletionSource<object>();
+                tcs.TrySetException(new InvalidOperationException("Cannot sign up a user that already exists."));
+                return tcs.Task;
+            }
+
+            IDictionary<string, IParseFieldOperation> currentOperations = StartSave();
+
+            return toAwait.OnSuccess(_ => Services.UserController.SignUpAsync(State, currentOperations, Services, cancellationToken)).Unwrap().ContinueWith(t =>
+            {
+                if (t.IsFaulted || t.IsCanceled)
+                {
+                    HandleFailedSave(currentOperations);
+                }
+                else
+                {
+                    HandleSave(t.Result);
+                }
+                return t;
+            }).Unwrap().OnSuccess(_ => Services.SaveCurrentUserAsync(this)).Unwrap();
+        }
+
+        /// <summary>
+        /// Signs up a new user. This will create a new ParseUser on the server and will also persist the
+        /// session on disk so that you can access the user using <see cref="CurrentUser"/>. A username and
+        /// password must be set before calling SignUpAsync.
+        /// </summary>
+        public Task SignUpAsync() => SignUpAsync(CancellationToken.None);
+
+        /// <summary>
+        /// Signs up a new user. This will create a new ParseUser on the server and will also persist the
+        /// session on disk so that you can access the user using <see cref="CurrentUser"/>. A username and
+        /// password must be set before calling SignUpAsync.
+        /// </summary>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public Task SignUpAsync(CancellationToken cancellationToken) => TaskQueue.Enqueue(toAwait => SignUpAsync(toAwait, cancellationToken), cancellationToken);
+
+        protected override Task SaveAsync(Task toAwait, CancellationToken cancellationToken)
+        {
+            lock (Mutex)
+            {
+                if (ObjectId is null)
+                {
+                    throw new InvalidOperationException("You must call SignUpAsync before calling SaveAsync.");
+                }
+
+                return base.SaveAsync(toAwait, cancellationToken).OnSuccess(_ => Services.CurrentUserController.IsCurrent(this) ? Services.SaveCurrentUserAsync(this) : Task.CompletedTask).Unwrap();
+            }
+        }
+
+        // If this is already the current user, refresh its state on disk.
+        internal override Task<ParseObject> FetchAsyncInternal(Task toAwait, CancellationToken cancellationToken) => base.FetchAsyncInternal(toAwait, cancellationToken).OnSuccess(t => !Services.CurrentUserController.IsCurrent(this) ? Task.FromResult(t.Result) : Services.SaveCurrentUserAsync(this).OnSuccess(_ => t.Result)).Unwrap();
+
+        internal Task LogOutAsync(Task toAwait, CancellationToken cancellationToken)
+        {
+            string oldSessionToken = SessionToken;
+            if (oldSessionToken == null)
+            {
+                return Task.FromResult(0);
+            }
+
+            // Cleanup in-memory session.
+
+            MutateState(mutableClone => mutableClone.ServerData.Remove("sessionToken"));
+            Task revokeSessionTask = Services.RevokeSessionAsync(oldSessionToken, cancellationToken);
+            return Task.WhenAll(revokeSessionTask, Services.CurrentUserController.LogOutAsync(Services, cancellationToken));
+        }
+
+        internal Task UpgradeToRevocableSessionAsync() => UpgradeToRevocableSessionAsync(CancellationToken.None);
+
+        internal Task UpgradeToRevocableSessionAsync(CancellationToken cancellationToken) => TaskQueue.Enqueue(toAwait => UpgradeToRevocableSessionAsync(toAwait, cancellationToken), cancellationToken);
+
+        internal Task UpgradeToRevocableSessionAsync(Task toAwait, CancellationToken cancellationToken)
+        {
+            string sessionToken = SessionToken;
+
+            return toAwait.OnSuccess(_ => Services.UpgradeToRevocableSessionAsync(sessionToken, cancellationToken)).Unwrap().OnSuccess(task => SetSessionTokenAsync(task.Result)).Unwrap();
+        }
+
+        /// <summary>
+        /// Gets the authData for this user.
+        /// </summary>
+        public IDictionary<string, IDictionary<string, object>> AuthData
+        {
+            get => TryGetValue("authData", out IDictionary<string, IDictionary<string, object>> authData) ? authData : null;
+            set => this["authData"] = value;
+        }
+
+        /// <summary>
+        /// Removes null values from authData (which exist temporarily for unlinking)
+        /// </summary>
+        void CleanupAuthData()
+        {
+            lock (Mutex)
+            {
+                if (!Services.CurrentUserController.IsCurrent(this))
+                {
+                    return;
+                }
+
+                IDictionary<string, IDictionary<string, object>> authData = AuthData;
+
+                if (authData == null)
+                {
+                    return;
+                }
+
+                foreach (KeyValuePair<string, IDictionary<string, object>> pair in new Dictionary<string, IDictionary<string, object>>(authData))
+                {
+                    if (pair.Value == null)
+                    {
+                        authData.Remove(pair.Key);
+                    }
+                }
+            }
+        }
+
+#warning Check if the following properties should be injected via IServiceHub.UserController (except for ImmutableKeys).
+
+        internal static IParseAuthenticationProvider GetProvider(string providerName) => Authenticators.TryGetValue(providerName, out IParseAuthenticationProvider provider) ? provider : null;
+
+        internal static IDictionary<string, IParseAuthenticationProvider> Authenticators { get; } = new Dictionary<string, IParseAuthenticationProvider> { };
+
+        internal static HashSet<string> ImmutableKeys { get; } = new HashSet<string> { "sessionToken", "isNew" };
+
+        /// <summary>
+        /// Synchronizes authData for all providers.
+        /// </summary>
+        internal void SynchronizeAllAuthData()
+        {
+            lock (Mutex)
+            {
+                IDictionary<string, IDictionary<string, object>> authData = AuthData;
+
+                if (authData == null)
+                {
+                    return;
+                }
+
+                foreach (KeyValuePair<string, IDictionary<string, object>> pair in authData)
+                {
+                    SynchronizeAuthData(GetProvider(pair.Key));
+                }
+            }
+        }
+
+        internal void SynchronizeAuthData(IParseAuthenticationProvider provider)
+        {
+            bool restorationSuccess = false;
+
+            lock (Mutex)
+            {
+                IDictionary<string, IDictionary<string, object>> authData = AuthData;
+
+                if (authData == null || provider == null)
+                {
+                    return;
+                }
+
+                if (authData.TryGetValue(provider.AuthType, out IDictionary<string, object> data))
+                {
+                    restorationSuccess = provider.RestoreAuthentication(data);
+                }
+            }
+
+            if (!restorationSuccess)
+            {
+                UnlinkFromAsync(provider.AuthType, CancellationToken.None);
+            }
+        }
+
+        internal Task LinkWithAsync(string authType, IDictionary<string, object> data, CancellationToken cancellationToken) => TaskQueue.Enqueue(toAwait =>
+        {
+            IDictionary<string, IDictionary<string, object>> authData = AuthData;
+
+            if (authData == null)
+            {
+                authData = AuthData = new Dictionary<string, IDictionary<string, object>>();
+            }
+
+            authData[authType] = data;
+            AuthData = authData;
+
+            return SaveAsync(cancellationToken);
+        }, cancellationToken);
+
+        internal Task LinkWithAsync(string authType, CancellationToken cancellationToken)
+        {
+            IParseAuthenticationProvider provider = GetProvider(authType);
+            return provider.AuthenticateAsync(cancellationToken).OnSuccess(t => LinkWithAsync(authType, t.Result, cancellationToken)).Unwrap();
+        }
+
+        /// <summary>
+        /// Unlinks a user from a service.
+        /// </summary>
+        internal Task UnlinkFromAsync(string authType, CancellationToken cancellationToken) => LinkWithAsync(authType, null, cancellationToken);
+
+        /// <summary>
+        /// Checks whether a user is linked to a service.
+        /// </summary>
+        internal bool IsLinked(string authType)
+        {
+            lock (Mutex)
+            {
+                return AuthData != null && AuthData.ContainsKey(authType) && AuthData[authType] != null;
+            }
+        }
+    }
+}
diff --git a/Parse/Platform/Users/ParseUserController.cs b/Parse/Platform/Users/ParseUserController.cs
new file mode 100644
index 00000000..635f1470
--- /dev/null
+++ b/Parse/Platform/Users/ParseUserController.cs
@@ -0,0 +1,48 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure.Control;
+using Parse.Abstractions.Infrastructure.Data;
+using Parse.Abstractions.Infrastructure.Execution;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Users;
+using Parse.Infrastructure.Utilities;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Infrastructure.Execution;
+using Parse.Infrastructure.Data;
+
+namespace Parse.Platform.Users
+{
+    public class ParseUserController : IParseUserController
+    {
+        IParseCommandRunner CommandRunner { get; }
+
+        IParseDataDecoder Decoder { get; }
+
+        public bool RevocableSessionEnabled { get; set; }
+
+        public object RevocableSessionEnabledMutex { get; } = new object { };
+
+        public ParseUserController(IParseCommandRunner commandRunner, IParseDataDecoder decoder) => (CommandRunner, Decoder) = (commandRunner, decoder);
+
+        public Task<IObjectState> SignUpAsync(IObjectState state, IDictionary<string, IParseFieldOperation> operations, IServiceHub serviceHub, CancellationToken cancellationToken = default) => CommandRunner.RunCommandAsync(new ParseCommand("classes/_User", method: "POST", data: serviceHub.GenerateJSONObjectForSaving(operations)), cancellationToken: cancellationToken).OnSuccess(task => ParseObjectCoder.Instance.Decode(task.Result.Item2, Decoder, serviceHub).MutatedClone(mutableClone => mutableClone.IsNew = true));
+
+        public Task<IObjectState> LogInAsync(string username, string password, IServiceHub serviceHub, CancellationToken cancellationToken = default) => CommandRunner.RunCommandAsync(new ParseCommand($"login?{ParseClient.BuildQueryString(new Dictionary<string, object> { [nameof(username)] = username, [nameof(password)] = password })}", method: "GET", data: null), cancellationToken: cancellationToken).OnSuccess(task => ParseObjectCoder.Instance.Decode(task.Result.Item2, Decoder, serviceHub).MutatedClone(mutableClone => mutableClone.IsNew = task.Result.Item1 == System.Net.HttpStatusCode.Created));
+
+        public Task<IObjectState> LogInAsync(string authType, IDictionary<string, object> data, IServiceHub serviceHub, CancellationToken cancellationToken = default)
+        {
+            Dictionary<string, object> authData = new Dictionary<string, object>
+            {
+                [authType] = data
+            };
+
+            return CommandRunner.RunCommandAsync(new ParseCommand("users", method: "POST", data: new Dictionary<string, object> { [nameof(authData)] = authData }), cancellationToken: cancellationToken).OnSuccess(task => ParseObjectCoder.Instance.Decode(task.Result.Item2, Decoder, serviceHub).MutatedClone(mutableClone => mutableClone.IsNew = task.Result.Item1 == System.Net.HttpStatusCode.Created));
+        }
+
+        public Task<IObjectState> GetUserAsync(string sessionToken, IServiceHub serviceHub, CancellationToken cancellationToken = default) => CommandRunner.RunCommandAsync(new ParseCommand("users/me", method: "GET", sessionToken: sessionToken, data: default), cancellationToken: cancellationToken).OnSuccess(task => ParseObjectCoder.Instance.Decode(task.Result.Item2, Decoder, serviceHub));
+
+        public Task RequestPasswordResetAsync(string email, CancellationToken cancellationToken = default) => CommandRunner.RunCommandAsync(new ParseCommand("requestPasswordReset", method: "POST", data: new Dictionary<string, object> { [nameof(email)] = email }), cancellationToken: cancellationToken);
+    }
+}
diff --git a/Parse/Public/ParseClient.cs b/Parse/Public/ParseClient.cs
deleted file mode 100644
index 5cbca097..00000000
--- a/Parse/Public/ParseClient.cs
+++ /dev/null
@@ -1,296 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
-using Parse.Common.Internal;
-using Parse.Internal.Utilities;
-
-namespace Parse
-{
-    /// <summary>
-    /// ParseClient contains static functions that handle global
-    /// configuration for the Parse library.
-    /// </summary>
-    public static partial class ParseClient
-    {
-        internal static readonly string[] DateFormatStrings =
-        {
-            // Official ISO format
-            "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fff'Z'",
-
-            // It's possible that the string converter server-side may trim trailing zeroes,
-            // so these two formats cover ourselves from that.
-            "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ff'Z'",
-            "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'f'Z'",
-
-        };
-
-        /// <summary>
-        /// Represents the configuration of the Parse SDK.
-        /// </summary>
-        public struct Configuration
-        {
-            /// <summary>
-            /// A unit that can generate a relative path to a persistent storage file.
-            /// </summary>
-            public interface IStorageConfiguration
-            {
-                /// <summary>
-                /// The corresponding relative path generated by this <see cref="IStorageConfiguration"/>.
-                /// </summary>
-                string RelativeStorageFilePath { get; }
-            }
-
-            /// <summary>
-            /// A configuration of the Parse SDK persistent storage location based on product metadata such as company name and product name.
-            /// </summary>
-            public struct MetadataBasedStorageConfiguration : IStorageConfiguration
-            {
-                /// <summary>
-                /// An instance of <see cref="MetadataBasedStorageConfiguration"/> with inferred values based on the entry assembly. Should be used with <see cref="VersionInformation.Inferred"/>.
-                /// </summary>
-                /// <remarks>Should not be used with Unity.</remarks>
-                public static MetadataBasedStorageConfiguration NoCompanyInferred { get; } = new MetadataBasedStorageConfiguration { CompanyName = Assembly.GetEntryAssembly().GetName().Name, ProductName = String.Empty };
-
-                /// <summary>
-                /// The name of the company that owns the product specified by <see cref="ProductName"/>.
-                /// </summary>
-                public string CompanyName { get; set; }
-
-                /// <summary>
-                /// The name of the product that is using the Parse .NET SDK.
-                /// </summary>
-                public string ProductName { get; set; }
-
-                /// <summary>
-                /// The corresponding relative path generated by this <see cref="IStorageConfiguration"/>.
-                /// </summary>
-                public string RelativeStorageFilePath => Path.Combine(CompanyName ?? "Parse", ProductName ?? "_global", $"{CurrentConfiguration.VersionInfo.DisplayVersion ?? "1.0.0.0"}.cachefile");
-            }
-
-            /// <summary>
-            /// A configuration of the Parse SDK persistent storage location based on an identifier.
-            /// </summary>
-            public struct IdentifierBasedStorageConfiguration : IStorageConfiguration
-            {
-                internal static IdentifierBasedStorageConfiguration Fallback { get; } = new IdentifierBasedStorageConfiguration { IsFallback = true };
-
-                /// <summary>
-                /// Dictates whether or not this <see cref="IStorageConfiguration"/> instance should act as a fallback for when <see cref="ParseClient"/> has not yet been initialized but the storage path is needed.
-                /// </summary>
-                internal bool IsFallback { get; set; }
-
-                /// <summary>
-                /// The identifier that all Parse SDK cache files should be labelled with.
-                /// </summary>
-                public string Identifier { get; set; }
-
-                /// <summary>
-                /// The corresponding relative path generated by this <see cref="IStorageConfiguration"/>.
-                /// </summary>
-                /// <remarks>This will cause a .cachefile file extension to be added to the cache file in order to prevent the creation of files with unwanted extensions due to the value of <see cref="Identifier"/> containing periods.</remarks>
-                public string RelativeStorageFilePath
-                {
-                    get
-                    {
-                        FileInfo file = default;
-                        while ((file = StorageManager.GetWrapperForRelativePersistentStorageFilePath(GeneratePath())).Exists && IsFallback);
-
-                        return file.FullName;
-                    }
-                }
-
-                /// <summary>
-                /// Generates a path for use in the <see cref="RelativeStorageFilePath"/> getter.
-                /// </summary>
-                /// <returns>A potential path to the cachefile</returns>
-                string GeneratePath() => Path.Combine("Parse", IsFallback ? "_fallback" : "_global", $"{(IsFallback ? new Random { }.Next().ToString() : Identifier)}.cachefile");
-            }
-
-            /// <summary>
-            /// In the event that you would like to use the Parse SDK
-            /// from a completely portable project, with no platform-specific library required,
-            /// to get full access to all of our features available on Parse Dashboard
-            /// (A/B testing, slow queries, etc.), you must set the values of this struct
-            /// to be appropriate for your platform.
-            ///
-            /// Any values set here will overwrite those that are automatically configured by
-            /// any platform-specific migration library your app includes.
-            /// </summary>
-            public struct VersionInformation
-            {
-                /// <summary>
-                /// An instance of <see cref="VersionInformation"/> with inferred values based on the entry assembly.
-                /// </summary>
-                /// <remarks>Should not be used with Unity.</remarks>
-                public static VersionInformation Inferred { get; } = new VersionInformation { BuildVersion = Assembly.GetEntryAssembly().GetName().Version.Build.ToString(), DisplayVersion = Assembly.GetEntryAssembly().GetName().Version.ToString(), OSVersion = Environment.OSVersion.ToString() };
-
-                /// <summary>
-                /// The build number of your app.
-                /// </summary>
-                public string BuildVersion { get; set; }
-
-                /// <summary>
-                /// The human friendly version number of your app.
-                /// </summary>
-                public string DisplayVersion { get; set; }
-
-                /// <summary>
-                /// The operating system version of the platform the SDK is operating in..
-                /// </summary>
-                public string OSVersion { get; set; }
-
-                /// <summary>
-                /// Gets a value for whether or not this instance of <see cref="VersionInformation"/> is populated with default values.
-                /// </summary>
-                internal bool IsDefault => BuildVersion is null && DisplayVersion is null && OSVersion is null;
-
-                /// <summary>
-                /// Gets a value for whether or not this instance of <see cref="VersionInformation"/> can currently be used for the generation of <see cref="MetadataBasedStorageConfiguration.NoCompanyInferred"/>.
-                /// </summary>
-                internal bool CanBeUsedForInference => !(IsDefault || String.IsNullOrWhiteSpace(DisplayVersion));
-            }
-
-            /// <summary>
-            /// The App ID of your app.
-            /// </summary>
-            public string ApplicationID { get; set; }
-
-            /// <summary>
-            /// A URI pointing to the target Parse Server instance hosting the app targeted by <see cref="ApplicationID"/>.
-            /// </summary>
-            public string ServerURI { get; set; }
-
-            /// <summary>
-            /// The .NET Key for the Parse app targeted by <see cref="ApplicationID"/>.
-            /// </summary>
-            public string Key { get; set; }
-
-            /// <summary>
-            /// The Master Key for the Parse app targeted by <see cref="ApplicationID"/>.
-            /// </summary>
-            public string MasterKey
-            {
-                get => AuxiliaryHeaders?["X-Parse-Master-Key"];
-                set => (AuxiliaryHeaders ?? (AuxiliaryHeaders = new Dictionary<string, string> { }))["X-Parse-Master-Key"] = value;
-            }
-
-            /// <summary>
-            /// Additional HTTP headers to be sent with network requests from the SDK.
-            /// </summary>
-            public IDictionary<string, string> AuxiliaryHeaders { get; set; }
-
-            /// <summary>
-            /// The version information of your application environment.
-            /// </summary>
-            public VersionInformation VersionInfo { get; set; }
-
-            /// <summary>
-            /// The <see cref="IStorageConfiguration"/> that Parse should use when generating cache files.
-            /// </summary>
-            public IStorageConfiguration StorageConfiguration { get; set; }
-        }
-
-        private static readonly object mutex = new object();
-
-
-        // TODO: Investigate if the version string header can be changed to simple "net-".
-        static ParseClient() => VersionString = "net-portable-" + Version; //ParseModuleController.Instance.ScanForModules();
-
-        /// <summary>
-        /// The current configuration that parse has been initialized with.
-        /// </summary>
-        public static Configuration CurrentConfiguration { get; internal set; }
-        internal static string MasterKey { get; set; }
-
-        internal static Version Version => new AssemblyName(typeof(ParseClient).GetTypeInfo().Assembly.FullName).Version;
-        internal static string VersionString { get; }
-
-        /// <summary>
-        /// Authenticates this client as belonging to your application. This must be
-        /// called before your application can use the Parse library. The recommended
-        /// way is to put a call to <c>ParseClient.Initialize</c> in your
-        /// Application startup.
-        /// </summary>
-        /// <param name="identifier">The Application ID provided in the Parse dashboard.
-        /// </param>
-        /// <param name="serverURI">The server URI provided in the Parse dashboard.
-        /// </param>
-        public static void Initialize(string identifier, string serverURI) => Initialize(new Configuration { ApplicationID = identifier, ServerURI = serverURI });
-
-        /// <summary>
-        /// Authenticates this client as belonging to your application. This must be
-        /// called before your application can use the Parse library. The recommended
-        /// way is to put a call to <c>ParseClient.Initialize</c> in your
-        /// Application startup.
-        /// </summary>
-        /// <param name="configuration">The configuration to initialize Parse with.
-        /// </param>
-        public static void Initialize(Configuration configuration)
-        {
-            lock (mutex)
-            {
-                configuration.ServerURI = configuration.ServerURI ?? "https://api.parse.com/1/";
-                //if (configuration.Server == null || configuration.Server.Length < 11) throw new ArgumentNullException("Since the official parse server has shut down, you must specify the URI that points to another implementation.");
-
-                switch (configuration.VersionInfo)
-                {
-                    case Configuration.VersionInformation info when info.CanBeUsedForInference:
-                        break;
-                    case Configuration.VersionInformation info when !info.IsDefault:
-                        configuration.VersionInfo = new Configuration.VersionInformation { BuildVersion = info.BuildVersion, OSVersion = info.OSVersion, DisplayVersion = Configuration.VersionInformation.Inferred.DisplayVersion };
-                        break;
-                    default:
-                        configuration.VersionInfo = Configuration.VersionInformation.Inferred;
-                        break;
-                }
-
-                switch (configuration.StorageConfiguration)
-                {
-                    case null:
-                        configuration.StorageConfiguration = Configuration.MetadataBasedStorageConfiguration.NoCompanyInferred;
-                        break;
-                    default:
-                        break;
-                }
-
-                CurrentConfiguration = configuration;
-
-                ParseObject.RegisterSubclass<ParseUser>();
-                ParseObject.RegisterSubclass<ParseRole>();
-                ParseObject.RegisterSubclass<ParseSession>();
-                ParseObject.RegisterSubclass<ParseInstallation>();
-
-                ParseModuleController.Instance.ParseDidInitialize();
-            }
-        }
-
-        /// <summary>
-        /// Reflects a change in the Parse SDK storage configuration by copying all of the cached data into the new location.
-        /// </summary>
-        /// <param name="originalRelativePath"></param>
-        /// <returns></returns>
-        public static async Task ReflectStorageChangeAsync(string originalRelativePath) => await StorageManager.TransferAsync(StorageManager.GetWrapperForRelativePersistentStorageFilePath(originalRelativePath).FullName, StorageManager.PersistentStorageFilePath);
-
-        internal static string BuildQueryString(IDictionary<string, object> parameters) => String.Join("&", (from pair in parameters let valueString = pair.Value as string select $"{Uri.EscapeDataString(pair.Key)}={Uri.EscapeDataString(String.IsNullOrEmpty(valueString) ? Json.Encode(pair.Value) : valueString)}").ToArray());
-
-        internal static IDictionary<string, string> DecodeQueryString(string queryString)
-        {
-            Dictionary<string, string> dict = new Dictionary<string, string>();
-            foreach (string pair in queryString.Split('&'))
-            {
-                string[] parts = pair.Split(new char[] { '=' }, 2);
-                dict[parts[0]] = parts.Length == 2 ? Uri.UnescapeDataString(parts[1].Replace("+", " ")) : null;
-            }
-            return dict;
-        }
-
-        internal static IDictionary<string, object> DeserializeJsonString(string jsonData) => Json.Parse(jsonData) as IDictionary<string, object>;
-
-        internal static string SerializeJsonString(IDictionary<string, object> jsonData) => Json.Encode(jsonData);
-    }
-}
diff --git a/Parse/Public/ParseConfig.cs b/Parse/Public/ParseConfig.cs
deleted file mode 100644
index 7756074c..00000000
--- a/Parse/Public/ParseConfig.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
-using Parse.Core.Internal;
-using Parse.Utilities;
-using Parse.Common.Internal;
-
-namespace Parse
-{
-    /// <summary>
-    /// The ParseConfig is a representation of the remote configuration object,
-    /// that enables you to add things like feature gating, a/b testing or simple "Message of the day".
-    /// </summary>
-    public class ParseConfig : IJsonConvertible
-    {
-        private IDictionary<string, object> properties = new Dictionary<string, object>();
-
-        /// <summary>
-        /// Gets the latest fetched ParseConfig.
-        /// </summary>
-        /// <returns>ParseConfig object</returns>
-        public static ParseConfig CurrentConfig
-        {
-            get
-            {
-                Task<ParseConfig> task = ConfigController.CurrentConfigController.GetCurrentConfigAsync();
-                task.Wait();
-                return task.Result;
-            }
-        }
-
-        internal static void ClearCurrentConfig()
-        {
-            ConfigController.CurrentConfigController.ClearCurrentConfigAsync().Wait();
-        }
-
-        internal static void ClearCurrentConfigInMemory()
-        {
-            ConfigController.CurrentConfigController.ClearCurrentConfigInMemoryAsync().Wait();
-        }
-
-        private static IParseConfigController ConfigController
-        {
-            get { return ParseCorePlugins.Instance.ConfigController; }
-        }
-
-        internal ParseConfig()
-          : base()
-        {
-        }
-
-        internal ParseConfig(IDictionary<string, object> fetchedConfig)
-        {
-            var props = ParseDecoder.Instance.Decode(fetchedConfig["params"]) as IDictionary<string, object>;
-            properties = props;
-        }
-
-        /// <summary>
-        /// Retrieves the ParseConfig asynchronously from the server.
-        /// </summary>
-        /// <returns>ParseConfig object that was fetched</returns>
-        public static Task<ParseConfig> GetAsync()
-        {
-            return GetAsync(CancellationToken.None);
-        }
-
-        /// <summary>
-        /// Retrieves the ParseConfig asynchronously from the server.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>ParseConfig object that was fetched</returns>
-        public static Task<ParseConfig> GetAsync(CancellationToken cancellationToken)
-        {
-            return ConfigController.FetchConfigAsync(ParseUser.CurrentSessionToken, cancellationToken);
-        }
-
-        /// <summary>
-        /// Gets a value for the key of a particular type.
-        /// </summary>
-        /// <typeparam name="T">The type to convert the value to. Supported types are
-        /// ParseObject and its descendents, Parse types such as ParseRelation and ParseGeopoint,
-        /// primitive types,IList&lt;T&gt;, IDictionary&lt;string, T&gt; and strings.</typeparam>
-        /// <param name="key">The key of the element to get.</param>
-        /// <exception cref="System.Collections.Generic.KeyNotFoundException">The property is retrieved
-        /// and <paramref name="key"/> is not found.</exception>
-        /// <exception cref="System.FormatException">The property under this <paramref name="key"/>
-        /// key was found, but of a different type.</exception>
-        public T Get<T>(string key)
-        {
-            return Conversion.To<T>(this.properties[key]);
-        }
-
-        /// <summary>
-        /// Populates result with the value for the key, if possible.
-        /// </summary>
-        /// <typeparam name="T">The desired type for the value.</typeparam>
-        /// <param name="key">The key to retrieve a value for.</param>
-        /// <param name="result">The value for the given key, converted to the
-        /// requested type, or null if unsuccessful.</param>
-        /// <returns>true if the lookup and conversion succeeded, otherwise false.</returns>
-        public bool TryGetValue<T>(string key, out T result)
-        {
-            if (this.properties.ContainsKey(key))
-            {
-                try
-                {
-                    var temp = Conversion.To<T>(this.properties[key]);
-                    result = temp;
-                    return true;
-                }
-                catch
-                {
-                    // Could not convert, do nothing
-                }
-            }
-            result = default(T);
-            return false;
-        }
-
-        /// <summary>
-        /// Gets a value on the config.
-        /// </summary>
-        /// <param name="key">The key for the parameter.</param>
-        /// <exception cref="System.Collections.Generic.KeyNotFoundException">The property is
-        /// retrieved and <paramref name="key"/> is not found.</exception>
-        /// <returns>The value for the key.</returns>
-        virtual public object this[string key]
-        {
-            get
-            {
-                return this.properties[key];
-            }
-        }
-
-        IDictionary<string, object> IJsonConvertible.ToJSON()
-        {
-            return new Dictionary<string, object> {
-        { "params", NoObjectsEncoder.Instance.Encode(properties) }
-      };
-        }
-    }
-}
diff --git a/Parse/Public/ParseDownloadProgressEventArgs.cs b/Parse/Public/ParseDownloadProgressEventArgs.cs
deleted file mode 100644
index b9da12ec..00000000
--- a/Parse/Public/ParseDownloadProgressEventArgs.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-
-namespace Parse
-{
-    /// <summary>
-    /// Represents download progress.
-    /// </summary>
-    public class ParseDownloadProgressEventArgs : EventArgs
-    {
-        public ParseDownloadProgressEventArgs() { }
-
-        /// <summary>
-        /// Gets the progress (a number between 0.0 and 1.0) of a download.
-        /// </summary>
-        public double Progress { get; set; }
-    }
-}
diff --git a/Parse/Public/ParseExtensions.cs b/Parse/Public/ParseExtensions.cs
deleted file mode 100644
index 5dae9417..00000000
--- a/Parse/Public/ParseExtensions.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Linq;
-using Parse.Core.Internal;
-using Parse.Common.Internal;
-
-namespace Parse
-{
-    /// <summary>
-    /// Provides convenience extension methods for working with collections
-    /// of ParseObjects so that you can easily save and fetch them in batches.
-    /// </summary>
-    public static class ParseExtensions
-    {
-        /// <summary>
-        /// Saves all of the ParseObjects in the enumeration. Equivalent to
-        /// calling <see cref="ParseObject.SaveAllAsync{T}(IEnumerable{T})"/>.
-        /// </summary>
-        /// <param name="objects">The objects to save.</param>
-        public static Task SaveAllAsync<T>(this IEnumerable<T> objects) where T : ParseObject
-        {
-            return ParseObject.SaveAllAsync(objects);
-        }
-
-        /// <summary>
-        /// Saves all of the ParseObjects in the enumeration. Equivalent to
-        /// calling
-        /// <see cref="ParseObject.SaveAllAsync{T}(IEnumerable{T}, CancellationToken)"/>.
-        /// </summary>
-        /// <param name="objects">The objects to save.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        public static Task SaveAllAsync<T>(
-            this IEnumerable<T> objects, CancellationToken cancellationToken) where T : ParseObject
-        {
-            return ParseObject.SaveAllAsync(objects, cancellationToken);
-        }
-
-        /// <summary>
-        /// Fetches all of the objects in the enumeration. Equivalent to
-        /// calling <see cref="ParseObject.FetchAllAsync{T}(IEnumerable{T})"/>.
-        /// </summary>
-        /// <param name="objects">The objects to save.</param>
-        public static Task<IEnumerable<T>> FetchAllAsync<T>(this IEnumerable<T> objects)
-          where T : ParseObject
-        {
-            return ParseObject.FetchAllAsync(objects);
-        }
-
-        /// <summary>
-        /// Fetches all of the objects in the enumeration. Equivalent to
-        /// calling
-        /// <see cref="ParseObject.FetchAllAsync{T}(IEnumerable{T}, CancellationToken)"/>.
-        /// </summary>
-        /// <param name="objects">The objects to fetch.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        public static Task<IEnumerable<T>> FetchAllAsync<T>(
-            this IEnumerable<T> objects, CancellationToken cancellationToken)
-          where T : ParseObject
-        {
-            return ParseObject.FetchAllAsync(objects, cancellationToken);
-        }
-
-        /// <summary>
-        /// Fetches all of the objects in the enumeration that don't already have
-        /// data. Equivalent to calling
-        /// <see cref="ParseObject.FetchAllIfNeededAsync{T}(IEnumerable{T})"/>.
-        /// </summary>
-        /// <param name="objects">The objects to fetch.</param>
-        public static Task<IEnumerable<T>> FetchAllIfNeededAsync<T>(
-            this IEnumerable<T> objects)
-          where T : ParseObject
-        {
-            return ParseObject.FetchAllIfNeededAsync(objects);
-        }
-
-        /// <summary>
-        /// Fetches all of the objects in the enumeration that don't already have
-        /// data. Equivalent to calling
-        /// <see cref="ParseObject.FetchAllIfNeededAsync{T}(IEnumerable{T}, CancellationToken)"/>.
-        /// </summary>
-        /// <param name="objects">The objects to fetch.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        public static Task<IEnumerable<T>> FetchAllIfNeededAsync<T>(
-            this IEnumerable<T> objects, CancellationToken cancellationToken)
-          where T : ParseObject
-        {
-            return ParseObject.FetchAllIfNeededAsync(objects, cancellationToken);
-        }
-
-        /// <summary>
-        /// Constructs a query that is the or of the given queries.
-        /// </summary>
-        /// <typeparam name="T">The type of ParseObject being queried.</typeparam>
-        /// <param name="source">An initial query to 'or' with additional queries.</param>
-        /// <param name="queries">The list of ParseQueries to 'or' together.</param>
-        /// <returns>A query that is the or of the given queries.</returns>
-        public static ParseQuery<T> Or<T>(this ParseQuery<T> source, params ParseQuery<T>[] queries)
-            where T : ParseObject
-        {
-            return ParseQuery<T>.Or(queries.Concat(new[] { source }));
-        }
-
-        /// <summary>
-        /// Fetches this object with the data from the server.
-        /// </summary>
-        public static Task<T> FetchAsync<T>(this T obj) where T : ParseObject
-        {
-            return obj.FetchAsyncInternal(CancellationToken.None).OnSuccess(t => (T) t.Result);
-        }
-
-        /// <summary>
-        /// Fetches this object with the data from the server.
-        /// </summary>
-        /// <param name="obj">The ParseObject to fetch.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        public static Task<T> FetchAsync<T>(this T obj, CancellationToken cancellationToken)
-            where T : ParseObject
-        {
-            return obj.FetchAsyncInternal(cancellationToken).OnSuccess(t => (T) t.Result);
-        }
-
-        /// <summary>
-        /// If this ParseObject has not been fetched (i.e. <see cref="ParseObject.IsDataAvailable"/> returns
-        /// false), fetches this object with the data from the server.
-        /// </summary>
-        /// <param name="obj">The ParseObject to fetch.</param>
-        public static Task<T> FetchIfNeededAsync<T>(this T obj) where T : ParseObject
-        {
-            return obj.FetchIfNeededAsyncInternal(CancellationToken.None).OnSuccess(t => (T) t.Result);
-        }
-
-        /// <summary>
-        /// If this ParseObject has not been fetched (i.e. <see cref="ParseObject.IsDataAvailable"/> returns
-        /// false), fetches this object with the data from the server.
-        /// </summary>
-        /// <param name="obj">The ParseObject to fetch.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        public static Task<T> FetchIfNeededAsync<T>(this T obj, CancellationToken cancellationToken)
-            where T : ParseObject
-        {
-            return obj.FetchIfNeededAsyncInternal(cancellationToken).OnSuccess(t => (T) t.Result);
-        }
-    }
-}
diff --git a/Parse/Public/ParseInstallation.cs b/Parse/Public/ParseInstallation.cs
deleted file mode 100644
index 4622e7c2..00000000
--- a/Parse/Public/ParseInstallation.cs
+++ /dev/null
@@ -1,431 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using Parse;
-using Parse.Common.Internal;
-using Parse.Core.Internal;
-using Parse.Push.Internal;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Parse
-{
-
-    /// <summary>
-    ///  Represents this app installed on this device. Use this class to track information you want
-    ///  to sample from (i.e. if you update a field on app launch, you can issue a query to see
-    ///  the number of devices which were active in the last N hours).
-    /// </summary>
-    [ParseClassName("_Installation")]
-    public partial class ParseInstallation : ParseObject
-    {
-        private static readonly HashSet<string> readOnlyKeys = new HashSet<string> {
-      "deviceType", "deviceUris", "installationId", "timeZone", "localeIdentifier", "parseVersion", "appName", "appIdentifier", "appVersion", "pushType"
-    };
-
-        internal static IParseCurrentInstallationController CurrentInstallationController
-        {
-            get
-            {
-                return ParsePushPlugins.Instance.CurrentInstallationController;
-            }
-        }
-
-        internal static IDeviceInfoController DeviceInfoController
-        {
-            get
-            {
-                return ParsePushPlugins.Instance.DeviceInfoController;
-            }
-        }
-
-        /// <summary>
-        /// Constructs a new ParseInstallation. Generally, you should not need to construct
-        /// ParseInstallations yourself. Instead use <see cref="CurrentInstallation"/>.
-        /// </summary>
-        public ParseInstallation()
-          : base()
-        {
-        }
-
-        /// <summary>
-        /// Gets the ParseInstallation representing this app on this device.
-        /// </summary>
-        public static ParseInstallation CurrentInstallation
-        {
-            get
-            {
-                var task = CurrentInstallationController.GetAsync(CancellationToken.None);
-                // TODO (hallucinogen): this will absolutely break on Unity, but how should we resolve this?
-                task.Wait();
-                return task.Result;
-            }
-        }
-
-        internal static void ClearInMemoryInstallation()
-        {
-            CurrentInstallationController.ClearFromMemory();
-        }
-
-        /// <summary>
-        /// Constructs a <see cref="ParseQuery{ParseInstallation}"/> for ParseInstallations.
-        /// </summary>
-        /// <remarks>
-        /// Only the following types of queries are allowed for installations:
-        ///
-        /// <code>
-        /// query.GetAsync(objectId)
-        /// query.WhereEqualTo(key, value)
-        /// query.WhereMatchesKeyInQuery&lt;TOther&gt;(key, keyInQuery, otherQuery)
-        /// </code>
-        ///
-        /// You can add additional query conditions, but one of the above must appear as a top-level <c>AND</c>
-        /// clause in the query.
-        /// </remarks>
-        public static ParseQuery<ParseInstallation> Query
-        {
-            get
-            {
-                return new ParseQuery<ParseInstallation>();
-            }
-        }
-
-        /// <summary>
-        /// A GUID that uniquely names this app installed on this device.
-        /// </summary>
-        [ParseFieldName("installationId")]
-        public Guid InstallationId
-        {
-            get
-            {
-                string installationIdString = GetProperty<string>("InstallationId");
-                Guid? installationId = null;
-                try
-                {
-                    installationId = new Guid(installationIdString);
-                }
-                catch (Exception)
-                {
-                    // Do nothing.
-                }
-
-                return installationId.Value;
-            }
-            internal set
-            {
-                Guid installationId = value;
-                SetProperty<string>(installationId.ToString(), "InstallationId");
-            }
-        }
-
-        /// <summary>
-        /// The runtime target of this installation object.
-        /// </summary>
-        [ParseFieldName("deviceType")]
-        public string DeviceType
-        {
-            get { return GetProperty<string>("DeviceType"); }
-            internal set { SetProperty<string>(value, "DeviceType"); }
-        }
-
-        /// <summary>
-        /// The user-friendly display name of this application.
-        /// </summary>
-        [ParseFieldName("appName")]
-        public string AppName
-        {
-            get { return GetProperty<string>("AppName"); }
-            internal set { SetProperty<string>(value, "AppName"); }
-        }
-
-        /// <summary>
-        /// A version string consisting of Major.Minor.Build.Revision.
-        /// </summary>
-        [ParseFieldName("appVersion")]
-        public string AppVersion
-        {
-            get { return GetProperty<string>("AppVersion"); }
-            internal set { SetProperty<string>(value, "AppVersion"); }
-        }
-
-        /// <summary>
-        /// The system-dependent unique identifier of this installation. This identifier should be
-        /// sufficient to distinctly name an app on stores which may allow multiple apps with the
-        /// same display name.
-        /// </summary>
-        [ParseFieldName("appIdentifier")]
-        public string AppIdentifier
-        {
-            get { return GetProperty<string>("AppIdentifier"); }
-            internal set { SetProperty<string>(value, "AppIdentifier"); }
-        }
-
-        /// <summary>
-        /// The time zone in which this device resides. This string is in the tz database format
-        /// Parse uses for local-time pushes. Due to platform restrictions, the mapping is less
-        /// granular on Windows than it may be on other systems. E.g. The zones
-        /// America/Vancouver America/Dawson America/Whitehorse, America/Tijuana, PST8PDT, and
-        /// America/Los_Angeles are all reported as America/Los_Angeles.
-        /// </summary>
-        [ParseFieldName("timeZone")]
-        public string TimeZone
-        {
-            get { return GetProperty<string>("TimeZone"); }
-            private set { SetProperty<string>(value, "TimeZone"); }
-        }
-
-        /// <summary>
-        /// The users locale. This field gets automatically populated by the SDK.
-        /// Can be null (Parse Push uses default language in this case).
-        /// </summary>
-        [ParseFieldName("localeIdentifier")]
-        public string LocaleIdentifier
-        {
-            get { return GetProperty<string>("LocaleIdentifier"); }
-            private set { SetProperty<string>(value, "LocaleIdentifier"); }
-        }
-
-        /// <summary>
-        /// Gets the locale identifier in the format: [language code]-[COUNTRY CODE].
-        /// </summary>
-        /// <returns>The locale identifier in the format: [language code]-[COUNTRY CODE].</returns>
-        private string GetLocaleIdentifier()
-        {
-            string languageCode = null;
-            string countryCode = null;
-            if (CultureInfo.CurrentCulture != null)
-            {
-                languageCode = CultureInfo.CurrentCulture.TwoLetterISOLanguageName;
-            }
-            if (RegionInfo.CurrentRegion != null)
-            {
-                countryCode = RegionInfo.CurrentRegion.TwoLetterISORegionName;
-            }
-            if (string.IsNullOrEmpty(countryCode))
-            {
-                return languageCode;
-            }
-            else
-            {
-                return string.Format("{0}-{1}", languageCode, countryCode);
-            }
-        }
-
-        /// <summary>
-        /// The version of the Parse SDK used to build this application.
-        /// </summary>
-        [ParseFieldName("parseVersion")]
-        public Version ParseVersion
-        {
-            get
-            {
-                var versionString = GetProperty<string>("ParseVersion");
-                Version version = null;
-                try
-                {
-                    version = new Version(versionString);
-                }
-                catch (Exception)
-                {
-                    // Do nothing.
-                }
-
-                return version;
-            }
-            private set
-            {
-                Version version = value;
-                SetProperty<string>(version.ToString(), "ParseVersion");
-            }
-        }
-
-        /// <summary>
-        /// A sequence of arbitrary strings which are used to identify this installation for push notifications.
-        /// By convention, the empty string is known as the "Broadcast" channel.
-        /// </summary>
-        [ParseFieldName("channels")]
-        public IList<string> Channels
-        {
-            get { return GetProperty<IList<string>>("Channels"); }
-            set { SetProperty(value, "Channels"); }
-        }
-
-        protected override bool IsKeyMutable(string key)
-        {
-            return !readOnlyKeys.Contains(key);
-        }
-
-        protected override Task SaveAsync(Task toAwait, CancellationToken cancellationToken)
-        {
-            Task platformHookTask = null;
-            if (CurrentInstallationController.IsCurrent(this))
-            {
-                var configuration = ParseClient.CurrentConfiguration;
-
-                // 'this' is required in order for the extension method to be used.
-                this.SetIfDifferent("deviceType", DeviceInfoController.DeviceType);
-                this.SetIfDifferent("timeZone", DeviceInfoController.DeviceTimeZone);
-                this.SetIfDifferent("localeIdentifier", GetLocaleIdentifier());
-                this.SetIfDifferent("parseVersion", GetParseVersion().ToString());
-                this.SetIfDifferent("appVersion", configuration.VersionInfo.BuildVersion ?? DeviceInfoController.AppBuildVersion);
-                this.SetIfDifferent("appIdentifier", DeviceInfoController.AppIdentifier);
-                this.SetIfDifferent("appName", DeviceInfoController.AppName);
-
-                platformHookTask = DeviceInfoController.ExecuteParseInstallationSaveHookAsync(this);
-            }
-
-            return platformHookTask.Safe().OnSuccess(_ =>
-            {
-                return base.SaveAsync(toAwait, cancellationToken);
-            }).Unwrap().OnSuccess(_ =>
-            {
-                if (CurrentInstallationController.IsCurrent(this))
-                {
-                    return Task.FromResult(0);
-                }
-                return CurrentInstallationController.SetAsync(this, cancellationToken);
-            }).Unwrap();
-        }
-
-        private Version GetParseVersion()
-        {
-            return new AssemblyName(typeof(ParseInstallation).GetTypeInfo().Assembly.FullName).Version;
-        }
-
-        /// <summary>
-        /// This mapping of Windows names to a standard everyone else uses is maintained
-        /// by the Unicode consortium, which makes this officially the first helpful
-        /// interaction between Unicode and Microsoft.
-        /// Unfortunately this is a little lossy in that we only store the first mapping in each zone because
-        /// Microsoft does not give us more granular location information.
-        /// Built from http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/zone_tzid.html
-        /// </summary>
-        internal static readonly Dictionary<string, string> TimeZoneNameMap = new Dictionary<string, string>() {
-      {"Dateline Standard Time", "Etc/GMT+12"},
-      {"UTC-11", "Etc/GMT+11"},
-      {"Hawaiian Standard Time", "Pacific/Honolulu"},
-      {"Alaskan Standard Time", "America/Anchorage"},
-      {"Pacific Standard Time (Mexico)", "America/Santa_Isabel"},
-      {"Pacific Standard Time", "America/Los_Angeles"},
-      {"US Mountain Standard Time", "America/Phoenix"},
-      {"Mountain Standard Time (Mexico)", "America/Chihuahua"},
-      {"Mountain Standard Time", "America/Denver"},
-      {"Central America Standard Time", "America/Guatemala"},
-      {"Central Standard Time", "America/Chicago"},
-      {"Central Standard Time (Mexico)", "America/Mexico_City"},
-      {"Canada Central Standard Time", "America/Regina"},
-      {"SA Pacific Standard Time", "America/Bogota"},
-      {"Eastern Standard Time", "America/New_York"},
-      {"US Eastern Standard Time", "America/Indianapolis"},
-      {"Venezuela Standard Time", "America/Caracas"},
-      {"Paraguay Standard Time", "America/Asuncion"},
-      {"Atlantic Standard Time", "America/Halifax"},
-      {"Central Brazilian Standard Time", "America/Cuiaba"},
-      {"SA Western Standard Time", "America/La_Paz"},
-      {"Pacific SA Standard Time", "America/Santiago"},
-      {"Newfoundland Standard Time", "America/St_Johns"},
-      {"E. South America Standard Time", "America/Sao_Paulo"},
-      {"Argentina Standard Time", "America/Buenos_Aires"},
-      {"SA Eastern Standard Time", "America/Cayenne"},
-      {"Greenland Standard Time", "America/Godthab"},
-      {"Montevideo Standard Time", "America/Montevideo"},
-      {"Bahia Standard Time", "America/Bahia"},
-      {"UTC-02", "Etc/GMT+2"},
-      {"Azores Standard Time", "Atlantic/Azores"},
-      {"Cape Verde Standard Time", "Atlantic/Cape_Verde"},
-      {"Morocco Standard Time", "Africa/Casablanca"},
-      {"UTC", "Etc/GMT"},
-      {"GMT Standard Time", "Europe/London"},
-      {"Greenwich Standard Time", "Atlantic/Reykjavik"},
-      {"W. Europe Standard Time", "Europe/Berlin"},
-      {"Central Europe Standard Time", "Europe/Budapest"},
-      {"Romance Standard Time", "Europe/Paris"},
-      {"Central European Standard Time", "Europe/Warsaw"},
-      {"W. Central Africa Standard Time", "Africa/Lagos"},
-      {"Namibia Standard Time", "Africa/Windhoek"},
-      {"GTB Standard Time", "Europe/Bucharest"},
-      {"Middle East Standard Time", "Asia/Beirut"},
-      {"Egypt Standard Time", "Africa/Cairo"},
-      {"Syria Standard Time", "Asia/Damascus"},
-      {"E. Europe Standard Time", "Asia/Nicosia"},
-      {"South Africa Standard Time", "Africa/Johannesburg"},
-      {"FLE Standard Time", "Europe/Kiev"},
-      {"Turkey Standard Time", "Europe/Istanbul"},
-      {"Israel Standard Time", "Asia/Jerusalem"},
-      {"Jordan Standard Time", "Asia/Amman"},
-      {"Arabic Standard Time", "Asia/Baghdad"},
-      {"Kaliningrad Standard Time", "Europe/Kaliningrad"},
-      {"Arab Standard Time", "Asia/Riyadh"},
-      {"E. Africa Standard Time", "Africa/Nairobi"},
-      {"Iran Standard Time", "Asia/Tehran"},
-      {"Arabian Standard Time", "Asia/Dubai"},
-      {"Azerbaijan Standard Time", "Asia/Baku"},
-      {"Russian Standard Time", "Europe/Moscow"},
-      {"Mauritius Standard Time", "Indian/Mauritius"},
-      {"Georgian Standard Time", "Asia/Tbilisi"},
-      {"Caucasus Standard Time", "Asia/Yerevan"},
-      {"Afghanistan Standard Time", "Asia/Kabul"},
-      {"Pakistan Standard Time", "Asia/Karachi"},
-      {"West Asia Standard Time", "Asia/Tashkent"},
-      {"India Standard Time", "Asia/Calcutta"},
-      {"Sri Lanka Standard Time", "Asia/Colombo"},
-      {"Nepal Standard Time", "Asia/Katmandu"},
-      {"Central Asia Standard Time", "Asia/Almaty"},
-      {"Bangladesh Standard Time", "Asia/Dhaka"},
-      {"Ekaterinburg Standard Time", "Asia/Yekaterinburg"},
-      {"Myanmar Standard Time", "Asia/Rangoon"},
-      {"SE Asia Standard Time", "Asia/Bangkok"},
-      {"N. Central Asia Standard Time", "Asia/Novosibirsk"},
-      {"China Standard Time", "Asia/Shanghai"},
-      {"North Asia Standard Time", "Asia/Krasnoyarsk"},
-      {"Singapore Standard Time", "Asia/Singapore"},
-      {"W. Australia Standard Time", "Australia/Perth"},
-      {"Taipei Standard Time", "Asia/Taipei"},
-      {"Ulaanbaatar Standard Time", "Asia/Ulaanbaatar"},
-      {"North Asia East Standard Time", "Asia/Irkutsk"},
-      {"Tokyo Standard Time", "Asia/Tokyo"},
-      {"Korea Standard Time", "Asia/Seoul"},
-      {"Cen. Australia Standard Time", "Australia/Adelaide"},
-      {"AUS Central Standard Time", "Australia/Darwin"},
-      {"E. Australia Standard Time", "Australia/Brisbane"},
-      {"AUS Eastern Standard Time", "Australia/Sydney"},
-      {"West Pacific Standard Time", "Pacific/Port_Moresby"},
-      {"Tasmania Standard Time", "Australia/Hobart"},
-      {"Yakutsk Standard Time", "Asia/Yakutsk"},
-      {"Central Pacific Standard Time", "Pacific/Guadalcanal"},
-      {"Vladivostok Standard Time", "Asia/Vladivostok"},
-      {"New Zealand Standard Time", "Pacific/Auckland"},
-      {"UTC+12", "Etc/GMT-12"},
-      {"Fiji Standard Time", "Pacific/Fiji"},
-      {"Magadan Standard Time", "Asia/Magadan"},
-      {"Tonga Standard Time", "Pacific/Tongatapu"},
-      {"Samoa Standard Time", "Pacific/Apia"}
-    };
-
-        /// <summary>
-        /// This is a mapping of odd TimeZone offsets to their respective IANA codes across the world.
-        /// This list was compiled from painstakingly pouring over the information available at
-        /// https://en.wikipedia.org/wiki/List_of_tz_database_time_zones.
-        /// </summary>
-        internal static readonly Dictionary<TimeSpan, String> TimeZoneOffsetMap = new Dictionary<TimeSpan, string>() {
-      { new TimeSpan(12, 45, 0), "Pacific/Chatham" },
-      { new TimeSpan(10, 30, 0), "Australia/Lord_Howe" },
-      { new TimeSpan(9, 30, 0),  "Australia/Adelaide" },
-      { new TimeSpan(8, 45, 0), "Australia/Eucla" },
-      { new TimeSpan(8, 30, 0), "Asia/Pyongyang" }, // Parse in North Korea confirmed.
-      { new TimeSpan(6, 30, 0), "Asia/Rangoon" },
-      { new TimeSpan(5, 45, 0), "Asia/Kathmandu" },
-      { new TimeSpan(5, 30, 0), "Asia/Colombo" },
-      { new TimeSpan(4, 30, 0), "Asia/Kabul" },
-      { new TimeSpan(3, 30, 0), "Asia/Tehran" },
-      { new TimeSpan(-3, 30, 0), "America/St_Johns" },
-      { new TimeSpan(-4, 30, 0), "America/Caracas" },
-      { new TimeSpan(-9, 30, 0), "Pacific/Marquesas" },
-    };
-    }
-}
diff --git a/Parse/Public/ParseObject.cs b/Parse/Public/ParseObject.cs
deleted file mode 100644
index 0c7fde6a..00000000
--- a/Parse/Public/ParseObject.cs
+++ /dev/null
@@ -1,1697 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using Parse.Core.Internal;
-using Parse.Utilities;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Net;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-using Parse.Common.Internal;
-
-namespace Parse
-{
-    /// <summary>
-    /// The ParseObject is a local representation of data that can be saved and
-    /// retrieved from the Parse cloud.</summary>
-    /// <remarks>
-    /// <para>
-    /// The basic workflow for creating new data is to construct a new ParseObject,
-    /// use the indexer to fill it with data, and then use SaveAsync() to persist to the
-    /// database.
-    /// </para>
-    /// <para>
-    /// The basic workflow for accessing existing data is to use a ParseQuery
-    /// to specify which existing data to retrieve.
-    /// </para>
-    /// </remarks>
-    public class ParseObject : IEnumerable<KeyValuePair<string, object>>, INotifyPropertyChanged
-    {
-        private static readonly string AutoClassName = "_Automatic";
-
-        private static readonly bool isCompiledByIL2CPP = false;
-
-        internal readonly object mutex = new object();
-
-        private readonly LinkedList<IDictionary<string, IParseFieldOperation>> operationSetQueue = new LinkedList<IDictionary<string, IParseFieldOperation>>();
-        private readonly IDictionary<string, object> estimatedData = new Dictionary<string, object>();
-
-        private static readonly ThreadLocal<bool> isCreatingPointer = new ThreadLocal<bool>(() => false);
-
-        private bool hasBeenFetched;
-        private bool dirty;
-        internal TaskQueue taskQueue = new TaskQueue();
-
-        private IObjectState state;
-        internal void MutateState(Action<MutableObjectState> func)
-        {
-            lock (mutex)
-            {
-                state = state.MutatedClone(func);
-
-                // Refresh the estimated data.
-                RebuildEstimatedData();
-            }
-        }
-
-        internal IObjectState State => state;
-
-        internal static IParseObjectController ObjectController => ParseCorePlugins.Instance.ObjectController;
-
-        internal static IObjectSubclassingController SubclassingController => ParseCorePlugins.Instance.SubclassingController;
-
-        #region ParseObject Creation
-
-        /// <summary>
-        /// Constructor for use in ParseObject subclasses. Subclasses must specify a ParseClassName attribute.
-        /// </summary>
-        protected ParseObject() : this(AutoClassName) { }
-
-        /// <summary>
-        /// Constructs a new ParseObject with no data in it. A ParseObject constructed in this way will
-        /// not have an ObjectId and will not persist to the database until <see cref="SaveAsync()"/>
-        /// is called.
-        /// </summary>
-        /// <remarks>
-        /// Class names must be alphanumerical plus underscore, and start with a letter. It is recommended
-        /// to name classes in CamelCaseLikeThis.
-        /// </remarks>
-        /// <param name="className">The className for this ParseObject.</param>
-        public ParseObject(string className)
-        {
-            // We use a ThreadLocal rather than passing a parameter so that createWithoutData can do the
-            // right thing with subclasses. It's ugly and terrible, but it does provide the development
-            // experience we generally want, so... yeah. Sorry to whomever has to deal with this in the
-            // future. I pinky-swear we won't make a habit of this -- you believe me, don't you?
-            var isPointer = isCreatingPointer.Value;
-            isCreatingPointer.Value = false;
-
-            if (className == null)
-                throw new ArgumentException("You must specify a Parse class name when creating a new ParseObject.");
-            if (AutoClassName.Equals(className))
-                className = SubclassingController.GetClassName(GetType());
-            // If this is supposed to be created by a factory but wasn't, throw an exception
-            if (!SubclassingController.IsTypeValid(className, GetType()))
-                throw new ArgumentException("You must create this type of ParseObject using ParseObject.Create() or the proper subclass.");
-            state = new MutableObjectState { ClassName = className };
-            OnPropertyChanged("ClassName");
-
-            operationSetQueue.AddLast(new Dictionary<string, IParseFieldOperation>());
-            if (!isPointer)
-            {
-                hasBeenFetched = true;
-                IsDirty = true;
-                SetDefaultValues();
-            }
-            else
-            {
-                IsDirty = false;
-                hasBeenFetched = false;
-            }
-        }
-
-        /// <summary>
-        /// Creates a new ParseObject based upon a class name. If the class name is a special type (e.g.
-        /// for <see cref="ParseUser"/>), then the appropriate type of ParseObject is returned.
-        /// </summary>
-        /// <param name="className">The class of object to create.</param>
-        /// <returns>A new ParseObject for the given class name.</returns>
-        public static ParseObject Create(string className) => SubclassingController.Instantiate(className);
-
-        /// <summary>
-        /// Creates a reference to an existing ParseObject for use in creating associations between
-        /// ParseObjects. Calling <see cref="ParseObject.IsDataAvailable"/> on this object will return
-        /// <c>false</c> until <see cref="ParseExtensions.FetchIfNeededAsync{T}(T)"/> has been called.
-        /// No network request will be made.
-        /// </summary>
-        /// <param name="className">The object's class.</param>
-        /// <param name="objectId">The object id for the referenced object.</param>
-        /// <returns>A ParseObject without data.</returns>
-        public static ParseObject CreateWithoutData(string className, string objectId)
-        {
-            isCreatingPointer.Value = true;
-            try
-            {
-                var result = SubclassingController.Instantiate(className);
-                result.ObjectId = objectId;
-                result.IsDirty = false; // Left in because the property setter might be doing something funky.
-                return result.IsDirty ? throw new InvalidOperationException("A ParseObject subclass default constructor must not make changes to the object that cause it to be dirty.") : result;
-            }
-            finally { isCreatingPointer.Value = false; }
-        }
-
-        /// <summary>
-        /// Creates a new ParseObject based upon a given subclass type.
-        /// </summary>
-        /// <returns>A new ParseObject for the given class name.</returns>
-        public static T Create<T>() where T : ParseObject => (T) SubclassingController.Instantiate(SubclassingController.GetClassName(typeof(T)));
-
-        /// <summary>
-        /// Creates a reference to an existing ParseObject for use in creating associations between
-        /// ParseObjects. Calling <see cref="ParseObject.IsDataAvailable"/> on this object will return
-        /// <c>false</c> until <see cref="ParseExtensions.FetchIfNeededAsync{T}(T)"/> has been called.
-        /// No network request will be made.
-        /// </summary>
-        /// <param name="objectId">The object id for the referenced object.</param>
-        /// <returns>A ParseObject without data.</returns>
-        public static T CreateWithoutData<T>(string objectId) where T : ParseObject => (T) CreateWithoutData(SubclassingController.GetClassName(typeof(T)), objectId);
-
-        // TODO (hallucinogen): add unit test
-        internal static T FromState<T>(IObjectState state, string defaultClassName) where T : ParseObject
-        {
-            T obj = (T) CreateWithoutData(state.ClassName ?? defaultClassName, state.ObjectId);
-            obj.HandleFetchResult(state);
-            return obj;
-        }
-
-        #endregion
-
-        private static string GetFieldForPropertyName(string className, string propertyName) => SubclassingController.GetPropertyMappings(className).TryGetValue(propertyName, out string fieldName) ? fieldName : fieldName;
-
-        /// <summary>
-        /// Sets the value of a property based upon its associated ParseFieldName attribute.
-        /// </summary>
-        /// <param name="value">The new value.</param>
-        /// <param name="propertyName">The name of the property.</param>
-        /// <typeparam name="T">The type for the property.</typeparam>
-        protected void SetProperty<T>(T value, [CallerMemberName] string propertyName = null) => this[GetFieldForPropertyName(ClassName, propertyName)] = value;
-
-        /// <summary>
-        /// Gets a relation for a property based upon its associated ParseFieldName attribute.
-        /// </summary>
-        /// <returns>The ParseRelation for the property.</returns>
-        /// <param name="propertyName">The name of the property.</param>
-        /// <typeparam name="T">The ParseObject subclass type of the ParseRelation.</typeparam>
-        protected ParseRelation<T> GetRelationProperty<T>([CallerMemberName] string propertyName = null) where T : ParseObject => GetRelation<T>(GetFieldForPropertyName(ClassName, propertyName));
-
-        /// <summary>
-        /// Gets the value of a property based upon its associated ParseFieldName attribute.
-        /// </summary>
-        /// <returns>The value of the property.</returns>
-        /// <param name="propertyName">The name of the property.</param>
-        /// <typeparam name="T">The return type of the property.</typeparam>
-        protected T GetProperty<T>([CallerMemberName] string propertyName = null) => GetProperty(default(T), propertyName);
-
-        /// <summary>
-        /// Gets the value of a property based upon its associated ParseFieldName attribute.
-        /// </summary>
-        /// <returns>The value of the property.</returns>
-        /// <param name="defaultValue">The value to return if the property is not present on the ParseObject.</param>
-        /// <param name="propertyName">The name of the property.</param>
-        /// <typeparam name="T">The return type of the property.</typeparam>
-        protected T GetProperty<T>(T defaultValue, [CallerMemberName] string propertyName = null) => TryGetValue(GetFieldForPropertyName(ClassName, propertyName), out T result) ? result : defaultValue;
-
-        /// <summary>
-        /// Allows subclasses to set values for non-pointer construction.
-        /// </summary>
-        internal virtual void SetDefaultValues() { }
-
-        /// <summary>
-        /// Registers a custom subclass type with the Parse SDK, enabling strong-typing of those ParseObjects whenever
-        /// they appear. Subclasses must specify the ParseClassName attribute, have a default constructor, and properties
-        /// backed by ParseObject fields should have ParseFieldName attributes supplied.
-        /// </summary>
-        /// <typeparam name="T">The ParseObject subclass type to register.</typeparam>
-        public static void RegisterSubclass<T>() where T : ParseObject, new() => SubclassingController.RegisterSubclass(typeof(T));
-
-        /// <summary>
-        /// Registers a custom subclass type with the Parse SDK, enabling strong-typing of those ParseObjects whenever
-        /// they appear. Subclasses must specify the ParseClassName attribute, have a default constructor, and properties
-        /// backed by ParseObject fields should have ParseFieldName attributes supplied.
-        /// </summary>
-        /// <param name="type">The ParseObject subclass type to register.</param>
-        public static void RegisterSubclass(Type type) { if (typeof(ParseObject).IsAssignableFrom(type)) SubclassingController.RegisterSubclass(type); }
-
-        internal static void UnregisterSubclass<T>() where T : ParseObject, new() => SubclassingController.UnregisterSubclass(typeof(T));
-        internal static void UnregisterSubclass(Type type) { if (typeof(ParseObject).IsAssignableFrom(type)) SubclassingController.UnregisterSubclass(type); }
-
-
-
-        /// <summary>
-        /// Clears any changes to this object made since the last call to <see cref="SaveAsync()"/>.
-        /// </summary>
-        public void Revert()
-        {
-            lock (mutex)
-            {
-                bool wasDirty = CurrentOperations.Count > 0;
-                if (wasDirty)
-                {
-                    CurrentOperations.Clear();
-                    RebuildEstimatedData();
-                    OnPropertyChanged("IsDirty");
-                }
-            }
-        }
-
-        internal virtual void HandleFetchResult(IObjectState serverState)
-        {
-            lock (mutex)
-            {
-                MergeFromServer(serverState);
-            }
-        }
-
-        internal void HandleFailedSave(IDictionary<string, IParseFieldOperation> operationsBeforeSave)
-        {
-            lock (mutex)
-            {
-                var opNode = operationSetQueue.Find(operationsBeforeSave);
-                var nextOperations = opNode.Next.Value;
-                bool wasDirty = nextOperations.Count > 0;
-                operationSetQueue.Remove(opNode);
-                // Merge the data from the failed save into the next save.
-                foreach (var pair in operationsBeforeSave)
-                {
-                    var operation1 = pair.Value;
-                    nextOperations.TryGetValue(pair.Key, out IParseFieldOperation operation2);
-                    if (operation2 != null)
-                        operation2 = operation2.MergeWithPrevious(operation1);
-                    else
-                        operation2 = operation1;
-                    nextOperations[pair.Key] = operation2;
-                }
-                if (!wasDirty && nextOperations == CurrentOperations && operationsBeforeSave.Count > 0)
-                    OnPropertyChanged("IsDirty");
-            }
-        }
-
-        internal virtual void HandleSave(IObjectState serverState)
-        {
-            lock (mutex)
-            {
-                var operationsBeforeSave = operationSetQueue.First.Value;
-                operationSetQueue.RemoveFirst();
-
-                // Merge the data from the save and the data from the server into serverData.
-                MutateState(mutableClone => mutableClone.Apply(operationsBeforeSave));
-                MergeFromServer(serverState);
-            }
-        }
-
-        internal virtual void MergeFromServer(IObjectState serverState)
-        {
-            // Make a new serverData with fetched values.
-            var newServerData = serverState.ToDictionary(t => t.Key, t => t.Value);
-
-            lock (mutex)
-            {
-                // Trigger handler based on serverState
-                if (serverState.ObjectId != null)
-                {
-                    // If the objectId is being merged in, consider this object to be fetched.
-                    hasBeenFetched = true;
-                    OnPropertyChanged("IsDataAvailable");
-                }
-                if (serverState.UpdatedAt != null)
-                    OnPropertyChanged("UpdatedAt");
-                if (serverState.CreatedAt != null)
-                    OnPropertyChanged("CreatedAt");
-
-                // We cache the fetched object because subsequent Save operation might flush
-                // the fetched objects into Pointers.
-                IDictionary<string, ParseObject> fetchedObject = CollectFetchedObjects();
-
-                foreach (var pair in serverState)
-                {
-                    var value = pair.Value;
-                    if (value is ParseObject)
-                    {
-                        // Resolve fetched object.
-                        var parseObject = value as ParseObject;
-                        if (fetchedObject.ContainsKey(parseObject.ObjectId))
-                            value = fetchedObject[parseObject.ObjectId];
-                    }
-                    newServerData[pair.Key] = value;
-                }
-
-                IsDirty = false;
-                serverState = serverState.MutatedClone(mutableClone => mutableClone.ServerData = newServerData);
-                MutateState(mutableClone => mutableClone.Apply(serverState));
-            }
-        }
-
-        internal void MergeFromObject(ParseObject other)
-        {
-            // If they point to the same instance, we don't need to merge
-            lock (mutex)
-                if (this == other)
-                    return;
-
-            // Clear out any changes on this object.
-            if (operationSetQueue.Count != 1)
-                throw new InvalidOperationException("Attempt to MergeFromObject during save.");
-            operationSetQueue.Clear();
-            foreach (var operationSet in other.operationSetQueue)
-                operationSetQueue.AddLast(operationSet.ToDictionary(entry => entry.Key, entry => entry.Value));
-
-            lock (mutex)
-                state = other.State;
-            RebuildEstimatedData();
-        }
-
-        private bool HasDirtyChildren
-        {
-            get
-            {
-                lock (mutex)
-                    return FindUnsavedChildren().FirstOrDefault() != null;
-            }
-        }
-
-        /// <summary>
-        /// Flattens dictionaries and lists into a single enumerable of all contained objects
-        /// that can then be queried over.
-        /// </summary>
-        /// <param name="root">The root of the traversal</param>
-        /// <param name="traverseParseObjects">Whether to traverse into ParseObjects' children</param>
-        /// <param name="yieldRoot">Whether to include the root in the result</param>
-        /// <returns></returns>
-        internal static IEnumerable<object> DeepTraversal(object root, bool traverseParseObjects = false, bool yieldRoot = false)
-        {
-            var items = DeepTraversalInternal(root, traverseParseObjects, new HashSet<object>(new IdentityEqualityComparer<object>()));
-            if (yieldRoot)
-                return new[] { root }.Concat(items);
-            else
-                return items;
-        }
-
-        private static IEnumerable<object> DeepTraversalInternal(object root, bool traverseParseObjects, ICollection<object> seen)
-        {
-            seen.Add(root);
-            var itemsToVisit = isCompiledByIL2CPP ? (System.Collections.IEnumerable) null : (IEnumerable<object>) null;
-            var dict = Conversion.As<IDictionary<string, object>>(root);
-            if (dict != null)
-            {
-                itemsToVisit = dict.Values;
-            }
-            else
-            {
-                var list = Conversion.As<IList<object>>(root);
-                if (list != null)
-                {
-                    itemsToVisit = list;
-                }
-                else if (traverseParseObjects)
-                {
-                    if (root is ParseObject obj)
-                    {
-                        itemsToVisit = obj.Keys.ToList().Select(k => obj[k]);
-                    }
-                }
-            }
-            if (itemsToVisit != null)
-            {
-                foreach (var i in itemsToVisit)
-                {
-                    if (!seen.Contains(i))
-                    {
-                        yield return i;
-                        var children = DeepTraversalInternal(i, traverseParseObjects, seen);
-                        foreach (var child in children)
-                        {
-                            yield return child;
-                        }
-                    }
-                }
-            }
-        }
-
-        private IEnumerable<ParseObject> FindUnsavedChildren() => DeepTraversal(estimatedData).OfType<ParseObject>().Where(o => o.IsDirty);
-
-        /// <summary>
-        /// Deep traversal of this object to grab a copy of any object referenced by this object.
-        /// These instances may have already been fetched, and we don't want to lose their data when
-        /// refreshing or saving.
-        /// </summary>
-        /// <returns>Map of objectId to ParseObject which have been fetched.</returns>
-        private IDictionary<string, ParseObject> CollectFetchedObjects() => DeepTraversal(estimatedData).OfType<ParseObject>().Where(o => o.ObjectId != null && o.IsDataAvailable).GroupBy(o => o.ObjectId).ToDictionary(group => group.Key, group => group.Last());
-
-        internal static IDictionary<string, object> ToJSONObjectForSaving(IDictionary<string, IParseFieldOperation> operations)
-        {
-            var result = new Dictionary<string, object>();
-            foreach (var pair in operations)
-                result[pair.Key] = PointerOrLocalIdEncoder.Instance.Encode(pair.Value);
-            return result;
-        }
-
-        internal IDictionary<string, object> ServerDataToJSONObjectForSerialization() => PointerOrLocalIdEncoder.Instance.Encode(state.ToDictionary(t => t.Key, t => t.Value)) as IDictionary<string, object>;
-
-        #region Save Object(s)
-
-        /// <summary>
-        /// Pushes new operations onto the queue and returns the current set of operations.
-        /// </summary>
-        internal IDictionary<string, IParseFieldOperation> StartSave()
-        {
-            lock (mutex)
-            {
-                var currentOperations = CurrentOperations;
-                operationSetQueue.AddLast(new Dictionary<string, IParseFieldOperation>());
-                OnPropertyChanged("IsDirty");
-                return currentOperations;
-            }
-        }
-
-        protected virtual Task SaveAsync(Task toAwait, CancellationToken cancellationToken)
-        {
-            IDictionary<string, IParseFieldOperation> currentOperations = null;
-            if (!IsDirty)
-                return Task.FromResult(0);
-
-            Task deepSaveTask;
-            string sessionToken;
-            lock (mutex)
-            {
-                // Get the JSON representation of the object.
-                currentOperations = StartSave();
-
-                sessionToken = ParseUser.CurrentSessionToken;
-
-                deepSaveTask = DeepSaveAsync(estimatedData, sessionToken, cancellationToken);
-            }
-
-            return deepSaveTask.OnSuccess(_ => toAwait).Unwrap().OnSuccess(_ => ObjectController.SaveAsync(state, currentOperations, sessionToken, cancellationToken)).Unwrap().ContinueWith(t =>
-            {
-                if (t.IsFaulted || t.IsCanceled)
-                    HandleFailedSave(currentOperations);
-                else
-                    HandleSave(t.Result);
-                return t;
-            }).Unwrap();
-        }
-
-        /// <summary>
-        /// Saves this object to the server.
-        /// </summary>
-        public Task SaveAsync() => SaveAsync(CancellationToken.None);
-
-        /// <summary>
-        /// Saves this object to the server.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        public Task SaveAsync(CancellationToken cancellationToken) => taskQueue.Enqueue(toAwait => SaveAsync(toAwait, cancellationToken), cancellationToken);
-
-        internal virtual Task<ParseObject> FetchAsyncInternal(Task toAwait, CancellationToken cancellationToken) => toAwait.OnSuccess(_ => ObjectId == null ? throw new InvalidOperationException("Cannot refresh an object that hasn't been saved to the server.") : ObjectController.FetchAsync(state, ParseUser.CurrentSessionToken, cancellationToken)).Unwrap().OnSuccess(t =>
-        {
-            HandleFetchResult(t.Result);
-            return this;
-        });
-
-        private static Task DeepSaveAsync(object obj, string sessionToken, CancellationToken cancellationToken)
-        {
-            var objects = new List<ParseObject>();
-            CollectDirtyChildren(obj, objects);
-
-            var uniqueObjects = new HashSet<ParseObject>(objects, new IdentityEqualityComparer<ParseObject>());
-
-            var saveDirtyFileTasks = DeepTraversal(obj, true).OfType<ParseFile>().Where(f => f.IsDirty).Select(f => f.SaveAsync(cancellationToken)).ToList();
-
-            return Task.WhenAll(saveDirtyFileTasks).OnSuccess(_ =>
-            {
-                IEnumerable<ParseObject> remaining = new List<ParseObject>(uniqueObjects);
-                return InternalExtensions.WhileAsync(() => Task.FromResult(remaining.Any()), () =>
-                {
-                    // Partition the objects into two sets: those that can be saved immediately,
-                    // and those that rely on other objects to be created first.
-                    var current = (from item in remaining where item.CanBeSerialized select item).ToList();
-                    var nextBatch = (from item in remaining where !item.CanBeSerialized select item).ToList();
-                    remaining = nextBatch;
-
-                    if (current.Count == 0)
-                    {
-                        // We do cycle-detection when building the list of objects passed to this
-                        // function, so this should never get called. But we should check for it
-                        // anyway, so that we get an exception instead of an infinite loop.
-                        throw new InvalidOperationException(
-                          "Unable to save a ParseObject with a relation to a cycle.");
-                    }
-
-                    // Save all of the objects in current.
-                    return ParseObject.EnqueueForAll<object>(current, toAwait =>
-                    {
-                        return toAwait.OnSuccess(__ =>
-                        {
-                            var states = (from item in current
-                                          select item.state).ToList();
-                            var operationsList = (from item in current
-                                                  select item.StartSave()).ToList();
-
-                            var saveTasks = ObjectController.SaveAllAsync(states,
-                                operationsList,
-                                sessionToken,
-                                cancellationToken);
-
-                            return Task.WhenAll(saveTasks).ContinueWith(t =>
-                            {
-                                if (t.IsFaulted || t.IsCanceled)
-                                {
-                                    foreach (var pair in current.Zip(operationsList, (item, ops) => new { item, ops }))
-                                    {
-                                        pair.item.HandleFailedSave(pair.ops);
-                                    }
-                                }
-                                else
-                                {
-                                    var serverStates = t.Result;
-                                    foreach (var pair in current.Zip(serverStates, (item, state) => new { item, state }))
-                                    {
-                                        pair.item.HandleSave(pair.state);
-                                    }
-                                }
-                                cancellationToken.ThrowIfCancellationRequested();
-                                return t;
-                            }).Unwrap();
-                        }).Unwrap().OnSuccess(t => (object) null);
-                    }, cancellationToken);
-                });
-            }).Unwrap();
-        }
-
-        /// <summary>
-        /// Saves each object in the provided list.
-        /// </summary>
-        /// <param name="objects">The objects to save.</param>
-        public static Task SaveAllAsync<T>(IEnumerable<T> objects) where T : ParseObject => SaveAllAsync(objects, CancellationToken.None);
-
-        /// <summary>
-        /// Saves each object in the provided list.
-        /// </summary>
-        /// <param name="objects">The objects to save.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        public static Task SaveAllAsync<T>(
-            IEnumerable<T> objects, CancellationToken cancellationToken) where T : ParseObject
-        {
-            return DeepSaveAsync(objects.ToList(), ParseUser.CurrentSessionToken, cancellationToken);
-        }
-
-        #endregion
-
-        #region Fetch Object(s)
-
-        /// <summary>
-        /// Fetches this object with the data from the server.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        internal Task<ParseObject> FetchAsyncInternal(CancellationToken cancellationToken)
-        {
-            return taskQueue.Enqueue(toAwait => FetchAsyncInternal(toAwait, cancellationToken),
-                cancellationToken);
-        }
-
-        internal Task<ParseObject> FetchIfNeededAsyncInternal(
-            Task toAwait, CancellationToken cancellationToken)
-        {
-            if (!IsDataAvailable)
-            {
-                return FetchAsyncInternal(toAwait, cancellationToken);
-            }
-            return Task.FromResult(this);
-        }
-
-        /// <summary>
-        /// If this ParseObject has not been fetched (i.e. <see cref="IsDataAvailable"/> returns
-        /// false), fetches this object with the data from the server.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        internal Task<ParseObject> FetchIfNeededAsyncInternal(CancellationToken cancellationToken)
-        {
-            return taskQueue.Enqueue(toAwait => FetchIfNeededAsyncInternal(toAwait, cancellationToken),
-              cancellationToken);
-        }
-
-        /// <summary>
-        /// Fetches all of the objects that don't have data in the provided list.
-        /// </summary>
-        /// <returns>The list passed in for convenience.</returns>
-        public static Task<IEnumerable<T>> FetchAllIfNeededAsync<T>(
-            IEnumerable<T> objects) where T : ParseObject
-        {
-            return FetchAllIfNeededAsync(objects, CancellationToken.None);
-        }
-
-        /// <summary>
-        /// Fetches all of the objects that don't have data in the provided list.
-        /// </summary>
-        /// <param name="objects">The objects to fetch.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>The list passed in for convenience.</returns>
-        public static Task<IEnumerable<T>> FetchAllIfNeededAsync<T>(
-            IEnumerable<T> objects, CancellationToken cancellationToken) where T : ParseObject
-        {
-            return ParseObject.EnqueueForAll(objects.Cast<ParseObject>(), (Task toAwait) =>
-            {
-                return FetchAllInternalAsync(objects, false, toAwait, cancellationToken);
-            }, cancellationToken);
-        }
-
-        /// <summary>
-        /// Fetches all of the objects in the provided list.
-        /// </summary>
-        /// <param name="objects">The objects to fetch.</param>
-        /// <returns>The list passed in for convenience.</returns>
-        public static Task<IEnumerable<T>> FetchAllAsync<T>(
-            IEnumerable<T> objects) where T : ParseObject
-        {
-            return FetchAllAsync(objects, CancellationToken.None);
-        }
-
-        /// <summary>
-        /// Fetches all of the objects in the provided list.
-        /// </summary>
-        /// <param name="objects">The objects to fetch.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>The list passed in for convenience.</returns>
-        public static Task<IEnumerable<T>> FetchAllAsync<T>(
-            IEnumerable<T> objects, CancellationToken cancellationToken) where T : ParseObject
-        {
-            return ParseObject.EnqueueForAll(objects.Cast<ParseObject>(), (Task toAwait) =>
-            {
-                return FetchAllInternalAsync(objects, true, toAwait, cancellationToken);
-            }, cancellationToken);
-        }
-
-        /// <summary>
-        /// Fetches all of the objects in the list.
-        /// </summary>
-        /// <param name="objects">The objects to fetch.</param>
-        /// <param name="force">If false, only objects without data will be fetched.</param>
-        /// <param name="toAwait">A task to await before starting.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>The list passed in for convenience.</returns>
-        private static Task<IEnumerable<T>> FetchAllInternalAsync<T>(
-            IEnumerable<T> objects, bool force, Task toAwait, CancellationToken cancellationToken) where T : ParseObject
-        {
-            return toAwait.OnSuccess(_ =>
-            {
-                if (objects.Any(obj => { return obj.state.ObjectId == null; }))
-                {
-                    throw new InvalidOperationException("You cannot fetch objects that haven't already been saved.");
-                }
-
-                var objectsToFetch = (from obj in objects
-                                      where force || !obj.IsDataAvailable
-                                      select obj).ToList();
-
-                if (objectsToFetch.Count == 0)
-                {
-                    return Task.FromResult(objects);
-                }
-
-                // Do one Find for each class.
-                var findsByClass =
-                  (from obj in objectsToFetch
-                   group obj.ObjectId by obj.ClassName into classGroup
-                   where classGroup.Count() > 0
-                   select new
-                   {
-                       ClassName = classGroup.Key,
-                       FindTask = new ParseQuery<ParseObject>(classGroup.Key)
-                       .WhereContainedIn("objectId", classGroup)
-                       .FindAsync(cancellationToken)
-                   }).ToDictionary(pair => pair.ClassName, pair => pair.FindTask);
-
-                // Wait for all the Finds to complete.
-                return Task.WhenAll(findsByClass.Values.ToList()).OnSuccess(__ =>
-                {
-                    if (cancellationToken.IsCancellationRequested)
-                    {
-                        return objects;
-                    }
-
-                    // Merge the data from the Finds into the input objects.
-                    var pairs = from obj in objectsToFetch
-                                from result in findsByClass[obj.ClassName].Result
-                                where result.ObjectId == obj.ObjectId
-                                select new { obj, result };
-                    foreach (var pair in pairs)
-                    {
-                        pair.obj.MergeFromObject(pair.result);
-                        pair.obj.hasBeenFetched = true;
-                    }
-
-                    return objects;
-                });
-            }).Unwrap();
-        }
-
-        #endregion
-
-        #region Delete Object
-
-        internal Task DeleteAsync(Task toAwait, CancellationToken cancellationToken)
-        {
-            if (ObjectId == null)
-            {
-                return Task.FromResult(0);
-            }
-
-            string sessionToken = ParseUser.CurrentSessionToken;
-
-            return toAwait.OnSuccess(_ =>
-            {
-                return ObjectController.DeleteAsync(State, sessionToken, cancellationToken);
-            }).Unwrap().OnSuccess(_ => IsDirty = true);
-        }
-
-        /// <summary>
-        /// Deletes this object on the server.
-        /// </summary>
-        public Task DeleteAsync()
-        {
-            return DeleteAsync(CancellationToken.None);
-        }
-
-        /// <summary>
-        /// Deletes this object on the server.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        public Task DeleteAsync(CancellationToken cancellationToken)
-        {
-            return taskQueue.Enqueue(toAwait => DeleteAsync(toAwait, cancellationToken),
-              cancellationToken);
-        }
-
-        /// <summary>
-        /// Deletes each object in the provided list.
-        /// </summary>
-        /// <param name="objects">The objects to delete.</param>
-        public static Task DeleteAllAsync<T>(IEnumerable<T> objects) where T : ParseObject
-        {
-            return DeleteAllAsync(objects, CancellationToken.None);
-        }
-
-        /// <summary>
-        /// Deletes each object in the provided list.
-        /// </summary>
-        /// <param name="objects">The objects to delete.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        public static Task DeleteAllAsync<T>(
-            IEnumerable<T> objects, CancellationToken cancellationToken) where T : ParseObject
-        {
-            var uniqueObjects = new HashSet<ParseObject>(objects.OfType<ParseObject>().ToList(),
-              new IdentityEqualityComparer<ParseObject>());
-
-            return ParseObject.EnqueueForAll<object>(uniqueObjects, toAwait =>
-            {
-                var states = uniqueObjects.Select(t => t.state).ToList();
-                return toAwait.OnSuccess(_ =>
-                {
-                    var deleteTasks = ObjectController.DeleteAllAsync(states,
-                      ParseUser.CurrentSessionToken,
-                      cancellationToken);
-
-                    return Task.WhenAll(deleteTasks);
-                }).Unwrap().OnSuccess(t =>
-                {
-                    // Dirty all objects in memory.
-                    foreach (var obj in uniqueObjects)
-                    {
-                        obj.IsDirty = true;
-                    }
-
-                    return (object) null;
-                });
-            }, cancellationToken);
-        }
-
-        #endregion
-
-        private static void CollectDirtyChildren(object node,
-            IList<ParseObject> dirtyChildren,
-            ICollection<ParseObject> seen,
-            ICollection<ParseObject> seenNew)
-        {
-            foreach (var obj in DeepTraversal(node).OfType<ParseObject>())
-            {
-                ICollection<ParseObject> scopedSeenNew;
-                // Check for cycles of new objects. Any such cycle means it will be impossible to save
-                // this collection of objects, so throw an exception.
-                if (obj.ObjectId != null)
-                {
-                    scopedSeenNew = new HashSet<ParseObject>(new IdentityEqualityComparer<ParseObject>());
-                }
-                else
-                {
-                    if (seenNew.Contains(obj))
-                    {
-                        throw new InvalidOperationException("Found a circular dependency while saving");
-                    }
-                    scopedSeenNew = new HashSet<ParseObject>(seenNew, new IdentityEqualityComparer<ParseObject>()) { obj };
-                }
-
-                // Check for cycles of any object. If this occurs, then there's no problem, but
-                // we shouldn't recurse any deeper, because it would be an infinite recursion.
-                if (seen.Contains(obj))
-                {
-                    return;
-                }
-                seen.Add(obj);
-
-                // Recurse into this object's children looking for dirty children.
-                // We only need to look at the child object's current estimated data,
-                // because that's the only data that might need to be saved now.
-                CollectDirtyChildren(obj.estimatedData, dirtyChildren, seen, scopedSeenNew);
-
-                if (obj.CheckIsDirty(false))
-                {
-                    dirtyChildren.Add(obj);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Helper version of CollectDirtyChildren so that callers don't have to add the internally
-        /// used parameters.
-        /// </summary>
-        private static void CollectDirtyChildren(object node, IList<ParseObject> dirtyChildren)
-        {
-            CollectDirtyChildren(node,
-                dirtyChildren,
-                new HashSet<ParseObject>(new IdentityEqualityComparer<ParseObject>()),
-                new HashSet<ParseObject>(new IdentityEqualityComparer<ParseObject>()));
-        }
-
-        /// <summary>
-        /// Returns true if the given object can be serialized for saving as a value
-        /// that is pointed to by a ParseObject.
-        /// </summary>
-        private static bool CanBeSerializedAsValue(object value)
-        {
-            return DeepTraversal(value, yieldRoot: true)
-              .OfType<ParseObject>()
-              .All(o => o.ObjectId != null);
-        }
-
-        private bool CanBeSerialized
-        {
-            get
-            {
-                // This method is only used for batching sets of objects for saveAll
-                // and when saving children automatically. Since it's only used to
-                // determine whether or not save should be called on them, it only
-                // needs to examine their current values, so we use estimatedData.
-                lock (mutex)
-                {
-                    return CanBeSerializedAsValue(estimatedData);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Adds a task to the queue for all of the given objects.
-        /// </summary>
-        private static Task<T> EnqueueForAll<T>(IEnumerable<ParseObject> objects,
-            Func<Task, Task<T>> taskStart, CancellationToken cancellationToken)
-        {
-            // The task that will be complete when all of the child queues indicate they're ready to start.
-            var readyToStart = new TaskCompletionSource<object>();
-
-            // First, we need to lock the mutex for the queue for every object. We have to hold this
-            // from at least when taskStart() is called to when obj.taskQueue enqueue is called, so
-            // that saves actually get executed in the order they were setup by taskStart().
-            // The locks have to be sorted so that we always acquire them in the same order.
-            // Otherwise, there's some risk of deadlock.
-            var lockSet = new LockSet(objects.Select(o => o.taskQueue.Mutex));
-
-            lockSet.Enter();
-            try
-            {
-
-                // The task produced by taskStart. By running this immediately, we allow everything prior
-                // to toAwait to run before waiting for all of the queues on all of the objects.
-                Task<T> fullTask = taskStart(readyToStart.Task);
-
-                // Add fullTask to each of the objects' queues.
-                var childTasks = new List<Task>();
-                foreach (ParseObject obj in objects)
-                {
-                    obj.taskQueue.Enqueue((Task task) =>
-                    {
-                        childTasks.Add(task);
-                        return fullTask;
-                    }, cancellationToken);
-                }
-
-                // When all of the objects' queues are ready, signal fullTask that it's ready to go on.
-                Task.WhenAll(childTasks.ToArray()).ContinueWith((Task task) =>
-                {
-                    readyToStart.SetResult(null);
-                });
-
-                return fullTask;
-            }
-            finally
-            {
-                lockSet.Exit();
-            }
-        }
-
-        /// <summary>
-        /// Removes a key from the object's data if it exists.
-        /// </summary>
-        /// <param name="key">The key to remove.</param>
-        public virtual void Remove(string key)
-        {
-            lock (mutex)
-            {
-                CheckKeyIsMutable(key);
-
-                PerformOperation(key, ParseDeleteOperation.Instance);
-            }
-        }
-
-
-        private void ApplyOperations(IDictionary<string,
-            IParseFieldOperation> operations,
-            IDictionary<string, object> map)
-        {
-            lock (mutex)
-            {
-                foreach (var pair in operations)
-                {
-                    map.TryGetValue(pair.Key, out object oldValue);
-                    var newValue = pair.Value.Apply(oldValue, pair.Key);
-                    if (newValue != ParseDeleteOperation.DeleteToken)
-                    {
-                        map[pair.Key] = newValue;
-                    }
-                    else
-                    {
-                        map.Remove(pair.Key);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Regenerates the estimatedData map from the serverData and operations.
-        /// </summary>
-        internal void RebuildEstimatedData()
-        {
-            lock (mutex)
-            {
-                estimatedData.Clear();
-                foreach (var item in state)
-                {
-                    estimatedData.Add(item);
-                }
-                foreach (var operations in operationSetQueue)
-                {
-                    ApplyOperations(operations, estimatedData);
-                }
-                // We've just applied a bunch of operations to estimatedData which
-                // may have changed all of its keys. Notify of all keys and properties
-                // mapped to keys being changed.
-                OnFieldsChanged(null);
-            }
-        }
-
-        /// <summary>
-        /// PerformOperation is like setting a value at an index, but instead of
-        /// just taking a new value, it takes a ParseFieldOperation that modifies the value.
-        /// </summary>
-        internal void PerformOperation(string key, IParseFieldOperation operation)
-        {
-            lock (mutex)
-            {
-                estimatedData.TryGetValue(key, out object oldValue);
-                object newValue = operation.Apply(oldValue, key);
-                if (newValue != ParseDeleteOperation.DeleteToken)
-                {
-                    estimatedData[key] = newValue;
-                }
-                else
-                {
-                    estimatedData.Remove(key);
-                }
-
-                bool wasDirty = CurrentOperations.Count > 0;
-                CurrentOperations.TryGetValue(key, out IParseFieldOperation oldOperation);
-                var newOperation = operation.MergeWithPrevious(oldOperation);
-                CurrentOperations[key] = newOperation;
-                if (!wasDirty)
-                {
-                    OnPropertyChanged("IsDirty");
-                }
-
-                OnFieldsChanged(new[] { key });
-            }
-        }
-
-        /// <summary>
-        /// Override to run validations on key/value pairs. Make sure to still
-        /// call the base version.
-        /// </summary>
-        internal virtual void OnSettingValue(ref string key, ref object value)
-        {
-            if (key == null)
-            {
-                throw new ArgumentNullException("key");
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value on the object. It is recommended to name
-        /// keys in partialCamelCaseLikeThis.
-        /// </summary>
-        /// <param name="key">The key for the object. Keys must be alphanumeric plus underscore
-        /// and start with a letter.</param>
-        /// <exception cref="System.Collections.Generic.KeyNotFoundException">The property is
-        /// retrieved and <paramref name="key"/> is not found.</exception>
-        /// <returns>The value for the key.</returns>
-        virtual public object this[string key]
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    CheckGetAccess(key);
-
-                    var value = estimatedData[key];
-
-                    // A relation may be deserialized without a parent or key. Either way,
-                    // make sure it's consistent.
-                    if (value is ParseRelationBase relation)
-                    {
-                        relation.EnsureParentAndKey(this, key);
-                    }
-
-                    return value;
-                }
-            }
-            set
-            {
-                lock (mutex)
-                {
-                    CheckKeyIsMutable(key);
-
-                    Set(key, value);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Perform Set internally which is not gated by mutability check.
-        /// </summary>
-        /// <param name="key">key for the object.</param>
-        /// <param name="value">the value for the key.</param>
-        internal void Set(string key, object value)
-        {
-            lock (mutex)
-            {
-                OnSettingValue(ref key, ref value);
-
-                if (!ParseEncoder.IsValidType(value))
-                {
-                    throw new ArgumentException("Invalid type for value: " + value.GetType().ToString());
-                }
-
-                PerformOperation(key, new ParseSetOperation(value));
-            }
-        }
-
-        internal void SetIfDifferent<T>(string key, T value)
-        {
-            bool hasCurrent = TryGetValue<T>(key, out T current);
-            if (value == null)
-            {
-                if (hasCurrent)
-                {
-                    PerformOperation(key, ParseDeleteOperation.Instance);
-                }
-                return;
-            }
-            if (!hasCurrent || !value.Equals(current))
-            {
-                Set(key, value);
-            }
-        }
-
-        #region Atomic Increment
-
-        /// <summary>
-        /// Atomically increments the given key by 1.
-        /// </summary>
-        /// <param name="key">The key to increment.</param>
-        public void Increment(string key)
-        {
-            Increment(key, 1);
-        }
-
-        /// <summary>
-        /// Atomically increments the given key by the given number.
-        /// </summary>
-        /// <param name="key">The key to increment.</param>
-        /// <param name="amount">The amount to increment by.</param>
-        public void Increment(string key, long amount)
-        {
-            lock (mutex)
-            {
-                CheckKeyIsMutable(key);
-
-                PerformOperation(key, new ParseIncrementOperation(amount));
-            }
-        }
-
-        /// <summary>
-        /// Atomically increments the given key by the given number.
-        /// </summary>
-        /// <param name="key">The key to increment.</param>
-        /// <param name="amount">The amount to increment by.</param>
-        public void Increment(string key, double amount)
-        {
-            lock (mutex)
-            {
-                CheckKeyIsMutable(key);
-
-                PerformOperation(key, new ParseIncrementOperation(amount));
-            }
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Atomically adds an object to the end of the list associated with the given key.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="value">The object to add.</param>
-        public void AddToList(string key, object value)
-        {
-            AddRangeToList(key, new[] { value });
-        }
-
-        /// <summary>
-        /// Atomically adds objects to the end of the list associated with the given key.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="values">The objects to add.</param>
-        public void AddRangeToList<T>(string key, IEnumerable<T> values)
-        {
-            lock (mutex)
-            {
-                CheckKeyIsMutable(key);
-
-                PerformOperation(key, new ParseAddOperation(values.Cast<object>()));
-            }
-        }
-
-        /// <summary>
-        /// Atomically adds an object to the end of the list associated with the given key,
-        /// only if it is not already present in the list. The position of the insert is not
-        /// guaranteed.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="value">The object to add.</param>
-        public void AddUniqueToList(string key, object value)
-        {
-            AddRangeUniqueToList(key, new object[] { value });
-        }
-
-        /// <summary>
-        /// Atomically adds objects to the end of the list associated with the given key,
-        /// only if they are not already present in the list. The position of the inserts are not
-        /// guaranteed.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="values">The objects to add.</param>
-        public void AddRangeUniqueToList<T>(string key, IEnumerable<T> values)
-        {
-            lock (mutex)
-            {
-                CheckKeyIsMutable(key);
-
-                PerformOperation(key, new ParseAddUniqueOperation(values.Cast<object>()));
-            }
-        }
-
-        /// <summary>
-        /// Atomically removes all instances of the objects in <paramref name="values"/>
-        /// from the list associated with the given key.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="values">The objects to remove.</param>
-        public void RemoveAllFromList<T>(string key, IEnumerable<T> values)
-        {
-            lock (mutex)
-            {
-                CheckKeyIsMutable(key);
-
-                PerformOperation(key, new ParseRemoveOperation(values.Cast<object>()));
-            }
-        }
-
-        /// <summary>
-        /// Returns whether this object has a particular key.
-        /// </summary>
-        /// <param name="key">The key to check for</param>
-        public bool ContainsKey(string key)
-        {
-            lock (mutex)
-            {
-                return estimatedData.ContainsKey(key);
-            }
-        }
-
-        /// <summary>
-        /// Gets a value for the key of a particular type.
-        /// <typeparam name="T">The type to convert the value to. Supported types are
-        /// ParseObject and its descendents, Parse types such as ParseRelation and ParseGeopoint,
-        /// primitive types,IList&lt;T&gt;, IDictionary&lt;string, T&gt;, and strings.</typeparam>
-        /// <param name="key">The key of the element to get.</param>
-        /// <exception cref="System.Collections.Generic.KeyNotFoundException">The property is
-        /// retrieved and <paramref name="key"/> is not found.</exception>
-        /// </summary>
-        public T Get<T>(string key)
-        {
-            return Conversion.To<T>(this[key]);
-        }
-
-        /// <summary>
-        /// Access or create a Relation value for a key.
-        /// </summary>
-        /// <typeparam name="T">The type of object to create a relation for.</typeparam>
-        /// <param name="key">The key for the relation field.</param>
-        /// <returns>A ParseRelation for the key.</returns>
-        public ParseRelation<T> GetRelation<T>(string key) where T : ParseObject
-        {
-            // All the sanity checking is done when add or remove is called.
-            TryGetValue(key, out ParseRelation<T> relation);
-            return relation ?? new ParseRelation<T>(this, key);
-        }
-
-        /// <summary>
-        /// Populates result with the value for the key, if possible.
-        /// </summary>
-        /// <typeparam name="T">The desired type for the value.</typeparam>
-        /// <param name="key">The key to retrieve a value for.</param>
-        /// <param name="result">The value for the given key, converted to the
-        /// requested type, or null if unsuccessful.</param>
-        /// <returns>true if the lookup and conversion succeeded, otherwise
-        /// false.</returns>
-        public bool TryGetValue<T>(string key, out T result)
-        {
-            lock (mutex)
-            {
-                if (ContainsKey(key))
-                {
-                    try
-                    {
-                        var temp = Conversion.To<T>(this[key]);
-                        result = temp;
-                        return true;
-                    }
-                    catch
-                    {
-                        result = default(T);
-                        return false;
-                    }
-                }
-                result = default(T);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Gets whether the ParseObject has been fetched.
-        /// </summary>
-        public bool IsDataAvailable
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    return hasBeenFetched;
-                }
-            }
-        }
-
-        private bool CheckIsDataAvailable(string key)
-        {
-            lock (mutex)
-            {
-                return IsDataAvailable || estimatedData.ContainsKey(key);
-            }
-        }
-
-        private void CheckGetAccess(string key)
-        {
-            lock (mutex)
-            {
-                if (!CheckIsDataAvailable(key))
-                {
-                    throw new InvalidOperationException(
-                        "ParseObject has no data for this key. Call FetchIfNeededAsync() to get the data.");
-                }
-            }
-        }
-
-        private void CheckKeyIsMutable(string key)
-        {
-            if (!IsKeyMutable(key))
-            {
-                throw new InvalidOperationException(
-                  "Cannot change the `" + key + "` property of a `" + ClassName + "` object.");
-            }
-        }
-
-        protected virtual bool IsKeyMutable(string key)
-        {
-            return true;
-        }
-
-        /// <summary>
-        /// A helper function for checking whether two ParseObjects point to
-        /// the same object in the cloud.
-        /// </summary>
-        public bool HasSameId(ParseObject other)
-        {
-            lock (mutex)
-            {
-                return other != null &&
-                    Equals(ClassName, other.ClassName) &&
-                    Equals(ObjectId, other.ObjectId);
-            }
-        }
-
-        internal IDictionary<string, IParseFieldOperation> CurrentOperations
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    return operationSetQueue.Last.Value;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets a set view of the keys contained in this object. This does not include createdAt,
-        /// updatedAt, or objectId. It does include things like username and ACL.
-        /// </summary>
-        public ICollection<string> Keys
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    return estimatedData.Keys;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the ParseACL governing this object.
-        /// </summary>
-        [ParseFieldName("ACL")]
-        public ParseACL ACL
-        {
-            get { return GetProperty<ParseACL>(null, "ACL"); }
-            set { SetProperty(value, "ACL"); }
-        }
-
-        /// <summary>
-        /// Returns true if this object was created by the Parse server when the
-        /// object might have already been there (e.g. in the case of a Facebook
-        /// login)
-        /// </summary>
-#if !UNITY
-        public
-#else
-    internal
-#endif
- bool IsNew
-        {
-            get
-            {
-                return state.IsNew;
-            }
-#if !UNITY
-            internal
-#endif
-      set
-            {
-                MutateState(mutableClone =>
-                {
-                    mutableClone.IsNew = value;
-                });
-                OnPropertyChanged("IsNew");
-            }
-        }
-
-        /// <summary>
-        /// Gets the last time this object was updated as the server sees it, so that if you make changes
-        /// to a ParseObject, then wait a while, and then call <see cref="SaveAsync()"/>, the updated time
-        /// will be the time of the <see cref="SaveAsync()"/> call rather than the time the object was
-        /// changed locally.
-        /// </summary>
-        [ParseFieldName("updatedAt")]
-        public DateTime? UpdatedAt
-        {
-            get
-            {
-                return state.UpdatedAt;
-            }
-        }
-
-        /// <summary>
-        /// Gets the first time this object was saved as the server sees it, so that if you create a
-        /// ParseObject, then wait a while, and then call <see cref="SaveAsync()"/>, the
-        /// creation time will be the time of the first <see cref="SaveAsync()"/> call rather than
-        /// the time the object was created locally.
-        /// </summary>
-        [ParseFieldName("createdAt")]
-        public DateTime? CreatedAt
-        {
-            get
-            {
-                return state.CreatedAt;
-            }
-        }
-
-        /// <summary>
-        /// Indicates whether this ParseObject has unsaved changes.
-        /// </summary>
-        public bool IsDirty
-        {
-            get
-            {
-                lock (mutex)
-                { return CheckIsDirty(true); }
-            }
-            internal set
-            {
-                lock (mutex)
-                {
-                    dirty = value;
-                    OnPropertyChanged("IsDirty");
-                }
-            }
-        }
-
-        /// <summary>
-        /// Indicates whether key is unsaved for this ParseObject.
-        /// </summary>
-        /// <param name="key">The key to check for.</param>
-        /// <returns><c>true</c> if the key has been altered and not saved yet, otherwise
-        /// <c>false</c>.</returns>
-        public bool IsKeyDirty(string key)
-        {
-            lock (mutex)
-            {
-                return CurrentOperations.ContainsKey(key);
-            }
-        }
-
-        private bool CheckIsDirty(bool considerChildren)
-        {
-            lock (mutex)
-            {
-                return (dirty || CurrentOperations.Count > 0 || (considerChildren && HasDirtyChildren));
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the object id. An object id is assigned as soon as an object is
-        /// saved to the server. The combination of a <see cref="ClassName"/> and an
-        /// <see cref="ObjectId"/> uniquely identifies an object in your application.
-        /// </summary>
-        [ParseFieldName("objectId")]
-        public string ObjectId
-        {
-            get
-            {
-                return state.ObjectId;
-            }
-            set
-            {
-                IsDirty = true;
-                SetObjectIdInternal(value);
-            }
-        }
-        /// <summary>
-        /// Sets the objectId without marking dirty.
-        /// </summary>
-        /// <param name="objectId">The new objectId</param>
-        private void SetObjectIdInternal(string objectId)
-        {
-            lock (mutex)
-            {
-                MutateState(mutableClone =>
-                {
-                    mutableClone.ObjectId = objectId;
-                });
-                OnPropertyChanged("ObjectId");
-            }
-        }
-
-        /// <summary>
-        /// Gets the class name for the ParseObject.
-        /// </summary>
-        public string ClassName
-        {
-            get
-            {
-                return state.ClassName;
-            }
-        }
-
-        /// <summary>
-        /// Adds a value for the given key, throwing an Exception if the key
-        /// already has a value.
-        /// </summary>
-        /// <remarks>
-        /// This allows you to use collection initialization syntax when creating ParseObjects,
-        /// such as:
-        /// <code>
-        /// var obj = new ParseObject("MyType")
-        /// {
-        ///     {"name", "foo"},
-        ///     {"count", 10},
-        ///     {"found", false}
-        /// };
-        /// </code>
-        /// </remarks>
-        /// <param name="key">The key for which a value should be set.</param>
-        /// <param name="value">The value for the key.</param>
-        public void Add(string key, object value)
-        {
-            lock (mutex)
-            {
-                if (this.ContainsKey(key))
-                {
-                    throw new ArgumentException("Key already exists", key);
-                }
-                this[key] = value;
-            }
-        }
-
-        IEnumerator<KeyValuePair<string, object>> IEnumerable<KeyValuePair<string, object>>
-            .GetEnumerator()
-        {
-            lock (mutex)
-            {
-                return estimatedData.GetEnumerator();
-            }
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            lock (mutex)
-            {
-                return ((IEnumerable<KeyValuePair<string, object>>) this).GetEnumerator();
-            }
-        }
-
-        /// <summary>
-        /// Gets a <see cref="ParseQuery{ParseObject}"/> for the type of object specified by
-        /// <paramref name="className"/>
-        /// </summary>
-        /// <param name="className">The class name of the object.</param>
-        /// <returns>A new <see cref="ParseQuery{ParseObject}"/>.</returns>
-        public static ParseQuery<ParseObject> GetQuery(string className)
-        {
-            // Since we can't return a ParseQuery<ParseUser> (due to strong-typing with
-            // generics), we'll require you to go through subclasses. This is a better
-            // experience anyway, especially with LINQ integration, since you'll get
-            // strongly-typed queries and compile-time checking of property names and
-            // types.
-            if (SubclassingController.GetType(className) != null)
-            {
-                throw new ArgumentException(
-                  "Use the class-specific query properties for class " + className, "className");
-            }
-            return new ParseQuery<ParseObject>(className);
-        }
-
-        /// <summary>
-        /// Raises change notifications for all properties associated with the given
-        /// field names. If fieldNames is null, this will notify for all known field-linked
-        /// properties (e.g. this happens when we recalculate all estimated data from scratch)
-        /// </summary>
-        protected void OnFieldsChanged(IEnumerable<string> fieldNames)
-        {
-            var mappings = SubclassingController.GetPropertyMappings(ClassName);
-            IEnumerable<string> properties;
-
-            if (fieldNames != null && mappings != null)
-            {
-                properties = from m in mappings
-                             join f in fieldNames on m.Value equals f
-                             select m.Key;
-            }
-            else if (mappings != null)
-            {
-                properties = mappings.Keys;
-            }
-            else
-            {
-                properties = Enumerable.Empty<string>();
-            }
-
-            foreach (var property in properties)
-            {
-                OnPropertyChanged(property);
-            }
-            OnPropertyChanged("Item[]");
-        }
-
-        /// <summary>
-        /// Raises change notifications for a property. Passing null or the empty string
-        /// notifies the binding framework that all properties/indexes have changed.
-        /// Passing "Item[]" tells the binding framework that all indexed values
-        /// have changed (but not all properties)
-        /// </summary>
-        protected void OnPropertyChanged(
-#if !UNITY
-[CallerMemberName] string propertyName = null
-#else
-string propertyName
-#endif
-)
-        {
-            propertyChanged.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-
-        private SynchronizedEventHandler<PropertyChangedEventArgs> propertyChanged =
-            new SynchronizedEventHandler<PropertyChangedEventArgs>();
-        /// <summary>
-        /// Occurs when a property value changes.
-        /// </summary>
-        public event PropertyChangedEventHandler PropertyChanged
-        {
-            add
-            {
-                propertyChanged.Add(value);
-            }
-            remove
-            {
-                propertyChanged.Remove(value);
-            }
-        }
-    }
-}
diff --git a/Parse/Public/ParsePush.cs b/Parse/Public/ParsePush.cs
deleted file mode 100644
index 7b97da1c..00000000
--- a/Parse/Public/ParsePush.cs
+++ /dev/null
@@ -1,556 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Parse.Push.Internal;
-using Parse.Core.Internal;
-using Parse.Common.Internal;
-
-namespace Parse
-{
-    /// <summary>
-    ///  A utility class for sending and receiving push notifications.
-    /// </summary>
-    public partial class ParsePush
-    {
-        private object mutex;
-        private IPushState state;
-
-        /// <summary>
-        /// Creates a push which will target every device. The Data field must be set before calling SendAsync.
-        /// </summary>
-        public ParsePush()
-        {
-            mutex = new object();
-            // Default to everyone.
-            state = new MutablePushState
-            {
-                Query = ParseInstallation.Query
-            };
-        }
-
-        #region Properties
-
-        /// <summary>
-        /// An installation query that specifies which installations should receive
-        /// this push.
-        /// This should not be used in tandem with Channels.
-        /// </summary>
-        public ParseQuery<ParseInstallation> Query
-        {
-            get { return state.Query; }
-            set
-            {
-                MutateState(s =>
-                {
-                    if (s.Channels != null && value != null && value.GetConstraint("channels") != null)
-                    {
-                        throw new InvalidOperationException("A push may not have both Channels and a Query with a channels constraint");
-                    }
-                    s.Query = value;
-                });
-            }
-        }
-
-        /// <summary>
-        /// A short-hand to set a query which only discriminates on the channels to which a device is subscribed.
-        /// This is shorthand for:
-        ///
-        /// <code>
-        /// var push = new Push();
-        /// push.Query = ParseInstallation.Query.WhereKeyContainedIn("channels", channels);
-        /// </code>
-        ///
-        /// This cannot be used in tandem with Query.
-        /// </summary>
-        public IEnumerable<string> Channels
-        {
-            get { return state.Channels; }
-            set
-            {
-                MutateState(s =>
-                {
-                    if (value != null && s.Query != null && s.Query.GetConstraint("channels") != null)
-                    {
-                        throw new InvalidOperationException("A push may not have both Channels and a Query with a channels constraint");
-                    }
-                    s.Channels = value;
-                });
-            }
-        }
-
-        /// <summary>
-        /// The time at which this push will expire. This should not be used in tandem with ExpirationInterval.
-        /// </summary>
-        public DateTime? Expiration
-        {
-            get { return state.Expiration; }
-            set
-            {
-                MutateState(s =>
-                {
-                    if (s.ExpirationInterval != null)
-                    {
-                        throw new InvalidOperationException("Cannot set Expiration after setting ExpirationInterval");
-                    }
-                    s.Expiration = value;
-                });
-            }
-        }
-
-        /// <summary>
-        /// The time at which this push will be sent.
-        /// </summary>
-        public DateTime? PushTime
-        {
-            get { return state.PushTime; }
-            set
-            {
-                MutateState(s =>
-                {
-                    DateTime now = DateTime.Now;
-                    if (value < now || value > now.AddDays(14))
-                    {
-                        throw new InvalidOperationException("Cannot set PushTime in the past or more than two weeks later than now");
-                    }
-                    s.PushTime = value;
-                });
-            }
-        }
-
-        /// <summary>
-        /// The time from initial schedul when this push will expire. This should not be used in tandem with Expiration.
-        /// </summary>
-        public TimeSpan? ExpirationInterval
-        {
-            get { return state.ExpirationInterval; }
-            set
-            {
-                MutateState(s =>
-                {
-                    if (s.Expiration != null)
-                    {
-                        throw new InvalidOperationException("Cannot set ExpirationInterval after setting Expiration");
-                    }
-                    s.ExpirationInterval = value;
-                });
-            }
-        }
-
-        /// <summary>
-        /// The contents of this push. Some keys have special meaning. A full list of pre-defined
-        /// keys can be found in the Parse Push Guide. The following keys affect WinRT devices.
-        /// Keys which do not start with x-winrt- can be prefixed with x-winrt- to specify an
-        /// override only sent to winrt devices.
-        /// alert: the body of the alert text.
-        /// title: The title of the text.
-        /// x-winrt-payload: A full XML payload to be sent to WinRT installations instead of
-        ///      the auto-layout.
-        /// This should not be used in tandem with Alert.
-        /// </summary>
-        public IDictionary<string, object> Data
-        {
-            get { return state.Data; }
-            set
-            {
-                MutateState(s =>
-                {
-                    if (s.Alert != null && value != null)
-                    {
-                        throw new InvalidOperationException("A push may not have both an Alert and Data");
-                    }
-                    s.Data = value;
-                });
-            }
-        }
-
-        /// <summary>
-        /// A convenience method which sets Data to a dictionary with alert as its only field. Equivalent to
-        ///
-        /// <code>
-        /// Data = new Dictionary&lt;string, object&gt; {{"alert", alert}};
-        /// </code>
-        ///
-        /// This should not be used in tandem with Data.
-        /// </summary>
-        public string Alert
-        {
-            get { return state.Alert; }
-            set
-            {
-                MutateState(s =>
-                {
-                    if (s.Data != null && value != null)
-                    {
-                        throw new InvalidOperationException("A push may not have both an Alert and Data");
-                    }
-                    s.Alert = value;
-                });
-            }
-        }
-
-        #endregion
-
-        internal IDictionary<string, object> Encode()
-        {
-            return ParsePushEncoder.Instance.Encode(state);
-        }
-
-        private void MutateState(Action<MutablePushState> func)
-        {
-            lock (mutex)
-            {
-                state = state.MutatedClone(func);
-            }
-        }
-
-        private static IParsePushController PushController
-        {
-            get
-            {
-                return ParsePushPlugins.Instance.PushController;
-            }
-        }
-
-        private static IParsePushChannelsController PushChannelsController
-        {
-            get
-            {
-                return ParsePushPlugins.Instance.PushChannelsController;
-            }
-        }
-
-        #region Sending Push
-
-        /// <summary>
-        /// Request a push to be sent. When this task completes, Parse has successfully acknowledged a request
-        /// to send push notifications but has not necessarily finished sending all notifications
-        /// requested. The current status of recent push notifications can be seen in your Push Notifications
-        /// console on http://parse.com
-        /// </summary>
-        /// <returns>A Task for continuation.</returns>
-        public Task SendAsync()
-        {
-            return SendAsync(CancellationToken.None);
-        }
-
-        /// <summary>
-        /// Request a push to be sent. When this task completes, Parse has successfully acknowledged a request
-        /// to send push notifications but has not necessarily finished sending all notifications
-        /// requested. The current status of recent push notifications can be seen in your Push Notifications
-        /// console on http://parse.com
-        /// </summary>
-        /// <param name="cancellationToken">CancellationToken to cancel the current operation.</param>
-        public Task SendAsync(CancellationToken cancellationToken)
-        {
-            return PushController.SendPushNotificationAsync(state, cancellationToken);
-        }
-
-        /// <summary>
-        /// Pushes a simple message to every device. This is shorthand for:
-        ///
-        /// <code>
-        /// var push = new ParsePush();
-        /// push.Data = new Dictionary&lt;string, object&gt;{{"alert", alert}};
-        /// return push.SendAsync();
-        /// </code>
-        /// </summary>
-        /// <param name="alert">The alert message to send.</param>
-        public static Task SendAlertAsync(string alert)
-        {
-            var push = new ParsePush();
-            push.Alert = alert;
-            return push.SendAsync();
-        }
-
-        /// <summary>
-        /// Pushes a simple message to every device subscribed to channel. This is shorthand for:
-        ///
-        /// <code>
-        /// var push = new ParsePush();
-        /// push.Channels = new List&lt;string&gt; { channel };
-        /// push.Data = new Dictionary&lt;string, object&gt;{{"alert", alert}};
-        /// return push.SendAsync();
-        /// </code>
-        /// </summary>
-        /// <param name="alert">The alert message to send.</param>
-        /// <param name="channel">An Installation must be subscribed to channel to receive this Push Notification.</param>
-        public static Task SendAlertAsync(string alert, string channel)
-        {
-            var push = new ParsePush();
-            push.Channels = new List<string> { channel };
-            push.Alert = alert;
-            return push.SendAsync();
-        }
-
-        /// <summary>
-        /// Pushes a simple message to every device subscribed to any of channels. This is shorthand for:
-        ///
-        /// <code>
-        /// var push = new ParsePush();
-        /// push.Channels = channels;
-        /// push.Data = new Dictionary&lt;string, object&gt;{{"alert", alert}};
-        /// return push.SendAsync();
-        /// </code>
-        /// </summary>
-        /// <param name="alert">The alert message to send.</param>
-        /// <param name="channels">An Installation must be subscribed to any of channels to receive this Push Notification.</param>
-        public static Task SendAlertAsync(string alert, IEnumerable<string> channels)
-        {
-            var push = new ParsePush();
-            push.Channels = channels;
-            push.Alert = alert;
-            return push.SendAsync();
-        }
-
-        /// <summary>
-        /// Pushes a simple message to every device matching the target query. This is shorthand for:
-        ///
-        /// <code>
-        /// var push = new ParsePush();
-        /// push.Query = query;
-        /// push.Data = new Dictionary&lt;string, object&gt;{{"alert", alert}};
-        /// return push.SendAsync();
-        /// </code>
-        /// </summary>
-        /// <param name="alert">The alert message to send.</param>
-        /// <param name="query">A query filtering the devices which should receive this Push Notification.</param>
-        public static Task SendAlertAsync(string alert, ParseQuery<ParseInstallation> query)
-        {
-            var push = new ParsePush();
-            push.Query = query;
-            push.Alert = alert;
-            return push.SendAsync();
-        }
-
-        /// <summary>
-        /// Pushes an arbitrary payload to every device. This is shorthand for:
-        ///
-        /// <code>
-        /// var push = new ParsePush();
-        /// push.Data = data;
-        /// return push.SendAsync();
-        /// </code>
-        /// </summary>
-        /// <param name="data">A push payload. See the ParsePush.Data property for more information.</param>
-        public static Task SendDataAsync(IDictionary<string, object> data)
-        {
-            var push = new ParsePush();
-            push.Data = data;
-            return push.SendAsync();
-        }
-
-        /// <summary>
-        /// Pushes an arbitrary payload to every device subscribed to channel. This is shorthand for:
-        ///
-        /// <code>
-        /// var push = new ParsePush();
-        /// push.Channels = new List&lt;string&gt; { channel };
-        /// push.Data = data;
-        /// return push.SendAsync();
-        /// </code>
-        /// </summary>
-        /// <param name="data">A push payload. See the ParsePush.Data property for more information.</param>
-        /// <param name="channel">An Installation must be subscribed to channel to receive this Push Notification.</param>
-        public static Task SendDataAsync(IDictionary<string, object> data, string channel)
-        {
-            var push = new ParsePush();
-            push.Channels = new List<string> { channel };
-            push.Data = data;
-            return push.SendAsync();
-        }
-
-        /// <summary>
-        /// Pushes an arbitrary payload to every device subscribed to any of channels. This is shorthand for:
-        ///
-        /// <code>
-        /// var push = new ParsePush();
-        /// push.Channels = channels;
-        /// push.Data = data;
-        /// return push.SendAsync();
-        /// </code>
-        /// </summary>
-        /// <param name="data">A push payload. See the ParsePush.Data property for more information.</param>
-        /// <param name="channels">An Installation must be subscribed to any of channels to receive this Push Notification.</param>
-        public static Task SendDataAsync(IDictionary<string, object> data, IEnumerable<string> channels)
-        {
-            var push = new ParsePush();
-            push.Channels = channels;
-            push.Data = data;
-            return push.SendAsync();
-        }
-
-        /// <summary>
-        /// Pushes an arbitrary payload to every device matching target. This is shorthand for:
-        ///
-        /// <code>
-        /// var push = new ParsePush();
-        /// push.Query = query
-        /// push.Data = data;
-        /// return push.SendAsync();
-        /// </code>
-        /// </summary>
-        /// <param name="data">A push payload. See the ParsePush.Data property for more information.</param>
-        /// <param name="query">A query filtering the devices which should receive this Push Notification.</param>
-        public static Task SendDataAsync(IDictionary<string, object> data, ParseQuery<ParseInstallation> query)
-        {
-            var push = new ParsePush();
-            push.Query = query;
-            push.Data = data;
-            return push.SendAsync();
-        }
-
-        #endregion
-
-        #region Receiving Push
-
-        /// <summary>
-        /// An event fired when a push notification is received.
-        /// </summary>
-        public static event EventHandler<ParsePushNotificationEventArgs> ParsePushNotificationReceived
-        {
-            add
-            {
-                parsePushNotificationReceived.Add(value);
-            }
-            remove
-            {
-                parsePushNotificationReceived.Remove(value);
-            }
-        }
-
-        internal static readonly SynchronizedEventHandler<ParsePushNotificationEventArgs> parsePushNotificationReceived = new SynchronizedEventHandler<ParsePushNotificationEventArgs>();
-
-        #endregion
-
-        #region Push Subscription
-
-        /// <summary>
-        /// Subscribe the current installation to this channel. This is shorthand for:
-        ///
-        /// <code>
-        /// var installation = ParseInstallation.CurrentInstallation;
-        /// installation.AddUniqueToList("channels", channel);
-        /// installation.SaveAsync();
-        /// </code>
-        /// </summary>
-        /// <param name="channel">The channel to which this installation should subscribe.</param>
-        public static Task SubscribeAsync(string channel)
-        {
-            return SubscribeAsync(new List<string> { channel }, CancellationToken.None);
-        }
-
-        /// <summary>
-        /// Subscribe the current installation to this channel. This is shorthand for:
-        ///
-        /// <code>
-        /// var installation = ParseInstallation.CurrentInstallation;
-        /// installation.AddUniqueToList("channels", channel);
-        /// installation.SaveAsync(cancellationToken);
-        /// </code>
-        /// </summary>
-        /// <param name="channel">The channel to which this installation should subscribe.</param>
-        /// <param name="cancellationToken">CancellationToken to cancel the current operation.</param>
-        public static Task SubscribeAsync(string channel, CancellationToken cancellationToken)
-        {
-            return SubscribeAsync(new List<string> { channel }, cancellationToken);
-        }
-
-        /// <summary>
-        /// Subscribe the current installation to these channels. This is shorthand for:
-        ///
-        /// <code>
-        /// var installation = ParseInstallation.CurrentInstallation;
-        /// installation.AddRangeUniqueToList("channels", channels);
-        /// installation.SaveAsync();
-        /// </code>
-        /// </summary>
-        /// <param name="channels">The channels to which this installation should subscribe.</param>
-        public static Task SubscribeAsync(IEnumerable<string> channels)
-        {
-            return SubscribeAsync(channels, CancellationToken.None);
-        }
-
-        /// <summary>
-        /// Subscribe the current installation to these channels. This is shorthand for:
-        ///
-        /// <code>
-        /// var installation = ParseInstallation.CurrentInstallation;
-        /// installation.AddRangeUniqueToList("channels", channels);
-        /// installation.SaveAsync(cancellationToken);
-        /// </code>
-        /// </summary>
-        /// <param name="channels">The channels to which this installation should subscribe.</param>
-        /// <param name="cancellationToken">CancellationToken to cancel the current operation.</param>
-        public static Task SubscribeAsync(IEnumerable<string> channels, CancellationToken cancellationToken)
-        {
-            return PushChannelsController.SubscribeAsync(channels, cancellationToken);
-        }
-
-        /// <summary>
-        /// Unsubscribe the current installation from this channel. This is shorthand for:
-        ///
-        /// <code>
-        /// var installation = ParseInstallation.CurrentInstallation;
-        /// installation.Remove("channels", channel);
-        /// installation.SaveAsync();
-        /// </code>
-        /// </summary>
-        /// <param name="channel">The channel from which this installation should unsubscribe.</param>
-        public static Task UnsubscribeAsync(string channel)
-        {
-            return UnsubscribeAsync(new List<string> { channel }, CancellationToken.None);
-        }
-
-        /// <summary>
-        /// Unsubscribe the current installation from this channel. This is shorthand for:
-        ///
-        /// <code>
-        /// var installation = ParseInstallation.CurrentInstallation;
-        /// installation.Remove("channels", channel);
-        /// installation.SaveAsync(cancellationToken);
-        /// </code>
-        /// </summary>
-        /// <param name="channel">The channel from which this installation should unsubscribe.</param>
-        /// <param name="cancellationToken">CancellationToken to cancel the current operation.</param>
-        public static Task UnsubscribeAsync(string channel, CancellationToken cancellationToken)
-        {
-            return UnsubscribeAsync(new List<string> { channel }, cancellationToken);
-        }
-
-        /// <summary>
-        /// Unsubscribe the current installation from these channels. This is shorthand for:
-        ///
-        /// <code>
-        /// var installation = ParseInstallation.CurrentInstallation;
-        /// installation.RemoveAllFromList("channels", channels);
-        /// installation.SaveAsync();
-        /// </code>
-        /// </summary>
-        /// <param name="channels">The channels from which this installation should unsubscribe.</param>
-        public static Task UnsubscribeAsync(IEnumerable<string> channels)
-        {
-            return UnsubscribeAsync(channels, CancellationToken.None);
-        }
-
-        /// <summary>
-        /// Unsubscribe the current installation from these channels. This is shorthand for:
-        ///
-        /// <code>
-        /// var installation = ParseInstallation.CurrentInstallation;
-        /// installation.RemoveAllFromList("channels", channels);
-        /// installation.SaveAsync(cancellationToken);
-        /// </code>
-        /// </summary>
-        /// <param name="channels">The channels from which this installation should unsubscribe.</param>
-        /// <param name="cancellationToken">CancellationToken to cancel the current operation.</param>
-        public static Task UnsubscribeAsync(IEnumerable<string> channels, CancellationToken cancellationToken)
-        {
-            return PushChannelsController.UnsubscribeAsync(channels, cancellationToken);
-        }
-
-        #endregion
-    }
-}
diff --git a/Parse/Public/ParseQueryExtensions.cs b/Parse/Public/ParseQueryExtensions.cs
deleted file mode 100644
index 6b0d370b..00000000
--- a/Parse/Public/ParseQueryExtensions.cs
+++ /dev/null
@@ -1,823 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using Parse.Common.Internal;
-using Parse.Core.Internal;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-
-namespace Parse
-{
-    /// <summary>
-    /// Provides extension methods for <see cref="ParseQuery{T}"/> to support
-    /// Linq-style queries.
-    /// </summary>
-    public static class ParseQueryExtensions
-    {
-        private static readonly MethodInfo getMethod;
-        private static readonly MethodInfo stringContains;
-        private static readonly MethodInfo stringStartsWith;
-        private static readonly MethodInfo stringEndsWith;
-        private static readonly MethodInfo containsMethod;
-        private static readonly MethodInfo notContainsMethod;
-        private static readonly MethodInfo containsKeyMethod;
-        private static readonly MethodInfo notContainsKeyMethod;
-        private static readonly Dictionary<MethodInfo, MethodInfo> functionMappings;
-        static ParseQueryExtensions()
-        {
-            getMethod = GetMethod<ParseObject>(obj => obj.Get<int>(null)).GetGenericMethodDefinition();
-            stringContains = GetMethod<string>(str => str.Contains(null));
-            stringStartsWith = GetMethod<string>(str => str.StartsWith(null));
-            stringEndsWith = GetMethod<string>(str => str.EndsWith(null));
-            functionMappings = new Dictionary<MethodInfo, MethodInfo> {
-        {
-          stringContains,
-          GetMethod<ParseQuery<ParseObject>>(q => q.WhereContains(null, null))
-        },
-        {
-          stringStartsWith,
-          GetMethod<ParseQuery<ParseObject>>(q => q.WhereStartsWith(null, null))
-        },
-        {
-          stringEndsWith,
-          GetMethod<ParseQuery<ParseObject>>(q => q.WhereEndsWith(null,null))
-        },
-      };
-            containsMethod = GetMethod<object>(
-                o => ParseQueryExtensions.ContainsStub<object>(null, null)).GetGenericMethodDefinition();
-            notContainsMethod = GetMethod<object>(
-                o => ParseQueryExtensions.NotContainsStub<object>(null, null))
-                    .GetGenericMethodDefinition();
-
-            containsKeyMethod = GetMethod<object>(o => ParseQueryExtensions.ContainsKeyStub(null, null));
-            notContainsKeyMethod = GetMethod<object>(
-              o => ParseQueryExtensions.NotContainsKeyStub(null, null));
-        }
-
-        /// <summary>
-        /// Gets a MethodInfo for a top-level method call.
-        /// </summary>
-        private static MethodInfo GetMethod<T>(Expression<Action<T>> expression)
-        {
-            return (expression.Body as MethodCallExpression).Method;
-        }
-
-        /// <summary>
-        /// When a query is normalized, this is a placeholder to indicate we should
-        /// add a WhereContainedIn() clause.
-        /// </summary>
-        private static bool ContainsStub<T>(object collection, T value)
-        {
-            throw new NotImplementedException(
-                "Exists only for expression translation as a placeholder.");
-        }
-
-        /// <summary>
-        /// When a query is normalized, this is a placeholder to indicate we should
-        /// add a WhereNotContainedIn() clause.
-        /// </summary>
-        private static bool NotContainsStub<T>(object collection, T value)
-        {
-            throw new NotImplementedException(
-                "Exists only for expression translation as a placeholder.");
-        }
-
-        /// <summary>
-        /// When a query is normalized, this is a placeholder to indicate that we should
-        /// add a WhereExists() clause.
-        /// </summary>
-        private static bool ContainsKeyStub(ParseObject obj, string key)
-        {
-            throw new NotImplementedException(
-                "Exists only for expression translation as a placeholder.");
-        }
-
-        /// <summary>
-        /// When a query is normalized, this is a placeholder to indicate that we should
-        /// add a WhereDoesNotExist() clause.
-        /// </summary>
-        private static bool NotContainsKeyStub(ParseObject obj, string key)
-        {
-            throw new NotImplementedException(
-                "Exists only for expression translation as a placeholder.");
-        }
-
-        /// <summary>
-        /// Evaluates an expression and throws if the expression has components that can't be
-        /// evaluated (e.g. uses the parameter that's only represented by an object on the server).
-        /// </summary>
-        private static object GetValue(Expression exp)
-        {
-            try
-            {
-                return Expression.Lambda(
-                    typeof(Func<>).MakeGenericType(exp.Type), exp).Compile().DynamicInvoke();
-            }
-            catch (Exception e)
-            {
-                throw new InvalidOperationException("Unable to evaluate expression: " + exp, e);
-            }
-        }
-
-        /// <summary>
-        /// Checks whether the MethodCallExpression is a call to ParseObject.Get(),
-        /// which is the call we normalize all indexing into the ParseObject to.
-        /// </summary>
-        private static bool IsParseObjectGet(MethodCallExpression node)
-        {
-            if (node == null || node.Object == null)
-            {
-                return false;
-            }
-            if (!typeof(ParseObject).GetTypeInfo().IsAssignableFrom(node.Object.Type.GetTypeInfo()))
-            {
-                return false;
-            }
-            return node.Method.IsGenericMethod && node.Method.GetGenericMethodDefinition() == getMethod;
-        }
-
-
-        /// <summary>
-        /// Visits an Expression, converting ParseObject.Get/ParseObject[]/ParseObject.Property,
-        /// and nested indices into a single call to ParseObject.Get() with a "field path" like
-        /// "foo.bar.baz"
-        /// </summary>
-        private class ObjectNormalizer : ExpressionVisitor
-        {
-            protected override Expression VisitIndex(IndexExpression node)
-            {
-                var visitedObject = Visit(node.Object);
-                var indexer = visitedObject as MethodCallExpression;
-                if (IsParseObjectGet(indexer))
-                {
-                    var indexValue = GetValue(node.Arguments[0]) as string;
-                    if (indexValue == null)
-                    {
-                        throw new InvalidOperationException("Index must be a string");
-                    }
-                    var newPath = GetValue(indexer.Arguments[0]) + "." + indexValue;
-                    return Expression.Call(indexer.Object,
-                        getMethod.MakeGenericMethod(node.Type),
-                        Expression.Constant(newPath, typeof(string)));
-                }
-                return base.VisitIndex(node);
-            }
-
-            /// <summary>
-            /// Check for a ParseFieldName attribute and use that as the path component, turning
-            /// properties like foo.ObjectId into foo.Get("objectId")
-            /// </summary>
-            protected override Expression VisitMember(MemberExpression node)
-            {
-                var fieldName = node.Member.GetCustomAttribute<ParseFieldNameAttribute>();
-                if (fieldName != null &&
-                    typeof(ParseObject).GetTypeInfo().IsAssignableFrom(node.Expression.Type.GetTypeInfo()))
-                {
-                    var newPath = fieldName.FieldName;
-                    return Expression.Call(node.Expression,
-                        getMethod.MakeGenericMethod(node.Type),
-                        Expression.Constant(newPath, typeof(string)));
-                }
-                return base.VisitMember(node);
-            }
-
-            /// <summary>
-            /// If a ParseObject.Get() call has been cast, just change the generic parameter.
-            /// </summary>
-            protected override Expression VisitUnary(UnaryExpression node)
-            {
-                var methodCall = Visit(node.Operand) as MethodCallExpression;
-                if ((node.NodeType == ExpressionType.Convert ||
-                    node.NodeType == ExpressionType.ConvertChecked) &&
-                    IsParseObjectGet(methodCall))
-                {
-                    return Expression.Call(methodCall.Object,
-                        getMethod.MakeGenericMethod(node.Type),
-                        methodCall.Arguments);
-                }
-                return base.VisitUnary(node);
-            }
-
-            protected override Expression VisitMethodCall(MethodCallExpression node)
-            {
-                // Turn parseObject["foo"] into parseObject.Get<object>("foo")
-                if (node.Method.Name == "get_Item" && node.Object is ParameterExpression)
-                {
-                    var indexPath = GetValue(node.Arguments[0]) as string;
-                    return Expression.Call(node.Object,
-                        getMethod.MakeGenericMethod(typeof(object)),
-                        Expression.Constant(indexPath, typeof(string)));
-                }
-
-                // Turn parseObject.Get<object>("foo")["bar"] into parseObject.Get<object>("foo.bar")
-                if (node.Method.Name == "get_Item" || IsParseObjectGet(node))
-                {
-                    var visitedObject = Visit(node.Object);
-                    var indexer = visitedObject as MethodCallExpression;
-                    if (IsParseObjectGet(indexer))
-                    {
-                        var indexValue = GetValue(node.Arguments[0]) as string;
-                        if (indexValue == null)
-                        {
-                            throw new InvalidOperationException("Index must be a string");
-                        }
-                        var newPath = GetValue(indexer.Arguments[0]) + "." + indexValue;
-                        return Expression.Call(indexer.Object,
-                            getMethod.MakeGenericMethod(node.Type),
-                            Expression.Constant(newPath, typeof(string)));
-                    }
-                }
-                return base.VisitMethodCall(node);
-            }
-        }
-
-        /// <summary>
-        /// Normalizes Where expressions.
-        /// </summary>
-        private class WhereNormalizer : ExpressionVisitor
-        {
-
-            /// <summary>
-            /// Normalizes binary operators. &lt;, &gt;, &lt;=, &gt;= !=, and ==
-            /// This puts the ParseObject.Get() on the left side of the operation
-            /// (reversing it if necessary), and normalizes the ParseObject.Get()
-            /// </summary>
-            protected override Expression VisitBinary(BinaryExpression node)
-            {
-                var leftTransformed = new ObjectNormalizer().Visit(node.Left) as MethodCallExpression;
-                var rightTransformed = new ObjectNormalizer().Visit(node.Right) as MethodCallExpression;
-
-                MethodCallExpression objectExpression;
-                Expression filterExpression;
-                bool inverted;
-                if (leftTransformed != null)
-                {
-                    objectExpression = leftTransformed;
-                    filterExpression = node.Right;
-                    inverted = false;
-                }
-                else
-                {
-                    objectExpression = rightTransformed;
-                    filterExpression = node.Left;
-                    inverted = true;
-                }
-
-                try
-                {
-                    switch (node.NodeType)
-                    {
-                        case ExpressionType.GreaterThan:
-                            if (inverted)
-                            {
-                                return Expression.LessThan(objectExpression, filterExpression);
-                            }
-                            else
-                            {
-                                return Expression.GreaterThan(objectExpression, filterExpression);
-                            }
-                        case ExpressionType.GreaterThanOrEqual:
-                            if (inverted)
-                            {
-                                return Expression.LessThanOrEqual(objectExpression, filterExpression);
-                            }
-                            else
-                            {
-                                return Expression.GreaterThanOrEqual(objectExpression, filterExpression);
-                            }
-                        case ExpressionType.LessThan:
-                            if (inverted)
-                            {
-                                return Expression.GreaterThan(objectExpression, filterExpression);
-                            }
-                            else
-                            {
-                                return Expression.LessThan(objectExpression, filterExpression);
-                            }
-                        case ExpressionType.LessThanOrEqual:
-                            if (inverted)
-                            {
-                                return Expression.GreaterThanOrEqual(objectExpression, filterExpression);
-                            }
-                            else
-                            {
-                                return Expression.LessThanOrEqual(objectExpression, filterExpression);
-                            }
-                        case ExpressionType.Equal:
-                            return Expression.Equal(objectExpression, filterExpression);
-                        case ExpressionType.NotEqual:
-                            return Expression.NotEqual(objectExpression, filterExpression);
-                    }
-                }
-                catch (ArgumentException)
-                {
-                    throw new InvalidOperationException("Operation not supported: " + node);
-                }
-                return base.VisitBinary(node);
-            }
-
-            /// <summary>
-            /// If a ! operator is used, this removes the ! and instead calls the equivalent
-            /// function (so e.g. == becomes !=, &lt; becomes &gt;=, Contains becomes NotContains)
-            /// </summary>
-            protected override Expression VisitUnary(UnaryExpression node)
-            {
-                // Normalizes inversion
-                if (node.NodeType == ExpressionType.Not)
-                {
-                    var visitedOperand = Visit(node.Operand);
-                    var binaryOperand = visitedOperand as BinaryExpression;
-                    if (binaryOperand != null)
-                    {
-                        switch (binaryOperand.NodeType)
-                        {
-                            case ExpressionType.GreaterThan:
-                                return Expression.LessThanOrEqual(binaryOperand.Left, binaryOperand.Right);
-                            case ExpressionType.GreaterThanOrEqual:
-                                return Expression.LessThan(binaryOperand.Left, binaryOperand.Right);
-                            case ExpressionType.LessThan:
-                                return Expression.GreaterThanOrEqual(binaryOperand.Left, binaryOperand.Right);
-                            case ExpressionType.LessThanOrEqual:
-                                return Expression.GreaterThan(binaryOperand.Left, binaryOperand.Right);
-                            case ExpressionType.Equal:
-                                return Expression.NotEqual(binaryOperand.Left, binaryOperand.Right);
-                            case ExpressionType.NotEqual:
-                                return Expression.Equal(binaryOperand.Left, binaryOperand.Right);
-                        }
-                    }
-
-                    var methodCallOperand = visitedOperand as MethodCallExpression;
-                    if (methodCallOperand != null)
-                    {
-                        if (methodCallOperand.Method.IsGenericMethod)
-                        {
-                            if (methodCallOperand.Method.GetGenericMethodDefinition() == containsMethod)
-                            {
-                                var genericNotContains = notContainsMethod.MakeGenericMethod(
-                                    methodCallOperand.Method.GetGenericArguments());
-                                return Expression.Call(genericNotContains, methodCallOperand.Arguments.ToArray());
-                            }
-                            if (methodCallOperand.Method.GetGenericMethodDefinition() == notContainsMethod)
-                            {
-                                var genericContains = containsMethod.MakeGenericMethod(
-                                    methodCallOperand.Method.GetGenericArguments());
-                                return Expression.Call(genericContains, methodCallOperand.Arguments.ToArray());
-                            }
-                        }
-                        if (methodCallOperand.Method == containsKeyMethod)
-                        {
-                            return Expression.Call(notContainsKeyMethod, methodCallOperand.Arguments.ToArray());
-                        }
-                        if (methodCallOperand.Method == notContainsKeyMethod)
-                        {
-                            return Expression.Call(containsKeyMethod, methodCallOperand.Arguments.ToArray());
-                        }
-                    }
-                }
-                return base.VisitUnary(node);
-            }
-
-            /// <summary>
-            /// Normalizes .Equals into == and Contains() into the appropriate stub.
-            /// </summary>
-            protected override Expression VisitMethodCall(MethodCallExpression node)
-            {
-                // Convert .Equals() into ==
-                if (node.Method.Name == "Equals" &&
-                    node.Method.ReturnType == typeof(bool) &&
-                    node.Method.GetParameters().Length == 1)
-                {
-                    var obj = new ObjectNormalizer().Visit(node.Object) as MethodCallExpression;
-                    var parameter = new ObjectNormalizer().Visit(node.Arguments[0]) as MethodCallExpression;
-                    if ((IsParseObjectGet(obj) && (obj.Object is ParameterExpression)) ||
-                        (IsParseObjectGet(parameter) && (parameter.Object is ParameterExpression)))
-                    {
-                        return Expression.Equal(node.Object, node.Arguments[0]);
-                    }
-                }
-
-                // Convert the .Contains() into a ContainsStub
-                if (node.Method != stringContains &&
-                    node.Method.Name == "Contains" &&
-                    node.Method.ReturnType == typeof(bool) &&
-                    node.Method.GetParameters().Length <= 2)
-                {
-                    var collection = node.Method.GetParameters().Length == 1 ?
-                        node.Object :
-                        node.Arguments[0];
-                    var parameterIndex = node.Method.GetParameters().Length - 1;
-                    var parameter = new ObjectNormalizer().Visit(node.Arguments[parameterIndex])
-                        as MethodCallExpression;
-                    if (IsParseObjectGet(parameter) && (parameter.Object is ParameterExpression))
-                    {
-                        var genericContains = containsMethod.MakeGenericMethod(parameter.Type);
-                        return Expression.Call(genericContains, collection, parameter);
-                    }
-                    var target = new ObjectNormalizer().Visit(collection) as MethodCallExpression;
-                    var element = node.Arguments[parameterIndex];
-                    if (IsParseObjectGet(target) && (target.Object is ParameterExpression))
-                    {
-                        var genericContains = containsMethod.MakeGenericMethod(element.Type);
-                        return Expression.Call(genericContains, target, element);
-                    }
-                }
-
-                // Convert obj["foo.bar"].ContainsKey("baz") into obj.ContainsKey("foo.bar.baz")
-                if (node.Method.Name == "ContainsKey" &&
-                    node.Method.ReturnType == typeof(bool) &&
-                    node.Method.GetParameters().Length == 1)
-                {
-                    var getter = new ObjectNormalizer().Visit(node.Object) as MethodCallExpression;
-                    Expression target = null;
-                    string path = null;
-                    if (IsParseObjectGet(getter) && getter.Object is ParameterExpression)
-                    {
-                        target = getter.Object;
-                        path = GetValue(getter.Arguments[0]) + "." + GetValue(node.Arguments[0]);
-                        return Expression.Call(containsKeyMethod, target, Expression.Constant(path));
-                    }
-                    else if (node.Object is ParameterExpression)
-                    {
-                        target = node.Object;
-                        path = GetValue(node.Arguments[0]) as string;
-                    }
-                    if (target != null && path != null)
-                    {
-                        return Expression.Call(containsKeyMethod, target, Expression.Constant(path));
-                    }
-                }
-                return base.VisitMethodCall(node);
-            }
-        }
-
-        /// <summary>
-        /// Converts a normalized method call expression into the appropriate ParseQuery clause.
-        /// </summary>
-        private static ParseQuery<T> WhereMethodCall<T>(
-            this ParseQuery<T> source, Expression<Func<T, bool>> expression, MethodCallExpression node)
-            where T : ParseObject
-        {
-            if (IsParseObjectGet(node) && (node.Type == typeof(bool) || node.Type == typeof(bool?)))
-            {
-                // This is a raw boolean field access like 'where obj.Get<bool>("foo")'
-                return source.WhereEqualTo(GetValue(node.Arguments[0]) as string, true);
-            }
-
-            MethodInfo translatedMethod;
-            if (functionMappings.TryGetValue(node.Method, out translatedMethod))
-            {
-                var objTransformed = new ObjectNormalizer().Visit(node.Object) as MethodCallExpression;
-                if (!(IsParseObjectGet(objTransformed) &&
-                    objTransformed.Object == expression.Parameters[0]))
-                {
-                    throw new InvalidOperationException(
-                      "The left-hand side of a supported function call must be a ParseObject field access.");
-                }
-                var fieldPath = GetValue(objTransformed.Arguments[0]);
-                var containedIn = GetValue(node.Arguments[0]);
-                var queryType = translatedMethod.DeclaringType.GetGenericTypeDefinition()
-                    .MakeGenericType(typeof(T));
-                translatedMethod = ReflectionHelpers.GetMethod(queryType,
-                    translatedMethod.Name,
-                    translatedMethod.GetParameters().Select(p => p.ParameterType).ToArray());
-                return translatedMethod.Invoke(source, new[] { fieldPath, containedIn }) as ParseQuery<T>;
-            }
-
-            if (node.Arguments[0] == expression.Parameters[0])
-            {
-                // obj.ContainsKey("foo") --> query.WhereExists("foo")
-                if (node.Method == containsKeyMethod)
-                {
-                    return source.WhereExists(GetValue(node.Arguments[1]) as string);
-                }
-                // !obj.ContainsKey("foo") --> query.WhereDoesNotExist("foo")
-                if (node.Method == notContainsKeyMethod)
-                {
-                    return source.WhereDoesNotExist(GetValue(node.Arguments[1]) as string);
-                }
-            }
-
-            if (node.Method.IsGenericMethod)
-            {
-                if (node.Method.GetGenericMethodDefinition() == containsMethod)
-                {
-                    // obj.Get<IList<T>>("path").Contains(someValue)
-                    if (IsParseObjectGet(node.Arguments[0] as MethodCallExpression))
-                    {
-                        return source.WhereEqualTo(
-                            GetValue(((MethodCallExpression) node.Arguments[0]).Arguments[0]) as string,
-                            GetValue(node.Arguments[1]));
-                    }
-                    // someList.Contains(obj.Get<T>("path"))
-                    if (IsParseObjectGet(node.Arguments[1] as MethodCallExpression))
-                    {
-                        var collection = GetValue(node.Arguments[0]) as System.Collections.IEnumerable;
-                        return source.WhereContainedIn(
-                            GetValue(((MethodCallExpression) node.Arguments[1]).Arguments[0]) as string,
-                            collection.Cast<object>());
-                    }
-                }
-
-                if (node.Method.GetGenericMethodDefinition() == notContainsMethod)
-                {
-                    // !obj.Get<IList<T>>("path").Contains(someValue)
-                    if (IsParseObjectGet(node.Arguments[0] as MethodCallExpression))
-                    {
-                        return source.WhereNotEqualTo(
-                            GetValue(((MethodCallExpression) node.Arguments[0]).Arguments[0]) as string,
-                            GetValue(node.Arguments[1]));
-                    }
-                    // !someList.Contains(obj.Get<T>("path"))
-                    if (IsParseObjectGet(node.Arguments[1] as MethodCallExpression))
-                    {
-                        var collection = GetValue(node.Arguments[0]) as System.Collections.IEnumerable;
-                        return source.WhereNotContainedIn(
-                            GetValue(((MethodCallExpression) node.Arguments[1]).Arguments[0]) as string,
-                            collection.Cast<object>());
-                    }
-                }
-            }
-            throw new InvalidOperationException(node.Method + " is not a supported method call in a where expression.");
-        }
-
-        /// <summary>
-        /// Converts a normalized binary expression into the appropriate ParseQuery clause.
-        /// </summary>
-        private static ParseQuery<T> WhereBinaryExpression<T>(
-            this ParseQuery<T> source, Expression<Func<T, bool>> expression, BinaryExpression node)
-            where T : ParseObject
-        {
-            var leftTransformed = new ObjectNormalizer().Visit(node.Left) as MethodCallExpression;
-
-            if (!(IsParseObjectGet(leftTransformed) &&
-                leftTransformed.Object == expression.Parameters[0]))
-            {
-                throw new InvalidOperationException(
-                  "Where expressions must have one side be a field operation on a ParseObject.");
-            }
-
-            var fieldPath = GetValue(leftTransformed.Arguments[0]) as string;
-            var filterValue = GetValue(node.Right);
-
-            if (filterValue != null && !ParseEncoder.IsValidType(filterValue))
-            {
-                throw new InvalidOperationException(
-                  "Where clauses must use types compatible with ParseObjects.");
-            }
-
-            switch (node.NodeType)
-            {
-                case ExpressionType.GreaterThan:
-                    return source.WhereGreaterThan(fieldPath, filterValue);
-                case ExpressionType.GreaterThanOrEqual:
-                    return source.WhereGreaterThanOrEqualTo(fieldPath, filterValue);
-                case ExpressionType.LessThan:
-                    return source.WhereLessThan(fieldPath, filterValue);
-                case ExpressionType.LessThanOrEqual:
-                    return source.WhereLessThanOrEqualTo(fieldPath, filterValue);
-                case ExpressionType.Equal:
-                    return source.WhereEqualTo(fieldPath, filterValue);
-                case ExpressionType.NotEqual:
-                    return source.WhereNotEqualTo(fieldPath, filterValue);
-                default:
-                    throw new InvalidOperationException(
-                      "Where expressions do not support this operator.");
-            }
-        }
-
-        /// <summary>
-        /// Filters a query based upon the predicate provided.
-        /// </summary>
-        /// <typeparam name="TSource">The type of ParseObject being queried for.</typeparam>
-        /// <param name="source">The base <see cref="ParseQuery{TSource}"/> to which
-        /// the predicate will be added.</param>
-        /// <param name="predicate">A function to test each ParseObject for a condition.
-        /// The predicate must be able to be represented by one of the standard Where
-        /// functions on ParseQuery</param>
-        /// <returns>A new ParseQuery whose results will match the given predicate as
-        /// well as the source's filters.</returns>
-        public static ParseQuery<TSource> Where<TSource>(
-            this ParseQuery<TSource> source, Expression<Func<TSource, bool>> predicate)
-            where TSource : ParseObject
-        {
-            // Handle top-level logic operators && and ||
-            var binaryExpression = predicate.Body as BinaryExpression;
-            if (binaryExpression != null)
-            {
-                if (binaryExpression.NodeType == ExpressionType.AndAlso)
-                {
-                    return source
-                        .Where(Expression.Lambda<Func<TSource, bool>>(
-                            binaryExpression.Left, predicate.Parameters))
-                        .Where(Expression.Lambda<Func<TSource, bool>>(
-                            binaryExpression.Right, predicate.Parameters));
-                }
-                if (binaryExpression.NodeType == ExpressionType.OrElse)
-                {
-                    var left = source.Where(Expression.Lambda<Func<TSource, bool>>(
-                            binaryExpression.Left, predicate.Parameters));
-                    var right = source.Where(Expression.Lambda<Func<TSource, bool>>(
-                            binaryExpression.Right, predicate.Parameters));
-                    return left.Or(right);
-                }
-            }
-
-            var normalized = new WhereNormalizer().Visit(predicate.Body);
-
-            var methodCallExpr = normalized as MethodCallExpression;
-            if (methodCallExpr != null)
-            {
-                return source.WhereMethodCall(predicate, methodCallExpr);
-            }
-
-            var binaryExpr = normalized as BinaryExpression;
-            if (binaryExpr != null)
-            {
-                return source.WhereBinaryExpression(predicate, binaryExpr);
-            }
-
-            var unaryExpr = normalized as UnaryExpression;
-            if (unaryExpr != null && unaryExpr.NodeType == ExpressionType.Not)
-            {
-                var node = unaryExpr.Operand as MethodCallExpression;
-                if (IsParseObjectGet(node) && (node.Type == typeof(bool) || node.Type == typeof(bool?)))
-                {
-                    // This is a raw boolean field access like 'where !obj.Get<bool>("foo")'
-                    return source.WhereNotEqualTo(GetValue(node.Arguments[0]) as string, true);
-                }
-            }
-
-            throw new InvalidOperationException(
-              "Encountered an unsupported expression for ParseQueries.");
-        }
-
-        /// <summary>
-        /// Normalizes an OrderBy's keySelector expression and then extracts the path
-        /// from the ParseObject.Get() call.
-        /// </summary>
-        private static string GetOrderByPath<TSource, TSelector>(
-              Expression<Func<TSource, TSelector>> keySelector)
-        {
-            string result = null;
-            var normalized = new ObjectNormalizer().Visit(keySelector.Body);
-            var callExpr = normalized as MethodCallExpression;
-            if (IsParseObjectGet(callExpr) && callExpr.Object == keySelector.Parameters[0])
-            {
-                // We're operating on the parameter
-                result = GetValue(callExpr.Arguments[0]) as string;
-            }
-            if (result == null)
-            {
-                throw new InvalidOperationException(
-                  "OrderBy expression must be a field access on a ParseObject.");
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// Orders a query based upon the key selector provided.
-        /// </summary>
-        /// <typeparam name="TSource">The type of ParseObject being queried for.</typeparam>
-        /// <typeparam name="TSelector">The type of key returned by keySelector.</typeparam>
-        /// <param name="source">The query to order.</param>
-        /// <param name="keySelector">A function to extract a key from the ParseObject.</param>
-        /// <returns>A new ParseQuery based on source whose results will be ordered by
-        /// the key specified in the keySelector.</returns>
-        public static ParseQuery<TSource> OrderBy<TSource, TSelector>(
-            this ParseQuery<TSource> source, Expression<Func<TSource, TSelector>> keySelector)
-            where TSource : ParseObject
-        {
-            return source.OrderBy(GetOrderByPath(keySelector));
-        }
-
-        /// <summary>
-        /// Orders a query based upon the key selector provided.
-        /// </summary>
-        /// <typeparam name="TSource">The type of ParseObject being queried for.</typeparam>
-        /// <typeparam name="TSelector">The type of key returned by keySelector.</typeparam>
-        /// <param name="source">The query to order.</param>
-        /// <param name="keySelector">A function to extract a key from the ParseObject.</param>
-        /// <returns>A new ParseQuery based on source whose results will be ordered by
-        /// the key specified in the keySelector.</returns>
-        public static ParseQuery<TSource> OrderByDescending<TSource, TSelector>(
-            this ParseQuery<TSource> source, Expression<Func<TSource, TSelector>> keySelector)
-            where TSource : ParseObject
-        {
-            return source.OrderByDescending(GetOrderByPath(keySelector));
-        }
-
-        /// <summary>
-        /// Performs a subsequent ordering of a query based upon the key selector provided.
-        /// </summary>
-        /// <typeparam name="TSource">The type of ParseObject being queried for.</typeparam>
-        /// <typeparam name="TSelector">The type of key returned by keySelector.</typeparam>
-        /// <param name="source">The query to order.</param>
-        /// <param name="keySelector">A function to extract a key from the ParseObject.</param>
-        /// <returns>A new ParseQuery based on source whose results will be ordered by
-        /// the key specified in the keySelector.</returns>
-        public static ParseQuery<TSource> ThenBy<TSource, TSelector>(
-            this ParseQuery<TSource> source, Expression<Func<TSource, TSelector>> keySelector)
-            where TSource : ParseObject
-        {
-            return source.ThenBy(GetOrderByPath(keySelector));
-        }
-
-        /// <summary>
-        /// Performs a subsequent ordering of a query based upon the key selector provided.
-        /// </summary>
-        /// <typeparam name="TSource">The type of ParseObject being queried for.</typeparam>
-        /// <typeparam name="TSelector">The type of key returned by keySelector.</typeparam>
-        /// <param name="source">The query to order.</param>
-        /// <param name="keySelector">A function to extract a key from the ParseObject.</param>
-        /// <returns>A new ParseQuery based on source whose results will be ordered by
-        /// the key specified in the keySelector.</returns>
-        public static ParseQuery<TSource> ThenByDescending<TSource, TSelector>(
-            this ParseQuery<TSource> source, Expression<Func<TSource, TSelector>> keySelector)
-            where TSource : ParseObject
-        {
-            return source.ThenByDescending(GetOrderByPath(keySelector));
-        }
-
-        /// <summary>
-        /// Correlates the elements of two queries based on matching keys.
-        /// </summary>
-        /// <typeparam name="TOuter">The type of ParseObjects of the first query.</typeparam>
-        /// <typeparam name="TInner">The type of ParseObjects of the second query.</typeparam>
-        /// <typeparam name="TKey">The type of the keys returned by the key selector
-        /// functions.</typeparam>
-        /// <typeparam name="TResult">The type of the result. This must match either
-        /// TOuter or TInner</typeparam>
-        /// <param name="outer">The first query to join.</param>
-        /// <param name="inner">The query to join to the first query.</param>
-        /// <param name="outerKeySelector">A function to extract a join key from the results of
-        /// the first query.</param>
-        /// <param name="innerKeySelector">A function to extract a join key from the results of
-        /// the second query.</param>
-        /// <param name="resultSelector">A function to select either the outer or inner query
-        /// result to determine which query is the base query.</param>
-        /// <returns>A new ParseQuery with a WhereMatchesQuery or WhereMatchesKeyInQuery
-        /// clause based upon the query indicated in the <paramref name="resultSelector"/>.</returns>
-        public static ParseQuery<TResult> Join<TOuter, TInner, TKey, TResult>(
-            this ParseQuery<TOuter> outer,
-            ParseQuery<TInner> inner,
-            Expression<Func<TOuter, TKey>> outerKeySelector,
-            Expression<Func<TInner, TKey>> innerKeySelector,
-            Expression<Func<TOuter, TInner, TResult>> resultSelector)
-          where TOuter : ParseObject
-          where TInner : ParseObject
-          where TResult : ParseObject
-        {
-            // resultSelector must select either the inner object or the outer object. If it's the inner
-            // object, reverse the query.
-            if (resultSelector.Body == resultSelector.Parameters[1])
-            {
-                // The inner object was selected.
-                return inner.Join<TInner, TOuter, TKey, TInner>(
-                    outer,
-                    innerKeySelector,
-                    outerKeySelector,
-                    (i, o) => i) as ParseQuery<TResult>;
-            }
-            if (resultSelector.Body != resultSelector.Parameters[0])
-            {
-                throw new InvalidOperationException("Joins must select either the outer or inner object.");
-            }
-
-            // Normalize both selectors
-            Expression outerNormalized = new ObjectNormalizer().Visit(outerKeySelector.Body);
-            Expression innerNormalized = new ObjectNormalizer().Visit(innerKeySelector.Body);
-            MethodCallExpression outerAsGet = outerNormalized as MethodCallExpression;
-            MethodCallExpression innerAsGet = innerNormalized as MethodCallExpression;
-            if (IsParseObjectGet(outerAsGet) && outerAsGet.Object == outerKeySelector.Parameters[0])
-            {
-                var outerKey = GetValue(outerAsGet.Arguments[0]) as string;
-
-                if (IsParseObjectGet(innerAsGet) && innerAsGet.Object == innerKeySelector.Parameters[0])
-                {
-                    // Both are key accesses, so treat this as a WhereMatchesKeyInQuery
-                    var innerKey = GetValue(innerAsGet.Arguments[0]) as string;
-                    return outer.WhereMatchesKeyInQuery(outerKey, innerKey, inner) as ParseQuery<TResult>;
-                }
-
-                if (innerKeySelector.Body == innerKeySelector.Parameters[0])
-                {
-                    // The inner selector is on the result of the query itself, so treat this as a
-                    // WhereMatchesQuery
-                    return outer.WhereMatchesQuery(outerKey, inner) as ParseQuery<TResult>;
-                }
-                throw new InvalidOperationException(
-                    "The key for the joined object must be a ParseObject or a field access " +
-                    "on the ParseObject.");
-            }
-
-            // TODO (hallucinogen): If we ever support "and" queries fully and/or support a "where this object
-            // matches some key in some other query" (as opposed to requiring a key on this query), we
-            // can add support for even more types of joins.
-
-            throw new InvalidOperationException(
-              "The key for the selected object must be a field access on the ParseObject.");
-        }
-    }
-}
diff --git a/Parse/Public/ParseRelation.cs b/Parse/Public/ParseRelation.cs
deleted file mode 100644
index 0f8b6da8..00000000
--- a/Parse/Public/ParseRelation.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using Parse.Core.Internal;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-using System.Text;
-using Parse.Common.Internal;
-
-namespace Parse
-{
-    /// <summary>
-    /// A common base class for ParseRelations.
-    /// </summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public abstract class ParseRelationBase : IJsonConvertible
-    {
-        private ParseObject parent;
-        private string key;
-        private string targetClassName;
-
-        internal ParseRelationBase(ParseObject parent, string key)
-        {
-            EnsureParentAndKey(parent, key);
-        }
-
-        internal ParseRelationBase(ParseObject parent, string key, string targetClassName)
-          : this(parent, key)
-        {
-            this.targetClassName = targetClassName;
-        }
-
-        internal static IObjectSubclassingController SubclassingController
-        {
-            get
-            {
-                return ParseCorePlugins.Instance.SubclassingController;
-            }
-        }
-
-        internal void EnsureParentAndKey(ParseObject parent, string key)
-        {
-            this.parent = this.parent ?? parent;
-            this.key = this.key ?? key;
-            Debug.Assert(this.parent == parent, "Relation retrieved from two different objects");
-            Debug.Assert(this.key == key, "Relation retrieved from two different keys");
-        }
-
-        internal void Add(ParseObject obj)
-        {
-            var change = new ParseRelationOperation(new[] { obj }, null);
-            parent.PerformOperation(key, change);
-            targetClassName = change.TargetClassName;
-        }
-
-        internal void Remove(ParseObject obj)
-        {
-            var change = new ParseRelationOperation(null, new[] { obj });
-            parent.PerformOperation(key, change);
-            targetClassName = change.TargetClassName;
-        }
-
-        IDictionary<string, object> IJsonConvertible.ToJSON()
-        {
-            return new Dictionary<string, object> {
-        {"__type", "Relation"},
-        {"className", targetClassName}
-      };
-        }
-
-        internal ParseQuery<T> GetQuery<T>() where T : ParseObject
-        {
-            if (targetClassName != null)
-            {
-                return new ParseQuery<T>(targetClassName)
-                  .WhereRelatedTo(parent, key);
-            }
-
-            return new ParseQuery<T>(parent.ClassName)
-              .RedirectClassName(key)
-              .WhereRelatedTo(parent, key);
-        }
-
-        internal string TargetClassName
-        {
-            get
-            {
-                return targetClassName;
-            }
-            set
-            {
-                targetClassName = value;
-            }
-        }
-
-        /// <summary>
-        /// Produces the proper ParseRelation&lt;T&gt; instance for the given classname.
-        /// </summary>
-        internal static ParseRelationBase CreateRelation(ParseObject parent,
-            string key,
-            string targetClassName)
-        {
-            var targetType = SubclassingController.GetType(targetClassName) ?? typeof(ParseObject);
-
-            Expression<Func<ParseRelation<ParseObject>>> createRelationExpr =
-                () => CreateRelation<ParseObject>(parent, key, targetClassName);
-            var createRelationMethod =
-                ((MethodCallExpression) createRelationExpr.Body)
-                .Method
-                .GetGenericMethodDefinition()
-                .MakeGenericMethod(targetType);
-            return (ParseRelationBase) createRelationMethod.Invoke(null, new object[] { parent, key, targetClassName });
-        }
-
-        private static ParseRelation<T> CreateRelation<T>(ParseObject parent, string key, string targetClassName)
-            where T : ParseObject
-        {
-            return new ParseRelation<T>(parent, key, targetClassName);
-        }
-    }
-
-    /// <summary>
-    /// Provides access to all of the children of a many-to-many relationship. Each instance of
-    /// ParseRelation is associated with a particular parent and key.
-    /// </summary>
-    /// <typeparam name="T">The type of the child objects.</typeparam>
-    public sealed class ParseRelation<T> : ParseRelationBase where T : ParseObject
-    {
-
-        internal ParseRelation(ParseObject parent, string key) : base(parent, key) { }
-
-        internal ParseRelation(ParseObject parent, string key, string targetClassName)
-          : base(parent, key, targetClassName) { }
-
-        /// <summary>
-        /// Adds an object to this relation. The object must already have been saved.
-        /// </summary>
-        /// <param name="obj">The object to add.</param>
-        public void Add(T obj)
-        {
-            base.Add(obj);
-        }
-
-        /// <summary>
-        /// Removes an object from this relation. The object must already have been saved.
-        /// </summary>
-        /// <param name="obj">The object to remove.</param>
-        public void Remove(T obj)
-        {
-            base.Remove(obj);
-        }
-
-        /// <summary>
-        /// Gets a query that can be used to query the objects in this relation.
-        /// </summary>
-        public ParseQuery<T> Query
-        {
-            get
-            {
-                return base.GetQuery<T>();
-            }
-        }
-    }
-}
diff --git a/Parse/Public/ParseSession.cs b/Parse/Public/ParseSession.cs
deleted file mode 100644
index 6f438c7c..00000000
--- a/Parse/Public/ParseSession.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using Parse.Core.Internal;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Parse.Common.Internal;
-
-namespace Parse
-{
-    /// <summary>
-    /// Represents a session of a user for a Parse application.
-    /// </summary>
-    [ParseClassName("_Session")]
-    public class ParseSession : ParseObject
-    {
-        private static readonly HashSet<string> readOnlyKeys = new HashSet<string> {
-      "sessionToken", "createdWith", "restricted", "user", "expiresAt", "installationId"
-    };
-
-        protected override bool IsKeyMutable(string key)
-        {
-            return !readOnlyKeys.Contains(key);
-        }
-
-        /// <summary>
-        /// Gets the session token for a user, if they are logged in.
-        /// </summary>
-        [ParseFieldName("sessionToken")]
-        public string SessionToken
-        {
-            get { return GetProperty<string>(null, "SessionToken"); }
-        }
-
-        /// <summary>
-        /// Constructs a <see cref="ParseQuery{ParseSession}"/> for ParseSession.
-        /// </summary>
-        public static ParseQuery<ParseSession> Query
-        {
-            get
-            {
-                return new ParseQuery<ParseSession>();
-            }
-        }
-
-        internal static IParseSessionController SessionController
-        {
-            get
-            {
-                return ParseCorePlugins.Instance.SessionController;
-            }
-        }
-
-        /// <summary>
-        /// Gets the current <see cref="ParseSession"/> object related to the current user.
-        /// </summary>
-        public static Task<ParseSession> GetCurrentSessionAsync()
-        {
-            return GetCurrentSessionAsync(CancellationToken.None);
-        }
-
-        /// <summary>
-        /// Gets the current <see cref="ParseSession"/> object related to the current user.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token</param>
-        public static Task<ParseSession> GetCurrentSessionAsync(CancellationToken cancellationToken)
-        {
-            return ParseUser.GetCurrentUserAsync().OnSuccess(t1 =>
-            {
-                ParseUser user = t1.Result;
-                if (user == null)
-                {
-                    return Task<ParseSession>.FromResult((ParseSession) null);
-                }
-
-                string sessionToken = user.SessionToken;
-                if (sessionToken == null)
-                {
-                    return Task<ParseSession>.FromResult((ParseSession) null);
-                }
-
-                return SessionController.GetSessionAsync(sessionToken, cancellationToken).OnSuccess(t =>
-                {
-                    ParseSession session = ParseObject.FromState<ParseSession>(t.Result, "_Session");
-                    return session;
-                });
-            }).Unwrap();
-        }
-
-        internal static Task RevokeAsync(string sessionToken, CancellationToken cancellationToken)
-        {
-            if (sessionToken == null || !SessionController.IsRevocableSessionToken(sessionToken))
-            {
-                return Task.FromResult(0);
-            }
-            return SessionController.RevokeAsync(sessionToken, cancellationToken);
-        }
-
-        internal static Task<string> UpgradeToRevocableSessionAsync(string sessionToken, CancellationToken cancellationToken)
-        {
-            if (sessionToken == null || SessionController.IsRevocableSessionToken(sessionToken))
-            {
-                return Task<string>.FromResult(sessionToken);
-            }
-
-            return SessionController.UpgradeToRevocableSessionAsync(sessionToken, cancellationToken).OnSuccess(t =>
-            {
-                ParseSession session = ParseObject.FromState<ParseSession>(t.Result, "_Session");
-                return session.SessionToken;
-            });
-        }
-    }
-}
diff --git a/Parse/Public/ParseUser.cs b/Parse/Public/ParseUser.cs
deleted file mode 100644
index 78c8318f..00000000
--- a/Parse/Public/ParseUser.cs
+++ /dev/null
@@ -1,600 +0,0 @@
-// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
-
-using Parse.Core.Internal;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Parse.Common.Internal;
-
-namespace Parse
-{
-    /// <summary>
-    /// Represents a user for a Parse application.
-    /// </summary>
-    [ParseClassName("_User")]
-    public class ParseUser : ParseObject
-    {
-        private static readonly IDictionary<string, IParseAuthenticationProvider> authProviders = new Dictionary<string, IParseAuthenticationProvider>();
-
-        private static readonly HashSet<string> readOnlyKeys = new HashSet<string> { "sessionToken", "isNew" };
-
-        internal static IParseUserController UserController => ParseCorePlugins.Instance.UserController;
-
-        internal static IParseCurrentUserController CurrentUserController => ParseCorePlugins.Instance.CurrentUserController;
-
-        /// <summary>
-        /// Whether the ParseUser has been authenticated on this device. Only an authenticated
-        /// ParseUser can be saved and deleted.
-        /// </summary>
-        public bool IsAuthenticated
-        {
-            get
-            {
-                lock (mutex)
-                {
-                    return SessionToken != null && CurrentUser != null && CurrentUser.ObjectId == ObjectId;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Removes a key from the object's data if it exists.
-        /// </summary>
-        /// <param name="key">The key to remove.</param>
-        /// <exception cref="System.ArgumentException">Cannot remove the username key.</exception>
-        public override void Remove(string key)
-        {
-            if (key == "username")
-            {
-                throw new ArgumentException("Cannot remove the username key.");
-            }
-            base.Remove(key);
-        }
-
-        protected override bool IsKeyMutable(string key) => !readOnlyKeys.Contains(key);
-
-        internal override void HandleSave(IObjectState serverState)
-        {
-            base.HandleSave(serverState);
-
-            SynchronizeAllAuthData();
-            CleanupAuthData();
-
-            MutateState(mutableClone => mutableClone.ServerData.Remove("password"));
-        }
-
-        public string SessionToken => State.ContainsKey("sessionToken") ? State["sessionToken"] as string : null;
-
-        internal static string CurrentSessionToken
-        {
-            get
-            {
-                Task<string> sessionTokenTask = GetCurrentSessionTokenAsync();
-                sessionTokenTask.Wait();
-                return sessionTokenTask.Result;
-            }
-        }
-
-        internal static Task<string> GetCurrentSessionTokenAsync(CancellationToken cancellationToken = default) => CurrentUserController.GetCurrentSessionTokenAsync(cancellationToken);
-
-        internal Task SetSessionTokenAsync(string newSessionToken) => SetSessionTokenAsync(newSessionToken, CancellationToken.None);
-
-        internal Task SetSessionTokenAsync(string newSessionToken, CancellationToken cancellationToken)
-        {
-            MutateState(mutableClone => mutableClone.ServerData["sessionToken"] = newSessionToken);
-
-            return SaveCurrentUserAsync(this);
-        }
-
-        /// <summary>
-        /// Gets or sets the username.
-        /// </summary>
-        [ParseFieldName("username")]
-        public string Username
-        {
-            get => GetProperty<string>(null, "Username");
-            set => SetProperty(value, "Username");
-        }
-
-        /// <summary>
-        /// Sets the password.
-        /// </summary>
-        [ParseFieldName("password")]
-        public string Password
-        {
-            private get => GetProperty<string>(null, "Password");
-            set => SetProperty(value, "Password");
-        }
-
-        /// <summary>
-        /// Sets the email address.
-        /// </summary>
-        [ParseFieldName("email")]
-        public string Email
-        {
-            get => GetProperty<string>(null, "Email");
-            set => SetProperty(value, "Email");
-        }
-
-        internal Task SignUpAsync(Task toAwait, CancellationToken cancellationToken)
-        {
-            if (AuthData == null)
-            {
-                // TODO (hallucinogen): make an Extension of Task to create Task with exception/canceled.
-                if (String.IsNullOrEmpty(Username))
-                {
-                    TaskCompletionSource<object> tcs = new TaskCompletionSource<object>();
-                    tcs.TrySetException(new InvalidOperationException("Cannot sign up user with an empty name."));
-                    return tcs.Task;
-                }
-                if (String.IsNullOrEmpty(Password))
-                {
-                    TaskCompletionSource<object> tcs = new TaskCompletionSource<object>();
-                    tcs.TrySetException(new InvalidOperationException("Cannot sign up user with an empty password."));
-                    return tcs.Task;
-                }
-            }
-            if (!String.IsNullOrEmpty(ObjectId))
-            {
-                TaskCompletionSource<object> tcs = new TaskCompletionSource<object>();
-                tcs.TrySetException(new InvalidOperationException("Cannot sign up a user that already exists."));
-                return tcs.Task;
-            }
-
-            IDictionary<string, IParseFieldOperation> currentOperations = StartSave();
-
-            return toAwait.OnSuccess(_ => UserController.SignUpAsync(State, currentOperations, cancellationToken)).Unwrap().ContinueWith(t =>
-            {
-                if (t.IsFaulted || t.IsCanceled)
-                {
-                    HandleFailedSave(currentOperations);
-                }
-                else
-                {
-                    HandleSave(t.Result);
-                }
-                return t;
-            }).Unwrap().OnSuccess(_ => SaveCurrentUserAsync(this)).Unwrap();
-        }
-
-        /// <summary>
-        /// Signs up a new user. This will create a new ParseUser on the server and will also persist the
-        /// session on disk so that you can access the user using <see cref="CurrentUser"/>. A username and
-        /// password must be set before calling SignUpAsync.
-        /// </summary>
-        public Task SignUpAsync() => SignUpAsync(CancellationToken.None);
-
-        /// <summary>
-        /// Signs up a new user. This will create a new ParseUser on the server and will also persist the
-        /// session on disk so that you can access the user using <see cref="CurrentUser"/>. A username and
-        /// password must be set before calling SignUpAsync.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        public Task SignUpAsync(CancellationToken cancellationToken) => taskQueue.Enqueue(toAwait => SignUpAsync(toAwait, cancellationToken), cancellationToken);
-
-        /// <summary>
-        /// Logs in a user with a username and password. On success, this saves the session to disk so you
-        /// can retrieve the currently logged in user using <see cref="CurrentUser"/>.
-        /// </summary>
-        /// <param name="username">The username to log in with.</param>
-        /// <param name="password">The password to log in with.</param>
-        /// <returns>The newly logged-in user.</returns>
-        public static Task<ParseUser> LogInAsync(string username, string password) => LogInAsync(username, password, CancellationToken.None);
-
-        /// <summary>
-        /// Logs in a user with a username and password. On success, this saves the session to disk so you
-        /// can retrieve the currently logged in user using <see cref="CurrentUser"/>.
-        /// </summary>
-        /// <param name="username">The username to log in with.</param>
-        /// <param name="password">The password to log in with.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>The newly logged-in user.</returns>
-        public static Task<ParseUser> LogInAsync(string username, string password, CancellationToken cancellationToken) => UserController.LogInAsync(username, password, cancellationToken).OnSuccess(t =>
-        {
-            ParseUser user = FromState<ParseUser>(t.Result, "_User");
-            return SaveCurrentUserAsync(user).OnSuccess(_ => user);
-        }).Unwrap();
-
-        /// <summary>
-        /// Logs in a user with a username and password. On success, this saves the session to disk so you
-        /// can retrieve the currently logged in user using <see cref="CurrentUser"/>.
-        /// </summary>
-        /// <param name="sessionToken">The session token to authorize with</param>
-        /// <returns>The user if authorization was successful</returns>
-        public static Task<ParseUser> BecomeAsync(string sessionToken) => BecomeAsync(sessionToken, CancellationToken.None);
-
-        /// <summary>
-        /// Logs in a user with a username and password. On success, this saves the session to disk so you
-        /// can retrieve the currently logged in user using <see cref="CurrentUser"/>.
-        /// </summary>
-        /// <param name="sessionToken">The session token to authorize with</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>The user if authorization was successful</returns>
-        public static Task<ParseUser> BecomeAsync(string sessionToken, CancellationToken cancellationToken) => UserController.GetUserAsync(sessionToken, cancellationToken).OnSuccess(t =>
-        {
-            ParseUser user = FromState<ParseUser>(t.Result, "_User");
-            return SaveCurrentUserAsync(user).OnSuccess(_ => user);
-        }).Unwrap();
-
-        protected override Task SaveAsync(Task toAwait, CancellationToken cancellationToken)
-        {
-            lock (mutex)
-            {
-                if (ObjectId == null)
-                {
-                    throw new InvalidOperationException("You must call SignUpAsync before calling SaveAsync.");
-                }
-                return base.SaveAsync(toAwait, cancellationToken).OnSuccess(_ =>
-                {
-                    if (!CurrentUserController.IsCurrent(this))
-                    {
-                        return Task.FromResult(0);
-                    }
-                    return SaveCurrentUserAsync(this);
-                }).Unwrap();
-            }
-        }
-
-        // If this is already the current user, refresh its state on disk.
-        internal override Task<ParseObject> FetchAsyncInternal(Task toAwait, CancellationToken cancellationToken) => base.FetchAsyncInternal(toAwait, cancellationToken).OnSuccess(t => !CurrentUserController.IsCurrent(this) ? Task.FromResult(t.Result) : SaveCurrentUserAsync(this).OnSuccess(_ => t.Result)).Unwrap();
-
-        /// <summary>
-        /// Logs out the currently logged in user session. This will remove the session from disk, log out of
-        /// linked services, and future calls to <see cref="CurrentUser"/> will return <c>null</c>.
-        /// </summary>
-        /// <remarks>
-        /// Typically, you should use <see cref="LogOutAsync()"/>, unless you are managing your own threading.
-        /// </remarks>
-        public static void LogOut() => LogOutAsync().Wait(); // TODO (hallucinogen): this will without a doubt fail in Unity. But what else can we do?
-
-        /// <summary>
-        /// Logs out the currently logged in user session. This will remove the session from disk, log out of
-        /// linked services, and future calls to <see cref="CurrentUser"/> will return <c>null</c>.
-        /// </summary>
-        /// <remarks>
-        /// This is preferable to using <see cref="LogOut()"/>, unless your code is already running from a
-        /// background thread.
-        /// </remarks>
-        public static Task LogOutAsync() => LogOutAsync(CancellationToken.None);
-
-        /// <summary>
-        /// Logs out the currently logged in user session. This will remove the session from disk, log out of
-        /// linked services, and future calls to <see cref="CurrentUser"/> will return <c>null</c>.
-        ///
-        /// This is preferable to using <see cref="LogOut()"/>, unless your code is already running from a
-        /// background thread.
-        /// </summary>
-        public static Task LogOutAsync(CancellationToken cancellationToken)
-        {
-            return GetCurrentUserAsync().OnSuccess(t =>
-            {
-                LogOutWithProviders();
-
-                ParseUser user = t.Result;
-                if (user == null)
-                {
-                    return Task.FromResult(0);
-                }
-
-                return user.taskQueue.Enqueue(toAwait => user.LogOutAsync(toAwait, cancellationToken), cancellationToken);
-            }).Unwrap();
-        }
-
-        internal Task LogOutAsync(Task toAwait, CancellationToken cancellationToken)
-        {
-            string oldSessionToken = SessionToken;
-            if (oldSessionToken == null)
-            {
-                return Task.FromResult(0);
-            }
-
-            // Cleanup in-memory session.
-            MutateState(mutableClone =>
-            {
-                mutableClone.ServerData.Remove("sessionToken");
-            });
-            var revokeSessionTask = ParseSession.RevokeAsync(oldSessionToken, cancellationToken);
-            return Task.WhenAll(revokeSessionTask, CurrentUserController.LogOutAsync(cancellationToken));
-        }
-
-        private static void LogOutWithProviders()
-        {
-            foreach (var provider in authProviders.Values)
-            {
-                provider.Deauthenticate();
-            }
-        }
-
-        /// <summary>
-        /// Gets the currently logged in ParseUser with a valid session, either from memory or disk
-        /// if necessary.
-        /// </summary>
-        public static ParseUser CurrentUser
-        {
-            get
-            {
-                var userTask = GetCurrentUserAsync();
-                // TODO (hallucinogen): this will without a doubt fail in Unity. How should we fix it?
-                userTask.Wait();
-                return userTask.Result;
-            }
-        }
-
-        /// <summary>
-        /// Gets the currently logged in ParseUser with a valid session, either from memory or disk
-        /// if necessary, asynchronously.
-        /// </summary>
-        internal static Task<ParseUser> GetCurrentUserAsync() => GetCurrentUserAsync(CancellationToken.None);
-
-        /// <summary>
-        /// Gets the currently logged in ParseUser with a valid session, either from memory or disk
-        /// if necessary, asynchronously.
-        /// </summary>
-        internal static Task<ParseUser> GetCurrentUserAsync(CancellationToken cancellationToken) => CurrentUserController.GetAsync(cancellationToken);
-
-        private static Task SaveCurrentUserAsync(ParseUser user) => SaveCurrentUserAsync(user, CancellationToken.None);
-
-        private static Task SaveCurrentUserAsync(ParseUser user, CancellationToken cancellationToken) => CurrentUserController.SetAsync(user, cancellationToken);
-
-        internal static void ClearInMemoryUser() => CurrentUserController.ClearFromMemory();
-
-        /// <summary>
-        /// Constructs a <see cref="ParseQuery{ParseUser}"/> for ParseUsers.
-        /// </summary>
-        public static ParseQuery<ParseUser> Query => new ParseQuery<ParseUser>();
-
-        #region Legacy / Revocable Session Tokens
-
-        private static readonly object isRevocableSessionEnabledMutex = new object();
-        private static bool isRevocableSessionEnabled;
-
-        /// <summary>
-        /// Tells server to use revocable session on LogIn and SignUp, even when App's Settings
-        /// has "Require Revocable Session" turned off. Issues network request in background to
-        /// migrate the sessionToken on disk to revocable session.
-        /// </summary>
-        /// <returns>The Task that upgrades the session.</returns>
-        public static Task EnableRevocableSessionAsync()
-        {
-            return EnableRevocableSessionAsync(CancellationToken.None);
-        }
-
-        /// <summary>
-        /// Tells server to use revocable session on LogIn and SignUp, even when App's Settings
-        /// has "Require Revocable Session" turned off. Issues network request in background to
-        /// migrate the sessionToken on disk to revocable session.
-        /// </summary>
-        /// <returns>The Task that upgrades the session.</returns>
-        public static Task EnableRevocableSessionAsync(CancellationToken cancellationToken)
-        {
-            lock (isRevocableSessionEnabledMutex)
-            {
-                isRevocableSessionEnabled = true;
-            }
-
-            return GetCurrentUserAsync(cancellationToken).OnSuccess(t =>
-            {
-                var user = t.Result;
-                return user.UpgradeToRevocableSessionAsync(cancellationToken);
-            });
-        }
-
-        internal static void DisableRevocableSession()
-        {
-            lock (isRevocableSessionEnabledMutex)
-            {
-                isRevocableSessionEnabled = false;
-            }
-        }
-
-        internal static bool IsRevocableSessionEnabled
-        {
-            get
-            {
-                lock (isRevocableSessionEnabledMutex)
-                {
-                    return isRevocableSessionEnabled;
-                }
-            }
-        }
-
-        internal Task UpgradeToRevocableSessionAsync()
-        {
-            return UpgradeToRevocableSessionAsync(CancellationToken.None);
-        }
-
-        internal Task UpgradeToRevocableSessionAsync(CancellationToken cancellationToken)
-        {
-            return taskQueue.Enqueue(toAwait => UpgradeToRevocableSessionAsync(toAwait, cancellationToken),
-                cancellationToken);
-        }
-
-        internal Task UpgradeToRevocableSessionAsync(Task toAwait, CancellationToken cancellationToken)
-        {
-            string sessionToken = SessionToken;
-
-            return toAwait.OnSuccess(_ =>
-            {
-                return ParseSession.UpgradeToRevocableSessionAsync(sessionToken, cancellationToken);
-            }).Unwrap().OnSuccess(t =>
-            {
-                return SetSessionTokenAsync(t.Result);
-            }).Unwrap();
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Requests a password reset email to be sent to the specified email address associated with the
-        /// user account. This email allows the user to securely reset their password on the Parse site.
-        /// </summary>
-        /// <param name="email">The email address associated with the user that forgot their password.</param>
-        public static Task RequestPasswordResetAsync(string email) => RequestPasswordResetAsync(email, CancellationToken.None);
-
-        /// <summary>
-        /// Requests a password reset email to be sent to the specified email address associated with the
-        /// user account. This email allows the user to securely reset their password on the Parse site.
-        /// </summary>
-        /// <param name="email">The email address associated with the user that forgot their password.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        public static Task RequestPasswordResetAsync(string email, CancellationToken cancellationToken) => UserController.RequestPasswordResetAsync(email, cancellationToken);
-
-        /// <summary>
-        /// Gets the authData for this user.
-        /// </summary>
-        internal IDictionary<string, IDictionary<string, object>> AuthData
-        {
-            get => TryGetValue("authData", out IDictionary<string, IDictionary<string, object>> authData) ? authData : null;
-            private set => this["authData"] = value;
-        }
-
-        private static IParseAuthenticationProvider GetProvider(string providerName) => authProviders.TryGetValue(providerName, out IParseAuthenticationProvider provider) ? provider : null;
-
-        /// <summary>
-        /// Removes null values from authData (which exist temporarily for unlinking)
-        /// </summary>
-        private void CleanupAuthData()
-        {
-            lock (mutex)
-            {
-                if (!CurrentUserController.IsCurrent(this))
-                {
-                    return;
-                }
-                IDictionary<string, IDictionary<string, object>> authData = AuthData;
-
-                if (authData == null)
-                {
-                    return;
-                }
-
-                foreach (KeyValuePair<string, IDictionary<string, object>> pair in new Dictionary<string, IDictionary<string, object>>(authData))
-                {
-                    if (pair.Value == null)
-                    {
-                        authData.Remove(pair.Key);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Synchronizes authData for all providers.
-        /// </summary>
-        private void SynchronizeAllAuthData()
-        {
-            lock (mutex)
-            {
-                IDictionary<string, IDictionary<string, object>> authData = AuthData;
-
-                if (authData == null)
-                {
-                    return;
-                }
-
-                foreach (var pair in authData)
-                {
-                    SynchronizeAuthData(GetProvider(pair.Key));
-                }
-            }
-        }
-
-        private void SynchronizeAuthData(IParseAuthenticationProvider provider)
-        {
-            bool restorationSuccess = false;
-            lock (mutex)
-            {
-                IDictionary<string, IDictionary<string, object>> authData = AuthData;
-                if (authData == null || provider == null)
-                {
-                    return;
-                }
-                if (authData.TryGetValue(provider.AuthType, out IDictionary<string, object> data))
-                {
-                    restorationSuccess = provider.RestoreAuthentication(data);
-                }
-            }
-
-            if (!restorationSuccess)
-            {
-                UnlinkFromAsync(provider.AuthType, CancellationToken.None);
-            }
-        }
-
-        internal Task LinkWithAsync(string authType, IDictionary<string, object> data, CancellationToken cancellationToken) => taskQueue.Enqueue(toAwait =>
-        {
-            IDictionary<string, IDictionary<string, object>> authData = AuthData;
-            if (authData == null)
-            {
-                authData = AuthData = new Dictionary<string, IDictionary<string, object>>();
-            }
-            authData[authType] = data;
-            AuthData = authData;
-            return SaveAsync(cancellationToken);
-        }, cancellationToken);
-
-        internal Task LinkWithAsync(string authType, CancellationToken cancellationToken)
-        {
-            IParseAuthenticationProvider provider = GetProvider(authType);
-            return provider.AuthenticateAsync(cancellationToken).OnSuccess(t => LinkWithAsync(authType, t.Result, cancellationToken)).Unwrap();
-        }
-
-        /// <summary>
-        /// Unlinks a user from a service.
-        /// </summary>
-        internal Task UnlinkFromAsync(string authType, CancellationToken cancellationToken) => LinkWithAsync(authType, null, cancellationToken);
-
-        /// <summary>
-        /// Checks whether a user is linked to a service.
-        /// </summary>
-        internal bool IsLinked(string authType)
-        {
-            lock (mutex)
-            {
-                return AuthData != null && AuthData.ContainsKey(authType) && AuthData[authType] != null;
-            }
-        }
-
-        internal static Task<ParseUser> LogInWithAsync(string authType, IDictionary<string, object> data, CancellationToken cancellationToken)
-        {
-            ParseUser user = null;
-
-            return UserController.LogInAsync(authType, data, cancellationToken).OnSuccess(t =>
-            {
-                user = FromState<ParseUser>(t.Result, "_User");
-
-                lock (user.mutex)
-                {
-                    if (user.AuthData == null)
-                    {
-                        user.AuthData = new Dictionary<string, IDictionary<string, object>>();
-                    }
-                    user.AuthData[authType] = data;
-                    user.SynchronizeAllAuthData();
-                }
-
-                return SaveCurrentUserAsync(user);
-            }).Unwrap().OnSuccess(t => user);
-        }
-
-        internal static Task<ParseUser> LogInWithAsync(string authType, CancellationToken cancellationToken)
-        {
-            IParseAuthenticationProvider provider = GetProvider(authType);
-            return provider.AuthenticateAsync(cancellationToken).OnSuccess(authData => LogInWithAsync(authType, authData.Result, cancellationToken)).Unwrap();
-        }
-
-        internal static void RegisterProvider(IParseAuthenticationProvider provider)
-        {
-            authProviders[provider.AuthType] = provider;
-            ParseUser curUser = CurrentUser;
-            if (curUser != null)
-            {
-                curUser.SynchronizeAuthData(provider);
-            }
-        }
-    }
-}
diff --git a/Parse/Resources.Designer.cs b/Parse/Resources.Designer.cs
new file mode 100644
index 00000000..3b6e39ff
--- /dev/null
+++ b/Parse/Resources.Designer.cs
@@ -0,0 +1,81 @@
+//------------------------------------------------------------------------------
+// <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 Parse {
+    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", "16.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("Parse.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;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Mutation of a file-backed cache is an asynchronous operation as the tracked file needs to be modified..
+        /// </summary>
+        internal static string FileBackedCacheSynchronousMutationNotSupportedMessage {
+            get {
+                return ResourceManager.GetString("FileBackedCacheSynchronousMutationNotSupportedMessage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Cannot perform file operations with in-memory cache controller..
+        /// </summary>
+        internal static string TransientCacheControllerDiskFileOperationNotSupportedMessage {
+            get {
+                return ResourceManager.GetString("TransientCacheControllerDiskFileOperationNotSupportedMessage", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/Parse/Resources.resx b/Parse/Resources.resx
new file mode 100644
index 00000000..69ace474
--- /dev/null
+++ b/Parse/Resources.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>
+  <data name="FileBackedCacheSynchronousMutationNotSupportedMessage" xml:space="preserve">
+    <value>Mutation of a file-backed cache is an asynchronous operation as the tracked file needs to be modified.</value>
+  </data>
+  <data name="TransientCacheControllerDiskFileOperationNotSupportedMessage" xml:space="preserve">
+    <value>Cannot perform file operations with in-memory cache controller.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/Parse/Public/ParseAnalytics.cs b/Parse/Utilities/AnalyticsServiceExtensions.cs
similarity index 67%
rename from Parse/Public/ParseAnalytics.cs
rename to Parse/Utilities/AnalyticsServiceExtensions.cs
index 9c08cf39..1e9e4d3b 100644
--- a/Parse/Public/ParseAnalytics.cs
+++ b/Parse/Utilities/AnalyticsServiceExtensions.cs
@@ -3,10 +3,8 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using System.Threading;
-using Parse.Common.Internal;
-using Parse.Analytics.Internal;
-using Parse.Core.Internal;
+using Parse.Abstractions.Infrastructure;
+using Parse.Infrastructure.Utilities;
 
 namespace Parse
 {
@@ -16,32 +14,13 @@ namespace Parse
     /// Methods will return immediately and cache requests (along with timestamps)
     /// to be handled in the background.
     /// </summary>
-    public partial class ParseAnalytics
+    public static class AnalyticsServiceExtensions
     {
-        internal static IParseAnalyticsController AnalyticsController
-        {
-            get
-            {
-                return ParseAnalyticsPlugins.Instance.AnalyticsController;
-            }
-        }
-
-        internal static IParseCurrentUserController CurrentUserController
-        {
-            get
-            {
-                return ParseAnalyticsPlugins.Instance.CorePlugins.CurrentUserController;
-            }
-        }
-
         /// <summary>
         /// Tracks this application being launched.
         /// </summary>
         /// <returns>An Async Task that can be waited on or ignored.</returns>
-        public static Task TrackAppOpenedAsync()
-        {
-            return ParseAnalytics.TrackAppOpenedWithPushHashAsync();
-        }
+        public static Task TrackLaunchAsync(this IServiceHub serviceHub) => TrackLaunchWithPushHashAsync(serviceHub);
 
         /// <summary>
         /// Tracks the occurrence of a custom event with additional dimensions.
@@ -67,10 +46,7 @@ public static Task TrackAppOpenedAsync()
         /// <param name="name">The name of the custom event to report to ParseClient
         /// as having happened.</param>
         /// <returns>An Async Task that can be waited on or ignored.</returns>
-        public static Task TrackEventAsync(string name)
-        {
-            return TrackEventAsync(name, null);
-        }
+        public static Task TrackAnalyticsEventAsync(this IServiceHub serviceHub, string name) => TrackAnalyticsEventAsync(serviceHub, name, default);
 
         /// <summary>
         /// Tracks the occurrence of a custom event with additional dimensions.
@@ -98,21 +74,14 @@ public static Task TrackEventAsync(string name)
         /// <param name="dimensions">The dictionary of information by which to
         /// segment this event.</param>
         /// <returns>An Async Task that can be waited on or ignored.</returns>
-        public static Task TrackEventAsync(string name, IDictionary<string, string> dimensions)
+        public static Task TrackAnalyticsEventAsync(this IServiceHub serviceHub, string name, IDictionary<string, string> dimensions)
         {
-            if (name == null || name.Trim().Length == 0)
+            if (name is null || name.Trim().Length == 0)
             {
                 throw new ArgumentException("A name for the custom event must be provided.");
             }
 
-            return CurrentUserController.GetCurrentSessionTokenAsync(CancellationToken.None)
-              .OnSuccess(t =>
-              {
-                  return AnalyticsController.TrackEventAsync(name,
-            dimensions,
-            t.Result,
-            CancellationToken.None);
-              }).Unwrap();
+            return serviceHub.CurrentUserController.GetCurrentSessionTokenAsync(serviceHub).OnSuccess(task => serviceHub.AnalyticsController.TrackEventAsync(name, dimensions, task.Result, serviceHub)).Unwrap();
         }
 
         /// <summary>
@@ -122,15 +91,6 @@ public static Task TrackEventAsync(string name, IDictionary<string, string> dime
         /// <param name="pushHash">An identifying hash for a given push notification,
         /// passed down from the server.</param>
         /// <returns>An Async Task that can be waited on or ignored.</returns>
-        private static Task TrackAppOpenedWithPushHashAsync(string pushHash = null)
-        {
-            return CurrentUserController.GetCurrentSessionTokenAsync(CancellationToken.None)
-              .OnSuccess(t =>
-              {
-                  return AnalyticsController.TrackAppOpenedAsync(pushHash,
-              t.Result,
-              CancellationToken.None);
-              }).Unwrap();
-        }
+        static Task TrackLaunchWithPushHashAsync(this IServiceHub serviceHub, string pushHash = null) => serviceHub.CurrentUserController.GetCurrentSessionTokenAsync(serviceHub).OnSuccess(task => serviceHub.AnalyticsController.TrackAppOpenedAsync(pushHash, task.Result, serviceHub)).Unwrap();
     }
 }
diff --git a/Parse/Public/ParseCloud.cs b/Parse/Utilities/CloudCodeServiceExtensions.cs
similarity index 73%
rename from Parse/Public/ParseCloud.cs
rename to Parse/Utilities/CloudCodeServiceExtensions.cs
index 7c533a2b..cfcde189 100644
--- a/Parse/Public/ParseCloud.cs
+++ b/Parse/Utilities/CloudCodeServiceExtensions.cs
@@ -1,10 +1,9 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Parse.Core.Internal;
+using Parse.Abstractions.Infrastructure;
 
 namespace Parse
 {
@@ -21,16 +20,8 @@ namespace Parse
     ///     await ParseCloud.CallFunctionAsync&lt;IDictionary&lt;string, object&gt;&gt;("validateGame", parameters);
     /// </code>
     /// </example>
-    public static class ParseCloud
+    public static class CloudCodeServiceExtensions
     {
-        internal static IParseCloudCodeController CloudCodeController
-        {
-            get
-            {
-                return ParseCorePlugins.Instance.CloudCodeController;
-            }
-        }
-
         /// <summary>
         /// Calls a cloud function.
         /// </summary>
@@ -42,10 +33,7 @@ internal static IParseCloudCodeController CloudCodeController
         /// dictionary can contain anything that could be passed into a ParseObject except for
         /// ParseObjects themselves.</param>
         /// <returns>The result of the cloud call.</returns>
-        public static Task<T> CallFunctionAsync<T>(string name, IDictionary<string, object> parameters)
-        {
-            return CallFunctionAsync<T>(name, parameters, CancellationToken.None);
-        }
+        public static Task<T> CallCloudCodeFunctionAsync<T>(this IServiceHub serviceHub, string name, IDictionary<string, object> parameters) => CallCloudCodeFunctionAsync<T>(serviceHub, name, parameters, CancellationToken.None);
 
         /// <summary>
         /// Calls a cloud function.
@@ -59,13 +47,6 @@ public static Task<T> CallFunctionAsync<T>(string name, IDictionary<string, obje
         /// ParseObjects themselves.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>The result of the cloud call.</returns>
-        public static Task<T> CallFunctionAsync<T>(string name,
-            IDictionary<string, object> parameters, CancellationToken cancellationToken)
-        {
-            return CloudCodeController.CallFunctionAsync<T>(name,
-                parameters,
-                ParseUser.CurrentSessionToken,
-                cancellationToken);
-        }
+        public static Task<T> CallCloudCodeFunctionAsync<T>(this IServiceHub serviceHub, string name, IDictionary<string, object> parameters, CancellationToken cancellationToken) => serviceHub.CloudCodeController.CallFunctionAsync<T>(name, parameters, serviceHub.GetCurrentSessionToken(), serviceHub, cancellationToken);
     }
 }
diff --git a/Parse/Utilities/ConfigurationServiceExtensions.cs b/Parse/Utilities/ConfigurationServiceExtensions.cs
new file mode 100644
index 00000000..019b3299
--- /dev/null
+++ b/Parse/Utilities/ConfigurationServiceExtensions.cs
@@ -0,0 +1,43 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Infrastructure.Data;
+using Parse.Platform.Configuration;
+
+namespace Parse
+{
+    public static class ConfigurationServiceExtensions
+    {
+        public static ParseConfiguration BuildConfiguration(this IServiceHub serviceHub, IDictionary<string, object> configurationData) => ParseConfiguration.Create(configurationData, serviceHub.Decoder, serviceHub);
+
+        public static ParseConfiguration BuildConfiguration(this IParseDataDecoder dataDecoder, IDictionary<string, object> configurationData, IServiceHub serviceHub) => ParseConfiguration.Create(configurationData, dataDecoder, serviceHub);
+
+#warning Investigate if these methods which simply block a thread waiting for an asynchronous process to complete should be eliminated.
+
+        /// <summary>
+        /// Gets the latest fetched ParseConfig.
+        /// </summary>
+        /// <returns>ParseConfig object</returns>
+        public static ParseConfiguration GetCurrentConfiguration(this IServiceHub serviceHub)
+        {
+            Task<ParseConfiguration> task = serviceHub.ConfigurationController.CurrentConfigurationController.GetCurrentConfigAsync(serviceHub);
+
+            task.Wait();
+            return task.Result;
+        }
+
+        internal static void ClearCurrentConfig(this IServiceHub serviceHub) => serviceHub.ConfigurationController.CurrentConfigurationController.ClearCurrentConfigAsync().Wait();
+
+        internal static void ClearCurrentConfigInMemory(this IServiceHub serviceHub) => serviceHub.ConfigurationController.CurrentConfigurationController.ClearCurrentConfigInMemoryAsync().Wait();
+
+        /// <summary>
+        /// Retrieves the ParseConfig asynchronously from the server.
+        /// </summary>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>ParseConfig object that was fetched</returns>
+        public static Task<ParseConfiguration> GetConfigurationAsync(this IServiceHub serviceHub, CancellationToken cancellationToken = default) => serviceHub.ConfigurationController.FetchConfigAsync(serviceHub.GetCurrentSessionToken(), serviceHub, cancellationToken);
+    }
+}
diff --git a/Parse/Utilities/InstallationServiceExtensions.cs b/Parse/Utilities/InstallationServiceExtensions.cs
new file mode 100644
index 00000000..afd4b9ad
--- /dev/null
+++ b/Parse/Utilities/InstallationServiceExtensions.cs
@@ -0,0 +1,43 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
+
+namespace Parse
+{
+    public static class InstallationServiceExtensions
+    {
+        /// <summary>
+        /// Constructs a <see cref="ParseQuery{ParseInstallation}"/> for ParseInstallations.
+        /// </summary>
+        /// <remarks>
+        /// Only the following types of queries are allowed for installations:
+        ///
+        /// <code>
+        /// query.GetAsync(objectId)
+        /// query.WhereEqualTo(key, value)
+        /// query.WhereMatchesKeyInQuery&lt;TOther&gt;(key, keyInQuery, otherQuery)
+        /// </code>
+        ///
+        /// You can add additional query conditions, but one of the above must appear as a top-level <c>AND</c>
+        /// clause in the query.
+        /// </remarks>
+        public static ParseQuery<ParseInstallation> GetInstallationQuery(this IServiceHub serviceHub) => new ParseQuery<ParseInstallation>(serviceHub);
+
+#warning Consider making the following method asynchronous.
+
+        /// <summary>
+        /// Gets the ParseInstallation representing this app on this device.
+        /// </summary>
+        public static ParseInstallation GetCurrentInstallation(this IServiceHub serviceHub)
+        {
+            Task<ParseInstallation> task = serviceHub.CurrentInstallationController.GetAsync(serviceHub);
+
+            // TODO (hallucinogen): this will absolutely break on Unity, but how should we resolve this?
+            task.Wait();
+            return task.Result;
+        }
+
+        internal static void ClearInMemoryInstallation(this IServiceHub serviceHub) => serviceHub.CurrentInstallationController.ClearFromMemory();
+    }
+}
diff --git a/Parse/Utilities/ObjectServiceExtensions.cs b/Parse/Utilities/ObjectServiceExtensions.cs
new file mode 100644
index 00000000..2c7c2765
--- /dev/null
+++ b/Parse/Utilities/ObjectServiceExtensions.cs
@@ -0,0 +1,514 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Internal;
+using Parse.Abstractions.Infrastructure.Control;
+using Parse.Abstractions.Platform.Objects;
+using Parse.Infrastructure.Utilities;
+using Parse.Infrastructure.Data;
+
+namespace Parse
+{
+    public static class ObjectServiceExtensions
+    {
+        /// <summary>
+        /// Registers a custom subclass type with the Parse SDK, enabling strong-typing of those ParseObjects whenever
+        /// they appear. Subclasses must specify the ParseClassName attribute, have a default constructor, and properties
+        /// backed by ParseObject fields should have ParseFieldName attributes supplied.
+        /// </summary>
+        /// <param name="serviceHub">The target <see cref="IServiceHub"/> instance.</param>
+        /// <typeparam name="T">The ParseObject subclass type to register.</typeparam>
+        public static void AddValidClass<T>(this IServiceHub serviceHub) where T : ParseObject, new() => serviceHub.ClassController.AddValid(typeof(T));
+
+        /// <summary>
+        /// Registers a custom subclass type with the Parse SDK, enabling strong-typing of those ParseObjects whenever
+        /// they appear. Subclasses must specify the ParseClassName attribute, have a default constructor, and properties
+        /// backed by ParseObject fields should have ParseFieldName attributes supplied.
+        /// </summary>
+        /// <param name="type">The ParseObject subclass type to register.</param>
+        /// <param name="serviceHub">The target <see cref="IServiceHub"/> instance.</param>
+        public static void RegisterSubclass(this IServiceHub serviceHub, Type type)
+        {
+            if (typeof(ParseObject).IsAssignableFrom(type))
+            {
+                serviceHub.ClassController.AddValid(type);
+            }
+        }
+
+        /// <summary>
+        /// Unregisters a previously-registered sub-class of <see cref="ParseObject"/> with the subclassing controller.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="serviceHub"></param>
+        public static void RemoveClass<T>(this IServiceHub serviceHub) where T : ParseObject, new() => serviceHub.ClassController.RemoveClass(typeof(T));
+
+        /// <summary>
+        /// Unregisters a previously-registered sub-class of <see cref="ParseObject"/> with the subclassing controller.
+        /// </summary>
+        /// <param name="subclassingController"></param>
+        /// <param name="type"></param>
+        public static void RemoveClass(this IParseObjectClassController subclassingController, Type type)
+        {
+            if (typeof(ParseObject).IsAssignableFrom(type))
+            {
+                subclassingController.RemoveClass(type);
+            }
+        }
+
+        /// <summary>
+        /// Creates a new ParseObject based upon a class name. If the class name is a special type (e.g.
+        /// for <see cref="ParseUser"/>), then the appropriate type of ParseObject is returned.
+        /// </summary>
+        /// <param name="className">The class of object to create.</param>
+        /// <returns>A new ParseObject for the given class name.</returns>
+        public static ParseObject CreateObject(this IServiceHub serviceHub, string className) => serviceHub.ClassController.Instantiate(className, serviceHub);
+
+        /// <summary>
+        /// Creates a new ParseObject based upon a given subclass type.
+        /// </summary>
+        /// <returns>A new ParseObject for the given class name.</returns>
+        public static T CreateObject<T>(this IServiceHub serviceHub) where T : ParseObject => (T) serviceHub.ClassController.CreateObject<T>(serviceHub);
+
+        /// <summary>
+        /// Creates a new ParseObject based upon a given subclass type.
+        /// </summary>
+        /// <returns>A new ParseObject for the given class name.</returns>
+        public static T CreateObject<T>(this IParseObjectClassController classController, IServiceHub serviceHub) where T : ParseObject => (T) classController.Instantiate(classController.GetClassName(typeof(T)), serviceHub);
+
+        /// <summary>
+        /// Creates a reference to an existing ParseObject for use in creating associations between
+        /// ParseObjects. Calling <see cref="IsDataAvailable"/> on this object will return
+        /// <c>false</c> until <see cref="ParseExtensions.FetchIfNeededAsync{T}(T)"/> has been called.
+        /// No network request will be made.
+        /// </summary>
+        /// <param name="className">The object's class.</param>
+        /// <param name="objectId">The object id for the referenced object.</param>
+        /// <returns>A ParseObject without data.</returns>
+        public static ParseObject CreateObjectWithoutData(this IServiceHub serviceHub, string className, string objectId) => serviceHub.ClassController.CreateObjectWithoutData(className, objectId, serviceHub);
+
+        /// <summary>
+        /// Creates a reference to an existing ParseObject for use in creating associations between
+        /// ParseObjects. Calling <see cref="IsDataAvailable"/> on this object will return
+        /// <c>false</c> until <see cref="ParseExtensions.FetchIfNeededAsync{T}(T)"/> has been called.
+        /// No network request will be made.
+        /// </summary>
+        /// <param name="className">The object's class.</param>
+        /// <param name="objectId">The object id for the referenced object.</param>
+        /// <returns>A ParseObject without data.</returns>
+        public static ParseObject CreateObjectWithoutData(this IParseObjectClassController classController, string className, string objectId, IServiceHub serviceHub)
+        {
+            ParseObject.CreatingPointer.Value = true;
+            try
+            {
+                ParseObject result = classController.Instantiate(className, serviceHub);
+                result.ObjectId = objectId;
+
+                // Left in because the property setter might be doing something funky.
+
+                result.IsDirty = false;
+                return result.IsDirty ? throw new InvalidOperationException("A ParseObject subclass default constructor must not make changes to the object that cause it to be dirty.") : result;
+            }
+            finally { ParseObject.CreatingPointer.Value = false; }
+        }
+
+        /// <summary>
+        /// Creates a reference to an existing ParseObject for use in creating associations between
+        /// ParseObjects. Calling <see cref="IsDataAvailable"/> on this object will return
+        /// <c>false</c> until <see cref="ParseExtensions.FetchIfNeededAsync{T}(T)"/> has been called.
+        /// No network request will be made.
+        /// </summary>
+        /// <param name="objectId">The object id for the referenced object.</param>
+        /// <returns>A ParseObject without data.</returns>
+        public static T CreateObjectWithoutData<T>(this IServiceHub serviceHub, string objectId) where T : ParseObject => (T) serviceHub.CreateObjectWithoutData(serviceHub.ClassController.GetClassName(typeof(T)), objectId);
+
+        /// <summary>
+        /// Deletes each object in the provided list.
+        /// </summary>
+        /// <param name="objects">The objects to delete.</param>
+        public static Task DeleteObjectsAsync<T>(this IServiceHub serviceHub, IEnumerable<T> objects) where T : ParseObject => DeleteObjectsAsync(serviceHub, objects, CancellationToken.None);
+
+        /// <summary>
+        /// Deletes each object in the provided list.
+        /// </summary>
+        /// <param name="objects">The objects to delete.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public static Task DeleteObjectsAsync<T>(this IServiceHub serviceHub, IEnumerable<T> objects, CancellationToken cancellationToken) where T : ParseObject
+        {
+            HashSet<ParseObject> unique = new HashSet<ParseObject>(objects.OfType<ParseObject>().ToList(), new IdentityEqualityComparer<ParseObject> { });
+
+            return EnqueueForAll(unique, toAwait => toAwait.OnSuccess(_ => Task.WhenAll(serviceHub.ObjectController.DeleteAllAsync(unique.Select(task => task.State).ToList(), serviceHub.GetCurrentSessionToken(), cancellationToken))).Unwrap().OnSuccess(task =>
+            {
+                // Dirty all objects in memory.
+
+                foreach (ParseObject obj in unique)
+                {
+                    obj.IsDirty = true;
+                }
+
+                return default(object);
+            }), cancellationToken);
+        }
+
+        /// <summary>
+        /// Fetches all of the objects in the provided list.
+        /// </summary>
+        /// <param name="objects">The objects to fetch.</param>
+        /// <returns>The list passed in for convenience.</returns>
+        public static Task<IEnumerable<T>> FetchObjectsAsync<T>(this IServiceHub serviceHub, IEnumerable<T> objects) where T : ParseObject => FetchObjectsAsync(serviceHub, objects, CancellationToken.None);
+
+        /// <summary>
+        /// Fetches all of the objects in the provided list.
+        /// </summary>
+        /// <param name="objects">The objects to fetch.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>The list passed in for convenience.</returns>
+        public static Task<IEnumerable<T>> FetchObjectsAsync<T>(this IServiceHub serviceHub, IEnumerable<T> objects, CancellationToken cancellationToken) where T : ParseObject => EnqueueForAll(objects.Cast<ParseObject>(), (Task toAwait) => serviceHub.FetchAllInternalAsync(objects, true, toAwait, cancellationToken), cancellationToken);
+
+        /// <summary>
+        /// Fetches all of the objects that don't have data in the provided list.
+        /// </summary>
+        /// <param name="objects">todo: describe objects parameter on FetchAllIfNeededAsync</param>
+        /// <returns>The list passed in for convenience.</returns>
+        public static Task<IEnumerable<T>> FetchObjectsIfNeededAsync<T>(this IServiceHub serviceHub, IEnumerable<T> objects) where T : ParseObject => FetchObjectsIfNeededAsync(serviceHub, objects, CancellationToken.None);
+
+        /// <summary>
+        /// Fetches all of the objects that don't have data in the provided list.
+        /// </summary>
+        /// <param name="objects">The objects to fetch.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>The list passed in for convenience.</returns>
+        public static Task<IEnumerable<T>> FetchObjectsIfNeededAsync<T>(this IServiceHub serviceHub, IEnumerable<T> objects, CancellationToken cancellationToken) where T : ParseObject => EnqueueForAll(objects.Cast<ParseObject>(), (Task toAwait) => serviceHub.FetchAllInternalAsync(objects, false, toAwait, cancellationToken), cancellationToken);
+
+        /// <summary>
+        /// Gets a <see cref="ParseQuery{ParseObject}"/> for the type of object specified by
+        /// <paramref name="className"/>
+        /// </summary>
+        /// <param name="className">The class name of the object.</param>
+        /// <returns>A new <see cref="ParseQuery{ParseObject}"/>.</returns>
+        public static ParseQuery<ParseObject> GetQuery(this IServiceHub serviceHub, string className)
+        {
+            // Since we can't return a ParseQuery<ParseUser> (due to strong-typing with
+            // generics), we'll require you to go through subclasses. This is a better
+            // experience anyway, especially with LINQ integration, since you'll get
+            // strongly-typed queries and compile-time checking of property names and
+            // types.
+
+            if (serviceHub.ClassController.GetType(className) is { })
+            {
+                throw new ArgumentException($"Use the class-specific query properties for class {className}", nameof(className));
+            }
+            return new ParseQuery<ParseObject>(serviceHub, className);
+        }
+
+        /// <summary>
+        /// Saves each object in the provided list.
+        /// </summary>
+        /// <param name="objects">The objects to save.</param>
+        public static Task SaveObjectsAsync<T>(this IServiceHub serviceHub, IEnumerable<T> objects) where T : ParseObject => SaveObjectsAsync(serviceHub, objects, CancellationToken.None);
+
+        /// <summary>
+        /// Saves each object in the provided list.
+        /// </summary>
+        /// <param name="objects">The objects to save.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public static Task SaveObjectsAsync<T>(this IServiceHub serviceHub, IEnumerable<T> objects, CancellationToken cancellationToken) where T : ParseObject => DeepSaveAsync(serviceHub, objects.ToList(), serviceHub.GetCurrentSessionToken(), cancellationToken);
+
+        /// <summary>
+        /// Flattens dictionaries and lists into a single enumerable of all contained objects
+        /// that can then be queried over.
+        /// </summary>
+        /// <param name="root">The root of the traversal</param>
+        /// <param name="traverseParseObjects">Whether to traverse into ParseObjects' children</param>
+        /// <param name="yieldRoot">Whether to include the root in the result</param>
+        /// <returns></returns>
+        internal static IEnumerable<object> TraverseObjectDeep(this IServiceHub serviceHub, object root, bool traverseParseObjects = false, bool yieldRoot = false)
+        {
+            IEnumerable<object> items = DeepTraversalInternal(serviceHub, root, traverseParseObjects, new HashSet<object>(new IdentityEqualityComparer<object>()));
+            return yieldRoot ? new[] { root }.Concat(items) : items;
+        }
+
+        // TODO (hallucinogen): add unit test
+        internal static T GenerateObjectFromState<T>(this IServiceHub serviceHub, IObjectState state, string defaultClassName) where T : ParseObject => serviceHub.ClassController.GenerateObjectFromState<T>(state, defaultClassName, serviceHub);
+
+        internal static T GenerateObjectFromState<T>(this IParseObjectClassController classController, IObjectState state, string defaultClassName, IServiceHub serviceHub) where T : ParseObject
+        {
+            T obj = (T) classController.CreateObjectWithoutData(state.ClassName ?? defaultClassName, state.ObjectId, serviceHub);
+            obj.HandleFetchResult(state);
+
+            return obj;
+        }
+
+        internal static IDictionary<string, object> GenerateJSONObjectForSaving(this IServiceHub serviceHub, IDictionary<string, IParseFieldOperation> operations)
+        {
+            Dictionary<string, object> result = new Dictionary<string, object>();
+
+            foreach (KeyValuePair<string, IParseFieldOperation> pair in operations)
+            {
+                result[pair.Key] = PointerOrLocalIdEncoder.Instance.Encode(pair.Value, serviceHub);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Returns true if the given object can be serialized for saving as a value
+        /// that is pointed to by a ParseObject.
+        /// </summary>
+        internal static bool CanBeSerializedAsValue(this IServiceHub serviceHub, object value) => TraverseObjectDeep(serviceHub, value, yieldRoot: true).OfType<ParseObject>().All(entity => entity.ObjectId is { });
+
+        static void CollectDirtyChildren(this IServiceHub serviceHub, object node, IList<ParseObject> dirtyChildren, ICollection<ParseObject> seen, ICollection<ParseObject> seenNew)
+        {
+            foreach (ParseObject target in TraverseObjectDeep(serviceHub, node).OfType<ParseObject>())
+            {
+                ICollection<ParseObject> scopedSeenNew;
+
+                // Check for cycles of new objects. Any such cycle means it will be impossible to save
+                // this collection of objects, so throw an exception.
+
+                if (target.ObjectId != null)
+                {
+                    scopedSeenNew = new HashSet<ParseObject>(new IdentityEqualityComparer<ParseObject>());
+                }
+                else
+                {
+                    if (seenNew.Contains(target))
+                    {
+                        throw new InvalidOperationException("Found a circular dependency while saving");
+                    }
+
+                    scopedSeenNew = new HashSet<ParseObject>(seenNew, new IdentityEqualityComparer<ParseObject>()) { target };
+                }
+
+                // Check for cycles of any object. If this occurs, then there's no problem, but
+                // we shouldn't recurse any deeper, because it would be an infinite recursion.
+
+                if (seen.Contains(target))
+                {
+                    return;
+                }
+
+                seen.Add(target);
+
+                // Recurse into this object's children looking for dirty children.
+                // We only need to look at the child object's current estimated data,
+                // because that's the only data that might need to be saved now.
+
+                CollectDirtyChildren(serviceHub, target.EstimatedData, dirtyChildren, seen, scopedSeenNew);
+
+                if (target.CheckIsDirty(false))
+                {
+                    dirtyChildren.Add(target);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Helper version of CollectDirtyChildren so that callers don't have to add the internally
+        /// used parameters.
+        /// </summary>
+        static void CollectDirtyChildren(this IServiceHub serviceHub, object node, IList<ParseObject> dirtyChildren) => CollectDirtyChildren(serviceHub, node, dirtyChildren, new HashSet<ParseObject>(new IdentityEqualityComparer<ParseObject>()), new HashSet<ParseObject>(new IdentityEqualityComparer<ParseObject>()));
+
+        internal static Task DeepSaveAsync(this IServiceHub serviceHub, object target, string sessionToken, CancellationToken cancellationToken)
+        {
+            List<ParseObject> objects = new List<ParseObject>();
+            CollectDirtyChildren(serviceHub, target, objects);
+
+            HashSet<ParseObject> uniqueObjects = new HashSet<ParseObject>(objects, new IdentityEqualityComparer<ParseObject>());
+            List<Task> saveDirtyFileTasks = TraverseObjectDeep(serviceHub, target, true).OfType<ParseFile>().Where(file => file.IsDirty).Select(file => file.SaveAsync(serviceHub, cancellationToken)).ToList();
+
+            return Task.WhenAll(saveDirtyFileTasks).OnSuccess(_ =>
+            {
+                IEnumerable<ParseObject> remaining = new List<ParseObject>(uniqueObjects);
+                return InternalExtensions.WhileAsync(() => Task.FromResult(remaining.Any()), () =>
+                {
+                    // Partition the objects into two sets: those that can be saved immediately,
+                    // and those that rely on other objects to be created first.
+
+                    List<ParseObject> current = (from item in remaining where item.CanBeSerialized select item).ToList(), nextBatch = (from item in remaining where !item.CanBeSerialized select item).ToList();
+                    remaining = nextBatch;
+
+                    if (current.Count == 0)
+                    {
+                        // We do cycle-detection when building the list of objects passed to this
+                        // function, so this should never get called. But we should check for it
+                        // anyway, so that we get an exception instead of an infinite loop.
+
+                        throw new InvalidOperationException("Unable to save a ParseObject with a relation to a cycle.");
+                    }
+
+                    // Save all of the objects in current.
+
+                    return EnqueueForAll(current, toAwait => toAwait.OnSuccess(__ =>
+                    {
+                        List<IObjectState> states = (from item in current select item.State).ToList();
+                        List<IDictionary<string, IParseFieldOperation>> operationsList = (from item in current select item.StartSave()).ToList();
+
+                        IList<Task<IObjectState>> saveTasks = serviceHub.ObjectController.SaveAllAsync(states, operationsList, sessionToken, serviceHub, cancellationToken);
+
+                        return Task.WhenAll(saveTasks).ContinueWith(task =>
+                        {
+                            if (task.IsFaulted || task.IsCanceled)
+                            {
+                                foreach ((ParseObject item, IDictionary<string, IParseFieldOperation> ops) pair in current.Zip(operationsList, (item, ops) => (item, ops)))
+                                {
+                                    pair.item.HandleFailedSave(pair.ops);
+                                }
+                            }
+                            else
+                            {
+                                foreach ((ParseObject item, IObjectState state) pair in current.Zip(task.Result, (item, state) => (item, state)))
+                                {
+                                    pair.item.HandleSave(pair.state);
+                                }
+                            }
+
+                            cancellationToken.ThrowIfCancellationRequested();
+                            return task;
+                        }).Unwrap();
+                    }).Unwrap().OnSuccess(t => (object) null), cancellationToken);
+                });
+            }).Unwrap();
+        }
+
+        static IEnumerable<object> DeepTraversalInternal(this IServiceHub serviceHub, object root, bool traverseParseObjects, ICollection<object> seen)
+        {
+            seen.Add(root);
+            System.Collections.IEnumerable targets = ParseClient.IL2CPPCompiled ? null : null as IEnumerable<object>;
+
+            if (Conversion.As<IDictionary<string, object>>(root) is { } rootDictionary)
+            {
+                targets = rootDictionary.Values;
+            }
+            else
+            {
+                if (Conversion.As<IList<object>>(root) is { } rootList)
+                {
+                    targets = rootList;
+                }
+                else if (traverseParseObjects)
+                {
+                    if (root is ParseObject entity)
+                    {
+                        targets = entity.Keys.ToList().Select(key => entity[key]);
+                    }
+                }
+            }
+
+            if (targets is { })
+            {
+                foreach (object item in targets)
+                {
+                    if (!seen.Contains(item))
+                    {
+                        yield return item;
+
+                        foreach (object child in DeepTraversalInternal(serviceHub, item, traverseParseObjects, seen))
+                        {
+                            yield return child;
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Adds a task to the queue for all of the given objects.
+        /// </summary>
+        static Task<T> EnqueueForAll<T>(IEnumerable<ParseObject> objects, Func<Task, Task<T>> taskStart, CancellationToken cancellationToken)
+        {
+            // The task that will be complete when all of the child queues indicate they're ready to start.
+
+            TaskCompletionSource<object> readyToStart = new TaskCompletionSource<object>();
+
+            // First, we need to lock the mutex for the queue for every object. We have to hold this
+            // from at least when taskStart() is called to when obj.taskQueue enqueue is called, so
+            // that saves actually get executed in the order they were setup by taskStart().
+            // The locks have to be sorted so that we always acquire them in the same order.
+            // Otherwise, there's some risk of deadlock.
+
+            LockSet lockSet = new LockSet(objects.Select(o => o.TaskQueue.Mutex));
+
+            lockSet.Enter();
+            try
+            {
+                // The task produced by taskStart. By running this immediately, we allow everything prior
+                // to toAwait to run before waiting for all of the queues on all of the objects.
+
+                Task<T> fullTask = taskStart(readyToStart.Task);
+
+                // Add fullTask to each of the objects' queues.
+
+                List<Task> childTasks = new List<Task>();
+                foreach (ParseObject obj in objects)
+                {
+                    obj.TaskQueue.Enqueue((Task task) =>
+                    {
+                        childTasks.Add(task);
+                        return fullTask;
+                    }, cancellationToken);
+                }
+
+                // When all of the objects' queues are ready, signal fullTask that it's ready to go on.
+                Task.WhenAll(childTasks.ToArray()).ContinueWith((Task task) => readyToStart.SetResult(default));
+                return fullTask;
+            }
+            finally
+            {
+                lockSet.Exit();
+            }
+        }
+
+        /// <summary>
+        /// Fetches all of the objects in the list.
+        /// </summary>
+        /// <param name="objects">The objects to fetch.</param>
+        /// <param name="force">If false, only objects without data will be fetched.</param>
+        /// <param name="toAwait">A task to await before starting.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>The list passed in for convenience.</returns>
+        static Task<IEnumerable<T>> FetchAllInternalAsync<T>(this IServiceHub serviceHub, IEnumerable<T> objects, bool force, Task toAwait, CancellationToken cancellationToken) where T : ParseObject => toAwait.OnSuccess(_ =>
+        {
+            if (objects.Any(obj => obj.State.ObjectId == null))
+            {
+                throw new InvalidOperationException("You cannot fetch objects that haven't already been saved.");
+            }
+
+            List<T> objectsToFetch = (from obj in objects where force || !obj.IsDataAvailable select obj).ToList();
+
+            if (objectsToFetch.Count == 0)
+            {
+                return Task.FromResult(objects);
+            }
+
+            // Do one Find for each class.
+
+            Dictionary<string, Task<IEnumerable<ParseObject>>> findsByClass = (from obj in objectsToFetch group obj.ObjectId by obj.ClassName into classGroup where classGroup.Count() > 0 select (ClassName: classGroup.Key, FindTask: new ParseQuery<ParseObject>(serviceHub, classGroup.Key).WhereContainedIn("objectId", classGroup).FindAsync(cancellationToken))).ToDictionary(pair => pair.ClassName, pair => pair.FindTask);
+
+            // Wait for all the Finds to complete.
+
+            return Task.WhenAll(findsByClass.Values.ToList()).OnSuccess(__ =>
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return objects;
+                }
+
+                // Merge the data from the Finds into the input objects.
+                foreach ((T obj, ParseObject result) in from obj in objectsToFetch from result in findsByClass[obj.ClassName].Result where result.ObjectId == obj.ObjectId select (obj, result))
+                {
+                    obj.MergeFromObject(result);
+                    obj.Fetched = true;
+                }
+
+                return objects;
+            });
+        }).Unwrap();
+
+        internal static string GetFieldForPropertyName(this IServiceHub serviceHub, string className, string propertyName) => serviceHub.ClassController.GetPropertyMappings(className).TryGetValue(propertyName, out string fieldName) ? fieldName : fieldName;
+    }
+}
diff --git a/Parse/Utilities/ParseExtensions.cs b/Parse/Utilities/ParseExtensions.cs
new file mode 100644
index 00000000..682a1234
--- /dev/null
+++ b/Parse/Utilities/ParseExtensions.cs
@@ -0,0 +1,42 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse
+{
+    /// <summary>
+    /// Provides convenience extension methods for working with collections
+    /// of ParseObjects so that you can easily save and fetch them in batches.
+    /// </summary>
+    public static class ParseExtensions
+    {
+        /// <summary>
+        /// Fetches this object with the data from the server.
+        /// </summary>
+        public static Task<T> FetchAsync<T>(this T obj) where T : ParseObject => obj.FetchAsyncInternal(CancellationToken.None).OnSuccess(t => (T) t.Result);
+
+        /// <summary>
+        /// Fetches this object with the data from the server.
+        /// </summary>
+        /// <param name="target">The ParseObject to fetch.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public static Task<T> FetchAsync<T>(this T target, CancellationToken cancellationToken) where T : ParseObject => target.FetchAsyncInternal(cancellationToken).OnSuccess(task => (T) task.Result);
+
+        /// <summary>
+        /// If this ParseObject has not been fetched (i.e. <see cref="ParseObject.IsDataAvailable"/> returns
+        /// false), fetches this object with the data from the server.
+        /// </summary>
+        /// <param name="obj">The ParseObject to fetch.</param>
+        public static Task<T> FetchIfNeededAsync<T>(this T obj) where T : ParseObject => obj.FetchIfNeededAsyncInternal(CancellationToken.None).OnSuccess(t => (T) t.Result);
+
+        /// <summary>
+        /// If this ParseObject has not been fetched (i.e. <see cref="ParseObject.IsDataAvailable"/> returns
+        /// false), fetches this object with the data from the server.
+        /// </summary>
+        /// <param name="obj">The ParseObject to fetch.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public static Task<T> FetchIfNeededAsync<T>(this T obj, CancellationToken cancellationToken) where T : ParseObject => obj.FetchIfNeededAsyncInternal(cancellationToken).OnSuccess(t => (T) t.Result);
+    }
+}
diff --git a/Parse/Internal/Utilities/ParseFileExtensions.cs b/Parse/Utilities/ParseFileExtensions.cs
similarity index 85%
rename from Parse/Internal/Utilities/ParseFileExtensions.cs
rename to Parse/Utilities/ParseFileExtensions.cs
index a5bbd236..1f5f3e2e 100644
--- a/Parse/Internal/Utilities/ParseFileExtensions.cs
+++ b/Parse/Utilities/ParseFileExtensions.cs
@@ -1,9 +1,8 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
 using System;
-using System.Collections.Generic;
 
-namespace Parse.Core.Internal
+namespace Parse.Abstractions.Internal
 {
     /// <summary>
     /// So here's the deal. We have a lot of internal APIs for ParseObject, ParseUser, etc.
@@ -17,9 +16,6 @@ namespace Parse.Core.Internal
     /// </summary>
     public static class ParseFileExtensions
     {
-        public static ParseFile Create(string name, Uri uri, string mimeType = null)
-        {
-            return new ParseFile(name, uri, mimeType);
-        }
+        public static ParseFile Create(string name, Uri uri, string mimeType = null) => new ParseFile(name, uri, mimeType);
     }
 }
diff --git a/Parse/Utilities/ParseQueryExtensions.cs b/Parse/Utilities/ParseQueryExtensions.cs
new file mode 100644
index 00000000..b8e2d816
--- /dev/null
+++ b/Parse/Utilities/ParseQueryExtensions.cs
@@ -0,0 +1,686 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+using Parse.Infrastructure.Data;
+
+namespace Parse.Abstractions.Internal
+{
+#warning Fully refactor at some point.
+
+    /// <summary>
+    /// So here's the deal. We have a lot of internal APIs for ParseObject, ParseUser, etc.
+    ///
+    /// These cannot be 'internal' anymore if we are fully modularizing things out, because
+    /// they are no longer a part of the same library, especially as we create things like
+    /// Installation inside push library.
+    ///
+    /// So this class contains a bunch of extension methods that can live inside another
+    /// namespace, which 'wrap' the intenral APIs that already exist.
+    /// </summary>
+    public static class ParseQueryExtensions
+    {
+        static MethodInfo ParseObjectGetMethod { get; }
+
+        static MethodInfo StringContainsMethod { get; }
+
+        static MethodInfo StringStartsWithMethod { get; }
+
+        static MethodInfo StringEndsWithMethod { get; }
+
+        static MethodInfo ContainsMethod { get; }
+
+        static MethodInfo NotContainsMethod { get; }
+
+        static MethodInfo ContainsKeyMethod { get; }
+
+        static MethodInfo NotContainsKeyMethod { get; }
+
+        static Dictionary<MethodInfo, MethodInfo> Mappings { get; }
+
+        static ParseQueryExtensions()
+        {
+            ParseObjectGetMethod = GetMethod<ParseObject>(target => target.Get<int>(null)).GetGenericMethodDefinition();
+            StringContainsMethod = GetMethod<string>(text => text.Contains(null));
+            StringStartsWithMethod = GetMethod<string>(text => text.StartsWith(null));
+            StringEndsWithMethod = GetMethod<string>(text => text.EndsWith(null));
+
+            Mappings = new Dictionary<MethodInfo, MethodInfo>
+            {
+                [StringContainsMethod] = GetMethod<ParseQuery<ParseObject>>(query => query.WhereContains(null, null)),
+                [StringStartsWithMethod] = GetMethod<ParseQuery<ParseObject>>(query => query.WhereStartsWith(null, null)),
+                [StringEndsWithMethod] = GetMethod<ParseQuery<ParseObject>>(query => query.WhereEndsWith(null, null)),
+            };
+
+            ContainsMethod = GetMethod<object>(o => ContainsStub<object>(null, null)).GetGenericMethodDefinition();
+            NotContainsMethod = GetMethod<object>(o => NotContainsStub<object>(null, null)).GetGenericMethodDefinition();
+
+            ContainsKeyMethod = GetMethod<object>(o => ContainsKeyStub(null, null));
+            NotContainsKeyMethod = GetMethod<object>(o => NotContainsKeyStub(null, null));
+        }
+
+        /// <summary>
+        /// Gets a MethodInfo for a top-level method call.
+        /// </summary>
+        static MethodInfo GetMethod<T>(Expression<Action<T>> expression) => (expression.Body as MethodCallExpression).Method;
+
+        /// <summary>
+        /// When a query is normalized, this is a placeholder to indicate we should
+        /// add a WhereContainedIn() clause.
+        /// </summary>
+        static bool ContainsStub<T>(object collection, T value) => throw new NotImplementedException("Exists only for expression translation as a placeholder.");
+
+        /// <summary>
+        /// When a query is normalized, this is a placeholder to indicate we should
+        /// add a WhereNotContainedIn() clause.
+        /// </summary>
+        static bool NotContainsStub<T>(object collection, T value) => throw new NotImplementedException("Exists only for expression translation as a placeholder.");
+
+        /// <summary>
+        /// When a query is normalized, this is a placeholder to indicate that we should
+        /// add a WhereExists() clause.
+        /// </summary>
+        static bool ContainsKeyStub(ParseObject obj, string key) => throw new NotImplementedException("Exists only for expression translation as a placeholder.");
+
+        /// <summary>
+        /// When a query is normalized, this is a placeholder to indicate that we should
+        /// add a WhereDoesNotExist() clause.
+        /// </summary>
+        static bool NotContainsKeyStub(ParseObject obj, string key) => throw new NotImplementedException("Exists only for expression translation as a placeholder.");
+
+        /// <summary>
+        /// Evaluates an expression and throws if the expression has components that can't be
+        /// evaluated (e.g. uses the parameter that's only represented by an object on the server).
+        /// </summary>
+        static object GetValue(Expression exp)
+        {
+            try
+            {
+                return Expression.Lambda(typeof(Func<>).MakeGenericType(exp.Type), exp).Compile().DynamicInvoke();
+            }
+            catch (Exception e)
+            {
+                throw new InvalidOperationException("Unable to evaluate expression: " + exp, e);
+            }
+        }
+
+        /// <summary>
+        /// Checks whether the MethodCallExpression is a call to ParseObject.Get(),
+        /// which is the call we normalize all indexing into the ParseObject to.
+        /// </summary>
+        static bool IsParseObjectGet(MethodCallExpression node) => node is { Object: { } } && typeof(ParseObject).GetTypeInfo().IsAssignableFrom(node.Object.Type.GetTypeInfo()) && node.Method.IsGenericMethod && node.Method.GetGenericMethodDefinition() == ParseObjectGetMethod;
+
+        /// <summary>
+        /// Visits an Expression, converting ParseObject.Get/ParseObject[]/ParseObject.Property,
+        /// and nested indices into a single call to ParseObject.Get() with a "field path" like
+        /// "foo.bar.baz"
+        /// </summary>
+        class ObjectNormalizer : ExpressionVisitor
+        {
+            protected override Expression VisitIndex(IndexExpression node)
+            {
+                Expression visitedObject = Visit(node.Object);
+                MethodCallExpression indexer = visitedObject as MethodCallExpression;
+
+                if (IsParseObjectGet(indexer))
+                {
+                    if (!(GetValue(node.Arguments[0]) is string indexValue))
+                    {
+                        throw new InvalidOperationException("Index must be a string");
+                    }
+
+                    return Expression.Call(indexer.Object, ParseObjectGetMethod.MakeGenericMethod(node.Type), Expression.Constant($"{GetValue(indexer.Arguments[0])}.{indexValue}", typeof(string)));
+                }
+
+                return base.VisitIndex(node);
+            }
+
+            /// <summary>
+            /// Check for a ParseFieldName attribute and use that as the path component, turning
+            /// properties like foo.ObjectId into foo.Get("objectId")
+            /// </summary>
+            protected override Expression VisitMember(MemberExpression node) => node.Member.GetCustomAttribute<ParseFieldNameAttribute>() is { } fieldName && typeof(ParseObject).GetTypeInfo().IsAssignableFrom(node.Expression.Type.GetTypeInfo()) ? Expression.Call(node.Expression, ParseObjectGetMethod.MakeGenericMethod(node.Type), Expression.Constant(fieldName.FieldName, typeof(string))) : base.VisitMember(node);
+
+            /// <summary>
+            /// If a ParseObject.Get() call has been cast, just change the generic parameter.
+            /// </summary>
+            protected override Expression VisitUnary(UnaryExpression node)
+            {
+                MethodCallExpression methodCall = Visit(node.Operand) as MethodCallExpression;
+                return (node.NodeType == ExpressionType.Convert || node.NodeType == ExpressionType.ConvertChecked) && IsParseObjectGet(methodCall) ? Expression.Call(methodCall.Object, ParseObjectGetMethod.MakeGenericMethod(node.Type), methodCall.Arguments) : base.VisitUnary(node);
+            }
+
+            protected override Expression VisitMethodCall(MethodCallExpression node)
+            {
+                // Turn parseObject["foo"] into parseObject.Get<object>("foo")
+
+                if (node.Method.Name == "get_Item" && node.Object is ParameterExpression)
+                {
+                    return Expression.Call(node.Object, ParseObjectGetMethod.MakeGenericMethod(typeof(object)), Expression.Constant(GetValue(node.Arguments[0]) as string, typeof(string)));
+                }
+
+                // Turn parseObject.Get<object>("foo")["bar"] into parseObject.Get<object>("foo.bar")
+
+                if (node.Method.Name == "get_Item" || IsParseObjectGet(node))
+                {
+                    Expression visitedObject = Visit(node.Object);
+                    MethodCallExpression indexer = visitedObject as MethodCallExpression;
+
+                    if (IsParseObjectGet(indexer))
+                    {
+                        if (!(GetValue(node.Arguments[0]) is string indexValue))
+                        {
+                            throw new InvalidOperationException("Index must be a string");
+                        }
+
+                        return Expression.Call(indexer.Object, ParseObjectGetMethod.MakeGenericMethod(node.Type), Expression.Constant($"{GetValue(indexer.Arguments[0])}.{indexValue}", typeof(string)));
+                    }
+                }
+
+                return base.VisitMethodCall(node);
+            }
+        }
+
+        /// <summary>
+        /// Normalizes Where expressions.
+        /// </summary>
+        class WhereNormalizer : ExpressionVisitor
+        {
+
+            /// <summary>
+            /// Normalizes binary operators. &lt;, &gt;, &lt;=, &gt;= !=, and ==
+            /// This puts the ParseObject.Get() on the left side of the operation
+            /// (reversing it if necessary), and normalizes the ParseObject.Get()
+            /// </summary>
+            protected override Expression VisitBinary(BinaryExpression node)
+            {
+                MethodCallExpression rightTransformed = new ObjectNormalizer().Visit(node.Right) as MethodCallExpression, objectExpression;
+                Expression filterExpression;
+                bool inverted;
+
+                if (new ObjectNormalizer().Visit(node.Left) is MethodCallExpression leftTransformed)
+                {
+                    objectExpression = leftTransformed;
+                    filterExpression = node.Right;
+                    inverted = false;
+                }
+                else
+                {
+                    objectExpression = rightTransformed;
+                    filterExpression = node.Left;
+                    inverted = true;
+                }
+
+                try
+                {
+                    switch (node.NodeType)
+                    {
+                        case ExpressionType.GreaterThan:
+                            return inverted ? Expression.LessThan(objectExpression, filterExpression) : Expression.GreaterThan(objectExpression, filterExpression);
+                        case ExpressionType.GreaterThanOrEqual:
+                            return inverted ? Expression.LessThanOrEqual(objectExpression, filterExpression) : Expression.GreaterThanOrEqual(objectExpression, filterExpression);
+                        case ExpressionType.LessThan:
+                            return inverted ? Expression.GreaterThan(objectExpression, filterExpression) : Expression.LessThan(objectExpression, filterExpression);
+                        case ExpressionType.LessThanOrEqual:
+                            return inverted ? Expression.GreaterThanOrEqual(objectExpression, filterExpression) : Expression.LessThanOrEqual(objectExpression, filterExpression);
+                        case ExpressionType.Equal:
+                            return Expression.Equal(objectExpression, filterExpression);
+                        case ExpressionType.NotEqual:
+                            return Expression.NotEqual(objectExpression, filterExpression);
+                    }
+                }
+                catch (ArgumentException)
+                {
+                    throw new InvalidOperationException("Operation not supported: " + node);
+                }
+
+                return base.VisitBinary(node);
+            }
+
+            /// <summary>
+            /// If a ! operator is used, this removes the ! and instead calls the equivalent
+            /// function (so e.g. == becomes !=, &lt; becomes &gt;=, Contains becomes NotContains)
+            /// </summary>
+            protected override Expression VisitUnary(UnaryExpression node)
+            {
+                // This is incorrect because control is supposed to be able to flow out of the binaryOperand case if the value of NodeType is not matched against an ExpressionType value, which it will not do.
+                //
+                // return node switch
+                // {
+                //     { NodeType: ExpressionType.Not, Operand: var operand } => Visit(operand) switch
+                //     {
+                //         BinaryExpression { Left: var left, Right: var right, NodeType: var type } binaryOperand => type switch
+                //         {
+                //             ExpressionType.GreaterThan => Expression.LessThanOrEqual(left, right),
+                //             ExpressionType.GreaterThanOrEqual => Expression.LessThan(left, right),
+                //             ExpressionType.LessThan => Expression.GreaterThanOrEqual(left, right),
+                //             ExpressionType.LessThanOrEqual => Expression.GreaterThan(left, right),
+                //             ExpressionType.Equal => Expression.NotEqual(left, right),
+                //             ExpressionType.NotEqual => Expression.Equal(left, right),
+                //         },
+                //         _ => base.VisitUnary(node)
+                //     },
+                //     _ => base.VisitUnary(node)
+                // };
+
+                // Normalizes inversion
+
+                if (node.NodeType == ExpressionType.Not)
+                {
+                    Expression visitedOperand = Visit(node.Operand);
+                    if (visitedOperand is BinaryExpression binaryOperand)
+                    {
+                        switch (binaryOperand.NodeType)
+                        {
+                            case ExpressionType.GreaterThan:
+                                return Expression.LessThanOrEqual(binaryOperand.Left, binaryOperand.Right);
+                            case ExpressionType.GreaterThanOrEqual:
+                                return Expression.LessThan(binaryOperand.Left, binaryOperand.Right);
+                            case ExpressionType.LessThan:
+                                return Expression.GreaterThanOrEqual(binaryOperand.Left, binaryOperand.Right);
+                            case ExpressionType.LessThanOrEqual:
+                                return Expression.GreaterThan(binaryOperand.Left, binaryOperand.Right);
+                            case ExpressionType.Equal:
+                                return Expression.NotEqual(binaryOperand.Left, binaryOperand.Right);
+                            case ExpressionType.NotEqual:
+                                return Expression.Equal(binaryOperand.Left, binaryOperand.Right);
+                        }
+                    }
+
+                    if (visitedOperand is MethodCallExpression methodCallOperand)
+                    {
+                        if (methodCallOperand.Method.IsGenericMethod)
+                        {
+                            if (methodCallOperand.Method.GetGenericMethodDefinition() == ContainsMethod)
+                            {
+                                return Expression.Call(NotContainsMethod.MakeGenericMethod(methodCallOperand.Method.GetGenericArguments()), methodCallOperand.Arguments.ToArray());
+                            }
+                            if (methodCallOperand.Method.GetGenericMethodDefinition() == NotContainsMethod)
+                            {
+                                return Expression.Call(ContainsMethod.MakeGenericMethod(methodCallOperand.Method.GetGenericArguments()), methodCallOperand.Arguments.ToArray());
+                            }
+                        }
+                        if (methodCallOperand.Method == ContainsKeyMethod)
+                        {
+                            return Expression.Call(NotContainsKeyMethod, methodCallOperand.Arguments.ToArray());
+                        }
+                        if (methodCallOperand.Method == NotContainsKeyMethod)
+                        {
+                            return Expression.Call(ContainsKeyMethod, methodCallOperand.Arguments.ToArray());
+                        }
+                    }
+                }
+                return base.VisitUnary(node);
+            }
+
+            /// <summary>
+            /// Normalizes .Equals into == and Contains() into the appropriate stub.
+            /// </summary>
+            protected override Expression VisitMethodCall(MethodCallExpression node)
+            {
+                // Convert .Equals() into ==
+
+                if (node.Method.Name == "Equals" && node.Method.ReturnType == typeof(bool) && node.Method.GetParameters().Length == 1)
+                {
+                    MethodCallExpression obj = new ObjectNormalizer().Visit(node.Object) as MethodCallExpression,  parameter = new ObjectNormalizer().Visit(node.Arguments[0]) as MethodCallExpression;
+
+                    if (IsParseObjectGet(obj) && obj.Object is ParameterExpression || IsParseObjectGet(parameter) && parameter.Object is ParameterExpression)
+                    {
+                        return Expression.Equal(node.Object, node.Arguments[0]);
+                    }
+                }
+
+                // Convert the .Contains() into a ContainsStub
+
+                if (node.Method != StringContainsMethod && node.Method.Name == "Contains" && node.Method.ReturnType == typeof(bool) && node.Method.GetParameters().Length <= 2)
+                {
+                    Expression collection = node.Method.GetParameters().Length == 1 ? node.Object : node.Arguments[0];
+                    int parameterIndex = node.Method.GetParameters().Length - 1;
+
+                    if (new ObjectNormalizer().Visit(node.Arguments[parameterIndex]) is MethodCallExpression { } parameter && IsParseObjectGet(parameter) && parameter.Object is ParameterExpression)
+                    {
+                        return Expression.Call(ContainsMethod.MakeGenericMethod(parameter.Type), collection, parameter);
+                    }
+
+                    if (new ObjectNormalizer().Visit(collection) is MethodCallExpression { } target && IsParseObjectGet(target) && target.Object is ParameterExpression)
+                    {
+                        Expression element = node.Arguments[parameterIndex];
+                        return Expression.Call(ContainsMethod.MakeGenericMethod(element.Type), target, element);
+                    }
+                }
+
+                // Convert obj["foo.bar"].ContainsKey("baz") into obj.ContainsKey("foo.bar.baz").
+
+                if (node.Method.Name == "ContainsKey" && node.Method.ReturnType == typeof(bool) && node.Method.GetParameters().Length == 1)
+                {
+                    Expression target = null;
+                    string path = null;
+
+                    if (new ObjectNormalizer().Visit(node.Object) is MethodCallExpression { } getter && IsParseObjectGet(getter) && getter.Object is ParameterExpression)
+                    {
+                        return Expression.Call(ContainsKeyMethod, getter.Object, Expression.Constant($"{GetValue(getter.Arguments[0])}.{GetValue(node.Arguments[0])}"));
+                    }
+                    else if (node.Object is ParameterExpression)
+                    {
+                        target = node.Object;
+                        path = GetValue(node.Arguments[0]) as string;
+                    }
+
+                    if (target is { } && path is { })
+                    {
+                        return Expression.Call(ContainsKeyMethod, target, Expression.Constant(path));
+                    }
+                }
+                return base.VisitMethodCall(node);
+            }
+        }
+
+        /// <summary>
+        /// Converts a normalized method call expression into the appropriate ParseQuery clause.
+        /// </summary>
+        static ParseQuery<T> WhereMethodCall<T>(this ParseQuery<T> source, Expression<Func<T, bool>> expression, MethodCallExpression node) where T : ParseObject
+        {
+            if (IsParseObjectGet(node) && (node.Type == typeof(bool) || node.Type == typeof(bool?)))
+            {
+                // This is a raw boolean field access like 'where obj.Get<bool>("foo")'.
+
+                return source.WhereEqualTo(GetValue(node.Arguments[0]) as string, true);
+            }
+
+            if (Mappings.TryGetValue(node.Method, out MethodInfo translatedMethod))
+            {
+                MethodCallExpression objTransformed = new ObjectNormalizer().Visit(node.Object) as MethodCallExpression;
+
+                if (!(IsParseObjectGet(objTransformed) && objTransformed.Object == expression.Parameters[0]))
+                {
+                    throw new InvalidOperationException("The left-hand side of a supported function call must be a ParseObject field access.");
+                }
+
+                return translatedMethod.DeclaringType.GetGenericTypeDefinition().MakeGenericType(typeof(T)).GetRuntimeMethod(translatedMethod.Name, translatedMethod.GetParameters().Select(parameter => parameter.ParameterType).ToArray()).Invoke(source, new[] { GetValue(objTransformed.Arguments[0]), GetValue(node.Arguments[0]) }) as ParseQuery<T>;
+            }
+
+            if (node.Arguments[0] == expression.Parameters[0])
+            {
+                // obj.ContainsKey("foo") --> query.WhereExists("foo")
+
+                if (node.Method == ContainsKeyMethod)
+                {
+                    return source.WhereExists(GetValue(node.Arguments[1]) as string);
+                }
+
+                // !obj.ContainsKey("foo") --> query.WhereDoesNotExist("foo")
+
+                if (node.Method == NotContainsKeyMethod)
+                {
+                    return source.WhereDoesNotExist(GetValue(node.Arguments[1]) as string);
+                }
+            }
+
+            if (node.Method.IsGenericMethod)
+            {
+                if (node.Method.GetGenericMethodDefinition() == ContainsMethod)
+                {
+                    // obj.Get<IList<T>>("path").Contains(someValue)
+
+                    if (IsParseObjectGet(node.Arguments[0] as MethodCallExpression))
+                    {
+                        return source.WhereEqualTo(GetValue(((MethodCallExpression) node.Arguments[0]).Arguments[0]) as string, GetValue(node.Arguments[1]));
+                    }
+
+                    // someList.Contains(obj.Get<T>("path"))
+
+                    if (IsParseObjectGet(node.Arguments[1] as MethodCallExpression))
+                    {
+                        return source.WhereContainedIn(GetValue(((MethodCallExpression) node.Arguments[1]).Arguments[0]) as string, (GetValue(node.Arguments[0]) as IEnumerable).Cast<object>());
+                    }
+                }
+
+                if (node.Method.GetGenericMethodDefinition() == NotContainsMethod)
+                {
+                    // !obj.Get<IList<T>>("path").Contains(someValue)
+
+                    if (IsParseObjectGet(node.Arguments[0] as MethodCallExpression))
+                    {
+                        return source.WhereNotEqualTo(GetValue(((MethodCallExpression) node.Arguments[0]).Arguments[0]) as string, GetValue(node.Arguments[1]));
+                    }
+
+                    // !someList.Contains(obj.Get<T>("path"))
+
+                    if (IsParseObjectGet(node.Arguments[1] as MethodCallExpression))
+                    {
+                        return source.WhereNotContainedIn(GetValue(((MethodCallExpression) node.Arguments[1]).Arguments[0]) as string, (GetValue(node.Arguments[0]) as IEnumerable).Cast<object>());
+                    }
+                }
+            }
+            throw new InvalidOperationException(node.Method + " is not a supported method call in a where expression.");
+        }
+
+        /// <summary>
+        /// Converts a normalized binary expression into the appropriate ParseQuery clause.
+        /// </summary>
+        static ParseQuery<T> WhereBinaryExpression<T>(this ParseQuery<T> source, Expression<Func<T, bool>> expression, BinaryExpression node) where T : ParseObject
+        {
+            MethodCallExpression leftTransformed = new ObjectNormalizer().Visit(node.Left) as MethodCallExpression;
+
+            if (!(IsParseObjectGet(leftTransformed) && leftTransformed.Object == expression.Parameters[0]))
+            {
+                throw new InvalidOperationException("Where expressions must have one side be a field operation on a ParseObject.");
+            }
+
+            string fieldPath = GetValue(leftTransformed.Arguments[0]) as string;
+            object filterValue = GetValue(node.Right);
+
+            if (filterValue != null && !ParseDataEncoder.Validate(filterValue))
+            {
+                throw new InvalidOperationException("Where clauses must use types compatible with ParseObjects.");
+            }
+
+            return node.NodeType switch
+            {
+                ExpressionType.GreaterThan => source.WhereGreaterThan(fieldPath, filterValue),
+                ExpressionType.GreaterThanOrEqual => source.WhereGreaterThanOrEqualTo(fieldPath, filterValue),
+                ExpressionType.LessThan => source.WhereLessThan(fieldPath, filterValue),
+                ExpressionType.LessThanOrEqual => source.WhereLessThanOrEqualTo(fieldPath, filterValue),
+                ExpressionType.Equal => source.WhereEqualTo(fieldPath, filterValue),
+                ExpressionType.NotEqual => source.WhereNotEqualTo(fieldPath, filterValue),
+                _ => throw new InvalidOperationException("Where expressions do not support this operator."),
+            };
+        }
+
+        /// <summary>
+        /// Filters a query based upon the predicate provided.
+        /// </summary>
+        /// <typeparam name="TSource">The type of ParseObject being queried for.</typeparam>
+        /// <param name="source">The base <see cref="ParseQuery{TSource}"/> to which
+        /// the predicate will be added.</param>
+        /// <param name="predicate">A function to test each ParseObject for a condition.
+        /// The predicate must be able to be represented by one of the standard Where
+        /// functions on ParseQuery</param>
+        /// <returns>A new ParseQuery whose results will match the given predicate as
+        /// well as the source's filters.</returns>
+        public static ParseQuery<TSource> Where<TSource>(this ParseQuery<TSource> source, Expression<Func<TSource, bool>> predicate) where TSource : ParseObject
+        {
+            // Handle top-level logic operators && and ||
+
+            if (predicate.Body is BinaryExpression binaryExpression)
+            {
+                if (binaryExpression.NodeType == ExpressionType.AndAlso)
+                {
+                    return source.Where(Expression.Lambda<Func<TSource, bool>>(binaryExpression.Left, predicate.Parameters)).Where(Expression.Lambda<Func<TSource, bool>>(binaryExpression.Right, predicate.Parameters));
+                }
+
+                if (binaryExpression.NodeType == ExpressionType.OrElse)
+                {
+                    return source.Services.ConstructOrQuery(source.Where(Expression.Lambda<Func<TSource, bool>>(binaryExpression.Left, predicate.Parameters)), (ParseQuery<TSource>) source.Where(Expression.Lambda<Func<TSource, bool>>(binaryExpression.Right, predicate.Parameters)));
+                }
+            }
+
+            Expression normalized = new WhereNormalizer().Visit(predicate.Body);
+
+            if (normalized is MethodCallExpression methodCallExpr)
+            {
+                return source.WhereMethodCall(predicate, methodCallExpr);
+            }
+
+            if (normalized is BinaryExpression binaryExpr)
+            {
+                return source.WhereBinaryExpression(predicate, binaryExpr);
+            }
+
+            if (normalized is UnaryExpression { NodeType: ExpressionType.Not, Operand: MethodCallExpression { } node, Type: var type } unaryExpr && IsParseObjectGet(node) && (type == typeof(bool) || type == typeof(bool?)))
+            {
+                // This is a raw boolean field access like 'where !obj.Get<bool>("foo")'.
+
+                return source.WhereNotEqualTo(GetValue(node.Arguments[0]) as string, true);
+            }
+
+            throw new InvalidOperationException("Encountered an unsupported expression for ParseQueries.");
+        }
+
+        /// <summary>
+        /// Normalizes an OrderBy's keySelector expression and then extracts the path
+        /// from the ParseObject.Get() call.
+        /// </summary>
+        static string GetOrderByPath<TSource, TSelector>(Expression<Func<TSource, TSelector>> keySelector)
+        {
+            string result = null;
+            Expression normalized = new ObjectNormalizer().Visit(keySelector.Body);
+            MethodCallExpression callExpr = normalized as MethodCallExpression;
+
+            if (IsParseObjectGet(callExpr) && callExpr.Object == keySelector.Parameters[0])
+            {
+                // We're operating on the parameter
+
+                result = GetValue(callExpr.Arguments[0]) as string;
+            }
+
+            if (result == null)
+            {
+                throw new InvalidOperationException("OrderBy expression must be a field access on a ParseObject.");
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Orders a query based upon the key selector provided.
+        /// </summary>
+        /// <typeparam name="TSource">The type of ParseObject being queried for.</typeparam>
+        /// <typeparam name="TSelector">The type of key returned by keySelector.</typeparam>
+        /// <param name="source">The query to order.</param>
+        /// <param name="keySelector">A function to extract a key from the ParseObject.</param>
+        /// <returns>A new ParseQuery based on source whose results will be ordered by
+        /// the key specified in the keySelector.</returns>
+        public static ParseQuery<TSource> OrderBy<TSource, TSelector>(this ParseQuery<TSource> source, Expression<Func<TSource, TSelector>> keySelector) where TSource : ParseObject => source.OrderBy(GetOrderByPath(keySelector));
+
+        /// <summary>
+        /// Orders a query based upon the key selector provided.
+        /// </summary>
+        /// <typeparam name="TSource">The type of ParseObject being queried for.</typeparam>
+        /// <typeparam name="TSelector">The type of key returned by keySelector.</typeparam>
+        /// <param name="source">The query to order.</param>
+        /// <param name="keySelector">A function to extract a key from the ParseObject.</param>
+        /// <returns>A new ParseQuery based on source whose results will be ordered by
+        /// the key specified in the keySelector.</returns>
+        public static ParseQuery<TSource> OrderByDescending<TSource, TSelector>( this ParseQuery<TSource> source, Expression<Func<TSource, TSelector>> keySelector) where TSource : ParseObject => source.OrderByDescending(GetOrderByPath(keySelector));
+
+        /// <summary>
+        /// Performs a subsequent ordering of a query based upon the key selector provided.
+        /// </summary>
+        /// <typeparam name="TSource">The type of ParseObject being queried for.</typeparam>
+        /// <typeparam name="TSelector">The type of key returned by keySelector.</typeparam>
+        /// <param name="source">The query to order.</param>
+        /// <param name="keySelector">A function to extract a key from the ParseObject.</param>
+        /// <returns>A new ParseQuery based on source whose results will be ordered by
+        /// the key specified in the keySelector.</returns>
+        public static ParseQuery<TSource> ThenBy<TSource, TSelector>(this ParseQuery<TSource> source, Expression<Func<TSource, TSelector>> keySelector) where TSource : ParseObject => source.ThenBy(GetOrderByPath(keySelector));
+
+        /// <summary>
+        /// Performs a subsequent ordering of a query based upon the key selector provided.
+        /// </summary>
+        /// <typeparam name="TSource">The type of ParseObject being queried for.</typeparam>
+        /// <typeparam name="TSelector">The type of key returned by keySelector.</typeparam>
+        /// <param name="source">The query to order.</param>
+        /// <param name="keySelector">A function to extract a key from the ParseObject.</param>
+        /// <returns>A new ParseQuery based on source whose results will be ordered by
+        /// the key specified in the keySelector.</returns>
+        public static ParseQuery<TSource> ThenByDescending<TSource, TSelector>(this ParseQuery<TSource> source, Expression<Func<TSource, TSelector>> keySelector) where TSource : ParseObject => source.ThenByDescending(GetOrderByPath(keySelector));
+
+        /// <summary>
+        /// Correlates the elements of two queries based on matching keys.
+        /// </summary>
+        /// <typeparam name="TOuter">The type of ParseObjects of the first query.</typeparam>
+        /// <typeparam name="TInner">The type of ParseObjects of the second query.</typeparam>
+        /// <typeparam name="TKey">The type of the keys returned by the key selector
+        /// functions.</typeparam>
+        /// <typeparam name="TResult">The type of the result. This must match either
+        /// TOuter or TInner</typeparam>
+        /// <param name="outer">The first query to join.</param>
+        /// <param name="inner">The query to join to the first query.</param>
+        /// <param name="outerKeySelector">A function to extract a join key from the results of
+        /// the first query.</param>
+        /// <param name="innerKeySelector">A function to extract a join key from the results of
+        /// the second query.</param>
+        /// <param name="resultSelector">A function to select either the outer or inner query
+        /// result to determine which query is the base query.</param>
+        /// <returns>A new ParseQuery with a WhereMatchesQuery or WhereMatchesKeyInQuery
+        /// clause based upon the query indicated in the <paramref name="resultSelector"/>.</returns>
+        public static ParseQuery<TResult> Join<TOuter, TInner, TKey, TResult>(this ParseQuery<TOuter> outer, ParseQuery<TInner> inner, Expression<Func<TOuter, TKey>> outerKeySelector, Expression<Func<TInner, TKey>> innerKeySelector, Expression<Func<TOuter, TInner, TResult>> resultSelector) where TOuter : ParseObject where TInner : ParseObject where TResult : ParseObject
+        {
+            // resultSelector must select either the inner object or the outer object. If it's the inner object, reverse the query.
+
+            if (resultSelector.Body == resultSelector.Parameters[1])
+            {
+                // The inner object was selected.
+
+                return inner.Join(outer, innerKeySelector, outerKeySelector, (i, o) => i) as ParseQuery<TResult>;
+            }
+
+            if (resultSelector.Body != resultSelector.Parameters[0])
+            {
+                throw new InvalidOperationException("Joins must select either the outer or inner object.");
+            }
+
+            // Normalize both selectors
+            Expression outerNormalized = new ObjectNormalizer().Visit(outerKeySelector.Body), innerNormalized = new ObjectNormalizer().Visit(innerKeySelector.Body);
+            MethodCallExpression outerAsGet = outerNormalized as MethodCallExpression, innerAsGet = innerNormalized as MethodCallExpression;
+
+            if (IsParseObjectGet(outerAsGet) && outerAsGet.Object == outerKeySelector.Parameters[0])
+            {
+                string outerKey = GetValue(outerAsGet.Arguments[0]) as string;
+
+                if (IsParseObjectGet(innerAsGet) && innerAsGet.Object == innerKeySelector.Parameters[0])
+                {
+                    // Both are key accesses, so treat this as a WhereMatchesKeyInQuery.
+
+                    return outer.WhereMatchesKeyInQuery(outerKey, GetValue(innerAsGet.Arguments[0]) as string, inner) as ParseQuery<TResult>;
+                }
+
+                if (innerKeySelector.Body == innerKeySelector.Parameters[0])
+                {
+                    // The inner selector is on the result of the query itself, so treat this as a WhereMatchesQuery.
+
+                    return outer.WhereMatchesQuery(outerKey, inner) as ParseQuery<TResult>;
+                }
+
+                throw new InvalidOperationException("The key for the joined object must be a ParseObject or a field access on the ParseObject.");
+            }
+
+            // TODO (hallucinogen): If we ever support "and" queries fully and/or support a "where this object
+            // matches some key in some other query" (as opposed to requiring a key on this query), we
+            // can add support for even more types of joins.
+
+            throw new InvalidOperationException("The key for the selected object must be a field access on the ParseObject.");
+        }
+
+        public static string GetClassName<T>(this ParseQuery<T> query) where T : ParseObject => query.ClassName;
+
+        public static IDictionary<string, object> BuildParameters<T>(this ParseQuery<T> query) where T : ParseObject => query.BuildParameters(false);
+
+        public static object GetConstraint<T>(this ParseQuery<T> query, string key) where T : ParseObject => query.GetConstraint(key);
+    }
+}
diff --git a/Parse/Internal/Utilities/ParseRelationExtensions.cs b/Parse/Utilities/ParseRelationExtensions.cs
similarity index 73%
rename from Parse/Internal/Utilities/ParseRelationExtensions.cs
rename to Parse/Utilities/ParseRelationExtensions.cs
index 7f80ffb9..42bd5558 100644
--- a/Parse/Internal/Utilities/ParseRelationExtensions.cs
+++ b/Parse/Utilities/ParseRelationExtensions.cs
@@ -1,9 +1,6 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
-using System;
-using System.Collections.Generic;
-
-namespace Parse.Core.Internal
+namespace Parse.Abstractions.Internal
 {
     /// <summary>
     /// So here's the deal. We have a lot of internal APIs for ParseObject, ParseUser, etc.
@@ -17,19 +14,10 @@ namespace Parse.Core.Internal
     /// </summary>
     public static class ParseRelationExtensions
     {
-        public static ParseRelation<T> Create<T>(ParseObject parent, string childKey) where T : ParseObject
-        {
-            return new ParseRelation<T>(parent, childKey);
-        }
+        public static ParseRelation<T> Create<T>(ParseObject parent, string childKey) where T : ParseObject => new ParseRelation<T>(parent, childKey);
 
-        public static ParseRelation<T> Create<T>(ParseObject parent, string childKey, string targetClassName) where T : ParseObject
-        {
-            return new ParseRelation<T>(parent, childKey, targetClassName);
-        }
+        public static ParseRelation<T> Create<T>(ParseObject parent, string childKey, string targetClassName) where T : ParseObject => new ParseRelation<T>(parent, childKey, targetClassName);
 
-        public static string GetTargetClassName<T>(this ParseRelation<T> relation) where T : ParseObject
-        {
-            return relation.TargetClassName;
-        }
+        public static string GetTargetClassName<T>(this ParseRelation<T> relation) where T : ParseObject => relation.TargetClassName;
     }
 }
diff --git a/Parse/Internal/Utilities/ParseSessionExtensions.cs b/Parse/Utilities/ParseUserExtensions.cs
similarity index 53%
rename from Parse/Internal/Utilities/ParseSessionExtensions.cs
rename to Parse/Utilities/ParseUserExtensions.cs
index 131cafca..30e3bd87 100644
--- a/Parse/Internal/Utilities/ParseSessionExtensions.cs
+++ b/Parse/Utilities/ParseUserExtensions.cs
@@ -1,11 +1,10 @@
 // Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
 
-using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Parse.Core.Internal
+namespace Parse.Abstractions.Internal
 {
     /// <summary>
     /// So here's the deal. We have a lot of internal APIs for ParseObject, ParseUser, etc.
@@ -17,16 +16,14 @@ namespace Parse.Core.Internal
     /// So this class contains a bunch of extension methods that can live inside another
     /// namespace, which 'wrap' the intenral APIs that already exist.
     /// </summary>
-    public static class ParseSessionExtensions
+    public static class ParseUserExtensions
     {
-        public static Task<string> UpgradeToRevocableSessionAsync(string sessionToken, CancellationToken cancellationToken)
-        {
-            return ParseSession.UpgradeToRevocableSessionAsync(sessionToken, cancellationToken);
-        }
+        public static Task UnlinkFromAsync(this ParseUser user, string authType, CancellationToken cancellationToken) => user.UnlinkFromAsync(authType, cancellationToken);
 
-        public static Task RevokeAsync(string sessionToken, CancellationToken cancellationToken)
-        {
-            return ParseSession.RevokeAsync(sessionToken, cancellationToken);
-        }
+        public static Task LinkWithAsync(this ParseUser user, string authType, CancellationToken cancellationToken) => user.LinkWithAsync(authType, cancellationToken);
+
+        public static Task LinkWithAsync(this ParseUser user, string authType, IDictionary<string, object> data, CancellationToken cancellationToken) => user.LinkWithAsync(authType, data, cancellationToken);
+
+        public static Task UpgradeToRevocableSessionAsync(this ParseUser user, CancellationToken cancellationToken) => user.UpgradeToRevocableSessionAsync(cancellationToken);
     }
 }
diff --git a/Parse/Utilities/PushServiceExtensions.cs b/Parse/Utilities/PushServiceExtensions.cs
new file mode 100644
index 00000000..ad94e282
--- /dev/null
+++ b/Parse/Utilities/PushServiceExtensions.cs
@@ -0,0 +1,202 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
+using Parse.Infrastructure.Utilities;
+using Parse.Platform.Push;
+
+namespace Parse
+{
+    public static class PushServiceExtensions
+    {
+        /// <summary>
+        /// Pushes a simple message to every device. This is shorthand for:
+        ///
+        /// <code>
+        /// var push = new ParsePush();
+        /// push.Data = new Dictionary&lt;string, object&gt;{{"alert", alert}};
+        /// return push.SendAsync();
+        /// </code>
+        /// </summary>
+        /// <param name="alert">The alert message to send.</param>
+        public static Task SendPushAlertAsync(this IServiceHub serviceHub, string alert) => new ParsePush(serviceHub) { Alert = alert }.SendAsync();
+
+        /// <summary>
+        /// Pushes a simple message to every device subscribed to channel. This is shorthand for:
+        ///
+        /// <code>
+        /// var push = new ParsePush();
+        /// push.Channels = new List&lt;string&gt; { channel };
+        /// push.Data = new Dictionary&lt;string, object&gt;{{"alert", alert}};
+        /// return push.SendAsync();
+        /// </code>
+        /// </summary>
+        /// <param name="alert">The alert message to send.</param>
+        /// <param name="channel">An Installation must be subscribed to channel to receive this Push Notification.</param>
+        public static Task SendPushAlertAsync(this IServiceHub serviceHub, string alert, string channel) => new ParsePush(serviceHub) { Channels = new List<string> { channel }, Alert = alert }.SendAsync();
+
+        /// <summary>
+        /// Pushes a simple message to every device subscribed to any of channels. This is shorthand for:
+        ///
+        /// <code>
+        /// var push = new ParsePush();
+        /// push.Channels = channels;
+        /// push.Data = new Dictionary&lt;string, object&gt;{{"alert", alert}};
+        /// return push.SendAsync();
+        /// </code>
+        /// </summary>
+        /// <param name="alert">The alert message to send.</param>
+        /// <param name="channels">An Installation must be subscribed to any of channels to receive this Push Notification.</param>
+        public static Task SendPushAlertAsync(this IServiceHub serviceHub, string alert, IEnumerable<string> channels) => new ParsePush(serviceHub) { Channels = channels, Alert = alert }.SendAsync();
+
+        /// <summary>
+        /// Pushes a simple message to every device matching the target query. This is shorthand for:
+        ///
+        /// <code>
+        /// var push = new ParsePush();
+        /// push.Query = query;
+        /// push.Data = new Dictionary&lt;string, object&gt;{{"alert", alert}};
+        /// return push.SendAsync();
+        /// </code>
+        /// </summary>
+        /// <param name="alert">The alert message to send.</param>
+        /// <param name="query">A query filtering the devices which should receive this Push Notification.</param>
+        public static Task SendPushAlertAsync(this IServiceHub serviceHub, string alert, ParseQuery<ParseInstallation> query) => new ParsePush(serviceHub) { Query = query, Alert = alert }.SendAsync();
+
+        /// <summary>
+        /// Pushes an arbitrary payload to every device. This is shorthand for:
+        ///
+        /// <code>
+        /// var push = new ParsePush();
+        /// push.Data = data;
+        /// return push.SendAsync();
+        /// </code>
+        /// </summary>
+        /// <param name="data">A push payload. See the ParsePush.Data property for more information.</param>
+        public static Task SendPushDataAsync(this IServiceHub serviceHub, IDictionary<string, object> data) => new ParsePush(serviceHub) { Data = data }.SendAsync();
+
+        /// <summary>
+        /// Pushes an arbitrary payload to every device subscribed to channel. This is shorthand for:
+        ///
+        /// <code>
+        /// var push = new ParsePush();
+        /// push.Channels = new List&lt;string&gt; { channel };
+        /// push.Data = data;
+        /// return push.SendAsync();
+        /// </code>
+        /// </summary>
+        /// <param name="data">A push payload. See the ParsePush.Data property for more information.</param>
+        /// <param name="channel">An Installation must be subscribed to channel to receive this Push Notification.</param>
+        public static Task SendPushDataAsync(this IServiceHub serviceHub, IDictionary<string, object> data, string channel) => new ParsePush(serviceHub) { Channels = new List<string> { channel }, Data = data }.SendAsync();
+
+        /// <summary>
+        /// Pushes an arbitrary payload to every device subscribed to any of channels. This is shorthand for:
+        ///
+        /// <code>
+        /// var push = new ParsePush();
+        /// push.Channels = channels;
+        /// push.Data = data;
+        /// return push.SendAsync();
+        /// </code>
+        /// </summary>
+        /// <param name="data">A push payload. See the ParsePush.Data property for more information.</param>
+        /// <param name="channels">An Installation must be subscribed to any of channels to receive this Push Notification.</param>
+        public static Task SendPushDataAsync(this IServiceHub serviceHub, IDictionary<string, object> data, IEnumerable<string> channels) => new ParsePush(serviceHub) { Channels = channels, Data = data }.SendAsync();
+
+        /// <summary>
+        /// Pushes an arbitrary payload to every device matching target. This is shorthand for:
+        ///
+        /// <code>
+        /// var push = new ParsePush();
+        /// push.Query = query
+        /// push.Data = data;
+        /// return push.SendAsync();
+        /// </code>
+        /// </summary>
+        /// <param name="data">A push payload. See the ParsePush.Data property for more information.</param>
+        /// <param name="query">A query filtering the devices which should receive this Push Notification.</param>
+        public static Task SendPushDataAsync(this IServiceHub serviceHub, IDictionary<string, object> data, ParseQuery<ParseInstallation> query) => new ParsePush(serviceHub) { Query = query, Data = data }.SendAsync();
+
+        #region Receiving Push
+
+#warning Check if this should be moved into IParsePushController.
+
+        /// <summary>
+        /// An event fired when a push notification is received.
+        /// </summary>
+        public static event EventHandler<ParsePushNotificationEvent> ParsePushNotificationReceived
+        {
+            add
+            {
+                parsePushNotificationReceived.Add(value);
+            }
+            remove
+            {
+                parsePushNotificationReceived.Remove(value);
+            }
+        }
+
+        internal static readonly SynchronizedEventHandler<ParsePushNotificationEvent> parsePushNotificationReceived = new SynchronizedEventHandler<ParsePushNotificationEvent>();
+
+        #endregion
+
+        #region Push Subscription
+
+        /// <summary>
+        /// Subscribe the current installation to this channel. This is shorthand for:
+        ///
+        /// <code>
+        /// var installation = ParseInstallation.CurrentInstallation;
+        /// installation.AddUniqueToList("channels", channel);
+        /// installation.SaveAsync(cancellationToken);
+        /// </code>
+        /// </summary>
+        /// <param name="channel">The channel to which this installation should subscribe.</param>
+        /// <param name="cancellationToken">CancellationToken to cancel the current operation.</param>
+        public static Task SubscribeToPushChannelAsync(this IServiceHub serviceHub, string channel, CancellationToken cancellationToken = default) => SubscribeToPushChannelsAsync(serviceHub, new List<string> { channel }, cancellationToken);
+
+        /// <summary>
+        /// Subscribe the current installation to these channels. This is shorthand for:
+        ///
+        /// <code>
+        /// var installation = ParseInstallation.CurrentInstallation;
+        /// installation.AddRangeUniqueToList("channels", channels);
+        /// installation.SaveAsync(cancellationToken);
+        /// </code>
+        /// </summary>
+        /// <param name="channels">The channels to which this installation should subscribe.</param>
+        /// <param name="cancellationToken">CancellationToken to cancel the current operation.</param>
+        public static Task SubscribeToPushChannelsAsync(this IServiceHub serviceHub, IEnumerable<string> channels, CancellationToken cancellationToken = default) => serviceHub.PushChannelsController.SubscribeAsync(channels, serviceHub, cancellationToken);
+
+        /// <summary>
+        /// Unsubscribe the current installation from this channel. This is shorthand for:
+        ///
+        /// <code>
+        /// var installation = ParseInstallation.CurrentInstallation;
+        /// installation.Remove("channels", channel);
+        /// installation.SaveAsync(cancellationToken);
+        /// </code>
+        /// </summary>
+        /// <param name="channel">The channel from which this installation should unsubscribe.</param>
+        /// <param name="cancellationToken">CancellationToken to cancel the current operation.</param>
+        public static Task UnsubscribeToPushChannelAsync(this IServiceHub serviceHub, string channel, CancellationToken cancellationToken = default) => UnsubscribeToPushChannelsAsync(serviceHub, new List<string> { channel }, cancellationToken);
+
+        /// <summary>
+        /// Unsubscribe the current installation from these channels. This is shorthand for:
+        ///
+        /// <code>
+        /// var installation = ParseInstallation.CurrentInstallation;
+        /// installation.RemoveAllFromList("channels", channels);
+        /// installation.SaveAsync(cancellationToken);
+        /// </code>
+        /// </summary>
+        /// <param name="channels">The channels from which this installation should unsubscribe.</param>
+        /// <param name="cancellationToken">CancellationToken to cancel the current operation.</param>
+        public static Task UnsubscribeToPushChannelsAsync(this IServiceHub serviceHub, IEnumerable<string> channels, CancellationToken cancellationToken = default) => serviceHub.PushChannelsController.UnsubscribeAsync(channels, serviceHub, cancellationToken);
+
+        #endregion
+    }
+}
diff --git a/Parse/Utilities/QueryServiceExtensions.cs b/Parse/Utilities/QueryServiceExtensions.cs
new file mode 100644
index 00000000..c31b66e6
--- /dev/null
+++ b/Parse/Utilities/QueryServiceExtensions.cs
@@ -0,0 +1,67 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Parse.Abstractions.Infrastructure;
+
+namespace Parse
+{
+    public static class QueryServiceExtensions
+    {
+        public static ParseQuery<T> GetQuery<T>(this IServiceHub serviceHub) where T : ParseObject => new ParseQuery<T>(serviceHub);
+
+        // ALTERNATE NAME: BuildOrQuery
+
+        /// <summary>
+        /// Constructs a query that is the or of the given queries.
+        /// </summary>
+        /// <typeparam name="T">The type of ParseObject being queried.</typeparam>
+        /// <param name="source">An initial query to 'or' with additional queries.</param>
+        /// <param name="queries">The list of ParseQueries to 'or' together.</param>
+        /// <returns>A query that is the or of the given queries.</returns>
+        public static ParseQuery<T> ConstructOrQuery<T>(this IServiceHub serviceHub, ParseQuery<T> source, params ParseQuery<T>[] queries) where T : ParseObject => serviceHub.ConstructOrQuery(queries.Concat(new[] { source }));
+
+        /// <summary>
+        /// Constructs a query that is the or of the given queries.
+        /// </summary>
+        /// <param name="queries">The list of ParseQueries to 'or' together.</param>
+        /// <returns>A ParseQquery that is the 'or' of the passed in queries.</returns>
+        public static ParseQuery<T> ConstructOrQuery<T>(this IServiceHub serviceHub, IEnumerable<ParseQuery<T>> queries) where T : ParseObject
+        {
+            string className = default;
+            List<IDictionary<string, object>> orValue = new List<IDictionary<string, object>> { };
+
+            // We need to cast it to non-generic IEnumerable because of AOT-limitation
+
+            IEnumerable nonGenericQueries = queries;
+            foreach (object obj in nonGenericQueries)
+            {
+                ParseQuery<T> query = obj as ParseQuery<T>;
+
+                if (className is { } && query.ClassName != className)
+                {
+                    throw new ArgumentException("All of the queries in an or query must be on the same class.");
+                }
+
+                className = query.ClassName;
+                IDictionary<string, object> parameters = query.BuildParameters();
+
+                if (parameters.Count == 0)
+                {
+                    continue;
+                }
+
+                if (!parameters.TryGetValue("where", out object where) || parameters.Count > 1)
+                {
+                    throw new ArgumentException("None of the queries in an or query can have non-filtering clauses");
+                }
+
+                orValue.Add(where as IDictionary<string, object>);
+            }
+
+            return new ParseQuery<T>(new ParseQuery<T>(serviceHub, className), where: new Dictionary<string, object> { ["$or"] = orValue });
+        }
+    }
+}
diff --git a/Parse/Utilities/RoleServiceExtensions.cs b/Parse/Utilities/RoleServiceExtensions.cs
new file mode 100644
index 00000000..fcd5d05a
--- /dev/null
+++ b/Parse/Utilities/RoleServiceExtensions.cs
@@ -0,0 +1,14 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using Parse.Abstractions.Infrastructure;
+
+namespace Parse
+{
+    public static class RoleServiceExtensions
+    {
+        /// <summary>
+        /// Gets a <see cref="ParseQuery{ParseRole}"/> over the Role collection.
+        /// </summary>
+        public static ParseQuery<ParseRole> GetRoleQuery(this IServiceHub serviceHub) => serviceHub.GetQuery<ParseRole>();
+    }
+}
diff --git a/Parse/Utilities/SessionsServiceExtensions.cs b/Parse/Utilities/SessionsServiceExtensions.cs
new file mode 100644
index 00000000..a23aac95
--- /dev/null
+++ b/Parse/Utilities/SessionsServiceExtensions.cs
@@ -0,0 +1,37 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse
+{
+    public static class SessionsServiceExtensions
+    {
+        /// <summary>
+        /// Constructs a <see cref="ParseQuery{ParseSession}"/> for ParseSession.
+        /// </summary>
+        public static ParseQuery<ParseSession> GetSessionQuery(this IServiceHub serviceHub) => serviceHub.GetQuery<ParseSession>();
+
+        /// <summary>
+        /// Gets the current <see cref="ParseSession"/> object related to the current user.
+        /// </summary>
+        public static Task<ParseSession> GetCurrentSessionAsync(this IServiceHub serviceHub) => GetCurrentSessionAsync(serviceHub, CancellationToken.None);
+
+        /// <summary>
+        /// Gets the current <see cref="ParseSession"/> object related to the current user.
+        /// </summary>
+        /// <param name="cancellationToken">The cancellation token</param>
+        public static Task<ParseSession> GetCurrentSessionAsync(this IServiceHub serviceHub, CancellationToken cancellationToken) => serviceHub.GetCurrentUserAsync().OnSuccess(task => task.Result switch
+        {
+            null => Task.FromResult<ParseSession>(default),
+            { SessionToken: null } => Task.FromResult<ParseSession>(default),
+            { SessionToken: { } sessionToken } => serviceHub.SessionController.GetSessionAsync(sessionToken, serviceHub, cancellationToken).OnSuccess(successTask => serviceHub.GenerateObjectFromState<ParseSession>(successTask.Result, "_Session"))
+        }).Unwrap();
+
+        public static Task RevokeSessionAsync(this IServiceHub serviceHub, string sessionToken, CancellationToken cancellationToken) => sessionToken is null || !serviceHub.SessionController.IsRevocableSessionToken(sessionToken) ? Task.CompletedTask : serviceHub.SessionController.RevokeAsync(sessionToken, cancellationToken);
+
+        public static Task<string> UpgradeToRevocableSessionAsync(this IServiceHub serviceHub, string sessionToken, CancellationToken cancellationToken) => sessionToken is null || serviceHub.SessionController.IsRevocableSessionToken(sessionToken) ? Task.FromResult(sessionToken) : serviceHub.SessionController.UpgradeToRevocableSessionAsync(sessionToken, serviceHub, cancellationToken).OnSuccess(task => serviceHub.GenerateObjectFromState<ParseSession>(task.Result, "_Session").SessionToken);
+    }
+}
diff --git a/Parse/Utilities/UserServiceExtensions.cs b/Parse/Utilities/UserServiceExtensions.cs
new file mode 100644
index 00000000..c4188193
--- /dev/null
+++ b/Parse/Utilities/UserServiceExtensions.cs
@@ -0,0 +1,240 @@
+// Copyright (c) 2015-present, Parse, LLC.  All rights reserved.  This source code is licensed under the BSD-style license found in the LICENSE file in the root directory of this source tree.  An additional grant of patent rights can be found in the PATENTS file in the same directory.
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Internal;
+using Parse.Abstractions.Platform.Authentication;
+using Parse.Infrastructure.Utilities;
+
+namespace Parse
+{
+    public static class UserServiceExtensions
+    {
+        internal static string GetCurrentSessionToken(this IServiceHub serviceHub)
+        {
+            Task<string> sessionTokenTask = GetCurrentSessionTokenAsync(serviceHub);
+            sessionTokenTask.Wait();
+            return sessionTokenTask.Result;
+        }
+
+        internal static Task<string> GetCurrentSessionTokenAsync(this IServiceHub serviceHub, CancellationToken cancellationToken = default) => serviceHub.CurrentUserController.GetCurrentSessionTokenAsync(serviceHub, cancellationToken);
+
+        // TODO: Consider renaming SignUpAsync and LogInAsync to SignUpWithAsync and LogInWithAsync, respectively.
+        // TODO: Consider returning the created user from the SignUpAsync overload that accepts a username and password.
+
+        /// <summary>
+        /// Creates a new <see cref="ParseUser"/>, saves it with the target Parse Server instance, and then authenticates it on the target client.
+        /// </summary>
+        /// <param name="serviceHub">The <see cref="IServiceHub"/> instance to target when creating the user and authenticating.</param>
+        /// <param name="username">The value that should be used for <see cref="ParseUser.Username"/>.</param>
+        /// <param name="password">The value that should be used for <see cref="ParseUser.Password"/>.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public static Task SignUpAsync(this IServiceHub serviceHub, string username, string password, CancellationToken cancellationToken = default) => new ParseUser { Services = serviceHub, Username = username, Password = password }.SignUpAsync(cancellationToken);
+
+        /// <summary>
+        /// Saves the provided <see cref="ParseUser"/> instance with the target Parse Server instance and then authenticates it on the target client. This method should only be used once <see cref="ParseClient.Publicize"/> has been called and <see cref="ParseClient.Instance"/> is the wanted bind target, or if <see cref="ParseObject.Services"/> has already been set or <see cref="ParseObject.Bind(IServiceHub)"/> has already been called on the <paramref name="user"/>.
+        /// </summary>
+        /// <param name="serviceHub">The <see cref="IServiceHub"/> instance to target when creating the user and authenticating.</param>
+        /// <param name="user">The <see cref="ParseUser"/> instance to save on the target Parse Server instance and authenticate.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public static Task SignUpAsync(this IServiceHub serviceHub, ParseUser user, CancellationToken cancellationToken = default)
+        {
+            user.Bind(serviceHub);
+            return user.SignUpAsync(cancellationToken);
+        }
+
+        /// <summary>
+        /// Logs in a user with a username and password. On success, this saves the session to disk or to memory so you can retrieve the currently logged in user using <see cref="GetCurrentUser(IServiceHub)"/>.
+        /// </summary>
+        /// <param name="serviceHub">The <see cref="IServiceHub"/> instance to target when logging in.</param>
+        /// <param name="username">The username to log in with.</param>
+        /// <param name="password">The password to log in with.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>The newly logged-in user.</returns>
+        public static Task<ParseUser> LogInAsync(this IServiceHub serviceHub, string username, string password, CancellationToken cancellationToken = default) => serviceHub.UserController.LogInAsync(username, password, serviceHub, cancellationToken).OnSuccess(task =>
+        {
+            ParseUser user = serviceHub.GenerateObjectFromState<ParseUser>(task.Result, "_User");
+            return SaveCurrentUserAsync(serviceHub, user).OnSuccess(_ => user);
+        }).Unwrap();
+
+        /// <summary>
+        /// Logs in a user with a username and password. On success, this saves the session to disk so you
+        /// can retrieve the currently logged in user using <see cref="GetCurrentUser()"/>.
+        /// </summary>
+        /// <param name="sessionToken">The session token to authorize with</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>The user if authorization was successful</returns>
+        public static Task<ParseUser> BecomeAsync(this IServiceHub serviceHub, string sessionToken, CancellationToken cancellationToken = default) => serviceHub.UserController.GetUserAsync(sessionToken, serviceHub, cancellationToken).OnSuccess(t =>
+        {
+            ParseUser user = serviceHub.GenerateObjectFromState<ParseUser>(t.Result, "_User");
+            return SaveCurrentUserAsync(serviceHub, user).OnSuccess(_ => user);
+        }).Unwrap();
+
+        /// <summary>
+        /// Logs out the currently logged in user session. This will remove the session from disk, log out of
+        /// linked services, and future calls to <see cref="GetCurrentUser()"/> will return <c>null</c>.
+        /// </summary>
+        /// <remarks>
+        /// Typically, you should use <see cref="LogOutAsync()"/>, unless you are managing your own threading.
+        /// </remarks>
+        public static void LogOut(this IServiceHub serviceHub) => LogOutAsync(serviceHub).Wait(); // TODO (hallucinogen): this will without a doubt fail in Unity. But what else can we do?
+
+        /// <summary>
+        /// Logs out the currently logged in user session. This will remove the session from disk, log out of
+        /// linked services, and future calls to <see cref="GetCurrentUser()"/> will return <c>null</c>.
+        /// </summary>
+        /// <remarks>
+        /// This is preferable to using <see cref="LogOut()"/>, unless your code is already running from a
+        /// background thread.
+        /// </remarks>
+        public static Task LogOutAsync(this IServiceHub serviceHub) => LogOutAsync(serviceHub, CancellationToken.None);
+
+        /// <summary>
+        /// Logs out the currently logged in user session. This will remove the session from disk, log out of
+        /// linked services, and future calls to <see cref="GetCurrentUser(IServiceHub)"/> will return <c>null</c>.
+        ///
+        /// This is preferable to using <see cref="LogOut()"/>, unless your code is already running from a
+        /// background thread.
+        /// </summary>
+        public static Task LogOutAsync(this IServiceHub serviceHub, CancellationToken cancellationToken) => GetCurrentUserAsync(serviceHub).OnSuccess(task =>
+        {
+            LogOutWithProviders();
+            return task.Result is { } user ? user.TaskQueue.Enqueue(toAwait => user.LogOutAsync(toAwait, cancellationToken), cancellationToken) : Task.CompletedTask;
+        }).Unwrap();
+
+        static void LogOutWithProviders()
+        {
+            foreach (IParseAuthenticationProvider provider in ParseUser.Authenticators.Values)
+            {
+                provider.Deauthenticate();
+            }
+        }
+
+        /// <summary>
+        /// Gets the currently logged in ParseUser with a valid session, either from memory or disk
+        /// if necessary.
+        /// </summary>
+        public static ParseUser GetCurrentUser(this IServiceHub serviceHub)
+        {
+            Task<ParseUser> userTask = GetCurrentUserAsync(serviceHub);
+
+            // TODO (hallucinogen): this will without a doubt fail in Unity. How should we fix it?
+
+            userTask.Wait();
+            return userTask.Result;
+        }
+
+        /// <summary>
+        /// Gets the currently logged in ParseUser with a valid session, either from memory or disk
+        /// if necessary, asynchronously.
+        /// </summary>
+        internal static Task<ParseUser> GetCurrentUserAsync(this IServiceHub serviceHub, CancellationToken cancellationToken = default) => serviceHub.CurrentUserController.GetAsync(serviceHub, cancellationToken);
+
+        internal static Task SaveCurrentUserAsync(this IServiceHub serviceHub, ParseUser user, CancellationToken cancellationToken = default) => serviceHub.CurrentUserController.SetAsync(user, cancellationToken);
+
+        internal static void ClearInMemoryUser(this IServiceHub serviceHub) => serviceHub.CurrentUserController.ClearFromMemory();
+
+        /// <summary>
+        /// Constructs a <see cref="ParseQuery{ParseUser}"/> for <see cref="ParseUser"/>s.
+        /// </summary>
+        public static ParseQuery<ParseUser> GetUserQuery(this IServiceHub serviceHub) => serviceHub.GetQuery<ParseUser>();
+
+        #region Legacy / Revocable Session Tokens
+
+        /// <summary>
+        /// Tells server to use revocable session on LogIn and SignUp, even when App's Settings
+        /// has "Require Revocable Session" turned off. Issues network request in background to
+        /// migrate the sessionToken on disk to revocable session.
+        /// </summary>
+        /// <returns>The Task that upgrades the session.</returns>
+        public static Task EnableRevocableSessionAsync(this IServiceHub serviceHub, CancellationToken cancellationToken = default)
+        {
+            lock (serviceHub.UserController.RevocableSessionEnabledMutex)
+            {
+                serviceHub.UserController.RevocableSessionEnabled = true;
+            }
+
+            return GetCurrentUserAsync(serviceHub, cancellationToken).OnSuccess(task => task.Result.UpgradeToRevocableSessionAsync(cancellationToken));
+        }
+
+        internal static void DisableRevocableSession(this IServiceHub serviceHub)
+        {
+            lock (serviceHub.UserController.RevocableSessionEnabledMutex)
+            {
+                serviceHub.UserController.RevocableSessionEnabled = false;
+            }
+        }
+
+        internal static bool GetIsRevocableSessionEnabled(this IServiceHub serviceHub)
+        {
+            lock (serviceHub.UserController.RevocableSessionEnabledMutex)
+            {
+                return serviceHub.UserController.RevocableSessionEnabled;
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Requests a password reset email to be sent to the specified email address associated with the
+        /// user account. This email allows the user to securely reset their password on the Parse site.
+        /// </summary>
+        /// <param name="email">The email address associated with the user that forgot their password.</param>
+        public static Task RequestPasswordResetAsync(this IServiceHub serviceHub, string email) => RequestPasswordResetAsync(serviceHub, email, CancellationToken.None);
+
+        /// <summary>
+        /// Requests a password reset email to be sent to the specified email address associated with the
+        /// user account. This email allows the user to securely reset their password on the Parse site.
+        /// </summary>
+        /// <param name="email">The email address associated with the user that forgot their password.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public static Task RequestPasswordResetAsync(this IServiceHub serviceHub, string email, CancellationToken cancellationToken) => serviceHub.UserController.RequestPasswordResetAsync(email, cancellationToken);
+
+        public static Task<ParseUser> LogInWithAsync(this IServiceHub serviceHub, string authType, IDictionary<string, object> data, CancellationToken cancellationToken)
+        {
+            ParseUser user = null;
+
+            return serviceHub.UserController.LogInAsync(authType, data, serviceHub, cancellationToken).OnSuccess(task =>
+            {
+                user = serviceHub.GenerateObjectFromState<ParseUser>(task.Result, "_User");
+
+                lock (user.Mutex)
+                {
+                    if (user.AuthData == null)
+                    {
+                        user.AuthData = new Dictionary<string, IDictionary<string, object>>();
+                    }
+
+                    user.AuthData[authType] = data;
+
+#warning Check if SynchronizeAllAuthData should accept an IServiceHub for consistency on which actions take place on which IServiceHub implementation instance.
+
+                    user.SynchronizeAllAuthData();
+                }
+
+                return SaveCurrentUserAsync(serviceHub, user);
+            }).Unwrap().OnSuccess(t => user);
+        }
+
+        public static Task<ParseUser> LogInWithAsync(this IServiceHub serviceHub, string authType, CancellationToken cancellationToken)
+        {
+            IParseAuthenticationProvider provider = ParseUser.GetProvider(authType);
+            return provider.AuthenticateAsync(cancellationToken).OnSuccess(authData => LogInWithAsync(serviceHub, authType, authData.Result, cancellationToken)).Unwrap();
+        }
+
+        internal static void RegisterProvider(this IServiceHub serviceHub, IParseAuthenticationProvider provider)
+        {
+            ParseUser.Authenticators[provider.AuthType] = provider;
+            ParseUser curUser = GetCurrentUser(serviceHub);
+
+            if (curUser != null)
+            {
+#warning Check if SynchronizeAllAuthData should accept an IServiceHub for consistency on which actions take place on which IServiceHub implementation instance.
+
+                curUser.SynchronizeAuthData(provider);
+            }
+        }
+    }
+}
diff --git a/README.md b/README.md
index 8b5dbd81..a1a3dbd4 100644
--- a/README.md
+++ b/README.md
@@ -9,51 +9,166 @@
 ![Twitter Follow](https://img.shields.io/twitter/follow/ParsePlatform.svg?label=Follow%20us%20on%20Twitter&style=social)
 
 ## Getting Started
-The latest stable release of the SDK is available as a [NuGet package][nuget-link]. Note that the latest package currently available on the official distribution channel is quite old.
-To use the most up-to-date code, build this project and reference the generated NuGet package.
+The latest stable release of the SDK is available as [a NuGet package][nuget-link]. Note that the latest package currently available on the official distribution channel is quite old; to use the most up-to-date code, build this project and reference the generated NuGet package.
 
 ## Using the Code
-Make sure you are using the project's root namespace:
+Make sure you are using the project's root namespace.
 
-```cs
+```csharp
 using Parse;
 ```
 
-Then, in your program's entry point, paste the following code, with the text reflecting your application and Parse Server setup emplaced between the quotation marks.
+The `ParseClient` class has three constructors, one allowing you to specify your Application ID, Server URI, and .NET Key as well as some configuration items, one for creating clones of `ParseClient.Instance` if `Publicize` was called on an instance previously, and another, accepting an `IServerConnectionData` implementation instance which exposes the data needed for the SDK to connect to a Parse Server instance, like the first constructor, but with a few extra options. You can create your own `IServerConnectionData` implementation or use the `ServerConnectionData` struct. `IServerConnectionData` allows you to expose a value the SDK should use as the master key, as well as some extra request headers if needed.
 
-```cs
-ParseClient.Initialize(new ParseClient.Configuration
+```csharp
+ParseClient client = new ParseClient("Your Application ID", "The Parse Server Instance Host URI", "Your .NET Key");
+```
+
+```csharp
+ParseClient client = new ParseClient(new ServerConnectionData
 {
-    ApplicationId = "",
-    Key = "",
-    Server = "",
+    ApplicationID = "Your Application ID",
+    ServerURI = "The Parse Server Instance Host URI",
+    Key = "Your .NET Key", // This is unnecessary if a value for MasterKey is specified.
+    MasterKey = "Your Master Key",
+    Headers = new Dictionary<string, string>
+    {
+        ["X-Extra-Header"] = "Some Value"
+    }
 });
 ```
 
-`ApplicationId` is your app's `ApplicationId` field from your Parse Server.
-`Key` is your app's `DotNetKey` field from your Parse Server.
-`Server` is the full URL to your web-hosted Parse Server.
-
-If you would like to, you can also set the `MasterKey` property, which will allow the SDK to bypass any CLPs and object permissions that are set. This property should be compatible with read-only master keys as well.
+`ServerConnectionData` is available in the `Parse.Infrastructure` namespace.
 
-There are also a few optional parameters you can choose to set if you prefer or are experiencing issues with the SDK; sometimes the operation that generates values for these properties automatically can fail unexpectedly, causing the SDK to not be able to initialize, so these properties are provided to give you the ability to bypass that operation by providing the details outright.
+The two non-cloning `ParseClient` constructors contain optional parameters for an `IServiceHub` implementation instance and an array of `IServiceHubMutator`s. These should only be used when the behaviour of the SDK needs to be changed such as [when it is used with the Unity game engine](#use-in-unity-client).
 
-`StorageConfiguration` represents some metadata information usually collected reflectively about the project for the purpose of data caching.
-`VersionInfo` represents some version information usually collected reflectively about the project for the purposes of data caching and metadata collection for installation object creation.
 
 To find full usage instructions for the latest stable release, please visit the [Parse docs website][parse-docs-link]. Please note that the latest stable release is quite old and does not reflect the work being done at the moment.
 
-## Building The Library
-You can build the library from Visual Studio Code (with the proper extensions), Visual Studio 2017 Community and higher, or Visual Studio for Mac 7 and higher. You can also build the library using the command line:
+### Common Definitions
+
+- `Application ID`:
+Your app's `ApplicationId` field from your Parse Server.
+- `Key`:
+Your app's `.NET Key` field from your Parse Server.
+- `Master Key`:
+Your app's `Master Key` field from your Parse Server. Using this key with the SDK will allow it to bypass any CLPs and object permissions that are set. This also should be compatible with read-only master keys as well.
+- `Server URI`:
+The full URL to your web-hosted Parse Server.
+
+### Client-Side Use
+
+In your program's entry point, instantiate a `ParseClient` with all the parameters needed to connect to your target Parse Server instance, then call `Publicize` on it. This will light up the static `ParseClient.Instance` property with the newly-instantiated `ParseClient`, so you can perform operations with the SDK.
+
+```csharp
+new ParseClient(/* Parameters */).Publicize();
+```
+
+### Use In Unity Client
+
+In Unity, the same logic applies to use the SDK as in [any other client](#client-side-use), except that a special `IServiceHub` impelementation instance, a `MetadataMutator`, and an `AbsoluteCacheLocationMutator` need to be passed in to one of the non-cloning `ParseClient` constructors in order to specify the environment and platform metadata, as well as the absolute cache location manually. This step is needed because the logic that creates these values automatically will fail and create incorrect values. The functionality to do this automatically may eventually be provided as a Unity package in the future, but for now, the following code can be used.
+
+```csharp
+using System;
+using UnityEngine;
+using Parse.Infrastructure;
+```
+
+```csharp
+new ParseClient(/* Parameters */, new LateInitializedMutableServiceHub { }, new MetadataMutator { EnvironmentData = new EnvironmentData { OSVersion = SystemInfo.operatingSystem, Platform = $"Unity {Application.unityVersion} on {SystemInfo.operatingSystemFamily}", TimeZone = TimeZoneInfo.Local.StandardName }, HostManifestData = new HostManifestData { Name = Application.productName, Identifier = Application.productName, ShortVersion = Application.version, Version = Application.version } }, new AbsoluteCacheLocationMutator { CustomAbsoluteCacheFilePath = $"{Application.persistentDataPath.Replace('/', Path.DirectorySeparatorChar)}{Path.DirectorySeparatorChar}Parse.cache" }).Publicize();
+```
+
+Other `IServiceHubMutator` implementations are available that do different things, such as the `RelativeCacheLocationMutator`, which allows a custom cache location relative to the default base folder (`System.Environment.SpecialFolder.LocalApplicationData`) to be specified.
+
+If you are having trouble getting the SDK to work on other platforms, try to use the above code to control what values for various metadata information items the SDK will use, to see if that fixes the issue.
+
+### Server-Side Use
+
+The SDK can be set up in a way such that every new `ParseClient` instance can authenticate a different user concurrently. This is enabled by an `IServiceHubMutator` implementation which adds itself as an `IServiceHubCloner` implementation to the service hub which, making it so that consecutive calls to the cloning `ParseClient` constructor (the one without parameters) will clone the publicized `ParseClient` instance, exposed by `ParseClient.Instance`, replacing the `IParseCurrentUserController` implementation instance with a fresh one with no caching every time. This allows you to configure the original instance, and have the clones retain the general behaviour, while also allowing the differnt users to be signed into the their respective clones and execute requests concurrently, without causing race conditions. To use this feature of the SDK, the first `ParseClient` instance must be constructued and publicized as follows once, before any other `ParseClient` instantiations. Any classes that need to be registered must be done so with the original instance.
+
+```csharp
+new ParseClient(/* Parameters */, default, new ConcurrentUserServiceHubCloner { }).Publicize();
+```
+
+Consecutive instantiations can be done via the cloning constructor for simplicity's sake.
+
+```csharp
+ParseClient client = new ParseClient { };
+```
+
+### Basic Demonstration
+
+The following code shows how to use the Parse .NET SDK to create a new user, save and authenticate the user, deauthenticate the user, re-authenticate the user, create an object with permissions that allow only the user to modify it, save the object, update the object, delete the object, and deauthenticate the user once more.
+
+```csharp
+// Instantiate a ParseClient.
+ParseClient client = new ParseClient(/* Parameters */);
+
+// Create a user, save it, and authenticate with it.
+await client.SignUpAsync(username: "Test", password: "Test");
+
+// Get the authenticated user. This is can also be done with a variable that stores the ParseUser instance before the SignUp overload that accepts a ParseUser is called.
+Console.WriteLine(client.GetCurrentUser().SessionToken);
+
+// Deauthenticate the user.
+await client.LogOutAsync();
+
+// Authenticate the user.
+ParseUser user = await client.LogInAsync(username: "Test", password: "Test");
+
+// Create a new object with permessions that allow only the user to modify it.
+ParseObject testObject = new ParseObject("TestClass") { ACL = new ParseACL(user) };
+
+// Bind the ParseObject to the target ParseClient instance. This is unnecessary if Publicize is called on the client.
+testObject.Bind(client);
+
+// Set some value on the object.
+testObject.Set("someValue", "This is a value.");
+
+// See that the ObjectId of an unsaved object is null;
+Console.WriteLine(testObject.ObjectId);
+
+// Save the object to the target Parse Server instance.
+await testObject.SaveAsync();
+
+// See that the ObjectId of a saved object is non-null;
+Console.WriteLine(testObject.ObjectId);
+
+// Query the object back down from the server to check that it was actually saved.
+Console.WriteLine((await client.GetQuery("TestClass").WhereEqualTo("objectId", testObject.ObjectId).FirstAsync()).Get<string>("someValue"));
+
+// Mutate some value on the object.
+testObject.Set("someValue", "This is another value.");
+
+// Save the object again.
+await testObject.SaveAsync();
+
+// Query the object again to see that the change was made.
+Console.WriteLine((await client.GetQuery("TestClass").WhereEqualTo("objectId", testObject.ObjectId).FirstAsync()).Get<string>("someValue"));
+
+// Store the object's objectId so it can be verified that it was deleted later.
+var testObjectId = testObject.ObjectId;
+
+// Delete the object.
+await testObject.DeleteAsync();
+
+// Check that the object was deleted from the server.
+Console.WriteLine(await client.GetQuery("TestClass").WhereEqualTo("objectId", testObjectId).FirstOrDefaultAsync() == null);
+
+// Deauthenticate the user again.
+await client.LogOutAsync();
+```
+
+## Local Builds
+You can build the SDK on any system with the MSBuild or .NET Core CLI installed. Results can be found under either the `Release/netstandard` or `Debug/netstandard` in the `bin` folder unless a non-standard build configuration is used.
+
+## .NET Core CLI
 
-### On Windows or any .NET Core compatible Unix-based system with the .NET Core SDK installed:
 ```batch
 dotnet build Parse.sln
 ```
 
-Results can be found in either `Parse/bin/Release/netstandard2.0/` or `Parse/bin/Debug/netstandard2.0/` relative to the root project directory, where `/` is the path separator character for your system.
-
-## How Do I Contribute?
+## Contributions
 We want to make contributing to this project as easy and transparent as possible. Please refer to the [Contribution Guidelines][contributing].
 
 ## License
@@ -72,4 +187,4 @@ of patent rights can be found in the PATENTS file in the same directory.
  [license-link]: https://github.com/parse-community/Parse-SDK-dotNET/blob/master/LICENSE
  [nuget-link]: http://nuget.org/packages/parse
  [nuget-svg]: https://img.shields.io/nuget/v/parse.svg
- [parse-docs-link]: http://docs.parseplatform.org/
+ [parse-docs-link]: http://docs.parseplatform.org/
\ No newline at end of file