From 62be7582942f5d1276bf082c3f1cce1b65d0baf9 Mon Sep 17 00:00:00 2001
From: Phill <phill.wiggins@gmail.com>
Date: Sat, 12 Jan 2019 18:02:03 +0000
Subject: [PATCH 1/2] Version 1.0.5 - Fixing save issues

---
 .idea/flutter_parse_sdk.iml                   |   19 +
 .idea/libraries/Dart_Packages.xml             |   28 +
 .idea/libraries/Dart_SDK.xml                  |   38 +-
 .idea/libraries/Flutter_Plugins.xml           |    4 +-
 .idea/libraries/Flutter_for_Android.xml       |    7 -
 .idea/misc.xml                                |    4 +-
 .idea/modules.xml                             |    3 +-
 .../example_lib_main_dart.xml                 |    7 -
 .idea/vcs.xml                                 |    6 +
 .idea/workspace.xml                           | 1172 ++++++++++-------
 CHANGELOG.md                                  |   37 +-
 README.md                                     |  223 +++-
 example/ios/Flutter/Debug.xcconfig            |    1 +
 example/ios/Flutter/Release.xcconfig          |    1 +
 example/lib/application_constants.dart        |    8 +-
 example/lib/diet_plan.dart                    |   85 +-
 example/lib/main.dart                         |  109 +-
 lib/base/parse_constants.dart                 |   10 -
 lib/data/parse_data.dart                      |   27 -
 lib/data/parse_data_objects.dart              |   19 -
 lib/data/parse_data_server.dart               |   35 -
 lib/data/parse_data_user.dart                 |   53 -
 lib/enums/parse_enum_object_call.dart         |   26 -
 lib/enums/parse_enum_user_call.dart           |   32 -
 lib/network/parse_http_client.dart            |   23 -
 lib/network/parse_query.dart                  |  282 ----
 lib/objects/parse_base.dart                   |   52 -
 lib/objects/parse_exception.dart              |    8 -
 lib/objects/parse_object.dart                 |   99 --
 lib/objects/parse_response.dart               |   75 --
 lib/objects/parse_user.dart                   |  165 ---
 lib/parse.dart                                |  120 +-
 lib/src/base/parse_constants.dart             |   43 +
 lib/src/data/parse_core_data.dart             |   53 +
 lib/src/enums/parse_enum_api_rq.dart          |   20 +
 lib/src/network/parse_http_client.dart        |   20 +
 lib/{ => src}/network/parse_livequery.dart    |    6 +-
 lib/src/network/parse_query.dart              |  268 ++++
 lib/src/objects/parse_base.dart               |  175 +++
 lib/src/objects/parse_clonable.dart           |    6 +
 lib/src/objects/parse_error.dart              |   79 ++
 lib/src/objects/parse_function.dart           |   29 +
 lib/src/objects/parse_geo_point.dart          |   30 +
 lib/src/objects/parse_object.dart             |  127 ++
 lib/src/objects/parse_response.dart           |   92 ++
 lib/src/objects/parse_user.dart               |  278 ++++
 lib/src/utils/parse_decoder.dart              |   74 ++
 lib/src/utils/parse_encoder.dart              |   43 +
 lib/src/utils/parse_logger.dart               |   30 +
 lib/src/utils/parse_utils.dart                |   11 +
 lib/src/utils/parse_utils_date.dart           |   51 +
 lib/src/utils/parse_utils_objects.dart        |    9 +
 lib/utils/parse_utils_date.dart               |   20 -
 lib/utils/parse_utils_network.dart            |    6 -
 lib/utils/parse_utils_objects.dart            |   13 -
 pubspec.yaml                                  |    8 +-
 56 files changed, 2635 insertions(+), 1634 deletions(-)
 create mode 100644 .idea/flutter_parse_sdk.iml
 create mode 100644 .idea/libraries/Dart_Packages.xml
 delete mode 100644 .idea/libraries/Flutter_for_Android.xml
 delete mode 100644 .idea/runConfigurations/example_lib_main_dart.xml
 create mode 100644 .idea/vcs.xml
 delete mode 100644 lib/base/parse_constants.dart
 delete mode 100644 lib/data/parse_data.dart
 delete mode 100644 lib/data/parse_data_objects.dart
 delete mode 100644 lib/data/parse_data_server.dart
 delete mode 100644 lib/data/parse_data_user.dart
 delete mode 100644 lib/enums/parse_enum_object_call.dart
 delete mode 100644 lib/enums/parse_enum_user_call.dart
 delete mode 100644 lib/network/parse_http_client.dart
 delete mode 100644 lib/network/parse_query.dart
 delete mode 100644 lib/objects/parse_base.dart
 delete mode 100644 lib/objects/parse_exception.dart
 delete mode 100644 lib/objects/parse_object.dart
 delete mode 100644 lib/objects/parse_response.dart
 delete mode 100644 lib/objects/parse_user.dart
 create mode 100644 lib/src/base/parse_constants.dart
 create mode 100644 lib/src/data/parse_core_data.dart
 create mode 100644 lib/src/enums/parse_enum_api_rq.dart
 create mode 100644 lib/src/network/parse_http_client.dart
 rename lib/{ => src}/network/parse_livequery.dart (89%)
 create mode 100644 lib/src/network/parse_query.dart
 create mode 100644 lib/src/objects/parse_base.dart
 create mode 100644 lib/src/objects/parse_clonable.dart
 create mode 100644 lib/src/objects/parse_error.dart
 create mode 100644 lib/src/objects/parse_function.dart
 create mode 100644 lib/src/objects/parse_geo_point.dart
 create mode 100644 lib/src/objects/parse_object.dart
 create mode 100644 lib/src/objects/parse_response.dart
 create mode 100644 lib/src/objects/parse_user.dart
 create mode 100644 lib/src/utils/parse_decoder.dart
 create mode 100644 lib/src/utils/parse_encoder.dart
 create mode 100644 lib/src/utils/parse_logger.dart
 create mode 100644 lib/src/utils/parse_utils.dart
 create mode 100644 lib/src/utils/parse_utils_date.dart
 create mode 100644 lib/src/utils/parse_utils_objects.dart
 delete mode 100644 lib/utils/parse_utils_date.dart
 delete mode 100644 lib/utils/parse_utils_network.dart
 delete mode 100644 lib/utils/parse_utils_objects.dart

diff --git a/.idea/flutter_parse_sdk.iml b/.idea/flutter_parse_sdk.iml
new file mode 100644
index 000000000..c9d208a4e
--- /dev/null
+++ b/.idea/flutter_parse_sdk.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/example/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Dart SDK" level="project" />
+    <orderEntry type="library" name="Dart Packages" level="project" />
+    <orderEntry type="library" name="Flutter Plugins" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
new file mode 100644
index 000000000..97a3d9f67
--- /dev/null
+++ b/.idea/libraries/Dart_Packages.xml
@@ -0,0 +1,28 @@
+<component name="libraryTable">
+  <library name="Dart Packages">
+    <CLASSES>
+      <root url="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/async-2.0.8/lib" />
+      <root url="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.2/lib" />
+      <root url="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.14.11/lib" />
+      <root url="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/convert-2.1.1/lib" />
+      <root url="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.6/lib" />
+      <root url="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2/lib" />
+      <root url="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0+1/lib" />
+      <root url="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3/lib" />
+      <root url="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.1.6/lib" />
+      <root url="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/path-1.6.2/lib" />
+      <root url="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.4.3/lib" />
+      <root url="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.5.0/lib" />
+      <root url="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.8/lib" />
+      <root url="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.4/lib" />
+      <root url="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.1.0/lib" />
+      <root url="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6/lib" />
+      <root url="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.0.8/lib" />
+      <root url="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.9/lib" />
+      <root url="file://C:/Programming/Flutter/bin/cache/pkg/sky_engine/lib" />
+      <root url="file://C:/Programming/Flutter/packages/flutter/lib" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml
index 33279489a..128e0bcc2 100644
--- a/.idea/libraries/Dart_SDK.xml
+++ b/.idea/libraries/Dart_SDK.xml
@@ -1,25 +1,25 @@
 <component name="libraryTable">
   <library name="Dart SDK">
     <CLASSES>
-      <root url="file://C:/flutter/bin/cache/dart-sdk/lib/async" />
-      <root url="file://C:/flutter/bin/cache/dart-sdk/lib/cli" />
-      <root url="file://C:/flutter/bin/cache/dart-sdk/lib/collection" />
-      <root url="file://C:/flutter/bin/cache/dart-sdk/lib/convert" />
-      <root url="file://C:/flutter/bin/cache/dart-sdk/lib/core" />
-      <root url="file://C:/flutter/bin/cache/dart-sdk/lib/developer" />
-      <root url="file://C:/flutter/bin/cache/dart-sdk/lib/html" />
-      <root url="file://C:/flutter/bin/cache/dart-sdk/lib/indexed_db" />
-      <root url="file://C:/flutter/bin/cache/dart-sdk/lib/io" />
-      <root url="file://C:/flutter/bin/cache/dart-sdk/lib/isolate" />
-      <root url="file://C:/flutter/bin/cache/dart-sdk/lib/js" />
-      <root url="file://C:/flutter/bin/cache/dart-sdk/lib/js_util" />
-      <root url="file://C:/flutter/bin/cache/dart-sdk/lib/math" />
-      <root url="file://C:/flutter/bin/cache/dart-sdk/lib/mirrors" />
-      <root url="file://C:/flutter/bin/cache/dart-sdk/lib/svg" />
-      <root url="file://C:/flutter/bin/cache/dart-sdk/lib/typed_data" />
-      <root url="file://C:/flutter/bin/cache/dart-sdk/lib/web_audio" />
-      <root url="file://C:/flutter/bin/cache/dart-sdk/lib/web_gl" />
-      <root url="file://C:/flutter/bin/cache/dart-sdk/lib/web_sql" />
+      <root url="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/async" />
+      <root url="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/cli" />
+      <root url="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/collection" />
+      <root url="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/convert" />
+      <root url="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/core" />
+      <root url="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/developer" />
+      <root url="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/html" />
+      <root url="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/indexed_db" />
+      <root url="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/io" />
+      <root url="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/isolate" />
+      <root url="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/js" />
+      <root url="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/js_util" />
+      <root url="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/math" />
+      <root url="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/mirrors" />
+      <root url="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/svg" />
+      <root url="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/typed_data" />
+      <root url="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/web_audio" />
+      <root url="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/web_gl" />
+      <root url="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/web_sql" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml
index 53449daee..22987bdb6 100644
--- a/.idea/libraries/Flutter_Plugins.xml
+++ b/.idea/libraries/Flutter_Plugins.xml
@@ -1,7 +1,7 @@
 <component name="libraryTable">
-  <library name="Flutter Plugins" type="FlutterPluginsLibraryType">
+  <library name="Flutter Plugins">
     <CLASSES>
-      <root url="file://$PROJECT_DIR$" />
+      <root url="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.4.3" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/libraries/Flutter_for_Android.xml b/.idea/libraries/Flutter_for_Android.xml
deleted file mode 100644
index 3a5f76447..000000000
--- a/.idea/libraries/Flutter_for_Android.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="libraryTable">
-  <library name="Flutter for Android">
-    <CLASSES />
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c75aae1ba..8dc6d52f3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -29,5 +29,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" default="false" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c81a67101..c749759a5 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/parse_android.iml" filepath="$PROJECT_DIR$/parse_android.iml" />
-      <module fileurl="file://$PROJECT_DIR$/parse_server_sdk.iml" filepath="$PROJECT_DIR$/parse_server_sdk.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/flutter_parse_sdk.iml" filepath="$PROJECT_DIR$/.idea/flutter_parse_sdk.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/example_lib_main_dart.xml b/.idea/runConfigurations/example_lib_main_dart.xml
deleted file mode 100644
index d2e33a592..000000000
--- a/.idea/runConfigurations/example_lib_main_dart.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="example/lib/main.dart" type="FlutterRunConfigurationType" factoryName="Flutter">
-    <option name="additionalArgs" value="--debug" />
-    <option name="filePath" value="$PROJECT_DIR$/example/lib/main.dart" />
-    <method />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 000000000..35eb1ddfb
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6c1dca3ea..d754f93d2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="AndroidLogFilters">
+    <option name="TOOL_WINDOW_CUSTOM_FILTER" value="Body" />
     <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
   </component>
   <component name="CMakeSettings">
@@ -9,38 +10,67 @@
     </configurations>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="17611aa1-4ca1-4afd-bc8b-ea48137da491" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/lib/base/parse_constants.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/data/parse_data_objects.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/data/parse_data_server.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/data/parse_data_user.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/network/parse_query.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/objects/parse_base.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/objects/parse_exception.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/objects/parse_object.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/objects/parse_response.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/utils/parse_utils_date.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/utils/parse_utils_network.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/utils/parse_utils_objects.dart" afterDir="false" />
+    <list default="true" id="671a34b5-b647-4093-b4db-14fa3bb81bec" name="Default" comment="Version 1.0.4 - Fixing duplicate 'getAll' &amp; pin issue">
+      <change afterPath="$PROJECT_DIR$/.idea/flutter_parse_sdk.iml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/src/base/parse_constants.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/src/data/parse_core_data.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/src/enums/parse_enum_api_rq.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/src/network/parse_http_client.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/src/network/parse_query.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/src/objects/parse_base.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/src/objects/parse_clonable.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/src/objects/parse_error.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/src/objects/parse_function.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/src/objects/parse_geo_point.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/src/objects/parse_object.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/src/objects/parse_response.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/src/objects/parse_user.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/src/utils/parse_decoder.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/src/utils/parse_encoder.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/src/utils/parse_logger.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/src/utils/parse_utils.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/src/utils/parse_utils_date.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/lib/src/utils/parse_utils_objects.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Flutter_Plugins.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Flutter_Plugins.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Flutter_for_Android.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/runConfigurations/example_lib_main_dart.xml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/android/gradlew" beforeDir="false" afterPath="$PROJECT_DIR$/example/android/gradlew" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/ios/Flutter/Debug.xcconfig" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/Flutter/Debug.xcconfig" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/ios/Flutter/Release.xcconfig" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/Flutter/Release.xcconfig" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/example/lib/application_constants.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/application_constants.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/example/lib/diet_plan.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/diet_plan.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/example/lib/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/main.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/base/parse_constants.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/data/parse_data.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/data/parse_data_objects.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/data/parse_data_server.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/data/parse_data_user.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/enums/parse_enum_object_call.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/enums/parse_enum_user_call.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/network/parse_http_client.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/network/parse_livequery.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/network/parse_livequery.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/network/parse_query.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/objects/parse_base.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/objects/parse_exception.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/objects/parse_object.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/objects/parse_response.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/objects/parse_user.dart" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/parse.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/parse.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/parse_base.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/parse_http_client.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/network/parse_http_client.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/parse_livequery.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/network/parse_livequery.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/parse_object.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/parse_query.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/parse_user.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/objects/parse_user.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/utils/parse_utils_date.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/utils/parse_utils_network.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/utils/parse_utils_objects.dart" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
     </list>
-    <ignored path="$PROJECT_DIR$/.dart_tool/" />
-    <ignored path="$PROJECT_DIR$/.idea/" />
-    <ignored path="$PROJECT_DIR$/.pub/" />
-    <ignored path="$PROJECT_DIR$/build/" />
-    <ignored path="$PROJECT_DIR$/example/.pub/" />
-    <ignored path="$PROJECT_DIR$/example/build/" />
+    <ignored path="$PROJECT_DIR$/out/" />
+    <ignored path="$PROJECT_DIR$/.idea/shelf/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -48,137 +78,180 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="FUSProjectUsageTrigger">
+    <session id="1811489074">
+      <usages-collector id="statistics.lifecycle.project">
+        <counts>
+          <entry key="project.closed" value="2" />
+          <entry key="project.open.time.1" value="1" />
+          <entry key="project.open.time.8" value="2" />
+          <entry key="project.opened" value="3" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="dart" value="7612" />
+          <entry key="md" value="398" />
+          <entry key="txt" value="228" />
+          <entry key="yaml" value="33" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="Dart" value="7612" />
+          <entry key="PLAIN_TEXT" value="626" />
+          <entry key="YAML" value="33" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.extensions.open">
+        <counts>
+          <entry key="dart" value="96" />
+          <entry key="md" value="3" />
+          <entry key="parse_decoder" value="1" />
+          <entry key="yaml" value="4" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.open">
+        <counts>
+          <entry key="Dart" value="96" />
+          <entry key="PLAIN_TEXT" value="4" />
+          <entry key="YAML" value="4" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.vcs.git.usages">
+        <counts>
+          <entry key="git.branch.create.new" value="2" />
+        </counts>
+      </usages-collector>
+    </session>
+  </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="pubspec.yaml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="53">
-              <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="parse.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/parse.dart">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="parse_base.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_base.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-444">
-              <caret line="4" column="32" selection-start-line="4" selection-start-column="32" selection-end-line="4" selection-end-column="32" />
+            <state relative-caret-position="313">
+              <caret line="53" column="32" selection-start-line="53" selection-start-column="32" selection-end-line="53" selection-end-column="32" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="application_constants.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/example/lib/application_constants.dart">
+      <file leaf-file-name="parse_user.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_user.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="68">
-              <caret line="4" column="42" selection-start-line="4" selection-start-column="42" selection-end-line="4" selection-end-column="42" />
+            <state relative-caret-position="211">
+              <caret line="259" column="48" selection-start-line="259" selection-start-column="48" selection-end-line="259" selection-end-column="48" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="diet_plan.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/lib/diet_plan.dart">
+      <file leaf-file-name="parse_response.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_response.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="51">
-              <caret line="5" column="30" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
-              <folding>
-                <element signature="e#0#19#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="151">
-              <caret line="104" column="5" lean-forward="true" selection-start-line="104" selection-start-column="5" selection-end-line="104" selection-end-column="5" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="parse_query.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/network/parse_query.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="136">
-              <caret line="8" column="18" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="18" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="177">
+              <caret line="46" column="50" selection-start-line="46" selection-start-column="50" selection-end-line="46" selection-end-column="50" />
             </state>
           </provider>
         </entry>
       </file>
     </leaf>
   </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Dart File" />
-      </list>
-    </option>
-  </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>flutter_test</find>
-      <find>parse</find>
-      <find>bodycal/parse</find>
+      <find>User()</find>
+      <find>import</find>
+      <find>BaseClient</find>
+      <find>bad</find>
+      <find>client</find>
+      <find>send</find>
+      <find>getObjectData()[key]</find>
+      <find>ParseResponse</find>
+      <find>setObjectData</find>
+      <find>saveInStorage</find>
+      <find>Store</find>
+      <find>fromJson</find>
+      <find>ParseBase</find>
+      <find>ParseObject</find>
+      <find>userLogger</find>
+      <find>user</find>
+      <find>toJson</find>
+      <find>toString</find>
+      <find>encode(</find>
     </findStrings>
     <replaceStrings>
-      <replace>parse_server_sdk</replace>
+      <replace>part</replace>
+      <replace>ParseBase</replace>
+      <replace>ParseResponse</replace>
+      <replace>logger</replace>
+      <replace>object</replace>
     </replaceStrings>
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="release/1.0.31" />
+      </map>
+    </option>
   </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/example/pubspec.lock" />
-        <option value="$PROJECT_DIR$/example/.packages" />
-        <option value="$PROJECT_DIR$/lib/credentials.dart" />
-        <option value="$PROJECT_DIR$/example/lib/DietPlan.dart" />
-        <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/lib/parse_base.dart" />
-        <option value="$PROJECT_DIR$/lib/parse_http_client.dart" />
-        <option value="$PROJECT_DIR$/lib/parse_livequery.dart" />
-        <option value="$PROJECT_DIR$/lib/parse_query.dart" />
-        <option value="$PROJECT_DIR$/lib/parse_data.dart" />
-        <option value="$PROJECT_DIR$/lib/parse_user_data.dart" />
-        <option value="$PROJECT_DIR$/lib/parse_object.dart" />
-        <option value="$PROJECT_DIR$/lib/parse_user.dart" />
-        <option value="$PROJECT_DIR$/example/android/build.gradle" />
-        <option value="$PROJECT_DIR$/example/android/app/build.gradle" />
-        <option value="$PROJECT_DIR$/example/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/lib/parse.dart" />
-        <option value="$PROJECT_DIR$/lib/utils/parse_utils_objects.dart" />
+        <option value="$PROJECT_DIR$/lib/objects/parse_response.dart" />
+        <option value="$PROJECT_DIR$/lib/enums/parse_enum_function_call.dart" />
+        <option value="$PROJECT_DIR$/lib/objects/parse_base.dart" />
         <option value="$PROJECT_DIR$/lib/utils/parse_utils_network.dart" />
         <option value="$PROJECT_DIR$/lib/utils/parse_utils_date.dart" />
-        <option value="$PROJECT_DIR$/lib/objects/parse_user.dart" />
-        <option value="$PROJECT_DIR$/lib/objects/parse_response.dart" />
+        <option value="$PROJECT_DIR$/lib/utils/parse_utils_objects.dart" />
+        <option value="$PROJECT_DIR$/lib/data/parse_data_user.dart" />
         <option value="$PROJECT_DIR$/lib/objects/parse_object.dart" />
-        <option value="$PROJECT_DIR$/lib/objects/parse_base.dart" />
+        <option value="$PROJECT_DIR$/lib/objects/parse_function.dart" />
+        <option value="$PROJECT_DIR$/lib/objects/parse_exception.dart" />
         <option value="$PROJECT_DIR$/lib/network/parse_query.dart" />
-        <option value="$PROJECT_DIR$/lib/network/parse_livequery.dart" />
-        <option value="$PROJECT_DIR$/lib/network/parse_http_client.dart" />
-        <option value="$PROJECT_DIR$/lib/data/parse_data_objects.dart" />
+        <option value="$PROJECT_DIR$/lib/objects/parse_user.dart" />
+        <option value="$PROJECT_DIR$/lib/src/data/parse_data_objects.dart" />
+        <option value="$PROJECT_DIR$/lib/src/objects/parse_file.dart" />
+        <option value="$PROJECT_DIR$/lib/src/objects/parse_geo_point.dart" />
+        <option value="$PROJECT_DIR$/lib/src/objects/parse_exception.dart" />
+        <option value="$PROJECT_DIR$/lib/src/network/parse_livequery.dart" />
+        <option value="$PROJECT_DIR$/lib/src/data/parse_data.dart" />
+        <option value="$PROJECT_DIR$/lib/src/enums/parse_enum_user_call.dart" />
+        <option value="$PROJECT_DIR$/lib/src/enums/parse_enum_object_call.dart" />
+        <option value="$PROJECT_DIR$/lib/src/enums/parse_enum_function_call.dart" />
+        <option value="$PROJECT_DIR$/lib/src/objects/parse_function.dart" />
+        <option value="$PROJECT_DIR$/lib/src/data/parse_data_server.dart" />
+        <option value="$PROJECT_DIR$/lib/src/utils/parse_utils_objects.dart" />
+        <option value="$PROJECT_DIR$/lib/src/data/parse_data_user.dart" />
+        <option value="$PROJECT_DIR$/lib/src/data/parse_core_data.dart" />
+        <option value="$PROJECT_DIR$/lib/src/utils/parse_utils_date.dart" />
+        <option value="$PROJECT_DIR$/lib/src/objects/parse_user_response.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
+        <option value="$PROJECT_DIR$/lib/src/network/parse_http_client.dart" />
+        <option value="$PROJECT_DIR$/lib/src/enums/parse_enum_api_rq.dart" />
+        <option value="$PROJECT_DIR$/lib/src/network/parse_query.dart" />
+        <option value="$PROJECT_DIR$/lib/parse.dart" />
+        <option value="$PROJECT_DIR$/lib/src/objects/parse_error.dart" />
+        <option value="$PROJECT_DIR$/lib/src/objects/parse_response.dart" />
+        <option value="$PROJECT_DIR$/lib/src/utils/parse_logger.dart" />
+        <option value="$PROJECT_DIR$/lib/src/utils/parse_decoder.dart" />
+        <option value="$PROJECT_DIR$/lib/src/utils/parse_utils.dart" />
+        <option value="$PROJECT_DIR$/lib/src/base/parse_constants.dart" />
         <option value="$PROJECT_DIR$/example/lib/diet_plan.dart" />
         <option value="$PROJECT_DIR$/example/lib/main.dart" />
         <option value="$PROJECT_DIR$/example/lib/application_constants.dart" />
+        <option value="$PROJECT_DIR$/lib/src/objects/parse_user.dart" />
+        <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/objects/parse_object.dart" />
+        <option value="$PROJECT_DIR$/lib/src/utils/parse_encoder.dart" />
+        <option value="$PROJECT_DIR$/lib/src/objects/parse_base.dart" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="430" />
-    <option name="y" value="17" />
-    <option name="width" value="873" />
-    <option name="height" value="723" />
+  <component name="ProjectFrameBounds">
+    <option name="x" value="-8" />
+    <option name="width" value="1544" />
+    <option name="height" value="1043" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -186,92 +259,120 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="AndroidView">
+        <subPane>
+          <expand>
+            <path>
+              <item name="flutter_parse_sdk" type="1abcf292:AndroidViewProjectNode" />
+              <item name="main" type="e9137016:NonAndroidModuleNode" />
+            </path>
+            <path>
+              <item name="flutter_parse_sdk" type="1abcf292:AndroidViewProjectNode" />
+              <item name="main" type="e9137016:NonAndroidModuleNode" />
+              <item name="java" type="f7eae187:NonAndroidSourceTypeNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
             <path>
-              <item name="parse_server_sdk" type="b2602c69:ProjectViewProjectNode" />
-              <item name="parse_server_sdk" type="462c0819:PsiDirectoryNode" />
+              <item name="flutter_parse_sdk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter_parse_sdk" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="parse_server_sdk" type="b2602c69:ProjectViewProjectNode" />
-              <item name="parse_server_sdk" type="462c0819:PsiDirectoryNode" />
+              <item name="flutter_parse_sdk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter_parse_sdk" type="462c0819:PsiDirectoryNode" />
               <item name="example" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="parse_server_sdk" type="b2602c69:ProjectViewProjectNode" />
-              <item name="parse_server_sdk" type="462c0819:PsiDirectoryNode" />
+              <item name="flutter_parse_sdk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter_parse_sdk" type="462c0819:PsiDirectoryNode" />
               <item name="example" type="462c0819:PsiDirectoryNode" />
               <item name="lib" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="parse_server_sdk" type="b2602c69:ProjectViewProjectNode" />
-              <item name="parse_server_sdk" type="462c0819:PsiDirectoryNode" />
+              <item name="flutter_parse_sdk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter_parse_sdk" type="462c0819:PsiDirectoryNode" />
               <item name="lib" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="parse_server_sdk" type="b2602c69:ProjectViewProjectNode" />
-              <item name="parse_server_sdk" type="462c0819:PsiDirectoryNode" />
+              <item name="flutter_parse_sdk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter_parse_sdk" type="462c0819:PsiDirectoryNode" />
               <item name="lib" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="flutter_parse_sdk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter_parse_sdk" type="462c0819:PsiDirectoryNode" />
+              <item name="lib" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="base" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="parse_server_sdk" type="b2602c69:ProjectViewProjectNode" />
-              <item name="parse_server_sdk" type="462c0819:PsiDirectoryNode" />
+              <item name="flutter_parse_sdk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter_parse_sdk" type="462c0819:PsiDirectoryNode" />
               <item name="lib" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="data" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="parse_server_sdk" type="b2602c69:ProjectViewProjectNode" />
-              <item name="parse_server_sdk" type="462c0819:PsiDirectoryNode" />
+              <item name="flutter_parse_sdk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter_parse_sdk" type="462c0819:PsiDirectoryNode" />
               <item name="lib" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="enums" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="flutter_parse_sdk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter_parse_sdk" type="462c0819:PsiDirectoryNode" />
+              <item name="lib" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="network" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="parse_server_sdk" type="b2602c69:ProjectViewProjectNode" />
-              <item name="parse_server_sdk" type="462c0819:PsiDirectoryNode" />
+              <item name="flutter_parse_sdk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter_parse_sdk" type="462c0819:PsiDirectoryNode" />
               <item name="lib" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="objects" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="parse_server_sdk" type="b2602c69:ProjectViewProjectNode" />
-              <item name="parse_server_sdk" type="462c0819:PsiDirectoryNode" />
+              <item name="flutter_parse_sdk" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter_parse_sdk" type="462c0819:PsiDirectoryNode" />
               <item name="lib" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="utils" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
-        <option name="show-excluded-files" value="false" />
       </pane>
-      <pane id="AndroidView" />
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
+    <property name="SearchEverywhereHistoryKey" value="httpClient&#9;null&#9;null&#10;HttpClient&#9;null&#9;null" />
+    <property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" />
     <property name="dart.analysis.tool.window.force.activate" value="false" />
     <property name="io.flutter.reload.alreadyRun" value="true" />
-    <property name="last_opened_file_path" value="$USER_HOME$/AndroidStudioProjects/FlutterParseSDK-master/example" />
-    <property name="show.migrate.to.gradle.popup" value="false" />
-    <property name="settings.editor.selected.configurable" value="flutter.settings" />
-    <property name="project.structure.last.edited" value="Problems" />
-    <property name="project.structure.proportion" value="0.15" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="project.structure.last.edited" value="SDKs" />
+    <property name="project.structure.proportion" value="0.0" />
     <property name="project.structure.side.proportion" value="0.2" />
-    <property name="android.project.structure.last.selected" value="SDK Location" />
-    <property name="android.project.structure.proportion" value="0.15" />
+    <property name="settings.editor.selected.configurable" value="preferences.sourceCode.Dart" />
+    <property name="show.migrate.to.gradle.popup" value="false" />
   </component>
   <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="C:\Users\phill\Desktop\Flutter Stuff\parse_server_sdk\example\lib" />
-      <recent name="C:\Users\phill\Desktop\Flutter Stuff\parse_server_sdk\lib" />
-      <recent name="C:\Users\phill\Desktop\Flutter Stuff\parse_server_sdk" />
-      <recent name="C:\Users\phill\Desktop\Flutter Stuff\parse_server\lib" />
-      <recent name="C:\Users\phill\Desktop\Flutter Home Apps\parse\example\lib" />
-    </key>
     <key name="MoveFile.RECENT_KEYS">
-      <recent name="C:\Users\phill\Desktop\Flutter Stuff\parse_server\lib\data" />
-      <recent name="C:\Users\phill\Desktop\Flutter Home Apps\parse\lib" />
+      <recent name="C:\Users\phill\Desktop\Flutter Home Apps\flutter_parse_sdk\lib\src" />
+    </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/lib/src/objects" />
+      <recent name="C:\Users\phill\Desktop\Flutter Home Apps\flutter_parse_sdk\lib\objects" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -287,93 +388,72 @@
     </option>
   </component>
   <component name="RunManager">
-    <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <method>
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="main.dart" type="FlutterRunConfigurationType" factoryName="Flutter">
+      <option name="filePath" value="$PROJECT_DIR$/example/lib/main.dart" />
+    </configuration>
+    <configuration default="true" type="TestNG" factoryName="TestNG">
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
       <option name="PACKAGE_NAME" />
       <option name="MAIN_CLASS_NAME" />
       <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="VM_PARAMETERS" />
       <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <option name="OUTPUT_DIRECTORY" />
       <option name="PASS_PARENT_ENVS" value="true" />
       <option name="TEST_SEARCH_SCOPE">
         <value defaultName="singleModule" />
       </option>
-      <patterns />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    </configuration>
-    <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
-      <module name="parse" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="WORKING_DIRECTORY" />
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
+      <option name="PROPERTIES_FILE" />
+      <properties />
+      <listeners />
+      <method>
+        <option name="Make" enabled="true" />
+      </method>
     </configuration>
-    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
-      <module name="parse" />
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="filePath" />
-      <option name="vmParameters" />
-      <option name="alternativeJrePath" />
-      <option name="programParameters" />
-      <option name="passParentEnvs" value="true" />
-      <option name="workingDirectory" />
-      <option name="isAlternativeJrePathEnabled" value="false" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PASS_PARENT_ENVS" value="true" />
+    <configuration name="&lt;template&gt;" type="Applet" default="true" selected="false">
       <option name="MAIN_CLASS_NAME" />
-      <option name="WORKING_DIRECTORY" />
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="filePath" />
-      <option name="vmParameters" />
-      <option name="alternativeJrePath" />
-      <option name="programParameters" />
-      <option name="passParentEnvs" value="true" />
-      <option name="workingDirectory" />
-      <option name="isAlternativeJrePathEnabled" value="false" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
       <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="WORKING_DIRECTORY" />
     </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
       <option name="PACKAGE_NAME" />
       <option name="MAIN_CLASS_NAME" />
       <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="TEST_OBJECT" value="class" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-      <option name="OUTPUT_DIRECTORY" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <option name="ENV_VARIABLES" />
       <option name="PASS_PARENT_ENVS" value="true" />
       <option name="TEST_SEARCH_SCOPE">
         <value defaultName="singleModule" />
       </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <properties />
-      <listeners />
+      <envs />
+      <patterns />
+      <method />
     </configuration>
-    <configuration name="&lt;template&gt;" type="JUnit" default="true" selected="false">
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+    <configuration name="&lt;template&gt;" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" default="true" selected="false">
+      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
     </configuration>
   </component>
   <component name="SvnConfiguration">
@@ -381,468 +461,561 @@
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="17611aa1-4ca1-4afd-bc8b-ea48137da491" name="Default" comment="" />
-      <created>1537612077691</created>
+      <changelist id="671a34b5-b647-4093-b4db-14fa3bb81bec" name="Default" comment="" />
+      <created>1546881355795</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1537612077691</updated>
+      <updated>1546881355795</updated>
     </task>
-    <task id="LOCAL-00001" summary="Added">
-      <created>1537714842215</created>
+    <task id="LOCAL-00001" summary="Version 0.3 for release">
+      <created>1546884752230</created>
       <option name="number" value="00001" />
       <option name="presentableId" value="LOCAL-00001" />
       <option name="project" value="LOCAL" />
-      <updated>1537714842215</updated>
+      <updated>1546884752230</updated>
+    </task>
+    <task id="LOCAL-00002" summary="Version 0.4 for release">
+      <created>1546887791210</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1546887791210</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00003" summary="Version 1.0.0 for release">
+      <created>1546888097714</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1546888097714</updated>
+    </task>
+    <task id="LOCAL-00004" summary="Version 1.0.0 for release">
+      <created>1546888309324</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1546888309324</updated>
+    </task>
+    <task id="LOCAL-00005" summary="Version 1.0.0 for release">
+      <created>1546894981978</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1546894981978</updated>
+    </task>
+    <task id="LOCAL-00006" summary="Version 1.0.1 - Fixed removed file">
+      <created>1546895042011</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1546895042011</updated>
+    </task>
+    <task id="LOCAL-00007" summary="Version 1.0.3, Added custom encoder, added date formatter, merged User to ParseUser">
+      <created>1547051168221</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1547051168221</updated>
+    </task>
+    <task id="LOCAL-00008" summary="Version 1.0.3 - Added decoder">
+      <created>1547051408891</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1547051408891</updated>
+    </task>
+    <task id="LOCAL-00009" summary="Version 1.0.3 - Added decoder">
+      <created>1547051451156</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1547051451156</updated>
+    </task>
+    <task id="LOCAL-00010" summary="Version 1.0.4 - Added Generics">
+      <created>1547121632281</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1547121632281</updated>
+    </task>
+    <task id="LOCAL-00011" summary="Version 1.0.4 - Fixing duplicate 'getAll' &amp; pin issue">
+      <created>1547127880224</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1547127880224</updated>
+    </task>
+    <task id="LOCAL-00012" summary="Version 1.0.4 - Removed static fromJson">
+      <created>1547128670936</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1547128670936</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
+  <component name="TodoView">
+    <todo-panel id="selected-file">
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+    <todo-panel id="all">
+      <are-packages-shown value="true" />
+      <is-autoscroll-to-source value="true" />
+    </todo-panel>
+  </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
+    <frame x="-8" y="0" width="1544" height="1043" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info anchor="bottom" id="Android Profiler" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Messages" order="7" sideWeight="0.7405446" visible="true" weight="0.31862745" />
-      <window_info anchor="right" id="Palette&#9;" order="3" />
-      <window_info id="Image Layers" order="2" />
-      <window_info id="Build Variants" order="2" side_tool="true" />
-      <window_info anchor="right" id="Capture Analysis" order="3" />
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.25945538" side_tool="true" visible="true" weight="0.31862745" />
-      <window_info anchor="bottom" id="Dart Analysis" order="7" sideWeight="0.4969743" weight="0.32843137" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.70423603" weight="0.4509804" />
-      <window_info anchor="bottom" id="Version Control" order="7" />
-      <window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.4969743" weight="0.2875817" />
-      <window_info anchor="right" id="Flutter Outline" order="3" />
-      <window_info anchor="bottom" id="Logcat" order="7" />
-      <window_info id="Captures" order="2" />
-      <window_info id="Capture Tool" order="2" />
+      <window_info anchor="bottom" id="TODO" order="6" sideWeight="0.49898854" weight="0.32785088" />
+      <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49359408" weight="0.26535088" />
+      <window_info anchor="right" id="Palette&#9;" order="8" />
+      <window_info id="Image Layers" order="5" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.28051248" side_tool="true" visible="true" weight="0.3859649" />
+      <window_info anchor="bottom" id="Flutter Performance" order="11" side_tool="true" />
+      <window_info anchor="bottom" id="Dart Analysis" order="7" sideWeight="0.4962913" weight="0.3267544" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.66756576" weight="0.41557017" />
+      <window_info anchor="bottom" id="Version Control" order="12" sideWeight="0.49308175" weight="0.32692307" />
+      <window_info anchor="bottom" id="Terminal" order="13" sideWeight="0.49566475" weight="0.3242938" />
+      <window_info anchor="right" id="Flutter Outline" order="6" weight="0.32922202" />
+      <window_info id="Capture Tool" order="7" />
       <window_info id="Designer" order="2" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.28668684" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.3047876" />
+      <window_info anchor="right" id="Android WiFi ADB" order="7" weight="0.32908162" />
+      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.49937108" weight="0.32819384" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="right" id="Device File Explorer" order="3" side_tool="true" />
-      <window_info anchor="right" id="Theme Preview" order="3" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="right" id="Theme Preview" order="9" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.71948755" visible="true" weight="0.3859649" />
+      <window_info id="Favorites" order="3" side_tool="true" />
       <window_info anchor="right" id="Flutter Inspector" order="3" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
-      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info id="Build Variants" order="4" side_tool="true" />
+      <window_info id="Captures" order="6" weight="0.25" />
+      <window_info anchor="bottom" id="Android Profiler" order="9" show_stripe_button="false" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="bottom" id="Logcat" order="8" sideWeight="0.49905124" weight="0.5562914" />
+      <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="right" id="Device File Explorer" order="5" side_tool="true" />
     </layout>
     <layout-to-restore>
-      <window_info id="Designer" order="4" />
-      <window_info anchor="bottom" id="Dart Analysis" order="9" weight="0.32843137" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info id="Build Variants" order="2" side_tool="true" />
-      <window_info id="Image Layers" order="5" />
-      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="bottom" id="Android Profiler" order="7" show_stripe_button="false" />
-      <window_info id="Favorites" order="7" side_tool="true" />
-      <window_info id="Captures" order="6" />
-      <window_info id="Capture Tool" order="3" />
-      <window_info anchor="right" id="Capture Analysis" order="6" />
-      <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
-      <window_info anchor="right" id="Flutter Inspector" order="8" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Device File Explorer" order="4" side_tool="true" />
-      <window_info anchor="right" id="Flutter Outline" order="3" />
-      <window_info anchor="bottom" id="Logcat" order="10" />
-      <window_info anchor="bottom" id="Version Control" order="12" />
-      <window_info anchor="bottom" id="Terminal" order="13" visible="true" weight="0.27941176" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2881997" />
-      <window_info anchor="bottom" id="Messages" order="11" weight="0.31862745" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info id="Designer" order="0" />
+      <window_info anchor="bottom" id="Dart Analysis" order="0" weight="0.32972974" />
+      <window_info id="Build Variants" order="1" side_tool="true" />
+      <window_info id="Image Layers" order="2" />
+      <window_info anchor="bottom" id="Run" order="10" sideWeight="0.86622393" visible="true" weight="0.43046358" />
+      <window_info anchor="bottom" id="Cvs" order="12" weight="0.25" />
+      <window_info anchor="right" id="Ant Build" order="8" weight="0.25" />
+      <window_info anchor="right" id="Flutter Inspector" order="1" />
+      <window_info anchor="bottom" id="Logcat" order="3" sideWeight="0.49905124" weight="0.5562914" />
+      <window_info anchor="bottom" id="Android Profiler" order="1" show_stripe_button="false" />
+      <window_info id="Capture Tool" order="4" />
+      <window_info anchor="right" id="Capture Analysis" order="2" />
+      <window_info anchor="right" id="Commander" order="7" weight="0.4" />
+      <window_info anchor="bottom" id="Event Log" order="2" sideWeight="0.5009488" side_tool="true" weight="0.5844371" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="9" weight="0.25" />
+      <window_info anchor="right" id="Device File Explorer" order="3" side_tool="true" />
+      <window_info anchor="right" id="Flutter Outline" order="4" weight="0.32922202" />
+      <window_info anchor="right" id="Android WiFi ADB" order="0" weight="0.32908162" />
+      <window_info anchor="bottom" id="Flutter Performance" order="4" side_tool="true" />
+      <window_info anchor="bottom" id="Version Control" order="5" weight="0.3294702" />
+      <window_info anchor="bottom" id="Terminal" order="6" sideWeight="0.49840087" weight="0.56456953" />
+      <window_info anchor="bottom" id="Find" order="9" />
+      <window_info id="Captures" order="7" weight="0.25" />
+      <window_info content_ui="combo" id="Project" order="5" visible="true" weight="0.28061223" />
+      <window_info anchor="bottom" id="Messages" order="7" sideWeight="0.49620494" weight="0.26821193" />
+      <window_info anchor="bottom" id="Message" order="8" />
+      <window_info anchor="bottom" id="TODO" order="14" />
       <window_info anchor="right" id="Palette&#9;" order="5" />
-      <window_info anchor="right" id="Theme Preview" order="7" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="right" id="Theme Preview" order="6" />
+      <window_info id="Structure" order="6" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="13" weight="0.4" />
+      <window_info id="Favorites" order="3" side_tool="true" />
+      <window_info anchor="bottom" id="Debug" order="11" sideWeight="0.49905124" weight="0.5149007" />
     </layout-to-restore>
   </component>
+  <component name="UnknownFeatures">
+    <option featureType="com.intellij.configurationType" implementationName="FlutterRunConfigurationType" />
+  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="Added" />
-    <option name="LAST_COMMIT_MESSAGE" value="Added" />
+    <MESSAGE value="Version 0.3 for release" />
+    <MESSAGE value="Version 0.4 for release" />
+    <MESSAGE value="Version 1.0.0 for release" />
+    <MESSAGE value="Version 1.0.1 - Fixed removed file" />
+    <MESSAGE value="Version 1.0.3, Added custom encoder, added date formatter, merged User to ParseUser" />
+    <MESSAGE value="Version 1.0.3 - Added decoder" />
+    <MESSAGE value="Version 1.0.4 - Added Generics" />
+    <MESSAGE value="Version 1.0.4 - Fixing duplicate 'getAll' &amp; pin issue" />
+    <MESSAGE value="Version 1.0.4 - Removed static fromJson" />
+    <option name="LAST_COMMIT_MESSAGE" value="Version 1.0.4 - Removed static fromJson" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="20" />
+      <breakpoints>
+        <line-breakpoint enabled="true" type="Dart">
+          <url>file://$PROJECT_DIR$/lib/src/objects/parse_user.dart</url>
+          <line>183</line>
+          <option name="timeStamp" value="21" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="Dart">
+          <url>file://$PROJECT_DIR$/lib/src/objects/parse_user.dart</url>
+          <line>186</line>
+          <option name="timeStamp" value="30" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="Dart">
+          <url>file://$PROJECT_DIR$/lib/src/objects/parse_user.dart</url>
+          <line>188</line>
+          <option name="timeStamp" value="31" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="Dart">
+          <url>file://$PROJECT_DIR$/lib/src/objects/parse_user.dart</url>
+          <line>259</line>
+          <option name="timeStamp" value="32" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="Dart">
+          <url>file://$PROJECT_DIR$/lib/src/objects/parse_response.dart</url>
+          <line>22</line>
+          <option name="timeStamp" value="33" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="Dart">
+          <url>file://$PROJECT_DIR$/lib/src/objects/parse_response.dart</url>
+          <line>46</line>
+          <option name="timeStamp" value="34" />
+        </line-breakpoint>
+      </breakpoints>
+      <default-breakpoints>
+        <breakpoint type="dart-exception">
+          <properties />
+        </breakpoint>
+      </default-breakpoints>
+      <option name="time" value="35" />
     </breakpoint-manager>
   </component>
   <component name="debuggerHistoryManager">
     <expressions id="evaluateExpression">
       <expression>
-        <expression-string>objectData</expression-string>
+        <expression-string>getObjectData()</expression-string>
+        <language-id>Dart</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>await ParseCoreData().getStore().getString(key)</expression-string>
         <language-id>Dart</language-id>
         <evaluation-mode>EXPRESSION</evaluation-mode>
       </expression>
       <expression>
-        <expression-string>value.body</expression-string>
+        <expression-string>await ParseCoreData().getStore().setString(key, toJson())</expression-string>
         <language-id>Dart</language-id>
         <evaluation-mode>EXPRESSION</evaluation-mode>
       </expression>
       <expression>
-        <expression-string>client</expression-string>
+        <expression-string>ParseCoreData().getStore().setString(key, toJson())</expression-string>
         <language-id>Dart</language-id>
         <evaluation-mode>EXPRESSION</evaluation-mode>
       </expression>
       <expression>
-        <expression-string>ParseHTTPClient</expression-string>
+        <expression-string>ParseCoreData().getStore().setString(key, toJson());</expression-string>
+        <language-id>Dart</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>emailAddress</expression-string>
+        <language-id>Dart</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>resultsList.first.objectId</expression-string>
+        <language-id>Dart</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>resultsList.first</expression-string>
+        <language-id>Dart</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>JsonEncoder().convert(_objectData)</expression-string>
+        <language-id>Dart</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>JsonEncoder().convert(objectData)</expression-string>
         <language-id>Dart</language-id>
         <evaluation-mode>EXPRESSION</evaluation-mode>
       </expression>
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/.idea/libraries/Flutter_for_Android.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.idea/libraries/Flutter_Plugins.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/parse_android.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="6" column="44" selection-start-line="6" selection-start-column="44" selection-end-line="6" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/LICENSE">
-      <provider selected="true" editor-type-id="text-editor">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.packages">
+    <entry file="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/intl-0.15.7/lib/src/intl/date_format_field.dart" />
+    <entry file="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0/lib/src/base_client.dart" />
+    <entry file="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0/lib/src/io_client.dart" />
+    <entry file="file://$PROJECT_DIR$/lib/utils/parse_utils_date.dart" />
+    <entry file="file://$PROJECT_DIR$/lib/utils/parse_utils_objects.dart" />
+    <entry file="file://$PROJECT_DIR$/lib/data/parse_data_user.dart" />
+    <entry file="file://$PROJECT_DIR$/lib/objects/parse_object.dart" />
+    <entry file="file://$USER_HOME$/development/flutter/packages/flutter/lib/src/foundation/binding.dart" />
+    <entry file="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/_http/http.dart" />
+    <entry file="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0+1/lib/src/client.dart" />
+    <entry file="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0+1/lib/src/base_client.dart" />
+    <entry file="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0+1/lib/src/response.dart" />
+    <entry file="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0+1/lib/src/io_client.dart" />
+    <entry file="file://$USER_HOME$/development/flutter/bin/cache/pkg/sky_engine/lib/_http/http.dart" />
+    <entry file="file://$PROJECT_DIR$/lib/src/data/parse_data_user.dart" />
+    <entry file="file://$USER_HOME$/development/flutter/packages/flutter/lib/src/widgets/framework.dart" />
+    <entry file="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0+1/lib/http.dart" />
+    <entry file="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/convert/json.dart" />
+    <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_utils_date.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor />
-          <second_editor />
+        <state relative-caret-position="45">
+          <caret line="3" column="25" selection-start-line="3" selection-start-column="9" selection-end-line="3" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
+    <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_response.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="6" column="39" selection-start-line="6" selection-start-column="39" selection-end-line="6" selection-end-column="39" />
+        <state relative-caret-position="415">
+          <caret line="79" selection-start-line="79" selection-end-line="79" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/parse_example_android.iml" />
-    <entry file="file://$PROJECT_DIR$/example/parse_example.iml" />
-    <entry file="file://$PROJECT_DIR$/lib/parse_query.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_utils_objects.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="33">
-          <caret line="2" column="32" selection-start-line="2" selection-start-column="32" selection-end-line="2" selection-end-column="32" />
+        <state relative-caret-position="60">
+          <caret line="4" column="34" selection-start-line="4" selection-start-column="34" selection-end-line="4" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/parse_object.dart">
+    <entry file="file://$USER_HOME$/development/flutter/bin/cache/pkg/sky_engine/lib/core/exceptions.dart" />
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="35">
-          <caret line="8" column="50" selection-start-line="8" selection-start-column="50" selection-end-line="8" selection-end-column="50" />
+        <state relative-caret-position="34">
+          <caret line="2" column="14" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/parse_livequery.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_geo_point.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="33">
-          <caret line="2" column="32" selection-start-line="2" selection-start-column="32" selection-end-line="2" selection-end-column="32" />
+        <state relative-caret-position="141">
+          <caret line="9" column="2" selection-start-line="9" selection-start-column="2" selection-end-line="9" selection-end-column="2" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/parse_http_client.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_function.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="65">
-          <caret line="4" column="32" selection-start-line="4" selection-start-column="32" selection-end-line="4" selection-end-column="32" />
+        <state relative-caret-position="493">
+          <caret line="29" lean-forward="true" selection-start-line="29" selection-end-line="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/data/parse_data.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_error.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="349">
-          <caret line="21" column="31" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
+        <state relative-caret-position="82">
+          <caret line="10" column="8" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="8" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/parse_user.dart">
+    <entry file="file://$PROJECT_DIR$/lib/parse.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1581">
-          <caret line="99" column="7" selection-start-line="99" selection-start-column="7" selection-end-line="99" selection-end-column="7" />
+        <state relative-caret-position="371">
+          <caret line="102" column="10" selection-start-line="102" selection-start-column="10" selection-end-line="102" selection-end-column="10" />
+          <folding>
+            <element signature="e#28#48#0" expanded="true" />
+            <element signature="e#264#301#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/parse_base.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_logger.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="32" selection-start-column="32" selection-end-column="32" />
+        <state relative-caret-position="272">
+          <caret line="16" column="42" selection-start-line="16" selection-start-column="42" selection-end-line="16" selection-end-column="42" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/data/parse_user_data.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_utils.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="323">
-          <caret line="19" column="6" selection-start-line="19" selection-start-column="6" selection-end-line="19" selection-end-column="6" />
+        <state relative-caret-position="102">
+          <caret line="6" column="20" selection-start-line="6" selection-start-column="20" selection-end-line="6" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.lock">
+    <entry file="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0+1/lib/src/base_client.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="274">
-          <caret line="53" column="22" selection-start-line="53" selection-start-column="17" selection-end-line="53" selection-end-column="22" />
+        <state relative-caret-position="219">
+          <caret line="162" column="16" selection-start-line="162" selection-start-column="16" selection-end-line="162" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/parse_server_sdk.iml">
+    <entry file="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0+1/lib/src/utils.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="116">
-          <caret line="11" column="12" selection-start-line="11" selection-start-column="12" selection-end-line="11" selection-end-column="12" />
+        <state relative-caret-position="-153">
+          <caret line="12" column="41" lean-forward="true" selection-start-line="12" selection-start-column="41" selection-end-line="12" selection-end-column="41" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor />
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/pubspec.lock">
+    <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_decoder.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="349">
-          <caret line="77" column="20" selection-start-line="77" selection-start-column="20" selection-end-line="77" selection-end-column="20" />
+        <state relative-caret-position="1088">
+          <caret line="64" column="50" selection-start-line="64" selection-start-column="50" selection-end-line="64" selection-end-column="50" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/flutter_plugin_example_android.iml">
+    <entry file="file://$PROJECT_DIR$/lib/src/base/parse_constants.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/.packages">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="11" column="60" selection-start-line="11" selection-start-column="60" selection-end-line="11" selection-end-column="60" />
+        <state relative-caret-position="714">
+          <caret line="42" column="19" selection-start-line="42" selection-start-column="19" selection-end-line="42" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/.metadata">
-      <provider selected="true" editor-type-id="text-editor">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/.flutter-plugins">
-      <provider selected="true" editor-type-id="text-editor">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/flutter_plugin_example.iml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/example/pubspec.yaml">
+    <entry file="file://$PROJECT_DIR$/lib/src/data/parse_core_data.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="17" />
+        <state relative-caret-position="748">
+          <caret line="44" column="7" selection-start-line="44" selection-start-column="7" selection-end-line="44" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/android/settings.gradle">
+    <entry file="file://$PROJECT_DIR$/lib/src/enums/parse_enum_api_rq.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="13" column="18" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
+        <state relative-caret-position="68">
+          <caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/android/build.gradle">
+    <entry file="file://$PROJECT_DIR$/lib/src/network/parse_http_client.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-144">
-          <caret line="5" selection-start-line="5" selection-end-line="5" />
+        <state relative-caret-position="34">
+          <caret line="2" column="70" selection-start-line="2" selection-start-column="70" selection-end-line="2" selection-end-column="70" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/android/app/build.gradle">
+    <entry file="file://$PROJECT_DIR$/lib/src/network/parse_livequery.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-420">
-          <caret line="9" column="26" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" />
+        <state relative-caret-position="17">
+          <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/android/app/src/main/AndroidManifest.xml">
+    <entry file="file://$PROJECT_DIR$/lib/src/network/parse_query.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-311">
-          <caret line="6" column="7" lean-forward="true" selection-start-line="6" selection-start-column="7" selection-end-line="6" selection-end-column="7" />
+        <state relative-caret-position="2567">
+          <caret line="151" column="23" selection-start-line="151" selection-start-column="23" selection-end-line="151" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/android/app/src/main/java/com/example/flutterpluginexample/MainActivity.java">
+    <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_clonable.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="68">
-          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+          <caret line="4" column="2" selection-start-line="4" selection-start-column="2" selection-end-line="4" selection-end-column="2" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="8" column="19" selection-start-line="8" selection-start-column="19" selection-end-line="8" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/utils/parse_utils_objects.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="32" selection-start-line="2" selection-start-column="32" selection-end-line="2" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/objects/parse_user.dart">
+    <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="6" column="32" selection-start-line="6" selection-start-column="32" selection-end-line="6" selection-end-column="32" />
+        <state relative-caret-position="573">
+          <caret line="111" column="34" selection-start-line="111" selection-start-column="34" selection-end-line="111" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/objects/parse_response.dart">
+    <entry file="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/internal/cast.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="5" column="32" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="32" />
+        <state relative-caret-position="168">
+          <caret line="285" column="24" selection-start-line="285" selection-start-column="24" selection-end-line="285" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/objects/parse_object.dart">
+    <entry file="file://$PROJECT_DIR$/example/lib/diet_plan.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="149">
-          <caret line="12" column="39" selection-start-line="12" selection-start-column="39" selection-end-line="12" selection-end-column="39" />
+        <state relative-caret-position="311">
+          <caret line="20" selection-start-line="20" selection-end-line="20" />
           <folding>
-            <element signature="e#0#20#0" expanded="true" />
+            <element signature="e#0#19#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/objects/parse_base.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="29" selection-start-column="29" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/network/parse_livequery.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-21">
-          <caret line="2" column="29" selection-start-line="2" selection-start-column="29" selection-end-line="2" selection-end-column="29" />
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="-1071">
+            <caret line="137" column="46" selection-start-line="137" selection-start-column="46" selection-end-line="137" selection-end-column="46" />
+          </first_editor>
+          <second_editor />
         </state>
       </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/network/parse_http_client.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="13">
-          <caret line="4" column="29" selection-start-line="4" selection-start-column="29" selection-end-line="4" selection-end-column="29" />
+      <provider editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="15" column="28" selection-start-line="15" selection-start-column="28" selection-end-line="15" selection-end-column="28" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/data/parse_data_objects.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="29" selection-start-column="29" selection-end-column="29" />
+    <entry file="file://$PROJECT_DIR$/example/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor />
+          <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/base/parse_constants.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/utils/parse_utils_network.dart">
+    <entry file="file://$PROJECT_DIR$/example/lib/application_constants.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="68">
-          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
-          <folding>
-            <element signature="e#0#60#0" expanded="true" />
-          </folding>
+          <caret line="4" column="29" selection-start-line="4" selection-start-column="29" selection-end-line="4" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/utils/parse_utils_date.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="1" column="20" lean-forward="true" selection-start-line="1" selection-start-column="20" selection-end-line="1" selection-end-column="20" />
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="34">
+            <caret line="2" column="66" selection-start-line="2" selection-start-column="66" selection-end-line="2" selection-end-column="66" />
+          </first_editor>
+          <second_editor />
         </state>
       </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="53">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
+      <provider editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="5" column="26" selection-start-line="5" selection-start-column="26" selection-end-line="5" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/parse.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_object.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-444">
-          <caret line="4" column="32" selection-start-line="4" selection-start-column="32" selection-end-line="4" selection-end-column="32" />
+        <state relative-caret-position="357">
+          <caret line="73" column="71" selection-start-line="73" selection-start-column="71" selection-end-line="73" selection-end-column="71" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/lib/diet_plan.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_encoder.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="5" column="30" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
-          <folding>
-            <element signature="e#0#19#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="272">
+          <caret line="16" column="8" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="8" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/network/parse_query.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_response.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="8" column="18" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="18" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="177">
+          <caret line="46" column="50" selection-start-line="46" selection-start-column="50" selection-end-line="46" selection-end-column="50" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_user.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="151">
-          <caret line="104" column="5" lean-forward="true" selection-start-line="104" selection-start-column="5" selection-end-line="104" selection-end-column="5" />
-          <folding>
-            <element signature="e#0#20#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="211">
+          <caret line="259" column="48" selection-start-line="259" selection-start-column="48" selection-end-line="259" selection-end-column="48" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/lib/application_constants.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_base.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" column="42" selection-start-line="4" selection-start-column="42" selection-end-line="4" selection-end-column="42" />
+        <state relative-caret-position="313">
+          <caret line="53" column="32" selection-start-line="53" selection-start-column="32" selection-end-line="53" selection-end-column="32" />
         </state>
       </provider>
     </entry>
@@ -863,7 +1036,7 @@
       </state>
       <state key="FacetStructureConfigurable.UI">
         <settings>
-          <last-edited>Android (parse_android)|Android</last-edited>
+          <last-edited>No facets are configured</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -898,7 +1071,20 @@
       </state>
       <state key="ModuleStructureConfigurable.UI">
         <settings>
-          <last-edited>parse_android</last-edited>
+          <last-edited>flutter_parse_sdk</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+                <option value="0.6" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41cc7d819..2fcc4ea5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,36 @@
-## 0.0.1
+## 1.0.5
 
-* TODO: Describe initial release.
+Corrected save. Now formatted items correctly for saving on server
+
+## 1.0.4
+
+Bug fix for get all items
+Can now pin/unpin/fromPin for all ParseObjects
+Now supports generics
+Cody tidy around extending
+
+## 1.0.3
+
+Added persistent storage. When a logged in user closes the app, then reopens, the data
+will now be persistent. Best practice would be to Parse.init, then Parse.currentUser. This
+will return the current user session and allow auto login. Can also pin data in storage.
+
+## 1.0.2
+
+Fixed login
+
+## 1.0.1
+
+Added documentation and GeoPoints
+
+## 1.0.0
+
+First full release!
+
+## 0.0.4
+
+Added description
+
+## 0.0.3
+
+Added more cloud functions
diff --git a/README.md b/README.md
index 495fb4bd8..298331779 100644
--- a/README.md
+++ b/README.md
@@ -1,52 +1,225 @@
-# Parse Server Dart
-A rewrite of a library hosted on GitHub. This is not my own content but based on a library already created and looks to be abandoned.
+![enter image description here](https://upload.wikimedia.org/wikipedia/commons/1/17/Google-flutter-logo.png)
+![enter image description here](https://i2.wp.com/blog.openshift.com/wp-content/uploads/parse-server-logo-1.png?fit=200%2C200&ssl=1&resize=350%2C200)
 
-https://github.com/lotux/parse_server_dart
+## Parse For Flutter! 
+Hi, this is a Flutter plugin that allows communication with a Parse Server, (https://parseplatform.org) either hosted on your own server or another, like (http://Back4App.com).
+
+This is a work in project and we are consistently updating it. Please let us know if you think anything needs changing/adding, and more than ever, please do join in on this project (Even if it is just to improve our documentation.
 
 ## Join in!
-Want to get involved? Join our Slack channel and help out! FlutterParseSDK.Slack.com
+Want to get involved? Join our Slack channel and help out! (http://flutter-parse-sdk.slack.com)
 
 ## Getting Started
+To install, either add to your pubspec.yaml
+```
+dependencies:  
+    parse_server_sdk: ^1.0.5
+```
+or clone this repository and add to your project. As this is an early development with multiple contributors, it is probably best to download/clone and keep updating as an when a new feature is added.
+
 
-## To init Parse, call the method:-
+Once you have the library added to your project, upon first call to your app (Similar to what your application class would be) add the following...
 
 ```
 Parse().initialize(
-        ApplicationConstants.PARSE_APPLICATION_ID,
-        ApplicationConstants.PARSE_SERVER_URL,
-        masterKey: ApplicationConstants.PARSE_MASTER_KEY);
+        ApplicationConstants.keyApplicationId,
+        ApplicationConstants.keyParseServerUrl);
+```
+
+It's possible to add other params, such as ...
+
+```
+Parse().initialize(
+        ApplicationConstants.keyApplicationId,
+        ApplicationConstants.keyParseServerUrl,
+        masterKey: ApplicationConstants.keyParseMasterKey,
+       debug: true,
+        liveQuery: true);
+```
+
+## Queries
+Once you have setup the project and initialised the instance, you can then retreive data from your server by calling:
+```
+var apiResponse = await ParseObject('ParseTableName').getAll();
+
+    if (apiResponse.success){
+      for (var testObject in apiResponse.result) {
+        print(ApplicationConstants.APP_NAME + ": " + testObject.toString());
+      }
+    }
 ```
+Or you can get an object by its objectId:
 
-## After, you can then get and save Parse Objects by calling:-
+```
+var dietPlan = await DietPlan().get('R5EonpUDWy');
 
+    if (dietPlan.success) {
+      print(ApplicationConstants.keyAppName + ": " + (dietPlan.result as DietPlan).toString());
+    } else {
+      print(ApplicationConstants.keyAppName + ": " + dietPlan.exception.message);
+    }
 ```
-Parse().object('Diet_Plans').get('R5EonpUDWy').then((dietPlan) {
-      print(dietPlan['name']);
-});
+
+
+## Complex queries
+You can create complex queries to really put your database to the test:
+
 ```
+    var queryBuilder = QueryBuilder<DietPlan>(DietPlan())
+      ..startsWith(DietPlan.keyName, "Keto")
+      ..greaterThan(DietPlan.keyFat, 64)
+      ..lessThan(DietPlan.keyFat, 66)
+      ..equals(DietPlan.keyCarbs, 5);
 
-## Or, extend the ParseObject class and create custom objects:-
+    var response = await queryBuilder.query();
 
+    if (response.success) {
+      print(ApplicationConstants.keyAppName + ": " + ((response.result as List<dynamic>).first as DietPlan).toString());
+    } else {
+      print(ApplicationConstants.keyAppName + ": " + response.exception.message);
+    }
 ```
-class DietPlan extends ParseObject {
-  static const String DIET_PLAN = 'Diet_Plans';
 
-  DietPlan() : super(DIET_PLAN);
+The features available are:-
+ * Equals
+ * Contains
+ * LessThan
+ * LessThanOrEqualTo
+ * GreaterThan
+ * GreaterThanOrEqualTo
+ * NotEqualTo
+ * StartsWith
+ * EndsWith
+ * Regex
+ * Order
+ * Limit
+ * Skip
+ * Ascending
+ * Descending
+ * Plenty more!
 
-  String name;
+## Objects
+
+You can create custom objects by calling:
+```
+var dietPlan = ParseObject('DietPlan')
+	..set('Name', 'Ketogenic')
+	..set('Fat', 65);
+```
+You then have the ability to do the following with that object:
+The features available are:-
+ * Get
+ * GetAll
+ * Create
+ * Save
+ * Query - By object Id
+ * Delete
+ * Complex queries as shown above
+ * Pin
+ * Plenty more
 
-  DietPlan.fromJson(Map<String, dynamic> json)
-      : name = json['name'],
-        super(DIET_PLAN);
+## Custom Objects
+You can create your own ParseObjects or convert your existing objects into Parse Objects by doing the following:
 
-  Map<String, dynamic> toJson() => {'name': name};
+```
+class DietPlan extends ParseObject implements ParseCloneable {
+
+  DietPlan() : super(_keyTableName);
+  DietPlan.clone(): this();
+
+  /// Looks strangely hacky but due to Flutter not using reflection, we have to
+  /// mimic a clone
+  @override clone(Map map) => DietPlan.clone()..fromJson(map);
+
+  static const String _keyTableName = 'Diet_Plans';
+  static const String keyName = 'Name';
+  
+  String get name => get<String>(keyName);
+  set name(String name) => set<String>(keyName, name);
 }
+  
 ```
 
-## then call:-
+## Add new values to objects
+
+To add a variable to an object call and retrieve it, call
 
 ```
-DietPlan().get('R5EonpUDWy').then((plan) {
-      print(DietPlan.fromJson(plan).name);
-});
+dietPlan.set<int>('RandomInt', 8);
+var randomInt = dietPlan.get<int>('RandomInt');
 ```
+
+## Save objects using pins
+
+You can now save an object by calling .pin() on an instance of an object
+
+```
+dietPlan.pin();
+```
+
+and to retreive it
+
+```
+var dietPlan = DietPlan().fromPin('OBJECT ID OF OBJECT');
+```
+
+## Users
+
+You can create and control users just as normal using this SDK.
+
+To register a user, first create one :
+```
+var user =  ParseUser().create("TestFlutter", "TestPassword123", "TestFlutterSDK@gmail.com");
+```
+Then have the user sign up:
+
+```
+user =  await  user.signUp();
+```
+You can also logout and login with the user:
+```
+user =  await  user.login();
+```
+Also, once logged in you can manage sessions tokens. This feature can be called after Parse().init() on startup to check for a logged in user.
+```
+user = ParseUser.currentUser();
+```
+Other user features are:-
+ * Request Password Reset
+ * Verification Email Request
+ * Get all users
+ * Save
+ * Destroy user
+
+## Other Features of this library
+
+Main:
+* Users
+* Objects
+* Queries
+* LiveQueries
+* GeoPoints
+* Persistent storage
+* Debug Mode - Logging API calls
+* Manage Session ID's tokens
+
+User:
+* Create       
+* Login
+* CurrentUser
+* RequestPasswordReset
+* VerificationEmailRequest
+* AllUsers
+* Save
+* Destroy
+
+Objects:
+* Create new object
+* Extend Parse Object and create local objects that can be saved and retreived
+* Queries:
+
+## Author:-
+This project was authored by Phill Wiggins. You can contact me at phill.wiggins@gmail.com
+<!--stackedit_data:
+eyJoaXN0b3J5IjpbNzE4NjUwNDIwXX0=
+-->
diff --git a/example/ios/Flutter/Debug.xcconfig b/example/ios/Flutter/Debug.xcconfig
index 592ceee85..e8efba114 100644
--- a/example/ios/Flutter/Debug.xcconfig
+++ b/example/ios/Flutter/Debug.xcconfig
@@ -1 +1,2 @@
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
diff --git a/example/ios/Flutter/Release.xcconfig b/example/ios/Flutter/Release.xcconfig
index 592ceee85..399e9340e 100644
--- a/example/ios/Flutter/Release.xcconfig
+++ b/example/ios/Flutter/Release.xcconfig
@@ -1 +1,2 @@
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
diff --git a/example/lib/application_constants.dart b/example/lib/application_constants.dart
index 7ddb84685..9e77a8bc0 100644
--- a/example/lib/application_constants.dart
+++ b/example/lib/application_constants.dart
@@ -1,6 +1,6 @@
 abstract class ApplicationConstants {
-  static const String APP_NAME = "";
-  static const String PARSE_APPLICATION_ID = "";
-  static const String PARSE_MASTER_KEY = "";
-  static const String PARSE_SERVER_URL = "";
+  static const String keyAppName = "";
+  static const String keyParseApplicationId = "";
+  static const String keyParseMasterKey = "";
+  static const String keyParseServerUrl = "";
 }
\ No newline at end of file
diff --git a/example/lib/diet_plan.dart b/example/lib/diet_plan.dart
index fa83e128b..52995379d 100644
--- a/example/lib/diet_plan.dart
+++ b/example/lib/diet_plan.dart
@@ -1,52 +1,39 @@
 import 'dart:core';
 
-import 'package:parse_server_sdk/objects/parse_object.dart';
-
-class DietPlan extends ParseObject {
-  DietPlan() : super(DIET_PLAN);
-
-  String name;
-  String description;
-  num protein;
-  num carbs;
-  num fat;
-  num status;
-
-  static const String DIET_PLAN = 'Diet_Plans';
-  static const String NAME = 'Name';
-  static const String DESCRIPTION = 'Description';
-  static const String PROTEIN = 'Protein';
-  static const String CARBS = 'Carbs';
-  static const String FAT = 'Fat';
-  static const String STATUS = 'Status';
-
-  @override
-  dynamic fromJson(Map objectData) {
-    this.name = objectData[NAME];
-    this.description = objectData[DESCRIPTION];
-    this.protein = objectData[PROTEIN];
-    this.carbs = objectData[CARBS];
-    this.fat = objectData[FAT];
-    this.status = objectData[STATUS];
-    return this;
-  }
-
-  Map<String, dynamic> toJson() => {
-        NAME: name,
-        DESCRIPTION: description,
-        PROTEIN: protein,
-        CARBS: carbs,
-        FAT: fat,
-        STATUS: status,
-      };
-
-  @override
-  String toString() {
-    return toJson().toString();
-  }
-
-  @override
-  dynamic copy() {
-    return DietPlan();
-  }
+import 'package:parse_server_sdk/parse.dart';
+
+class DietPlan extends ParseObject implements ParseCloneable {
+
+  DietPlan() : super(_keyTableName);
+  DietPlan.clone(): this();
+
+  /// Looks strangely hacky but due to Flutter not using reflection, we have to
+  /// mimic a clone
+  @override clone(Map map) => DietPlan.clone()..fromJson(map);
+
+  static const String _keyTableName = 'Diet_Plans';
+  static const String keyName = 'Name';
+  static const String keyDescription = 'Description';
+  static const String keyProtein = 'Protein';
+  static const String keyCarbs = 'Carbs';
+  static const String keyFat = 'Fat';
+  static const String keyStatus = 'Status';
+
+  String get name => get<String>(keyName);
+  set name(String name) => set<String>(keyName, name);
+
+  String get description => get<String>(keyDescription);
+  set description(String description) => set<String>(keyDescription, name);
+
+  int get protein => get<int>(keyProtein);
+  set protein(int protein) => super.set<int>(keyProtein, protein);
+
+  int get carbs => get<int>(keyCarbs);
+  set carbs(int carbs) => set<int>(keyCarbs, carbs);
+
+  int get fat => get<int>(keyFat);
+  set fat(int fat) => set<int>(keyFat, fat);
+
+  int get status => get<int>(keyStatus);
+  set status(int status) => set<int>(keyStatus, status);
 }
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 91237a695..f7e27a4b5 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -1,9 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_plugin_example/application_constants.dart';
 import 'package:flutter_plugin_example/diet_plan.dart';
-import 'package:parse_server_sdk/network/parse_query.dart';
-import 'package:parse_server_sdk/objects/parse_object.dart';
-import 'package:parse_server_sdk/objects/parse_user.dart';
 import 'package:parse_server_sdk/parse.dart';
 
 void main() => runApp(new MyApp());
@@ -18,7 +15,6 @@ class _MyAppState extends State<MyApp> {
   void initState() {
     super.initState();
     initParse();
-    runTestQueries();
   }
 
   @override
@@ -39,78 +35,115 @@ class _MyAppState extends State<MyApp> {
 
   initParse() async {
     // Initialize parse
-    Parse().initialize(ApplicationConstants.PARSE_APPLICATION_ID,
-        ApplicationConstants.PARSE_SERVER_URL,
-        masterKey: ApplicationConstants.PARSE_MASTER_KEY,
-        appName: ApplicationConstants.APP_NAME,
+    Parse().initialize(ApplicationConstants.keyParseApplicationId,
+        ApplicationConstants.keyParseServerUrl,
+        masterKey: ApplicationConstants.keyParseMasterKey,
+        appName: ApplicationConstants.keyAppName,
         debug: true);
+
+    // Check server is healthy and live - Debug is on in this instance so check logs for result
+    var response = await Parse().healthCheck();
+    if (response.success){
+      runTestQueries();
+    } else {
+      print("Server health check failed");
+    }
   }
 
   runTestQueries() {
-    //getAllItems();
-    //getAllItemsByName();
-    //getSingleItem();
+    getAllItems();
+    getAllItemsByName();
+    getSingleItem();
     query();
-    //initUser();
+    function();
+    initUser();
   }
 
   void getAllItemsByName() async {
     var apiResponse = await ParseObject('ParseTableName').getAll();
 
-    if (apiResponse.success) {
+    if (apiResponse.success && apiResponse.result != null) {
       for (var testObject in apiResponse.result) {
-        print(ApplicationConstants.APP_NAME + ": " + testObject.toString());
+        print(ApplicationConstants.keyAppName + ": " + testObject.toString());
       }
     }
   }
 
   void getAllItems() async {
-    var response = await DietPlan().getAll();
+    var apiResponse = await DietPlan().getAll();
 
-    if (response.success) {
-      for (var plan in response.result) {
-        print(ApplicationConstants.APP_NAME + ": " + (plan as DietPlan).name);
+    if (apiResponse.success && apiResponse.result != null) {
+      for (var plan in apiResponse.result) {
+        print(ApplicationConstants.keyAppName + ": " + (plan as DietPlan).name);
       }
     } else {
-      print(ApplicationConstants.APP_NAME + ": " + response.exception.message);
+      print(ApplicationConstants.keyAppName + ": " + apiResponse.error.message);
     }
   }
 
   void getSingleItem() async {
-    var response = await DietPlan().get('R5EonpUDWy');
+    var apiResponse = await DietPlan().getObject('R5EonpUDWy');
+
+    if (apiResponse.success && apiResponse.result != null) {
+      var dietPlan = (apiResponse.result as DietPlan);
+
+      // Shows example of storing values in their proper type and retrieving them
+      dietPlan.set<int>('RandomInt', 8);
+      var randomInt = dietPlan.get<int>('RandomInt');
+
+      if (randomInt is int) print('Saving generic value worked!');
+
+      // Shows example of pinning an item
+      dietPlan.pin();
+
+      // shows example of retrieving a pin
+      var newDietPlanFromPin = DietPlan().fromPin('R5EonpUDWy');
+
+      if (newDietPlanFromPin != null) print('Retreiving from pin worked!');
 
-    if (response.success) {
-      print(ApplicationConstants.APP_NAME + ": " + (response.result as DietPlan).toString());
     } else {
-      print(ApplicationConstants.APP_NAME + ": " + response.exception.message);
+      print(ApplicationConstants.keyAppName + ": " + apiResponse.error.message);
     }
   }
 
   void query() async {
     var queryBuilder = QueryBuilder<DietPlan>(DietPlan())
-      ..greaterThan(DietPlan.FAT, 20)
-      ..descending(DietPlan.FAT);
+      ..greaterThan(DietPlan.keyFat, 20)
+      ..descending(DietPlan.keyFat);
 
-    var response = await queryBuilder.query();
+    var apiResponse = await queryBuilder.query();
 
-    if (response.success) {
-      print("Result: ${((response.result as List<dynamic>).first as DietPlan).toString()}");
+    if (apiResponse.success && apiResponse.result != null) {
+      print("Result: ${((apiResponse.result as List<dynamic>).first as DietPlan).toString()}");
     } else {
-      print("Result: ${response.exception.message}");
+      print("Result: ${apiResponse.error.message}");
     }
   }
 
   initUser() async {
-    var user = ParseUser().create("TestFlutter", "TestPassword123", "TestFlutterSDK@gmail.com");
-    user = await ParseUser().signUp();
-    user = await ParseUser().login();
 
-    user = await ParseUser().currentUser(fromServer: true);
+   // All return type ParseUser except all
+    var user = ParseUser("TestFlutter", "TestPassword123", "TestFlutterSDK@gmail.com");
+    user = await user.signUp();
+    user = await user.login();
+    user = null;
+
+    // Best practice for starting the app. This will check for a
+    user = ParseUser.currentUser();
+    user = await user.getCurrentUserFromServer();
+    user = await user.requestPasswordReset();
+    user = await user.verificationEmailRequest();
+
+    user = await user.save();
+    var destroyResponse = await user.destroy();
+    if (destroyResponse.success) print('object has been destroyed!');
+
+    // Returns type ParseResponse as its a query, not a single result
+    await ParseUser.all();
+  }
 
-    user = await ParseUser().requestPasswordReset();
-    user = await ParseUser().verificationEmailRequest();
-    user = await ParseUser().all();
-    user = await ParseUser().save();
-    user = await ParseUser().destroy();
+  function() {
+    var function = ParseCloudFunction('testFunction');
+    function.execute();
   }
 }
diff --git a/lib/base/parse_constants.dart b/lib/base/parse_constants.dart
deleted file mode 100644
index 40052d27b..000000000
--- a/lib/base/parse_constants.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-class ParseConstants {
-
-  static const String PARSE_DATE_FORMAT = "yyyy-MM-dd'T'HH:mm";
-  static const String OBJECT_ID = 'objectId';
-  static const String CREATED_AT = 'createdAt';
-  static const String UPDATED_AT = 'updatedAT';
-
-  static const String HEADER_SESSION_TOKEN = 'X-Parse-Session-Token';
-  static const String HEADER_REVOCABLE_SESSION = 'X-Parse-Revocable-Session';
-}
\ No newline at end of file
diff --git a/lib/data/parse_data.dart b/lib/data/parse_data.dart
deleted file mode 100644
index 66bf62da1..000000000
--- a/lib/data/parse_data.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-class ParseData {
-  static ParseData _instance;
-
-  static ParseData get instance => _instance;
-
-  static void init(appId, serverUrl, {liveQueryUrl, masterKey, sessionId}) =>
-      _instance ??=
-          ParseData._init(appId, serverUrl, liveQueryUrl, masterKey, sessionId);
-
-  String applicationId;
-  String serverUrl;
-  String liveQueryURL;
-  String masterKey;
-  String sessionId;
-
-  ParseData._init(this.applicationId, this.serverUrl,
-      [this.liveQueryURL, this.masterKey, this.sessionId]);
-
-  factory ParseData() => _instance;
-
-  void setSessionId(String sessionId){
-    this.sessionId = sessionId;
-  }
-
-  @override
-  String toString() => "$applicationId $masterKey";
-}
diff --git a/lib/data/parse_data_objects.dart b/lib/data/parse_data_objects.dart
deleted file mode 100644
index 7b804c193..000000000
--- a/lib/data/parse_data_objects.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-import 'package:parse_server_sdk/objects/parse_object.dart';
-
-class ParseDataObjects {
-  static ParseDataObjects _instance;
-
-  static ParseDataObjects get instance => _instance;
-
-  static void init(objects) =>
-      _instance ??= ParseDataObjects._init(objects);
-
-  Map<ParseObject, String> objects;
-
-  ParseDataObjects._init(this.objects);
-
-  factory ParseDataObjects() => _instance;
-
-  @override
-  String toString() => "";
-}
diff --git a/lib/data/parse_data_server.dart b/lib/data/parse_data_server.dart
deleted file mode 100644
index 2fcae8889..000000000
--- a/lib/data/parse_data_server.dart
+++ /dev/null
@@ -1,35 +0,0 @@
-class ParseDataServer {
-  static ParseDataServer _instance;
-  static ParseDataServer get instance => _instance;
-
-  static void init(appId, serverUrl, {debug, appName, liveQueryUrl, masterKey, sessionId}){
-      _instance = ParseDataServer._init(appId, serverUrl);
-
-      if (debug != null) _instance.debug = debug;
-      if (appName != null) _instance.appName = appName;
-      if (liveQueryUrl != null) _instance.liveQueryURL = liveQueryUrl;
-      if (masterKey != null) _instance.masterKey = masterKey;
-      if (sessionId != null) _instance.sessionId = sessionId;
-  }
-
-  String appName;
-  String applicationId;
-  String serverUrl;
-  String liveQueryURL;
-  String masterKey;
-  String sessionId;
-  bool debug;
-
-  ParseDataServer._init(
-      this.applicationId,
-      this.serverUrl);
-
-  factory ParseDataServer() => _instance;
-
-  void setSessionId(String sessionId){
-    this.sessionId = sessionId;
-  }
-
-  @override
-  String toString() => "$applicationId $masterKey";
-}
diff --git a/lib/data/parse_data_user.dart b/lib/data/parse_data_user.dart
deleted file mode 100644
index c30f74047..000000000
--- a/lib/data/parse_data_user.dart
+++ /dev/null
@@ -1,53 +0,0 @@
-import 'package:parse_server_sdk/base/parse_constants.dart';
-import 'package:parse_server_sdk/objects/parse_base.dart';
-import 'package:parse_server_sdk/utils/parse_utils_date.dart';
-
-class User extends ParseBase {
-  static User _instance;
-
-  static User get instance => _instance;
-
-  static void init(username, password, emailAddress) =>
-      _instance ??= User._init(username, password, emailAddress);
-
-  String acl;
-  String username;
-  String password;
-  String emailAddress;
-
-  User._init(this.username, this.password, this.emailAddress): super();
-
-  factory User() => _instance;
-
-  fromJson(Map objectData) {
-    if (getObjectData() == null) setObjectData(objectData);
-    getObjectData().addAll(objectData);
-    if (getObjectData().containsKey(ParseConstants.OBJECT_ID)) objectId = getValue(ParseConstants.OBJECT_ID).toString();
-    if (getObjectData().containsKey(ParseConstants.CREATED_AT)) createdAt = convertStringToDateTime(getValue(ParseConstants.CREATED_AT).toString());
-    if (getObjectData().containsKey(ParseConstants.UPDATED_AT)) updatedAt = convertStringToDateTime(getValue(ParseConstants.UPDATED_AT).toString());
-    if (getObjectData().containsKey(ACL)) acl = getValue(ACL).toString();
-    if (getObjectData().containsKey(USERNAME)) username = getValue(USERNAME).toString();
-    if (getObjectData().containsKey(PASSWORD)) password = getValue(PASSWORD).toString();
-    if (getObjectData().containsKey(EMAIL)) emailAddress = getValue(EMAIL).toString();
-
-    if (updatedAt == null) updatedAt = createdAt;
-
-    return this;
-  }
-
-  Map<String, dynamic> toJson() => {
-        ACL: acl,
-        USERNAME: username,
-        PASSWORD: password,
-        EMAIL: emailAddress,
-      };
-
-  @override
-  String toString() => "Username: $username \n"
-      "Email Address:$emailAddress";
-
-  static const String USERNAME = 'Username';
-  static const String EMAIL = 'Email';
-  static const String PASSWORD = 'Password';
-  static const String ACL = 'ACL';
-}
diff --git a/lib/enums/parse_enum_object_call.dart b/lib/enums/parse_enum_object_call.dart
deleted file mode 100644
index c57044a59..000000000
--- a/lib/enums/parse_enum_object_call.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-enum ParseApiObjectCallType {
-  get, getAll, create, save, query, delete
-}
-
-getEnumValue(ParseApiObjectCallType type){
-    switch (type){
-      case ParseApiObjectCallType.get: {
-        return 'get';
-      }
-      case ParseApiObjectCallType.getAll: {
-        return 'getAll';
-      }
-      case ParseApiObjectCallType.create: {
-        return 'create';
-      }
-      case ParseApiObjectCallType.save: {
-        return 'save';
-      }
-      case ParseApiObjectCallType.query: {
-        return 'query';
-      }
-      case ParseApiObjectCallType.delete: {
-        return 'delete';
-      }
-    }
-}
\ No newline at end of file
diff --git a/lib/enums/parse_enum_user_call.dart b/lib/enums/parse_enum_user_call.dart
deleted file mode 100644
index 9d9c5dbf4..000000000
--- a/lib/enums/parse_enum_user_call.dart
+++ /dev/null
@@ -1,32 +0,0 @@
-enum ParseApiUserCallType {
-  currentUser, signUp, login, verificationEmailRequest, requestPasswordReset, save, destroy, all
-}
-
-getEnumValue(ParseApiUserCallType type){
-    switch (type){
-      case ParseApiUserCallType.currentUser: {
-        return 'currentUser';
-      }
-      case ParseApiUserCallType.signUp: {
-        return 'signUp';
-      }
-      case ParseApiUserCallType.login: {
-        return 'login';
-      }
-      case ParseApiUserCallType.verificationEmailRequest: {
-        return 'verificationEmailRequest';
-      }
-      case ParseApiUserCallType.requestPasswordReset: {
-        return 'requestPasswordReset';
-      }
-      case ParseApiUserCallType.save: {
-        return 'save';
-      }
-      case ParseApiUserCallType.destroy: {
-        return 'destroy';
-      }
-      case ParseApiUserCallType.all: {
-        return 'all';
-      }
-    }
-}
\ No newline at end of file
diff --git a/lib/network/parse_http_client.dart b/lib/network/parse_http_client.dart
deleted file mode 100644
index d5427ea75..000000000
--- a/lib/network/parse_http_client.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-import 'dart:async';
-
-import 'package:http/http.dart' as http;
-import 'package:http/http.dart';
-import 'package:parse_server_sdk/data/parse_data_server.dart';
-
-class ParseHTTPClient extends http.BaseClient {
-  final http.Client _client = new http.Client();
-  final String _userAgent = "Dart Parse SDK 0.1";
-  ParseDataServer data = ParseDataServer();
-
-  ParseHTTPClient();
-
-  @override
-  Future<StreamedResponse> send(BaseRequest request) {
-    request.headers['user-agent'] = _userAgent;
-    request.headers['X-Parse-Application-Id'] = data.applicationId;
-    request.headers['Content-Type'] = 'application/json';
-    if (data.masterKey != null)
-      request.headers['X-Parse-Master-Key'] = data.masterKey;
-    return _client.send(request);
-  }
-}
diff --git a/lib/network/parse_query.dart b/lib/network/parse_query.dart
deleted file mode 100644
index 633841b3c..000000000
--- a/lib/network/parse_query.dart
+++ /dev/null
@@ -1,282 +0,0 @@
-import 'dart:convert';
-
-import 'package:parse_server_sdk/objects/parse_object.dart';
-
-class QueryBuilder<T extends ParseObject> {
-
-  static const String _NO_OPERATOR_NEEDED = "NO_OP";
-
-  T object;
-
-  // QueryParams
-  List<MapEntry> _equalsQueries = List();
-  List<MapEntry> _lessThanQueries = List();
-  List<MapEntry> _lessThanOrEqualToQueries = List();
-  List<MapEntry> _greaterThanQueries = List();
-  List<MapEntry> _greaterThanOrEqualToQueries = List();
-  List<MapEntry> _notEqualToQueries = List();
-  List<MapEntry> _containsQueries = List();
-  List<MapEntry> _containedInQueries = List();
-  List<MapEntry> _notContainedInQueries = List();
-  List<MapEntry> _existsQueries = List();
-  List<MapEntry> _selectQueries = List();
-  List<MapEntry> _dontSelectQueries = List();
-  List<MapEntry> _allQueries = List();
-  List<MapEntry> _regExQueries = List();
-  List<MapEntry> _textQueries = List();
-  int _limit = 0;
-  int _skip = 0;
-  dynamic _where;
-  dynamic _order;
-  dynamic _keys;
-  dynamic _include;
-
-  QueryBuilder(this.object) : super();
-
-  void limit(int limit){
-    _limit = limit;
-  }
-
-  void skip(int skip){
-    _skip = skip;
-  }
-
-  void where(String where){
-    _where = where;
-  }
-
-  void ascending(String order){
-    _order = order;
-  }
-
-  void descending(String order){
-    _order = "-$order";
-  }
-
-  void keys(String keys){
-    _keys = keys;
-  }
-
-  void include(String include){
-    _include = include;
-  }
-
-  void startsWith(String key, dynamic value) {
-    _regExQueries.add(MapEntry(key, "^$value"));
-  }
-
-  void endsWith(String key, dynamic value) {
-    _regExQueries.add(MapEntry(key, "$value^"));
-  }
-
-  void equals(String column, dynamic value) {
-    _equalsQueries.add(MapEntry(column, value));
-  }
-
-  void lessThan(String column, dynamic value) {
-    _lessThanQueries.add(MapEntry(column, value));
-  }
-
-  void lessThanOrEqualTo(String column, dynamic value) {
-    _lessThanOrEqualToQueries.add(MapEntry(column, value));
-  }
-
-  void greaterThan(String column, dynamic value) {
-    _greaterThanQueries.add(MapEntry(column, value));
-  }
-
-  void greaterThanOrEqualsTo(String column, dynamic value) {
-    _greaterThanOrEqualToQueries.add(MapEntry(column, value));
-  }
-
-  void notEqualTo(String column, dynamic value) {
-    _notEqualToQueries.add(MapEntry(column, value));
-  }
-
-  void contains(String column, dynamic value) {
-    _containsQueries.add(MapEntry(column, value));
-  }
-
-  void containedIn(String column, dynamic value) {
-    _containedInQueries.add(MapEntry(column, value));
-  }
-
-  void exists(String column, dynamic value) {
-    _existsQueries.add(MapEntry(column, value));
-  }
-
-  void select(String column, dynamic value) {
-    _selectQueries.add(MapEntry(column, value));
-  }
-
-  void dontSelect(String column, dynamic value) {
-    _dontSelectQueries.add(MapEntry(column, value));
-  }
-
-  void all(String column, dynamic value) {
-    _allQueries.add(MapEntry(column, value));
-  }
-
-  void regEx(String column, dynamic value) {
-    _regExQueries.add(MapEntry(column, value));
-  }
-
-  void text(String column, dynamic value) {
-    _textQueries.add(MapEntry(column, value));
-  }
-
-  query() async {
-    return object.query(_buildQuery());
-  }
-
-  String _buildQuery() {
-    var queries = List<MapEntry>();
-
-    // START QUERY
-    const String QUERY_START = "where={";
-    const String QUERY_END = "}";
-
-    var query = QUERY_START;
-
-    // ADD PARAM TO MAP
-    //Needs fixing
-    if (_containsQueries.length != 0) queries.addAll(_getAllQueries(_containsQueries, "\$term"));
-
-    // Works
-    if (_equalsQueries.length != 0) queries.addAll(_getAllQueries(_equalsQueries, _NO_OPERATOR_NEEDED));
-    if (_lessThanQueries.length != 0) queries.addAll(_getAllQueries(_lessThanQueries, "\$lt"));
-    if (_lessThanOrEqualToQueries.length != 0) queries.addAll(_getAllQueries(_lessThanOrEqualToQueries, "\$lte"));
-    if (_greaterThanQueries.length != 0) queries.addAll(_getAllQueries(_greaterThanQueries, "\$gt"));
-    if (_greaterThanOrEqualToQueries.length != 0) queries.addAll(_getAllQueries(_greaterThanOrEqualToQueries, "\$gte"));
-    if (_notEqualToQueries.length != 0) queries.addAll(_getAllQueries(_notEqualToQueries, "\$ne"));
-
-    // Not sure
-    if (_containedInQueries.length != 0) queries.addAll(_getAllQueries(_containedInQueries, "\$in"));
-    if (_notContainedInQueries.length != 0) queries.addAll(_getAllQueries(_notContainedInQueries, "\$nin"));
-    if (_existsQueries.length != 0) queries.addAll(_getAllQueries(_existsQueries, "\$exists"));
-    if (_selectQueries.length != 0) queries.addAll(_getAllQueries(_selectQueries, "\$select"));
-    if (_dontSelectQueries.length != 0) queries.addAll(_getAllQueries(_dontSelectQueries, "\$dontSelect"));
-    if (_allQueries.length != 0) queries.addAll(_getAllQueries(_allQueries, "\$all"));
-
-    // Works
-    if (_regExQueries.length != 0) queries.addAll(_getAllQueries(_regExQueries, "\$regex"));
-
-    // Doesnt
-    if (_textQueries.length != 0) queries.addAll(_getAllQueries(_textQueries, "\$text"));
-
-    queries = _checkForMultipleColumnInstances(queries);
-
-    // -- BUILD QUERY USING MAP
-    for (var item in queries) {
-      if (query == QUERY_START) {
-        query += item.value;
-      } else {
-        query += ",${item.value}";
-      }
-    }
-
-    query += QUERY_END;
-
-    // ADD PARAMS
-    Map limiters = Map();
-    if (_where != null) limiters['where'] = _where;
-    if (_order != null) limiters["order"] = _order;
-    if (_limit != 0) limiters["limit"] = _limit;
-    if (_skip != 0) limiters["skip"] = _skip;
-    if (_keys != null) limiters["keys"] = _keys;
-    if (_include != null) limiters["include"] = _include;
-    query += getLimiters(limiters);
-
-    // -- TEST
-    print("QUERY: $query");
-
-    return "$query";
-  }
-
-  _getAllQueries(List<MapEntry> queries, String queryOperator){
-    List<MapEntry> queriesToReturn = List();
-    for (var query in queries){
-      queriesToReturn.add(_buildQueryWithColumnValueAndOperator(query, queryOperator));
-    }
-    return queriesToReturn;
-  }
-
-  _buildQueryWithColumnValueAndOperator(MapEntry columnAndValue, String queryOperator) {
-
-    var key = columnAndValue.key;
-    var value = convertValueToCorrectType(columnAndValue.value);
-
-    if (queryOperator == _NO_OPERATOR_NEEDED){
-      return MapEntry(_NO_OPERATOR_NEEDED, "\"${columnAndValue.key}\": $value");
-    } else {
-      var queryString = "\"$key\":";
-
-      var queryOperatorAndValueMap = Map();
-      queryOperatorAndValueMap[queryOperator] = columnAndValue.value;
-
-      var formattedQueryOperatorAndValue = JsonEncoder().convert(queryOperatorAndValueMap);
-      queryString += "$formattedQueryOperatorAndValue";
-
-      return MapEntry(key, queryString);
-    }
-  }
-
-  _checkForMultipleColumnInstances(List<MapEntry> queries) {
-    List<MapEntry> sanitisedQueries = List();
-    List<String> keysAlreadyCompacted = List();
-
-    // Run through each query
-    for (var query in queries){
-
-      // Add queries that don't need sanitising
-      if (query.key == _NO_OPERATOR_NEEDED) {
-        sanitisedQueries.add(MapEntry(_NO_OPERATOR_NEEDED, query.value));
-      }
-
-      // Check if query with same column name has been sanitised
-      if (!keysAlreadyCompacted.contains(query.key) && query.key != _NO_OPERATOR_NEEDED) {
-
-        // If not, check that it now has
-        keysAlreadyCompacted.add(query.key);
-
-        // Build a list of all queries with the same column name
-        var listOfQueriesCompact = queries.where((i) => query.key == i.key).toList();
-
-        // Build first part of query
-        var queryStart = "\"${query.key}\":";
-        var queryEnd = "";
-
-        // Compact all the queries in the correct format
-        for (var queryToCompact in listOfQueriesCompact) {
-
-          var queryToCompactValue = queryToCompact.value.toString();
-          queryToCompactValue = queryToCompactValue.replaceFirst("{", "");
-          queryToCompactValue = queryToCompactValue.replaceAll("}", "");
-
-          if (listOfQueriesCompact.first == queryToCompact){
-            queryEnd += (queryToCompactValue.replaceAll(queryStart, " "));
-          } else {
-            queryEnd += (queryToCompactValue.replaceAll(queryStart, ", "));
-          }
-        }
-
-        sanitisedQueries.add(MapEntry(query.key, queryStart += "{$queryEnd}"));
-      }
-    }
-
-    return sanitisedQueries;
-  }
-
-  getLimiters(Map map) {
-    String result;
-    map.forEach((key, value) {
-      result = (result != null) ? result + "&$key=$value" : "&$key=$value";
-    });
-    return result;
-  }
-
-  convertValueToCorrectType(dynamic value) {
-    if (value is int) return (value as num);
-    if (value is String) return "\"$value\"";
-  }
-}
diff --git a/lib/objects/parse_base.dart b/lib/objects/parse_base.dart
deleted file mode 100644
index 2eae594ec..000000000
--- a/lib/objects/parse_base.dart
+++ /dev/null
@@ -1,52 +0,0 @@
-import 'dart:convert';
-
-import 'package:meta/meta.dart';
-
-abstract class ParseBase {
-  Map _objectData;
-
-  get getObjectId => _objectData['objectId'] == null ? objectId : _objectData['objectId'];
-  String objectId;
-
-  get getCreatedAt => _objectData['createdAt'] == null ? createdAt : _objectData['createdAt'];
-  DateTime createdAt;
-
-  get getUpdatedAt => _objectData['updatedAt'] == null ? updatedAt : _objectData['updatedAt'];
-  DateTime updatedAt;
-
-  @protected
-  toJson() => JsonEncoder().convert(getObjectData());
-
-  @protected
-  copy() => JsonDecoder().convert(fromJson(getObjectData()));
-
-  @protected
-  setObjectData(Map objectData) => _objectData = objectData;
-
-  @protected
-  getObjectData() => _objectData;
-
-  @protected
-  fromJson(Map objectData) {
-    if (_objectData == null) _objectData = Map();
-    _objectData.addAll(objectData);
-  }
-
-  setValue(String key, dynamic value, {bool forceUpdate: true}) {
-    if (value != null) {
-      if (getObjectData().containsKey(key)) {
-        if (forceUpdate) getObjectData()[key] = value;
-      } else {
-        getObjectData()[key] = value;
-      }
-    }
-  }
-
-  getValue(String key, {dynamic defaultValue, bool fromServer}) {
-    if (getObjectData().containsKey(key)) {
-      return getObjectData()[key];
-    } else {
-      return defaultValue;
-    }
-  }
-}
diff --git a/lib/objects/parse_exception.dart b/lib/objects/parse_exception.dart
deleted file mode 100644
index 6921b5a5f..000000000
--- a/lib/objects/parse_exception.dart
+++ /dev/null
@@ -1,8 +0,0 @@
-import 'package:http/http.dart';
-
-class ParseException {
-
-  String message;
-
-  ParseException();
-}
\ No newline at end of file
diff --git a/lib/objects/parse_object.dart b/lib/objects/parse_object.dart
deleted file mode 100644
index 196a1475d..000000000
--- a/lib/objects/parse_object.dart
+++ /dev/null
@@ -1,99 +0,0 @@
-import 'dart:convert';
-
-import 'package:http/http.dart';
-import 'package:meta/meta.dart';
-import 'package:parse_server_sdk/enums/parse_enum_object_call.dart';
-import 'package:parse_server_sdk/network/parse_http_client.dart';
-import 'package:parse_server_sdk/objects/parse_base.dart';
-import 'package:parse_server_sdk/objects/parse_response.dart';
-
-class ParseObject extends ParseBase {
-  final String className;
-  String _path;
-  bool _debug;
-  ParseHTTPClient _client;
-
-  ParseObject(this.className, {bool debug, ParseHTTPClient client}) {
-
-    client == null ? _client = ParseHTTPClient() : _client = client;
-
-    if (debug == null) {
-      _debug = _client.data.debug;
-    } else {
-      _debug = debug;
-    }
-
-    _path = "/classes/$className";
-    setObjectData(Map<String, dynamic>());
-  }
-
-  get(String objectId) async {
-    var uri = _getBasePath(_path);
-    if (objectId != null) uri += "/$objectId";
-    var result = await _client.get(uri);
-    return _handleResult(result, ParseApiObjectCallType.get);
-  }
-
-  getAll() async {
-    var result = await _client.get(_getBasePath(_path));
-    return _handleResult(result, ParseApiObjectCallType.getAll);
-  }
-
-  create([Map<String, dynamic> objectData]) async {
-    var uri = _client.data.serverUrl + "$_path";
-    var result =
-        await _client.post(uri, body: JsonEncoder().convert(getObjectData()));
-    return _handleResult(result, ParseApiObjectCallType.create);
-  }
-
-  save() async {
-    if (getObjectData() == null) {
-      return create();
-    } else {
-      var uri = "${_getBasePath(_path)}/$objectId";
-      var result =
-          await _client.put(uri, body: JsonEncoder().convert(getObjectData()));
-      return _handleResult(result, ParseApiObjectCallType.save);
-    }
-  }
-
-  @protected
-  query(String query) async {
-    var uri = "${_getBasePath(_path)}?$query";
-    var result = await _client.get(uri);
-    return _handleResult(result, ParseApiObjectCallType.query);
-  }
-
-  delete(String path, String objectId) async {
-    var uri = "${_getBasePath(path)}/$objectId";
-    var result = await _client.delete(uri);
-    return _handleResult(result, ParseApiObjectCallType.delete);
-  }
-
-  _getBasePath(String path) => "${_client.data.serverUrl}$path";
-
-  ParseResponse _handleResult(Response response, ParseApiObjectCallType type) {
-    ParseResponse parseResponse = ParseResponse.handleResponse(this, response);
-    Map<String, dynamic> responseData = JsonDecoder().convert(response.body);
-
-    if (_client.data.debug || _debug) {
-      var responseString = ' \n';
-
-      responseString += "----"
-          "\n${_client.data.appName} API Response ($className : ${getEnumValue(type)}) :";
-
-      if (parseResponse.success && parseResponse.result != null) {
-        responseString += "\nStatus Code: ${parseResponse.statusCode}";
-        responseString += "\nPayload: ${responseData.toString()}";
-      } else if (!parseResponse.success) {
-        responseString += "\nStatus Code: ${responseData['code'] == null ? parseResponse.statusCode : responseData['code']}";
-        responseString += "\nException: ${responseData['error'] == null ? responseData.toString() : responseData['error']}";
-      }
-
-      responseString += "\n----\n";
-      print(responseString);
-    }
-
-    return parseResponse;
-  }
-}
diff --git a/lib/objects/parse_response.dart b/lib/objects/parse_response.dart
deleted file mode 100644
index d7e0028af..000000000
--- a/lib/objects/parse_response.dart
+++ /dev/null
@@ -1,75 +0,0 @@
-import 'dart:convert';
-
-import 'package:http/http.dart';
-import 'package:parse_server_sdk/objects/parse_exception.dart';
-import 'package:parse_server_sdk/objects/parse_object.dart';
-import 'package:parse_server_sdk/utils/parse_utils_objects.dart';
-
-class ParseResponse {
-  bool success = false;
-  int statusCode = -1;
-  dynamic result;
-  ParseException exception;
-
-  static ParseResponse _handleSuccess(ParseResponse response, ParseObject object, String responseBody) {
-    response.success = true;
-
-    var map = JsonDecoder().convert(responseBody) as Map;
-
-    if (map != null && map.length == 1 && map.containsKey('results')) {
-      response.result = _handleMultipleResults(object, map.entries.first.value);
-    } else {
-      response.result = _handleSingleResult(object, map);
-    }
-
-    return response;
-  }
-
-  static _handleMultipleResults(ParseObject object, dynamic map) {
-    var resultsList = List();
-
-    for (var value in map) {
-      resultsList.add(_handleSingleResult(object, value));
-    }
-
-    return resultsList;
-  }
-
-  static _handleSingleResult(ParseObject object, map) {
-    populateObjectBaseData(object, map);
-    return object.fromJson(map);
-  }
-
-  static ParseResponse _handleError(ParseResponse response, Response value) {
-    response.exception = ParseException();
-    response.exception.message = value.reasonPhrase;
-    return response;
-  }
-
-  static ParseResponse _handleSuccessWithNoResults(ParseResponse response, String value) {
-    response.statusCode = 200;
-    response.exception = ParseException();
-    response.exception.message = value;
-    return response;
-  }
-
-  static handleResponse(ParseObject object, Response value) {
-    var response = ParseResponse();
-
-    if (value != null) {
-      response.statusCode = value.statusCode;
-
-      if (value.statusCode != 200) {
-        return _handleError(response, value);
-      } else if (value.body == "{\"results\":[]}"){
-        return _handleSuccessWithNoResults(response, "Successful request but no results found");
-      } else {
-        return _handleSuccess(response, object, value.body);
-      }
-    } else {
-      response.exception = ParseException();
-      response.exception.message = "Error reaching server, or server response was null";
-      return response;
-    }
-  }
-}
diff --git a/lib/objects/parse_user.dart b/lib/objects/parse_user.dart
deleted file mode 100644
index d389f42f4..000000000
--- a/lib/objects/parse_user.dart
+++ /dev/null
@@ -1,165 +0,0 @@
-import 'dart:convert';
-
-import 'package:http/http.dart';
-import 'package:parse_server_sdk/base/parse_constants.dart';
-import 'package:parse_server_sdk/data/parse_data_user.dart';
-import 'package:parse_server_sdk/enums/parse_enum_user_call.dart';
-import 'package:parse_server_sdk/network/parse_http_client.dart';
-
-class ParseUser {
-  ParseHTTPClient _client;
-  static final String className = '_User';
-  String path = "/classes/$className";
-  bool _debug;
-
-  ParseUser({debug, ParseHTTPClient client}) {
-    client != null ? _client = client : _client = ParseHTTPClient();
-
-    if (_debug == null) {
-      _client.data.debug != null ? _debug = _client.data.debug : false;
-    } else {
-      _debug = _debug;
-    }
-  }
-
-  create(String username, String password, String emailAddress) {
-    User.init(username, password, emailAddress);
-    return User.instance;
-  }
-
-  currentUser({bool fromServer: false}) async {
-    if (_client.data.sessionId == null) {
-      return null;
-    } else if (fromServer == false) {
-      return User.instance;
-    } else {
-
-      Uri tempUri = Uri.parse(_client.data.serverUrl);
-
-      Uri uri= Uri(
-          scheme: tempUri.scheme,
-          host: tempUri.host,
-          path: "${tempUri.path}/users/me");
-
-      final response = await _client.get(uri, headers: {
-        ParseConstants.HEADER_SESSION_TOKEN: _client.data.sessionId
-      });
-      return _handleResponse(response, ParseApiUserCallType.currentUser);
-    }
-  }
-
-  signUp() async {
-    Map<String, dynamic> bodyData = {};
-    bodyData["email"] = User().emailAddress;
-    bodyData["password"] = User().password;
-    bodyData["username"] = User().username;
-
-    Uri tempUri = Uri.parse(_client.data.serverUrl);
-
-    Uri url = Uri(
-        scheme: tempUri.scheme,
-        host: tempUri.host,
-        path: "${tempUri.path}$path");
-
-    final response = await _client.post(url,
-        headers: {
-          ParseConstants.HEADER_REVOCABLE_SESSION: "1",
-        },
-        body: JsonEncoder().convert(bodyData));
-
-    _handleResponse(response, ParseApiUserCallType.signUp);
-    return User.instance;
-  }
-
-  login() async {
-    Uri tempUri = Uri.parse(_client.data.serverUrl);
-
-    Uri url = Uri(
-        scheme: tempUri.scheme,
-        host: tempUri.host,
-        path: "${tempUri.path}/login",
-        queryParameters: {
-          "username": User.instance.username,
-          "password": User.instance.password
-        });
-
-    final response = await _client.post(url, headers: {
-      ParseConstants.HEADER_REVOCABLE_SESSION: "1",
-    });
-
-    _handleResponse(response, ParseApiUserCallType.login);
-    return User.instance;
-  }
-
-  verificationEmailRequest() async {
-    final response = await _client.post(
-        "${_client.data.serverUrl}/verificationEmailRequest",
-        body: JsonEncoder().convert({"email": User().emailAddress}));
-
-    return _handleResponse(
-        response, ParseApiUserCallType.verificationEmailRequest);
-  }
-
-  requestPasswordReset() async {
-    final response = await _client.post(
-        "${_client.data.serverUrl}/requestPasswordReset",
-        body: JsonEncoder().convert({"email": User().emailAddress}));
-
-    return _handleResponse(response, ParseApiUserCallType.requestPasswordReset);
-  }
-
-  save() async {
-    if (User.instance.objectId == null) {
-      return signUp();
-    } else {
-      final response = await _client.put(
-          _client.data.serverUrl + "$path/${User().objectId}",
-          body: JsonEncoder().convert(User().getObjectData()));
-      return _handleResponse(response, ParseApiUserCallType.save);
-    }
-  }
-
-  destroy() async {
-    final response = await _client.delete(
-        _client.data.serverUrl + "$path/${User().objectId}",
-        headers: {"X-Parse-Session-Token": _client.data.sessionId});
-
-    _handleResponse(response, ParseApiUserCallType.destroy);
-
-    return User.instance.objectId;
-  }
-
-  all() async {
-    final response = await _client.get(_client.data.serverUrl + "$path");
-    return _handleResponse(response, ParseApiUserCallType.all);
-  }
-
-  _handleResponse(Response response, ParseApiUserCallType type) {
-    Map<String, dynamic> responseData = JsonDecoder().convert(response.body);
-
-    var responseString = ' \n';
-
-    responseString += "----"
-        "\n${_client.data.appName} API Response ($className : ${getEnumValue(type)}) :";
-
-    if (response.statusCode == 200 || response.statusCode == 201) {
-      responseString += "\nStatus Code: ${response.statusCode}";
-      responseString += "\nPayload: ${responseData.toString()}";
-
-      if (responseData.containsKey('objectId')) {
-        User.instance.fromJson(JsonDecoder().convert(response.body) as Map);
-        _client.data.sessionId = responseData['sessionToken'];
-      }
-    } else {
-      responseString += "\nStatus Code: ${responseData['code']}";
-      responseString += "\nException: ${responseData['error']}";
-    }
-
-    if (_client.data.debug || _debug) {
-      responseString += "\n----\n";
-      print(responseString);
-    }
-
-    return User.instance;
-  }
-}
diff --git a/lib/parse.dart b/lib/parse.dart
index 49081e8bf..2f38f3941 100644
--- a/lib/parse.dart
+++ b/lib/parse.dart
@@ -1,52 +1,108 @@
-import 'package:parse_server_sdk/data/parse_data_server.dart';
-import 'package:parse_server_sdk/network/parse_http_client.dart';
-import 'package:parse_server_sdk/network/parse_livequery.dart';
-import 'package:parse_server_sdk/objects/parse_object.dart';
-import 'package:parse_server_sdk/objects/parse_user.dart';
+library flutter_parse_sdk;
+
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:http/http.dart';
+import 'package:meta/meta.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:web_socket_channel/io.dart';
+
+part 'src/base/parse_constants.dart';
+
+part 'src/data/parse_core_data.dart';
+
+part 'src/enums/parse_enum_api_rq.dart';
+
+part 'src/network/parse_http_client.dart';
+
+part 'src/network/parse_livequery.dart';
+
+part 'src/network/parse_query.dart';
+
+part 'src/objects/parse_base.dart';
+
+part 'src/objects/parse_clonable.dart';
+
+part 'src/objects/parse_error.dart';
+
+part 'src/objects/parse_function.dart';
+
+part 'src/objects/parse_geo_point.dart';
+
+part 'src/objects/parse_object.dart';
+
+part 'src/objects/parse_response.dart';
+
+part 'src/objects/parse_user.dart';
+
+part 'src/utils/parse_decoder.dart';
+
+part 'src/utils/parse_encoder.dart';
+
+part 'src/utils/parse_logger.dart';
+
+part 'src/utils/parse_utils.dart';
+
+part 'src/utils/parse_utils_date.dart';
+
+part 'src/utils/parse_utils_objects.dart';
 
 class Parse {
-  ParseDataServer data;
+  ParseCoreData data;
   final ParseHTTPClient client = new ParseHTTPClient();
+  bool _hasBeenInitialised = false;
 
-  Parse();
-
-  Parse initialize(appId, serverUrl, {debug, appName, liveQueryUrl, masterKey, sessionId}) {
-    ParseDataServer.init(appId,
-        serverUrl,
+  /// To initialise Parse Server in your application
+  ///
+  /// This should be initialised in MyApp() creation
+  ///
+  /// ```
+  /// Parse().initialize(
+  //        "PARSE_APP_ID",
+  //        "https://parse.myaddress.com/parse/,
+  //        masterKey: "asd23rjh234r234r234r",
+  //        debug: true,
+  //        liveQuery: true);
+  // ```
+  Parse initialize(String appId, String serverUrl,
+      {bool debug,
+      String appName,
+      String liveQueryUrl,
+      String masterKey,
+      String sessionId}) {
+    ParseCoreData.init(appId, serverUrl,
         debug: debug,
         appName: appName,
         liveQueryUrl: liveQueryUrl,
         masterKey: masterKey,
         sessionId: sessionId);
 
-    return newInstance(ParseDataServer());
-  }
+    ParseCoreData().initStorage();
 
-  Parse newInstance(ParseDataServer data) {
-    var parse = Parse();
-    parse.data = data;
-    parse.client.data = data;
-    return parse;
+    _hasBeenInitialised = true;
+
+    return Parse();
   }
 
-  // ignore: unused_field
-  ParseObject _parseObject;
+  bool hasParseBeenInitialised() => _hasBeenInitialised;
 
-  // ignore: unused_field
-  ParseUser _user;
+  Future<ParseResponse> healthCheck() async {
 
-  // ignore: unused_field
-  LiveQuery _liveQuery;
+    ParseResponse parseResponse;
 
-  ParseObject object(objectName) {
-    return _parseObject = new ParseObject(objectName);
-  }
+    try {
+      var response = await ParseHTTPClient().get("${ParseCoreData().serverUrl}$keyEndPointHealth");
+      parseResponse = ParseResponse.handleResponse(this, response);
+    } on Exception catch (e) {
+      parseResponse = ParseResponse.handleException(e);
+    }
 
-  ParseUser user() {
-    return _user = new ParseUser();
-  }
+    if (ParseCoreData().debug) {
+      logger(ParseCoreData().appName, keyClassMain, ParseApiRQ.healthCheck.toString(), parseResponse);
+    }
 
-  LiveQuery liveQuery() {
-    return _liveQuery = new LiveQuery(client);
+    return parseResponse;
   }
 }
diff --git a/lib/src/base/parse_constants.dart b/lib/src/base/parse_constants.dart
new file mode 100644
index 000000000..2b7902730
--- /dev/null
+++ b/lib/src/base/parse_constants.dart
@@ -0,0 +1,43 @@
+part of flutter_parse_sdk;
+
+// Library
+const String keySdkVersion = '1.0.5';
+const String keyLibraryName= 'Flutter Parse SDK';
+
+// End Points
+const String keyEndPointUserName = '/users/me';
+const String keyEndPointLogin = '/login';
+const String keyEndPointVerificationEmail = '/verificationEmailRequest';
+const String keyEndPointRequestPasswordReset = '/requestPasswordReset';
+const String keyEndPointClasses = '/classes/';
+const String keyEndPointHealth = '/health';
+
+// ParseObject variables
+const String keyVarClassName = 'className';
+const String keyVarObjectId = 'objectId';
+const String keyVarCreatedAt = 'createdAt';
+const String keyVarUpdatedAt = 'updatedAT';
+const String keyVarUsername = 'username';
+const String keyVarEmail = 'email';
+const String keyVarPassword = 'password';
+const String keyVarAcl = 'ACL';
+
+// Classes
+const String keyClassMain = 'ParseMain';
+const String keyClassUser = '_User';
+
+// Headers
+const String keyHeaderSessionToken = 'X-Parse-Session-Token';
+const String keyHeaderRevocableSession = 'X-Parse-Revocable-Session';
+const String keyHeaderUserAgent = 'user-agent';
+const String keyHeaderApplicationId = 'X-Parse-Application-Id';
+const String keyHeaderContentType = 'Content-Type';
+const String keyHeaderContentTypeJson = 'application/json';
+const String keyHeaderMasterKey = 'X-Parse-Master-Key';
+
+// URL params
+const String keyParamSessionToken = 'sessionToken';
+
+// Storage
+const String keyParseStoreBase = 'flutter_parse_sdk_';
+const String keyParseStoreUser = "${keyParseStoreBase}user";
\ No newline at end of file
diff --git a/lib/src/data/parse_core_data.dart b/lib/src/data/parse_core_data.dart
new file mode 100644
index 000000000..516169610
--- /dev/null
+++ b/lib/src/data/parse_core_data.dart
@@ -0,0 +1,53 @@
+part of flutter_parse_sdk;
+
+/// Singleton class that defines all user keys and data
+class ParseCoreData {
+  static ParseCoreData _instance;
+  static ParseCoreData get instance => _instance;
+
+  /// Creates an instance of Parse Server
+  ///
+  /// This class should not be user unless switching servers during the app,
+  /// which is odd. Should only be user by Parse.init
+  static void init(appId, serverUrl, {debug, appName, liveQueryUrl, masterKey, sessionId}){
+      _instance = ParseCoreData._init(appId, serverUrl);
+
+      if (debug != null) _instance.debug = debug;
+      if (appName != null) _instance.appName = appName;
+      if (liveQueryUrl != null) _instance.liveQueryURL = liveQueryUrl;
+      if (masterKey != null) _instance.masterKey = masterKey;
+      if (sessionId != null) _instance.sessionId = sessionId;
+  }
+
+  String appName;
+  String applicationId;
+  String serverUrl;
+  String liveQueryURL;
+  String masterKey;
+  String sessionId;
+  bool debug;
+  SharedPreferences storage;
+
+  ParseCoreData._init(
+      this.applicationId,
+      this.serverUrl);
+
+  factory ParseCoreData() => _instance;
+
+  /// Sets the current sessionId.
+  ///
+  /// This is generated when a users logs in, or calls currentUser to update
+  /// their keys
+  void setSessionId(String sessionId){
+    this.sessionId = sessionId;
+  }
+
+  void initStorage() async {
+    storage = await SharedPreferences.getInstance();
+  }
+
+  SharedPreferences getStore() => storage;
+
+  @override
+  String toString() => "$applicationId $masterKey";
+}
diff --git a/lib/src/enums/parse_enum_api_rq.dart b/lib/src/enums/parse_enum_api_rq.dart
new file mode 100644
index 000000000..45ec4339d
--- /dev/null
+++ b/lib/src/enums/parse_enum_api_rq.dart
@@ -0,0 +1,20 @@
+part of flutter_parse_sdk;
+
+/// Used to define the API calls made in ParseObject logs
+enum ParseApiRQ {
+  healthCheck,
+  get,
+  getAll,
+  create,
+  save,
+  query,
+  delete,
+  currentUser,
+  signUp,
+  login,
+  verificationEmailRequest,
+  requestPasswordReset,
+  destroy,
+  all,
+  execute
+}
diff --git a/lib/src/network/parse_http_client.dart b/lib/src/network/parse_http_client.dart
new file mode 100644
index 000000000..c3656302c
--- /dev/null
+++ b/lib/src/network/parse_http_client.dart
@@ -0,0 +1,20 @@
+part of flutter_parse_sdk;
+
+/// Creates a custom version of HTTP Client that has Parse Data Preset
+class ParseHTTPClient extends BaseClient {
+  final Client _client = Client();
+  final String _userAgent = "$keyLibraryName $keySdkVersion";
+  ParseCoreData data = ParseCoreData();
+
+  ParseHTTPClient();
+
+  /// Overrides the call method for HTTP Client and adds custom headers
+  @override
+  Future<StreamedResponse> send(BaseRequest request) {
+    request.headers[keyHeaderUserAgent] = _userAgent;
+    request.headers[keyHeaderApplicationId] = data.applicationId;
+    request.headers[keyHeaderContentType] = keyHeaderContentTypeJson;
+    if (data.masterKey != null) request.headers[keyHeaderMasterKey] = data.masterKey;
+    return _client.send(request);
+  }
+}
diff --git a/lib/network/parse_livequery.dart b/lib/src/network/parse_livequery.dart
similarity index 89%
rename from lib/network/parse_livequery.dart
rename to lib/src/network/parse_livequery.dart
index 99219ae33..31bd4382e 100644
--- a/lib/network/parse_livequery.dart
+++ b/lib/src/network/parse_livequery.dart
@@ -1,8 +1,6 @@
-import "dart:convert";
-import 'package:web_socket_channel/io.dart';
-import 'package:parse_server_sdk/network/parse_http_client.dart';
-import 'dart:io';
+part of flutter_parse_sdk;
 
+/// Still under development
 class LiveQuery {
   final ParseHTTPClient client;
   var channel;
diff --git a/lib/src/network/parse_query.dart b/lib/src/network/parse_query.dart
new file mode 100644
index 000000000..9a53efd33
--- /dev/null
+++ b/lib/src/network/parse_query.dart
@@ -0,0 +1,268 @@
+part of flutter_parse_sdk;
+
+/// Class to create complex queries
+class QueryBuilder<T extends ParseObject> {
+
+  static const String _NO_OPERATOR_NEEDED = "NO_OP";
+
+  T object;
+  var queries = List<MapEntry>();
+  var limiters = Map();
+
+  /// Class to create complex queries
+  QueryBuilder(this.object) : super();
+
+  /// Adds a limit to amount of results return from Parse
+  void limit(int limit){
+    limiters["limit"] = limit;
+  }
+
+  /// Useful for pagination, skips [int] amount of results
+  void skip(int skip){
+    limiters["skip"] = skip;
+  }
+
+  /// Creates a query based on where
+  void where(String where){
+    limiters['where'] = where;
+  }
+
+  /// Orders the results ascedingly.
+  ///
+  /// [String] order will be the column of the table that the results are
+  /// ordered by
+  void ascending(String order){
+    limiters["order"] = order;
+  }
+
+  /// Orders the results descendingly.
+  ///
+  /// [String] order will be the column of the table that the results are
+  /// ordered by
+  void descending(String order){
+    limiters["order"] = "-$order";
+  }
+
+  /// Define which keys in an object to return.
+  ///
+  /// [String] keys will only return the columns of a result you want the data for,
+  /// this is useful for large objects
+  void keys(String keys){
+    limiters["keys"] = keys;
+  }
+
+  /// Includes other ParseObjects stored as a Pointer
+  void include(String include){
+    limiters["include"] = include;
+  }
+
+  /// Returns an object where the [String] column starts with [value]
+  void startsWith(String column, dynamic value) {
+    queries.add(_buildQueryWithColumnValueAndOperator(MapEntry(column, "^$value"), "\$regex"));
+  }
+
+  /// Returns an object where the [String] column ends with [value]
+  void endsWith(String column, dynamic value) {
+    queries.add(_buildQueryWithColumnValueAndOperator(MapEntry(column, "$value^"), "\$regex"));
+  }
+
+  /// Returns an object where the [String] column equals [value]
+  void equals(String column, dynamic value) {
+    queries.add(_buildQueryWithColumnValueAndOperator(MapEntry(column, value), _NO_OPERATOR_NEEDED));
+  }
+
+  /// Returns an object where the [String] column contains a value less than
+  /// value
+  void lessThan(String column, dynamic value) {
+    queries.add(_buildQueryWithColumnValueAndOperator(MapEntry(column, value), "\$lt"));
+  }
+
+  /// Returns an object where the [String] column contains a value less or equal
+  /// to than value
+  void lessThanOrEqualTo(String column, dynamic value) {
+    queries.add(_buildQueryWithColumnValueAndOperator(MapEntry(column, value), "\$lte"));
+  }
+
+  /// Returns an object where the [String] column contains a value greater
+  /// than value
+  void greaterThan(String column, dynamic value) {
+    queries.add(_buildQueryWithColumnValueAndOperator(MapEntry(column, value), "\$gt"));
+  }
+
+  /// Returns an object where the [String] column contains a value greater
+  /// than equal to value
+  void greaterThanOrEqualsTo(String column, dynamic value) {
+    queries.add(_buildQueryWithColumnValueAndOperator(MapEntry(column, value), "\$gte"));
+  }
+
+  /// Returns an object where the [String] column is not equal to value
+  void notEqualTo(String column, dynamic value) {
+    queries.add(_buildQueryWithColumnValueAndOperator(MapEntry(column, value), "\$ne"));
+  }
+
+  /// Returns an object where the [String] column contains value
+  void contains(String column, dynamic value) {
+    queries.add(_buildQueryWithColumnValueAndOperator(MapEntry(column, value), "\$term"));
+  }
+
+  /// Returns an object where the [String] column is containedIn
+  void containedIn(String column, dynamic value) {
+    queries.add(_buildQueryWithColumnValueAndOperator(MapEntry(column, value), "\$in"));
+  }
+
+  /// Returns an object where the [String] column is notContainedIn
+  void notContainedIn(String column, dynamic value) {
+    queries.add(_buildQueryWithColumnValueAndOperator(MapEntry(column, value), "\$nin"));
+  }
+
+  /// Returns an object where the [String] column is exists
+  void exists(String column, dynamic value) {
+    queries.add(_buildQueryWithColumnValueAndOperator(MapEntry(column, value), "\$exists"));
+  }
+
+  /// Returns an object where the [String] column contains select
+  void select(String column, dynamic value) {
+    queries.add(_buildQueryWithColumnValueAndOperator(MapEntry(column, value), "\$select"));
+  }
+
+  /// Returns an object where the [String] column doesn't select
+  void dontSelect(String column, dynamic value) {
+    queries.add(_buildQueryWithColumnValueAndOperator(MapEntry(column, value), "\$dontSelect"));
+  }
+
+  /// Returns an object where the [String] column contains all
+  void all(String column, dynamic value) {
+    queries.add(_buildQueryWithColumnValueAndOperator(MapEntry(column, value), "\$all"));
+  }
+
+  /// Returns an object where the [String] column has a regEx performed on,
+  /// this can include ^StringsWith, or ^EndsWith
+  void regEx(String column, dynamic value) {
+    queries.add(_buildQueryWithColumnValueAndOperator(MapEntry(column, value), "\$regex"));
+  }
+
+  /// Returns an object where the [String] column contains the text
+  void text(String column, dynamic value) {
+    queries.add(_buildQueryWithColumnValueAndOperator(MapEntry(column, value), "\$text"));
+  }
+
+  /// Finishes the query and calls the server
+  ///
+  /// Make sure to call this after defining your queries
+  Future<ParseResponse> query() async {
+    return object.query(_buildQuery());
+  }
+
+  /// Builds the query for Parse
+  String _buildQuery() {
+    queries = _checkForMultipleColumnInstances(queries);
+    var query = "where={${buildQueries(queries)}}${getLimiters(limiters)}";
+    return "$query";
+  }
+
+  /// Runs through all queries and adds them to a query string
+  String buildQueries(List<MapEntry> queries) {
+
+    String queryBuilder = "";
+
+    for (var item in queries) {
+      if (item == queries.first) {
+        queryBuilder += item.value;
+      } else {
+        queryBuilder += ",${item.value}";
+      }
+    }
+
+    return queryBuilder;
+  }
+
+  /// Creates a query param using the column, the value and the queryOperator
+  /// that the column and value are being queried against
+  MapEntry _buildQueryWithColumnValueAndOperator(MapEntry columnAndValue, String queryOperator) {
+
+    var key = columnAndValue.key;
+    var value = convertValueToCorrectType(columnAndValue.value);
+
+    if (queryOperator == _NO_OPERATOR_NEEDED){
+      return MapEntry(_NO_OPERATOR_NEEDED, "\"${columnAndValue.key}\": $value");
+    } else {
+      var queryString = "\"$key\":";
+
+      var queryOperatorAndValueMap = Map();
+      queryOperatorAndValueMap[queryOperator] = columnAndValue.value;
+
+      var formattedQueryOperatorAndValue = JsonEncoder().convert(queryOperatorAndValueMap);
+      queryString += "$formattedQueryOperatorAndValue";
+
+      return MapEntry(key, queryString);
+    }
+  }
+
+  /// This joins queries that should be joined together... e.g. age > 10 &&
+  /// age < 20, this would be similar to age > 10 < 20
+  List _checkForMultipleColumnInstances(List<MapEntry> queries) {
+    List<MapEntry> sanitisedQueries = List();
+    List<String> keysAlreadyCompacted = List();
+
+    // Run through each query
+    for (var query in queries){
+
+      // Add queries that don't need sanitising
+      if (query.key == _NO_OPERATOR_NEEDED) {
+        sanitisedQueries.add(MapEntry(_NO_OPERATOR_NEEDED, query.value));
+      }
+
+      // Check if query with same column name has been sanitised
+      if (!keysAlreadyCompacted.contains(query.key) && query.key != _NO_OPERATOR_NEEDED) {
+
+        // If not, check that it now has
+        keysAlreadyCompacted.add(query.key);
+
+        // Build a list of all queries with the same column name
+        var listOfQueriesCompact = queries.where((i) => query.key == i.key).toList();
+
+        // Build first part of query
+        var queryStart = "\"${query.key}\":";
+        var queryEnd = "";
+
+        // Compact all the queries in the correct format
+        for (var queryToCompact in listOfQueriesCompact) {
+
+          var queryToCompactValue = queryToCompact.value.toString();
+          queryToCompactValue = queryToCompactValue.replaceFirst("{", "");
+          queryToCompactValue = queryToCompactValue.replaceAll("}", "");
+
+          if (listOfQueriesCompact.first == queryToCompact){
+            queryEnd += (queryToCompactValue.replaceAll(queryStart, " "));
+          } else {
+            queryEnd += (queryToCompactValue.replaceAll(queryStart, ", "));
+          }
+        }
+
+        sanitisedQueries.add(MapEntry(query.key, queryStart += "{$queryEnd}"));
+      }
+    }
+
+    return sanitisedQueries;
+  }
+
+  /// Adds the limiters to the query, i.e. skip=10, limit=10
+  String getLimiters(Map map) {
+    String result = "";
+    map.forEach((key, value) {
+      result = (result != null) ? result + "&$key=$value" : "&$key=$value";
+    });
+    return result;
+  }
+
+  /// Converts the object to the correct value for JSON,
+  ///
+  /// Strings are wrapped with "" but ints and others are not
+  convertValueToCorrectType(dynamic value) {
+    if (value is String) {
+      return "\"$value\"";
+    } else {
+      return value;
+    }
+  }
+}
diff --git a/lib/src/objects/parse_base.dart b/lib/src/objects/parse_base.dart
new file mode 100644
index 000000000..3d77c7f0b
--- /dev/null
+++ b/lib/src/objects/parse_base.dart
@@ -0,0 +1,175 @@
+part of flutter_parse_sdk;
+
+abstract class ParseBase {
+  String className;
+
+  setClassName(String className) => this.className = className;
+
+  String getClassName() => className;
+
+  /// Stores all the values of a class
+  Map _objectData = Map<String, dynamic>();
+
+  /// Returns [String] objectId
+  String get objectId => get<String>(keyVarObjectId);
+
+  set objectId(String objectId) => set<String>(keyVarObjectId, objectId);
+
+  /// Returns [DateTime] createdAt
+  DateTime get createdAt => stringToDateTime(get<String>(keyVarCreatedAt));
+
+  set createdAt(DateTime createdAt) =>
+      set<String>(keyVarCreatedAt, dateTimeToString(createdAt));
+
+  /// Returns [DateTime] updatedAt
+  DateTime get updatedAt => stringToDateTime(get<String>(keyVarUpdatedAt));
+
+  set updatedAt(DateTime updatedAt) =>
+      set<String>(keyVarUpdatedAt, dateTimeToString(updatedAt));
+
+  /// Converts object to [String] in JSON format
+  @protected
+  toJson({bool forApiRQ: false}) {
+    final map = <String, dynamic>{
+      keyVarClassName: className,
+    };
+
+    if (objectId != null) {
+      map[keyVarObjectId] = objectId;
+    }
+
+    if (createdAt != null) {
+      map[keyVarCreatedAt] = dateTimeToString(createdAt);
+    }
+
+    if (updatedAt != null) {
+      map[keyVarUpdatedAt] = dateTimeToString(updatedAt);
+    }
+
+    getObjectData().forEach((key, value) {
+      if (!map.containsKey(key)) map[key] = parseEncode(value);
+    });
+
+    if (forApiRQ) {
+     map.remove(keyVarClassName);
+     map.remove(keyVarAcl);
+     map.remove(keyParamSessionToken);
+    }
+
+    return map;
+  }
+
+  @override
+  String toString() => JsonEncoder().convert(toJson());
+
+  @protected
+  fromJson(Map objectData) {
+    objectData.forEach((key, value) {
+      if (key == className || key == '__type') {
+        // NO OP
+      } else if (key == keyVarObjectId) {
+        objectId = value;
+      } else if (key == keyVarCreatedAt) {
+        createdAt = stringToDateTime(value);
+      } else if (key == keyVarUpdatedAt) {
+        updatedAt = stringToDateTime(value);
+      } else {
+        getObjectData()[key] = parseDecode(value);
+      }
+    });
+
+    return this;
+  }
+
+  /// Creates a copy of this class
+  @protected
+  copy() => fromJson(JsonDecoder().convert(toJson()));
+
+  /// Sets all the objects variables
+  @protected
+  void setObjectData(Map objectData) => _objectData = objectData;
+
+  /// Returns the objects variables
+  @protected
+  Map getObjectData() => _objectData;
+
+  /// Saves in storage
+  @protected
+  void saveInStorage(String key) async =>
+      await ParseCoreData().getStore().setString(key, toString());
+
+  /// Sets type [T] from objectData
+  ///
+  /// To set an int, call setType<int> and an int will be saved
+  /// [bool] forceUpdate is always true, if unsure as to whether an item is
+  /// needed or not, set to false
+  void set<T>(String key, T value, {bool forceUpdate: true}) {
+    if (value != null) {
+      if (getObjectData().containsKey(key)) {
+        if (forceUpdate) getObjectData()[key] = value;
+      } else {
+        getObjectData()[key] = value;
+      }
+    }
+  }
+
+  /// Gets type [T] from objectData
+  ///
+  /// Returns null or [defaultValue] if provided. To get an int, call
+  /// getType<int> and an int will be returned, null, or a defaultValue if
+  /// provided
+  get<T>(String key, {T defaultValue}) {
+    if (getObjectData().containsKey(key)) {
+      if (T != null && getObjectData()[key] is T) {
+        return getObjectData()[key] as T;
+      } else {
+        return getObjectData()[key];
+      }
+    } else {
+      return defaultValue;
+    }
+  }
+
+  /// Saves item to simple key pair value storage
+  ///
+  /// Replicates Android SDK pin process and saves object to storage
+  Future<bool> pin() async {
+    if (objectId != null) {
+      await ParseCoreData().getStore().setString(objectId, JsonEncoder().convert(toJson()));
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  /// Saves item to simple key pair value storage
+  ///
+  /// Replicates Android SDK pin process and saves object to storage
+  Future<bool> unpin() async {
+    if (objectId != null) {
+      var itemToSave =
+          await ParseCoreData().getStore().setString(objectId, null);
+      if (itemToSave) return true;
+    }
+
+    return false;
+  }
+
+  /// Saves item to simple key pair value storage
+  ///
+  /// Replicates Android SDK pin process and saves object to storage
+  fromPin(String objectId) {
+    if (objectId != null) {
+      var itemFromStore = ParseCoreData().getStore().getString(objectId);
+
+      if (itemFromStore != null) {
+        var map = JsonDecoder().convert(itemFromStore);
+
+        if (map != null) {
+          return fromJson(map);
+        }
+      }
+    }
+    return null;
+  }
+}
diff --git a/lib/src/objects/parse_clonable.dart b/lib/src/objects/parse_clonable.dart
new file mode 100644
index 000000000..0e423095e
--- /dev/null
+++ b/lib/src/objects/parse_clonable.dart
@@ -0,0 +1,6 @@
+part of flutter_parse_sdk;
+
+/// Creates method which can be used to deep clone objects
+abstract class ParseCloneable {
+  clone(Map map);
+}
\ No newline at end of file
diff --git a/lib/src/objects/parse_error.dart b/lib/src/objects/parse_error.dart
new file mode 100644
index 000000000..39cdc7e34
--- /dev/null
+++ b/lib/src/objects/parse_error.dart
@@ -0,0 +1,79 @@
+part of flutter_parse_sdk;
+
+/// ParseException is used in [ParseResult] to inform the user of the exception
+class ParseError {
+
+  Map<int, String> exceptions = {
+  -1 :'UnknownError',
+
+    // SDK errors / Errors
+  1: 'No Results',
+  2: 'OK',
+  400: 'Bad Request',
+
+    // Parse specific / Exceptions
+  100: 'ConnectionFailed',
+  101: 'ObjectNotFound',
+  102: 'InvalidQuery',
+  103: 'InvalidClassName',
+  104: 'MissingObjectId',
+  105: 'InvalidKeyName',
+  106: 'InvalidPointer',
+  107: 'InvalidJson',
+  108: 'CommandUnavailable',
+  109: 'NotInitialized',
+  111: 'IncorrectType',
+  112: 'InvalidChannelName',
+  115: 'PushMisconfigured',
+  116: 'ObjectTooLarge',
+  119: 'OperationForbidden',
+  120: 'CacheMiss',
+  121: 'InvalidNestedKey',
+  122: 'InvalidFileName',
+  123: 'InvalidAcl',
+  124: 'Timeout',
+  125: 'InvalidEmailAddress',
+  135: 'MissingRequiredFieldError',
+  137: 'DuplicateValue',
+  139: 'InvalidRoleName',
+  140: 'ExceededQuota',
+  141: 'ScriptError',
+  142: 'ValidationError',
+  153: 'FileDeleteError',
+  155: 'RequestLimitExceeded',
+  160: 'InvalidEventName',
+  200: 'UsernameMissing',
+  201: 'PasswordMissing',
+  202: 'UsernameTaken',
+  203: 'EmailTaken',
+  204: 'EmailMissing',
+  205: 'EmailNotFound',
+  206: 'SessionMissing',
+  207: 'MustCreateUserThroughSignup',
+  208: 'AccountAlreadyLinked',
+  209: 'InvalidSessionToken',
+  250: 'LinkedIdMissing',
+  251: 'InvalidLinkedSession',
+  252: 'UnsupportedService'};
+
+  final int code;
+  final String message;
+  final bool isTypeOfException;
+  String type;
+
+  ParseError({this.code = -1, this.message = "Unkown error", this.isTypeOfException = false, bool debug: false}){
+    type = exceptions[code];
+    if (debug) print(toString());
+  }
+
+  @override
+  String toString() {
+    var exceptionString = ' \n';
+    exceptionString += "----";
+    exceptionString +="\nParseException (Type: $type) :";
+    exceptionString +="\nCode: $code";
+    exceptionString +="\nMessage: $message";
+    exceptionString += "----";
+    return exceptionString;
+  }
+}
\ No newline at end of file
diff --git a/lib/src/objects/parse_function.dart b/lib/src/objects/parse_function.dart
new file mode 100644
index 000000000..578930446
--- /dev/null
+++ b/lib/src/objects/parse_function.dart
@@ -0,0 +1,29 @@
+part of flutter_parse_sdk;
+
+class ParseCloudFunction extends ParseObject {
+  final String functionName;
+  bool _debug;
+  ParseHTTPClient _client;
+
+  @override
+  String _path;
+
+  /// Creates a new cloud function object
+  ///
+  /// {https://docs.parseplatform.org/cloudcode/guide/}
+  ParseCloudFunction(this.functionName, {bool debug, ParseHTTPClient client}) : super (functionName) {
+    _path = "/functions/$functionName";
+
+    if (debug != null) setDebug(debug);
+    if (client != null) setClient(client);
+  }
+
+  /// Executes a cloud function
+  ///
+  /// To add the paramaters, create an object and call [set](value to set)
+  execute() async {
+    var uri = _client.data.serverUrl + "$_path";
+    var result = await _client.post(uri, body: JsonEncoder().convert(getObjectData()));
+    return super.handleResponse(result, ParseApiRQ.execute);
+  }
+}
diff --git a/lib/src/objects/parse_geo_point.dart b/lib/src/objects/parse_geo_point.dart
new file mode 100644
index 000000000..77f979b92
--- /dev/null
+++ b/lib/src/objects/parse_geo_point.dart
@@ -0,0 +1,30 @@
+part of flutter_parse_sdk;
+
+class ParseGeoPoint extends ParseObject {
+
+  double _latitude;
+  double _longitude;
+
+  /// Creates a Parse Object of type GeoPoint
+  ParseGeoPoint({double latitude = 0.0, double longitude = 0.0, bool debug, ParseHTTPClient client}): super ('GeoPoint') {
+    _latitude = latitude;
+    _longitude = longitude;
+
+    if (debug != null) setDebug(debug);
+    if (client != null) setClient(client);
+  }
+
+  double get latitude => _latitude;
+
+  double get longitude => _longitude;
+
+  set latitude(double value) {
+    assert(value >= -90.0 || value <= 90.0);
+    _latitude = value;
+  }
+
+  set longitude(double value) {
+    assert(value >= -180.0 || value <= 180.0);
+    _longitude = value;
+  }
+}
\ No newline at end of file
diff --git a/lib/src/objects/parse_object.dart b/lib/src/objects/parse_object.dart
new file mode 100644
index 000000000..8ad2a9093
--- /dev/null
+++ b/lib/src/objects/parse_object.dart
@@ -0,0 +1,127 @@
+part of flutter_parse_sdk;
+
+class ParseObject extends ParseBase implements ParseCloneable {
+
+  ParseObject.clone(String className): this('className');
+
+  @override
+  clone(Map map) => ParseObject.clone(className)..fromJson(map);
+
+  String _path;
+  bool _debug;
+  ParseHTTPClient _client;
+
+  /// Creates a new Parse Object
+  ///
+  /// [String] className refers to the Table Name in your Parse Server,
+  /// [bool] debug will overwrite the current default debug settings and
+  /// [ParseHttpClient] can be overwritten to create your own HTTP Client
+  ParseObject(String className, {bool debug: false}): super() {
+    setClassName(className);
+    _path = "$keyEndPointClasses$className";
+    setClient(ParseHTTPClient());
+    setDebug(isDebugEnabled(objectLevelDebug: debug));
+  }
+
+  void setDebug(bool debug){
+    _debug = debug;
+  }
+
+  void setClient(ParseHTTPClient client){
+    _client = client;
+  }
+
+  /// Gets an object from the server using it's [String] objectId
+  Future<ParseResponse> getObject(String objectId) async {
+    try {
+      var uri = "${ParseCoreData().serverUrl}$_path";
+      if (objectId != null) uri += "/$objectId";
+      var result = await _client.get(uri);
+      return handleResponse(result, ParseApiRQ.get);
+    } on Exception catch (e) {
+      return handleException(e, ParseApiRQ.get);
+    }
+  }
+
+  /// Gets all objects from this table - Limited response at the moment
+  Future<ParseResponse> getAll() async {
+    try {
+      var result = await _client.get("${ParseCoreData().serverUrl}$_path");
+      return handleResponse(result, ParseApiRQ.getAll);
+    } on Exception catch (e) {
+      return handleException(e, ParseApiRQ.getAll);
+    }
+  }
+
+  /// Creates a new object and saves it online
+  Future<ParseResponse> create() async {
+    try {
+      var uri = _client.data.serverUrl + "$_path";
+      var result = await _client.post(uri, body: toJson(forApiRQ: true));
+      return handleResponse(result, ParseApiRQ.create);
+    } on Exception catch (e) {
+      return handleException(e, ParseApiRQ.create);
+    }
+  }
+
+  /// Saves the current object online
+  Future<ParseResponse> save() async {
+    if (getObjectData() == null) {
+      return create();
+    } else {
+      try {
+        var uri = "${ParseCoreData().serverUrl}$_path/$objectId";
+        var result = await _client.put(uri, body: toJson(forApiRQ: true));
+        return handleResponse(result, ParseApiRQ.save);
+      } on Exception catch (e) {
+        return handleException(e, ParseApiRQ.save);
+      }
+    }
+  }
+
+  /// Can be used to create custom queries
+  Future<ParseResponse> query(String query) async {
+    try {
+      var uri = "${ParseCoreData().serverUrl}$_path?$query";
+      var result = await _client.get(uri);
+      return handleResponse(result, ParseApiRQ.query);
+    } on Exception catch (e) {
+      return handleException(e, ParseApiRQ.query);
+    }
+  }
+
+  /// Deletes the current object locally and online
+  Future<ParseResponse> delete(String path, String objectId) async {
+    try {
+      var uri = "${ParseCoreData().serverUrl}$_path/$objectId";
+      var result = await _client.delete(uri);
+      return handleResponse(result, ParseApiRQ.delete);
+    } on Exception catch (e) {
+      return handleException(e, ParseApiRQ.delete);
+    }
+  }
+
+  /// Handles an API response and logs data if [bool] debug is enabled
+  @protected
+  ParseResponse handleResponse(Response response, ParseApiRQ type) {
+    ParseResponse parseResponse = ParseResponse.handleResponse(this, response);
+
+    if (_debug) {
+      logger(ParseCoreData().appName, className, type.toString(), parseResponse);
+    }
+
+    return parseResponse;
+  }
+
+  /// Handles an API response and logs data if [bool] debug is enabled
+  @protected
+  ParseResponse handleException(Exception exception, ParseApiRQ type) {
+    ParseResponse parseResponse = ParseResponse.handleException(exception);
+
+    if (_debug) {
+      logger(ParseCoreData().appName, className, type.toString(), parseResponse);
+    }
+
+    return parseResponse;
+  }
+}
diff --git a/lib/src/objects/parse_response.dart b/lib/src/objects/parse_response.dart
new file mode 100644
index 000000000..102a5ca49
--- /dev/null
+++ b/lib/src/objects/parse_response.dart
@@ -0,0 +1,92 @@
+part of flutter_parse_sdk;
+
+class ParseResponse {
+  bool success = false;
+  int statusCode = -1;
+  dynamic result;
+  ParseError error;
+
+  /// Handles all the ParseObject responses
+  ///
+  /// There are 4 probable outcomes from a Parse API call,
+  /// 1. Fail - [ParseResponse()] will be returned with further details
+  /// 2. Success but no results. [ParseResponse()] is returned.
+  /// 3. Success with simple OK.
+  /// 4. Success with results. Again [ParseResponse()] is returned
+  static handleResponse(dynamic object, Response apiResponse) {
+    var parseResponse = ParseResponse();
+
+    if (apiResponse != null) {
+      parseResponse.statusCode = apiResponse.statusCode;
+
+      if (apiResponse.statusCode != 200) {
+        return _handleError(parseResponse, apiResponse);
+      } else if (apiResponse.body == "{\"results\":[]}"){
+        return _handleSuccessWithNoResults(parseResponse, 1, "Successful request, but no results found");
+      } else if (apiResponse.body == "OK"){
+        return _handleSuccessWithNoResults(parseResponse, 2, "Successful request");
+      } else {
+        return _handleSuccess(parseResponse, object, apiResponse.body);
+      }
+    } else {
+      parseResponse.error = ParseError(message: "Error reaching server, or server response was null");
+      return apiResponse;
+    }
+  }
+
+  /// Handles exception instead of throwing an exception
+  static ParseResponse handleException(Exception exception) {
+    var response = ParseResponse();
+    response.error = ParseError(message: exception.toString(), isTypeOfException: true);
+    return response;
+  }
+
+  /// Handles any errors returned in response
+  static ParseResponse _handleError(ParseResponse response, Response apiResponse) {
+    Map<String, dynamic> responseData = JsonDecoder().convert(apiResponse.body);
+    response.error = ParseError(code: responseData['code'], message: responseData['error']);
+    response.statusCode = responseData['code'];
+    return response;
+  }
+
+  /// Handles successful responses with no results
+  static ParseResponse _handleSuccessWithNoResults(ParseResponse response, int code, String value) {
+    response.success = true;
+    response.statusCode = 200;
+    response.error = ParseError(code: code, message: value);
+    return response;
+  }
+
+  /// Handles successful response with results
+  static ParseResponse _handleSuccess(ParseResponse response, dynamic object, String responseBody) {
+    response.success = true;
+
+    var map = JsonDecoder().convert(responseBody) as Map;
+
+    if (map != null && map.length == 1 && map.containsKey('results')) {
+      response.result = _handleMultipleResults(object, map.entries.first.value);
+    } else {
+      response.result = _handleSingleResult(object, map);
+    }
+
+    return response;
+  }
+
+  /// Handles a response with a multiple result object
+  static _handleMultipleResults(dynamic object, dynamic map) {
+    var resultsList = List();
+
+    for (var value in map) {
+      resultsList.add(_handleSingleResult(object, value));
+    }
+
+    return resultsList;
+  }
+
+  /// Handles a response with a single result object
+  static _handleSingleResult(dynamic object, map) {
+    if (object is Parse) return map;
+    if (object is ParseCloneable) return object.clone(map);
+    return null;
+  }
+}
diff --git a/lib/src/objects/parse_user.dart b/lib/src/objects/parse_user.dart
new file mode 100644
index 000000000..9bda3cef4
--- /dev/null
+++ b/lib/src/objects/parse_user.dart
@@ -0,0 +1,278 @@
+part of flutter_parse_sdk;
+
+class ParseUser extends ParseBase implements ParseCloneable {
+
+  ParseUser.clone(Map map): this(map[keyVarUsername],map[keyVarPassword],map[keyVarEmail]);
+
+  @override
+  clone(Map map) => ParseUser.clone(map)..fromJson(map);
+
+  static final String path = "$keyEndPointClasses$keyClassUser";
+
+  bool _debug;
+  ParseHTTPClient _client;
+
+  Map get acl => super.get<Map>(keyVarAcl);
+  set acl(Map acl) => set<Map>(keyVarAcl, acl);
+
+  String get username => super.get<String>(keyVarUsername);
+  set username(String username) => set<String>(keyVarUsername, username);
+
+  String get password => super.get<String>(keyVarPassword);
+  set password(String password) => set<String>(keyVarPassword, password);
+
+  String get emailAddress => super.get<String>(keyVarEmail);
+  set emailAddress(String emailAddress) => set<String>(keyVarEmail, emailAddress);
+
+  /// Creates an instance of ParseUser
+  ///
+  /// Users can set whether debug should be set on this class with a [bool],
+  /// they can also create thier own custom version of [ParseHttpClient]
+  ///
+  /// Creates a new user locally
+  ///
+  /// Requires [String] username, [String] password. [String] email address
+  /// is required as well to create a full new user object on ParseServer. Only
+  /// username and password is required to login
+  ParseUser(String username, String password, String emailAddress, {bool debug, ParseHTTPClient client}) : super() {
+    client == null ? _client = ParseHTTPClient() : _client = client;
+    _debug = isDebugEnabled(objectLevelDebug: debug);
+
+    this.username = username;
+    this.password = password;
+    this.emailAddress = emailAddress;
+
+    setClassName(keyClassUser);
+  }
+
+  create(String username, String password, [String emailAddress]) {
+    return ParseUser(username, password, emailAddress);
+  }
+
+  /// Gets the current user from the server
+  ///
+  /// Current user is stored locally, but in case of a server update [bool]
+  /// fromServer can be called and an updated version of the [User] object will be
+  /// returned
+  getCurrentUserFromServer() async {
+    // We can't get the current user and session without a sessionId
+    if (_client.data.sessionId == null) return null;
+
+    try {
+      Uri tempUri = Uri.parse(_client.data.serverUrl);
+
+      Uri uri = Uri(
+          scheme: tempUri.scheme,
+          host: tempUri.host,
+          path: "${tempUri.path}$keyEndPointUserName");
+
+      final response = await _client
+          .get(uri, headers: {keyHeaderSessionToken: _client.data.sessionId});
+      return _handleResponse(response, ParseApiRQ.currentUser);
+    } on Exception catch (e) {
+      return _handleException(e, ParseApiRQ.currentUser);
+    }
+  }
+  /// Gets the current user from storage
+  ///
+  /// Current user is stored locally, but in case of a server update [bool]
+  /// fromServer can be called and an updated version of the [User] object will be
+  /// returned
+  static currentUser() {
+    return _getUserFromLocalStore();
+  }
+
+  /// Registers a user on Parse Server
+  ///
+  /// After creating a new user via [Parse.create] call this method to register
+  /// that user on Parse
+  signUp() async {
+    try {
+      if (emailAddress == null) return null;
+
+      Map<String, dynamic> bodyData = {};
+      bodyData[keyVarEmail] = emailAddress;
+      bodyData[keyVarPassword] = password;
+      bodyData[keyVarUsername] = username;
+
+      Uri tempUri = Uri.parse(_client.data.serverUrl);
+
+      Uri url = Uri(
+          scheme: tempUri.scheme,
+          host: tempUri.host,
+          path: "${tempUri.path}$path");
+
+      final response = await _client.post(url,
+          headers: {
+            keyHeaderRevocableSession: "1",
+          },
+          body: JsonEncoder().convert(bodyData));
+
+      _handleResponse(response, ParseApiRQ.signUp);
+      return this;
+    } on Exception catch (e) {
+      return _handleException(e, ParseApiRQ.signUp);
+    }
+  }
+
+  /// Logs a user in via Parse
+  ///
+  /// Once a user is created using [Parse.create] and a username and password is
+  /// provided, call this method to login.
+  login() async {
+    try {
+      Uri tempUri = Uri.parse(_client.data.serverUrl);
+
+      Uri url = Uri(
+          scheme: tempUri.scheme,
+          host: tempUri.host,
+          path: "${tempUri.path}$keyEndPointLogin",
+          queryParameters: {keyVarUsername: username, keyVarPassword: password});
+
+      final response = await _client.post(url, headers: {
+        keyHeaderRevocableSession: "1",
+      });
+
+      _handleResponse(response, ParseApiRQ.login);
+      return this;
+    } on Exception catch (e) {
+      return _handleException(e, ParseApiRQ.login);
+    }
+  }
+
+  /// Removes the current user from the session data
+  logout() {
+    _client.data.sessionId = null;
+    setObjectData(null);
+  }
+
+  /// Sends a verification email to the users email address
+  verificationEmailRequest() async {
+    try {
+      final response = await _client.post(
+          "${_client.data.serverUrl}$keyEndPointVerificationEmail",
+          body: JsonEncoder().convert({keyVarEmail: emailAddress}));
+
+      return _handleResponse(response, ParseApiRQ.verificationEmailRequest);
+    } on Exception catch (e) {
+      return _handleException(e, ParseApiRQ.verificationEmailRequest);
+    }
+  }
+
+  /// Sends a password reset email to the users email address
+  requestPasswordReset() async {
+    try {
+      final response = await _client.post(
+          "${_client.data.serverUrl}$keyEndPointRequestPasswordReset",
+          body: JsonEncoder().convert({keyVarEmail: emailAddress}));
+      return _handleResponse(response, ParseApiRQ.requestPasswordReset);
+    } on Exception catch (e) {
+      return _handleException(e, ParseApiRQ.requestPasswordReset);
+    }
+  }
+
+  /// Saves the current user
+  ///
+  /// If changes are made to the current user, call save to sync them with
+  /// Parse Server
+  save() async {
+    if (objectId == null) {
+      return signUp();
+    } else {
+      try {
+        Map map = toJson(forApiRQ: true);
+        final response = await _client.put(
+            _client.data.serverUrl + "$path/$objectId",
+            body: map);
+        return _handleResponse(response, ParseApiRQ.save);
+      } on Exception catch (e) {
+        return _handleException(e, ParseApiRQ.save);
+      }
+    }
+  }
+
+  /// Removes a user from Parse Server locally and online
+  Future<ParseResponse> destroy() async {
+    if (objectId != null) {
+      try {
+        final response = await _client.delete(
+            _client.data.serverUrl + "$path/$objectId",
+            headers: {keyHeaderSessionToken: _client.data.sessionId});
+        return _handleResponse(response, ParseApiRQ.destroy);
+      } on Exception catch (e) {
+        return _handleException(e, ParseApiRQ.destroy);
+      }
+    }
+
+    return null;
+  }
+
+  /// Gets a list of all users (limited return)
+  static Future<ParseResponse> all() async {
+
+    var emptyUser = ParseUser(null, null, null);
+
+    try {
+      final response = await ParseHTTPClient().get(
+          "${ParseCoreData().serverUrl}/$path");
+
+      ParseResponse parseResponse = ParseResponse.handleResponse(emptyUser, response);
+
+      if (ParseCoreData().debug) {
+        logger(ParseCoreData().appName, keyClassUser, ParseApiRQ.getAll.toString(), parseResponse);
+      }
+
+      return parseResponse;
+    } on Exception catch (e) {
+      return ParseResponse.handleException(e);
+    }
+  }
+
+  static ParseUser _getUserFromLocalStore() {
+    var userJson = ParseCoreData().getStore().getString(keyParseStoreUser);
+
+    if (userJson != null) {
+      var userMap = JsonDecoder().convert(userJson);
+
+      if (userMap != null) {
+        ParseCoreData().sessionId = userMap[keyParamSessionToken];
+        return ParseUser.clone(userMap);
+      }
+    }
+
+    return null;
+  }
+
+  /// Handles an API response and logs data if [bool] debug is enabled
+  ParseResponse _handleException(Exception exception, ParseApiRQ type) {
+    ParseResponse parseResponse = ParseResponse.handleException(exception);
+
+    if (_debug) {
+      logger(ParseCoreData().appName, className, type.toString(), parseResponse);
+    }
+
+    return parseResponse;
+  }
+
+  /// Handles all the response data for this class
+  _handleResponse(Response response, ParseApiRQ type) {
+
+    ParseResponse parseResponse = ParseResponse.handleResponse(this, response);
+    if (_debug) {
+      logger(ParseCoreData().appName, className, type.toString(), parseResponse);
+    }
+
+    Map<String, dynamic> responseData = JsonDecoder().convert(response.body);
+    if (responseData.containsKey(keyVarObjectId)) {
+      fromJson(responseData);
+      _client.data.sessionId = responseData[keyParamSessionToken];
+    }
+
+    if (type == ParseApiRQ.getAll || type == ParseApiRQ.destroy) {
+      return parseResponse;
+    } else {
+      saveInStorage(keyParseStoreUser);
+      return this;
+    }
+  }
+}
diff --git a/lib/src/utils/parse_decoder.dart b/lib/src/utils/parse_decoder.dart
new file mode 100644
index 000000000..98b4c6588
--- /dev/null
+++ b/lib/src/utils/parse_decoder.dart
@@ -0,0 +1,74 @@
+part of flutter_parse_sdk;
+
+List<dynamic> _convertJSONArrayToList(List<dynamic> array) {
+  List<dynamic> list = new List();
+  array.forEach((value) {
+    list.add(parseDecode(value));
+  });
+  return list;
+}
+
+Map<String, dynamic> _convertJSONObjectToMap(Map<String, dynamic> object) {
+  Map<String, dynamic> map = new Map();
+  object.forEach((key, value) {
+    map.putIfAbsent(key, () => parseDecode(value));
+  });
+  return map;
+}
+
+/// Decode any type value
+dynamic parseDecode(dynamic value) {
+  if (value is List) {
+    return _convertJSONArrayToList(value);
+  }
+
+  if (value is bool) {
+    return value;
+  }
+
+  if (value is int) {
+    return value.toInt();
+  }
+
+  if (value is double) {
+    return value.toDouble();
+  }
+
+  if (value is num) {
+    return value;
+  }
+
+  if (!(value is Map)) {
+    return value;
+  }
+
+  Map map = value;
+  if (!map.containsKey("__type")) {
+    return _convertJSONObjectToMap(map);
+  }
+
+  switch (map["__type"]) {
+    case "Date":
+      String iso = map["iso"];
+      return stringToDateTime(iso);
+    case "Bytes":
+      String val = map["base64"];
+      return base64.decode(val);
+    case "Pointer":
+      String className = map["className"];
+      return ParseObject(className).fromJson(map);
+    case "Object":
+      String className = map["className"];
+      if (className == '_User') {
+        return ParseUser(null, null, null).fromJson(map);
+      }
+      return ParseObject(className).fromJson(map);
+    case "GeoPoint":
+      num latitude = map["latitude"] ?? 0.0;
+      num longitude = map["longitude"] ?? 0.0;
+      return new ParseGeoPoint(
+          latitude: latitude.toDouble(), longitude: longitude.toDouble());
+  }
+
+  return null;
+}
diff --git a/lib/src/utils/parse_encoder.dart b/lib/src/utils/parse_encoder.dart
new file mode 100644
index 000000000..770c54442
--- /dev/null
+++ b/lib/src/utils/parse_encoder.dart
@@ -0,0 +1,43 @@
+part of flutter_parse_sdk;
+
+bool isValidType(dynamic value) {
+  return value == null ||
+      value is String ||
+      value is num ||
+      value is bool ||
+      value is DateTime ||
+      value is List ||
+      value is Map ||
+      value is ParseObject ||
+      value is ParseGeoPoint ||
+      value is ParseUser;
+}
+
+/// Custom json encoder for types related to parse
+dynamic parseEncode(dynamic value) {
+  if (value is DateTime) return _encodeDate(value);
+
+  if (value is List) {
+    return value.map((v) {
+      return parseEncode(v);
+    }).toList();
+  }
+
+  if (value is ParseObject) {
+    return value.toJson;
+  }
+
+  if (value is ParseUser) {
+    return value.toJson();
+  }
+
+  if (value is ParseGeoPoint) {
+    return value.toJson;
+  }
+
+  return value;
+}
+
+Map<String, dynamic> _encodeDate(DateTime date) {
+  return <String, dynamic>{"__type": "Date", "iso": dateTimeToString(date)};
+}
diff --git a/lib/src/utils/parse_logger.dart b/lib/src/utils/parse_logger.dart
new file mode 100644
index 000000000..e3c97fff7
--- /dev/null
+++ b/lib/src/utils/parse_logger.dart
@@ -0,0 +1,30 @@
+part of flutter_parse_sdk;
+
+void logger(
+    String appName,
+    String className,
+    String type,
+    ParseResponse parseResponse) {
+    var responseString = ' \n';
+
+    responseString += "----\n$appName API Response ($className : $type) :";
+
+    if (parseResponse.success) {
+      responseString += "\nStatus Code: ${parseResponse.statusCode}";
+      if (parseResponse.result != null) {
+        responseString += "\nPayload: ${parseResponse.result.toString()}";
+      } else {
+        responseString += "\nReponse: OK";
+      }
+    } else if (!parseResponse.success) {
+      responseString += "\nStatus Code: ${parseResponse.error.code}";
+      responseString += "\nType: ${parseResponse.error.type}";
+
+      String errorOrException = parseResponse.error.isTypeOfException ? "Exception" : "Error";
+
+      responseString += "\n$errorOrException: ${parseResponse.error.message}";
+    }
+
+    responseString += "\n----\n";
+    print(responseString);
+}
\ No newline at end of file
diff --git a/lib/src/utils/parse_utils.dart b/lib/src/utils/parse_utils.dart
new file mode 100644
index 000000000..7e0c84d80
--- /dev/null
+++ b/lib/src/utils/parse_utils.dart
@@ -0,0 +1,11 @@
+part of flutter_parse_sdk;
+
+/// Checks whether debug is enabled
+///
+/// Debug can be set in 2 places, one global param in the Parse.initialise, and
+/// then can be overidden class by class
+bool isDebugEnabled({objectLevelDebug: false}) {
+  bool debug = objectLevelDebug;
+  if (ParseCoreData().debug != null) debug = ParseCoreData().debug;
+  return debug;
+}
\ No newline at end of file
diff --git a/lib/src/utils/parse_utils_date.dart b/lib/src/utils/parse_utils_date.dart
new file mode 100644
index 000000000..c0073abbd
--- /dev/null
+++ b/lib/src/utils/parse_utils_date.dart
@@ -0,0 +1,51 @@
+part of flutter_parse_sdk;
+
+/// Converts a [String] into a [DateTime] from a Parse Server format
+DateTime stringToDateTime(String date) {
+  if (date == null) return null;
+
+  try {
+    return DateTime.parse(date);
+  } on FormatException {
+    return null;
+  }
+}
+
+/// Serialize [DateTime] into an ISO-8601 full-precision extended format representation.
+String dateTimeToString(DateTime datetime) {
+  if (datetime == null) return null;
+
+  if (!datetime.isUtc) {
+    datetime = datetime.toUtc();
+  }
+
+  String y = _fourDigits(datetime.year);
+  String m = _twoDigits(datetime.month);
+  String d = _twoDigits(datetime.day);
+  String h = _twoDigits(datetime.hour);
+  String min = _twoDigits(datetime.minute);
+  String sec = _twoDigits(datetime.second);
+  String ms = _threeDigits(datetime.millisecond);
+
+  return "$y-$m-${d}T$h:$min:$sec.${ms}Z";
+}
+
+String _fourDigits(int n) {
+  int absN = n.abs();
+  String sign = n < 0 ? "-" : "";
+  if (absN >= 1000) return "$n";
+  if (absN >= 100) return "${sign}0$absN";
+  if (absN >= 10) return "${sign}00$absN";
+  return "${sign}000$absN";
+}
+
+String _threeDigits(int n) {
+  if (n >= 100) return "$n";
+  if (n >= 10) return "0$n";
+  return "00$n";
+}
+
+String _twoDigits(int n) {
+  if (n >= 10) return "$n";
+return "0$n";
+}
\ No newline at end of file
diff --git a/lib/src/utils/parse_utils_objects.dart b/lib/src/utils/parse_utils_objects.dart
new file mode 100644
index 000000000..da253939f
--- /dev/null
+++ b/lib/src/utils/parse_utils_objects.dart
@@ -0,0 +1,9 @@
+part of flutter_parse_sdk;
+
+/// Populates the base object data from a server response
+populateObjectBaseData(ParseBase object, Map<String, dynamic> objectData) {
+  object.set(keyVarObjectId, objectData[keyVarObjectId]);
+  object.set(keyVarCreatedAt, stringToDateTime(objectData[keyVarCreatedAt]));
+  object.set(keyVarObjectId, stringToDateTime(objectData[keyVarUpdatedAt]));
+  return object;
+}
diff --git a/lib/utils/parse_utils_date.dart b/lib/utils/parse_utils_date.dart
deleted file mode 100644
index be4d85824..000000000
--- a/lib/utils/parse_utils_date.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-import 'package:parse_server_sdk/base/parse_constants.dart';
-import 'package:intl/intl.dart';
-
-  DateTime convertStringToDateTime(String date) {
-    if (date == null) return null;
-
-    var formatter = DateFormat(ParseConstants.PARSE_DATE_FORMAT);
-    var dateToReturn = formatter.parse(_removeTimeZones(date));
-    return dateToReturn;
-  }
-
-  String _removeTimeZones(String date) {
-    // TODO - library doesn't support timezones. Monitor this
-    if (date.contains('zzzZ')) {
-      return date.replaceRange(date.length - 4, date.length, '');
-    } else {
-      return date;
-    }
-  }
-
diff --git a/lib/utils/parse_utils_network.dart b/lib/utils/parse_utils_network.dart
deleted file mode 100644
index c6bac7fba..000000000
--- a/lib/utils/parse_utils_network.dart
+++ /dev/null
@@ -1,6 +0,0 @@
-import 'package:parse_server_sdk/base/parse_constants.dart';
-import 'package:intl/intl.dart';
-
-class ParseUtilsDates {
-
-}
diff --git a/lib/utils/parse_utils_objects.dart b/lib/utils/parse_utils_objects.dart
deleted file mode 100644
index 8e61908cb..000000000
--- a/lib/utils/parse_utils_objects.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-import 'package:parse_server_sdk/base/parse_constants.dart';
-import 'package:parse_server_sdk/objects/parse_object.dart';
-import 'package:parse_server_sdk/utils/parse_utils_date.dart';
-
-populateObjectBaseData(ParseObject object, Map<String, dynamic> objectData) {
-  object.setValue(
-      ParseConstants.OBJECT_ID, objectData[ParseConstants.OBJECT_ID]);
-  object.setValue(ParseConstants.CREATED_AT,
-      convertStringToDateTime(objectData[ParseConstants.CREATED_AT]));
-  object.setValue(ParseConstants.OBJECT_ID,
-      convertStringToDateTime(objectData[ParseConstants.UPDATED_AT]));
-  return object;
-}
diff --git a/pubspec.yaml b/pubspec.yaml
index 4ffea64de..aa715c528 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: parse_server_sdk
-description: A Flutter Parse Server SDK
-version: 0.0.1
-homepage: https://www.github.com/PhillWiggins
+description: Flutter plugin for Parse Server, (https://parseplatform.org), (https://back4app.com)
+version: 1.0.5
+homepage: https://github.com/phillwiggins/flutter_parse_sdk
 author: PhillWiggins <phill.wiggins@gmail.com>
 
 environment:
@@ -16,4 +16,4 @@ dependencies:
   http: ^0.12.0
 
   # Utils
-  intl: ^0.15.7
\ No newline at end of file
+  shared_preferences: ^0.4.3
\ No newline at end of file

From eecc7516ff8585636cdd08f6b597e5a17fad3e74 Mon Sep 17 00:00:00 2001
From: Phill <phill.wiggins@gmail.com>
Date: Sun, 13 Jan 2019 11:36:48 +0000
Subject: [PATCH 2/2] Version 1.0.5 - Fixed saving issues

---
 .idea/workspace.xml                    | 471 +++++++++++++------------
 example/lib/main.dart                  |  14 +
 lib/parse.dart                         |   4 -
 lib/src/base/parse_constants.dart      |   2 +-
 lib/src/network/parse_http_client.dart |   2 +-
 lib/src/objects/parse_base.dart        |  36 +-
 lib/src/objects/parse_object.dart      |  21 +-
 lib/src/objects/parse_response.dart    |   2 +-
 lib/src/objects/parse_user.dart        |  14 +-
 lib/src/utils/parse_decoder.dart       |   2 +-
 lib/src/utils/parse_encoder.dart       |  16 +-
 lib/src/utils/parse_utils_date.dart    |  51 ---
 lib/src/utils/parse_utils_objects.dart |   9 -
 13 files changed, 311 insertions(+), 333 deletions(-)
 delete mode 100644 lib/src/utils/parse_utils_date.dart
 delete mode 100644 lib/src/utils/parse_utils_objects.dart

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d754f93d2..72b978510 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -11,63 +11,17 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="671a34b5-b647-4093-b4db-14fa3bb81bec" name="Default" comment="Version 1.0.4 - Fixing duplicate 'getAll' &amp; pin issue">
-      <change afterPath="$PROJECT_DIR$/.idea/flutter_parse_sdk.iml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/src/base/parse_constants.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/src/data/parse_core_data.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/src/enums/parse_enum_api_rq.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/src/network/parse_http_client.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/src/network/parse_query.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/src/objects/parse_base.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/src/objects/parse_clonable.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/src/objects/parse_error.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/src/objects/parse_function.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/src/objects/parse_geo_point.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/src/objects/parse_object.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/src/objects/parse_response.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/src/objects/parse_user.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/src/utils/parse_decoder.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/src/utils/parse_encoder.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/src/utils/parse_logger.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/src/utils/parse_utils.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/src/utils/parse_utils_date.dart" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/lib/src/utils/parse_utils_objects.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Flutter_Plugins.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Flutter_Plugins.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Flutter_for_Android.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/runConfigurations/example_lib_main_dart.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/example/android/gradlew" beforeDir="false" afterPath="$PROJECT_DIR$/example/android/gradlew" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/ios/Flutter/Debug.xcconfig" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/Flutter/Debug.xcconfig" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/ios/Flutter/Release.xcconfig" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/Flutter/Release.xcconfig" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/example/lib/application_constants.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/application_constants.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/example/lib/diet_plan.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/diet_plan.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/example/lib/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/main.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/base/parse_constants.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/data/parse_data.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/data/parse_data_objects.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/data/parse_data_server.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/data/parse_data_user.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/enums/parse_enum_object_call.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/enums/parse_enum_user_call.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/network/parse_http_client.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/network/parse_livequery.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/network/parse_livequery.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/network/parse_query.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/objects/parse_base.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/objects/parse_exception.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/objects/parse_object.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/objects/parse_response.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/objects/parse_user.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/parse.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/parse.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/utils/parse_utils_date.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/utils/parse_utils_network.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/utils/parse_utils_objects.dart" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/base/parse_constants.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/base/parse_constants.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/network/parse_http_client.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/network/parse_http_client.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/objects/parse_base.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/objects/parse_base.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/objects/parse_object.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/objects/parse_object.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/objects/parse_response.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/objects/parse_response.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/objects/parse_user.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/objects/parse_user.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/utils/parse_decoder.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/utils/parse_decoder.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/utils/parse_encoder.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/utils/parse_encoder.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/.idea/shelf/" />
@@ -130,8 +84,26 @@
       <file leaf-file-name="parse_base.dart" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_base.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="313">
-              <caret line="53" column="32" selection-start-line="53" selection-start-column="32" selection-end-line="53" selection-end-column="32" />
+            <state relative-caret-position="102">
+              <caret line="66" column="25" selection-start-line="66" selection-start-column="25" selection-end-line="66" selection-end-column="25" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="date_time.dart" pinned="false" current-in-tab="false">
+        <entry file="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/core/date_time.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="168">
+              <caret line="276" column="21" selection-start-line="276" selection-start-column="21" selection-end-line="276" selection-end-column="21" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="parse_constants.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/base/parse_constants.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="85">
+              <caret line="5" selection-start-line="5" selection-end-line="5" />
             </state>
           </provider>
         </entry>
@@ -139,8 +111,44 @@
       <file leaf-file-name="parse_user.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_user.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="211">
-              <caret line="259" column="48" selection-start-line="259" selection-start-column="48" selection-end-line="259" selection-end-column="48" />
+            <state relative-caret-position="73">
+              <caret line="169" column="5" selection-start-line="169" selection-start-column="5" selection-end-line="169" selection-end-column="5" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="parse_encoder.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_encoder.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="369">
+              <caret line="53" column="74" selection-start-line="53" selection-start-column="74" selection-end-line="53" selection-end-column="74" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="parse_utils_date.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_utils_date.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="45">
+              <caret line="3" column="16" selection-start-line="3" selection-start-column="16" selection-end-line="3" selection-end-column="16" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="parse_decoder.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_decoder.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-189">
+              <caret line="19" column="8" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="8" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="330">
+              <caret line="68" column="38" selection-start-line="68" selection-start-column="38" selection-end-line="68" selection-end-column="38" />
             </state>
           </provider>
         </entry>
@@ -154,6 +162,15 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="parse_object.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_object.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="136">
+              <caret line="59" column="25" selection-start-line="59" selection-start-column="25" selection-end-line="59" selection-end-column="25" />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FindInProjectRecents">
@@ -177,6 +194,9 @@
       <find>toJson</find>
       <find>toString</find>
       <find>encode(</find>
+      <find>Json()</find>
+      <find>saV</find>
+      <find>save</find>
     </findStrings>
     <replaceStrings>
       <replace>part</replace>
@@ -226,24 +246,24 @@
         <option value="$PROJECT_DIR$/lib/src/utils/parse_utils_date.dart" />
         <option value="$PROJECT_DIR$/lib/src/objects/parse_user_response.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/lib/src/network/parse_http_client.dart" />
         <option value="$PROJECT_DIR$/lib/src/enums/parse_enum_api_rq.dart" />
         <option value="$PROJECT_DIR$/lib/src/network/parse_query.dart" />
         <option value="$PROJECT_DIR$/lib/parse.dart" />
         <option value="$PROJECT_DIR$/lib/src/objects/parse_error.dart" />
-        <option value="$PROJECT_DIR$/lib/src/objects/parse_response.dart" />
         <option value="$PROJECT_DIR$/lib/src/utils/parse_logger.dart" />
-        <option value="$PROJECT_DIR$/lib/src/utils/parse_decoder.dart" />
         <option value="$PROJECT_DIR$/lib/src/utils/parse_utils.dart" />
-        <option value="$PROJECT_DIR$/lib/src/base/parse_constants.dart" />
         <option value="$PROJECT_DIR$/example/lib/diet_plan.dart" />
-        <option value="$PROJECT_DIR$/example/lib/main.dart" />
         <option value="$PROJECT_DIR$/example/lib/application_constants.dart" />
-        <option value="$PROJECT_DIR$/lib/src/objects/parse_user.dart" />
         <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/CHANGELOG.md" />
+        <option value="$PROJECT_DIR$/lib/src/objects/parse_response.dart" />
+        <option value="$PROJECT_DIR$/example/lib/main.dart" />
         <option value="$PROJECT_DIR$/lib/src/objects/parse_object.dart" />
+        <option value="$PROJECT_DIR$/lib/src/network/parse_http_client.dart" />
+        <option value="$PROJECT_DIR$/lib/src/objects/parse_user.dart" />
         <option value="$PROJECT_DIR$/lib/src/utils/parse_encoder.dart" />
+        <option value="$PROJECT_DIR$/lib/src/base/parse_constants.dart" />
+        <option value="$PROJECT_DIR$/lib/src/utils/parse_decoder.dart" />
         <option value="$PROJECT_DIR$/lib/src/objects/parse_base.dart" />
       </list>
     </option>
@@ -259,24 +279,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="AndroidView">
-        <subPane>
-          <expand>
-            <path>
-              <item name="flutter_parse_sdk" type="1abcf292:AndroidViewProjectNode" />
-              <item name="main" type="e9137016:NonAndroidModuleNode" />
-            </path>
-            <path>
-              <item name="flutter_parse_sdk" type="1abcf292:AndroidViewProjectNode" />
-              <item name="main" type="e9137016:NonAndroidModuleNode" />
-              <item name="java" type="f7eae187:NonAndroidSourceTypeNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -289,12 +291,6 @@
               <item name="flutter_parse_sdk" type="462c0819:PsiDirectoryNode" />
               <item name="example" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="flutter_parse_sdk" type="b2602c69:ProjectViewProjectNode" />
-              <item name="flutter_parse_sdk" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-              <item name="lib" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="flutter_parse_sdk" type="b2602c69:ProjectViewProjectNode" />
               <item name="flutter_parse_sdk" type="462c0819:PsiDirectoryNode" />
@@ -352,6 +348,24 @@
           <select />
         </subPane>
       </pane>
+      <pane id="AndroidView">
+        <subPane>
+          <expand>
+            <path>
+              <item name="flutter_parse_sdk" type="1abcf292:AndroidViewProjectNode" />
+              <item name="main" type="e9137016:NonAndroidModuleNode" />
+            </path>
+            <path>
+              <item name="flutter_parse_sdk" type="1abcf292:AndroidViewProjectNode" />
+              <item name="main" type="e9137016:NonAndroidModuleNode" />
+              <item name="java" type="f7eae187:NonAndroidSourceTypeNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -367,13 +381,13 @@
     <property name="show.migrate.to.gradle.popup" value="false" />
   </component>
   <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="C:\Users\phill\Desktop\Flutter Home Apps\flutter_parse_sdk\lib\src" />
-    </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/lib/src/objects" />
       <recent name="C:\Users\phill\Desktop\Flutter Home Apps\flutter_parse_sdk\lib\objects" />
     </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\Users\phill\Desktop\Flutter Home Apps\flutter_parse_sdk\lib\src" />
+    </key>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -568,73 +582,73 @@
     <editor active="true" />
     <layout>
       <window_info anchor="bottom" id="TODO" order="6" sideWeight="0.49898854" weight="0.32785088" />
-      <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49359408" weight="0.26535088" />
       <window_info anchor="right" id="Palette&#9;" order="8" />
       <window_info id="Image Layers" order="5" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.28051248" side_tool="true" visible="true" weight="0.3859649" />
+      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.33985165" side_tool="true" weight="0.41557017" />
       <window_info anchor="bottom" id="Flutter Performance" order="11" side_tool="true" />
       <window_info anchor="bottom" id="Dart Analysis" order="7" sideWeight="0.4962913" weight="0.3267544" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.66756576" weight="0.41557017" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.6601483" visible="true" weight="0.41557017" />
       <window_info anchor="bottom" id="Version Control" order="12" sideWeight="0.49308175" weight="0.32692307" />
       <window_info anchor="bottom" id="Terminal" order="13" sideWeight="0.49566475" weight="0.3242938" />
       <window_info anchor="right" id="Flutter Outline" order="6" weight="0.32922202" />
       <window_info id="Capture Tool" order="7" />
       <window_info id="Designer" order="2" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.3047876" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.30950776" />
       <window_info anchor="right" id="Android WiFi ADB" order="7" weight="0.32908162" />
-      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.49937108" weight="0.32819384" />
+      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.49898854" weight="0.32785088" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Theme Preview" order="9" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.71948755" visible="true" weight="0.3859649" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.7134187" weight="0.3859649" />
       <window_info id="Favorites" order="3" side_tool="true" />
       <window_info anchor="right" id="Flutter Inspector" order="3" />
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
+      <window_info id="Captures" order="6" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info id="Build Variants" order="4" side_tool="true" />
-      <window_info id="Captures" order="6" weight="0.25" />
       <window_info anchor="bottom" id="Android Profiler" order="9" show_stripe_button="false" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="bottom" id="Logcat" order="8" sideWeight="0.49905124" weight="0.5562914" />
+      <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49359408" weight="0.26535088" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="right" id="Device File Explorer" order="5" side_tool="true" />
     </layout>
     <layout-to-restore>
-      <window_info id="Designer" order="0" />
-      <window_info anchor="bottom" id="Dart Analysis" order="0" weight="0.32972974" />
-      <window_info id="Build Variants" order="1" side_tool="true" />
-      <window_info id="Image Layers" order="2" />
-      <window_info anchor="bottom" id="Run" order="10" sideWeight="0.86622393" visible="true" weight="0.43046358" />
-      <window_info anchor="bottom" id="Cvs" order="12" weight="0.25" />
-      <window_info anchor="right" id="Ant Build" order="8" weight="0.25" />
-      <window_info anchor="right" id="Flutter Inspector" order="1" />
-      <window_info anchor="bottom" id="Logcat" order="3" sideWeight="0.49905124" weight="0.5562914" />
-      <window_info anchor="bottom" id="Android Profiler" order="1" show_stripe_button="false" />
-      <window_info id="Capture Tool" order="4" />
-      <window_info anchor="right" id="Capture Analysis" order="2" />
-      <window_info anchor="right" id="Commander" order="7" weight="0.4" />
-      <window_info anchor="bottom" id="Event Log" order="2" sideWeight="0.5009488" side_tool="true" weight="0.5844371" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="9" weight="0.25" />
-      <window_info anchor="right" id="Device File Explorer" order="3" side_tool="true" />
-      <window_info anchor="right" id="Flutter Outline" order="4" weight="0.32922202" />
-      <window_info anchor="right" id="Android WiFi ADB" order="0" weight="0.32908162" />
-      <window_info anchor="bottom" id="Flutter Performance" order="4" side_tool="true" />
-      <window_info anchor="bottom" id="Version Control" order="5" weight="0.3294702" />
-      <window_info anchor="bottom" id="Terminal" order="6" sideWeight="0.49840087" weight="0.56456953" />
-      <window_info anchor="bottom" id="Find" order="9" />
-      <window_info id="Captures" order="7" weight="0.25" />
-      <window_info content_ui="combo" id="Project" order="5" visible="true" weight="0.28061223" />
-      <window_info anchor="bottom" id="Messages" order="7" sideWeight="0.49620494" weight="0.26821193" />
-      <window_info anchor="bottom" id="Message" order="8" />
-      <window_info anchor="bottom" id="TODO" order="14" />
-      <window_info anchor="right" id="Palette&#9;" order="5" />
-      <window_info anchor="right" id="Theme Preview" order="6" />
-      <window_info id="Structure" order="6" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="13" weight="0.4" />
+      <window_info id="Designer" order="2" />
       <window_info id="Favorites" order="3" side_tool="true" />
-      <window_info anchor="bottom" id="Debug" order="11" sideWeight="0.49905124" weight="0.5149007" />
+      <window_info anchor="bottom" id="Dart Analysis" order="7" sideWeight="0.4962913" weight="0.3267544" />
+      <window_info id="Build Variants" order="4" side_tool="true" />
+      <window_info id="Image Layers" order="5" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.6601483" visible="true" weight="0.41557017" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" id="Flutter Inspector" order="3" />
+      <window_info anchor="bottom" id="Logcat" order="8" sideWeight="0.49905124" weight="0.5562914" />
+      <window_info id="Captures" order="6" weight="0.25" />
+      <window_info id="Capture Tool" order="7" />
+      <window_info anchor="right" id="Capture Analysis" order="4" />
+      <window_info anchor="bottom" id="Android Profiler" order="9" show_stripe_button="false" />
+      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
+      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.33985165" side_tool="true" visible="true" weight="0.41557017" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Device File Explorer" order="5" side_tool="true" />
+      <window_info anchor="right" id="Flutter Outline" order="6" weight="0.32922202" />
+      <window_info anchor="right" id="Android WiFi ADB" order="7" weight="0.32908162" />
+      <window_info anchor="bottom" id="Flutter Performance" order="11" side_tool="true" />
+      <window_info anchor="bottom" id="Version Control" order="12" sideWeight="0.49308175" weight="0.32692307" />
+      <window_info anchor="bottom" id="Terminal" order="13" sideWeight="0.49566475" weight="0.3242938" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.30950776" />
+      <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49359408" weight="0.26535088" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="TODO" order="6" sideWeight="0.49898854" weight="0.32785088" />
+      <window_info anchor="right" id="Palette&#9;" order="8" />
+      <window_info anchor="right" id="Theme Preview" order="9" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.49898854" weight="0.32785088" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.7134187" weight="0.3859649" />
     </layout-to-restore>
   </component>
   <component name="UnknownFeatures">
@@ -659,34 +673,19 @@
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="Dart">
-          <url>file://$PROJECT_DIR$/lib/src/objects/parse_user.dart</url>
-          <line>183</line>
-          <option name="timeStamp" value="21" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="Dart">
-          <url>file://$PROJECT_DIR$/lib/src/objects/parse_user.dart</url>
-          <line>186</line>
-          <option name="timeStamp" value="30" />
+          <url>file://$PROJECT_DIR$/lib/src/objects/parse_object.dart</url>
+          <line>59</line>
+          <option name="timeStamp" value="52" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="Dart">
-          <url>file://$PROJECT_DIR$/lib/src/objects/parse_user.dart</url>
-          <line>188</line>
-          <option name="timeStamp" value="31" />
+          <url>file://$PROJECT_DIR$/lib/src/objects/parse_object.dart</url>
+          <line>74</line>
+          <option name="timeStamp" value="53" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="Dart">
           <url>file://$PROJECT_DIR$/lib/src/objects/parse_user.dart</url>
-          <line>259</line>
-          <option name="timeStamp" value="32" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="Dart">
-          <url>file://$PROJECT_DIR$/lib/src/objects/parse_response.dart</url>
-          <line>22</line>
-          <option name="timeStamp" value="33" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="Dart">
-          <url>file://$PROJECT_DIR$/lib/src/objects/parse_response.dart</url>
-          <line>46</line>
-          <option name="timeStamp" value="34" />
+          <line>183</line>
+          <option name="timeStamp" value="54" />
         </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
@@ -694,7 +693,7 @@
           <properties />
         </breakpoint>
       </default-breakpoints>
-      <option name="time" value="35" />
+      <option name="time" value="58" />
     </breakpoint-manager>
   </component>
   <component name="debuggerHistoryManager">
@@ -752,9 +751,6 @@
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/intl-0.15.7/lib/src/intl/date_format_field.dart" />
-    <entry file="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0/lib/src/base_client.dart" />
-    <entry file="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0/lib/src/io_client.dart" />
     <entry file="file://$PROJECT_DIR$/lib/utils/parse_utils_date.dart" />
     <entry file="file://$PROJECT_DIR$/lib/utils/parse_utils_objects.dart" />
     <entry file="file://$PROJECT_DIR$/lib/data/parse_data_user.dart" />
@@ -770,13 +766,6 @@
     <entry file="file://$USER_HOME$/development/flutter/packages/flutter/lib/src/widgets/framework.dart" />
     <entry file="file://$USER_HOME$/development/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0+1/lib/http.dart" />
     <entry file="file://$USER_HOME$/development/flutter/bin/cache/dart-sdk/lib/convert/json.dart" />
-    <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_utils_date.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="3" column="25" selection-start-line="3" selection-start-column="9" selection-end-line="3" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_response.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="415">
@@ -820,17 +809,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/parse.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="371">
-          <caret line="102" column="10" selection-start-line="102" selection-start-column="10" selection-end-line="102" selection-end-column="10" />
-          <folding>
-            <element signature="e#28#48#0" expanded="true" />
-            <element signature="e#264#301#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_logger.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="272">
@@ -845,13 +823,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0+1/lib/src/base_client.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="219">
-          <caret line="162" column="16" selection-start-line="162" selection-start-column="16" selection-end-line="162" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0+1/lib/src/utils.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-153">
@@ -859,20 +830,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_decoder.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1088">
-          <caret line="64" column="50" selection-start-line="64" selection-start-column="50" selection-end-line="64" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/base/parse_constants.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="714">
-          <caret line="42" column="19" selection-start-line="42" selection-start-column="19" selection-end-line="42" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/data/parse_core_data.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="748">
@@ -887,13 +844,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/network/parse_http_client.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="70" selection-start-line="2" selection-start-column="70" selection-end-line="2" selection-end-column="70" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/network/parse_livequery.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="17">
@@ -915,20 +865,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="573">
-          <caret line="111" column="34" selection-start-line="111" selection-start-column="34" selection-end-line="111" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/internal/cast.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="285" column="24" selection-start-line="285" selection-start-column="24" selection-end-line="285" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/example/lib/diet_plan.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="311">
@@ -984,17 +920,42 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_object.dart">
+    <entry file="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/internal/cast.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="73" column="71" selection-start-line="73" selection-start-column="71" selection-end-line="73" selection-end-column="71" />
+        <state relative-caret-position="168">
+          <caret line="285" column="24" selection-start-line="285" selection-start-column="24" selection-end-line="285" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_encoder.dart">
+    <entry file="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/convert/json.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="16" column="8" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="8" />
+        <state relative-caret-position="168">
+          <caret line="702" column="6" selection-start-line="702" selection-start-column="6" selection-end-line="702" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0+1/lib/src/base_client.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="177">
+          <caret line="51" column="19" selection-start-line="51" selection-start-column="19" selection-end-line="51" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/parse.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1734">
+          <caret line="102" column="10" selection-start-line="102" selection-start-column="10" selection-end-line="102" selection-end-column="10" />
+          <folding>
+            <element signature="e#28#48#0" expanded="true" />
+            <element signature="e#264#301#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/network/parse_http_client.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="255">
+          <caret line="15" column="6" selection-start-line="15" selection-start-column="6" selection-end-line="15" selection-end-column="6" />
         </state>
       </provider>
     </entry>
@@ -1005,17 +966,73 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://C:/Programming/Flutter/bin/cache/pkg/sky_engine/lib/core/date_time.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="251" column="54" selection-start-line="251" selection-start-column="54" selection-end-line="251" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="330">
+          <caret line="68" column="38" selection-start-line="68" selection-start-column="38" selection-end-line="68" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_object.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="136">
+          <caret line="59" column="25" selection-start-line="59" selection-start-column="25" selection-end-line="59" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/base/parse_constants.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="5" selection-start-line="5" selection-end-line="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/core/date_time.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="168">
+          <caret line="276" column="21" selection-start-line="276" selection-start-column="21" selection-end-line="276" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_decoder.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-189">
+          <caret line="19" column="8" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_utils_date.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="16" selection-start-line="3" selection-start-column="16" selection-end-line="3" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_encoder.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="369">
+          <caret line="53" column="74" selection-start-line="53" selection-start-column="74" selection-end-line="53" selection-end-column="74" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_user.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="211">
-          <caret line="259" column="48" selection-start-line="259" selection-start-column="48" selection-end-line="259" selection-end-column="48" />
+        <state relative-caret-position="73">
+          <caret line="169" column="5" selection-start-line="169" selection-start-column="5" selection-end-line="169" selection-end-column="5" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_base.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="313">
-          <caret line="53" column="32" selection-start-line="53" selection-start-column="32" selection-end-line="53" selection-end-column="32" />
+        <state relative-caret-position="102">
+          <caret line="66" column="25" selection-start-line="66" selection-start-column="25" selection-end-line="66" selection-end-column="25" />
         </state>
       </provider>
     </entry>
diff --git a/example/lib/main.dart b/example/lib/main.dart
index f7e27a4b5..ebd6e3d0e 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -51,6 +51,7 @@ class _MyAppState extends State<MyApp> {
   }
 
   runTestQueries() {
+    createItem();
     getAllItems();
     getAllItemsByName();
     getSingleItem();
@@ -59,6 +60,19 @@ class _MyAppState extends State<MyApp> {
     initUser();
   }
 
+  void createItem() async {
+
+    var newObject = ParseObject('TestObjectForApi');
+    newObject.set<String>('name', 'testItem');
+    newObject.set<int>('age', 26);
+
+    var apiResponse = await newObject.create();
+
+    if (apiResponse.success && apiResponse.result != null) {
+        print(ApplicationConstants.keyAppName + ": " + apiResponse.result.toString());
+    }
+  }
+
   void getAllItemsByName() async {
     var apiResponse = await ParseObject('ParseTableName').getAll();
 
diff --git a/lib/parse.dart b/lib/parse.dart
index 2f38f3941..822840149 100644
--- a/lib/parse.dart
+++ b/lib/parse.dart
@@ -45,10 +45,6 @@ part 'src/utils/parse_logger.dart';
 
 part 'src/utils/parse_utils.dart';
 
-part 'src/utils/parse_utils_date.dart';
-
-part 'src/utils/parse_utils_objects.dart';
-
 class Parse {
   ParseCoreData data;
   final ParseHTTPClient client = new ParseHTTPClient();
diff --git a/lib/src/base/parse_constants.dart b/lib/src/base/parse_constants.dart
index 2b7902730..89002b7dd 100644
--- a/lib/src/base/parse_constants.dart
+++ b/lib/src/base/parse_constants.dart
@@ -16,7 +16,7 @@ const String keyEndPointHealth = '/health';
 const String keyVarClassName = 'className';
 const String keyVarObjectId = 'objectId';
 const String keyVarCreatedAt = 'createdAt';
-const String keyVarUpdatedAt = 'updatedAT';
+const String keyVarUpdatedAt = 'updatedAt';
 const String keyVarUsername = 'username';
 const String keyVarEmail = 'email';
 const String keyVarPassword = 'password';
diff --git a/lib/src/network/parse_http_client.dart b/lib/src/network/parse_http_client.dart
index c3656302c..8b549938c 100644
--- a/lib/src/network/parse_http_client.dart
+++ b/lib/src/network/parse_http_client.dart
@@ -13,7 +13,7 @@ class ParseHTTPClient extends BaseClient {
   Future<StreamedResponse> send(BaseRequest request) {
     request.headers[keyHeaderUserAgent] = _userAgent;
     request.headers[keyHeaderApplicationId] = data.applicationId;
-    request.headers[keyHeaderContentType] = keyHeaderContentTypeJson;
+    //request.headers[keyHeaderContentType] = keyHeaderContentTypeJson;
     if (data.masterKey != null) request.headers[keyHeaderMasterKey] = data.masterKey;
     return _client.send(request);
   }
diff --git a/lib/src/objects/parse_base.dart b/lib/src/objects/parse_base.dart
index 3d77c7f0b..20e3f1798 100644
--- a/lib/src/objects/parse_base.dart
+++ b/lib/src/objects/parse_base.dart
@@ -16,16 +16,10 @@ abstract class ParseBase {
   set objectId(String objectId) => set<String>(keyVarObjectId, objectId);
 
   /// Returns [DateTime] createdAt
-  DateTime get createdAt => stringToDateTime(get<String>(keyVarCreatedAt));
-
-  set createdAt(DateTime createdAt) =>
-      set<String>(keyVarCreatedAt, dateTimeToString(createdAt));
+  DateTime get createdAt => get<DateTime>(keyVarCreatedAt);
 
   /// Returns [DateTime] updatedAt
-  DateTime get updatedAt => stringToDateTime(get<String>(keyVarUpdatedAt));
-
-  set updatedAt(DateTime updatedAt) =>
-      set<String>(keyVarUpdatedAt, dateTimeToString(updatedAt));
+  DateTime get updatedAt => get<DateTime>(keyVarUpdatedAt);
 
   /// Converts object to [String] in JSON format
   @protected
@@ -39,11 +33,11 @@ abstract class ParseBase {
     }
 
     if (createdAt != null) {
-      map[keyVarCreatedAt] = dateTimeToString(createdAt);
+      map[keyVarCreatedAt] = createdAt.toIso8601String();
     }
 
     if (updatedAt != null) {
-      map[keyVarUpdatedAt] = dateTimeToString(updatedAt);
+      map[keyVarUpdatedAt] = updatedAt.toIso8601String();
     }
 
     getObjectData().forEach((key, value) {
@@ -51,16 +45,18 @@ abstract class ParseBase {
     });
 
     if (forApiRQ) {
-     map.remove(keyVarClassName);
-     map.remove(keyVarAcl);
-     map.remove(keyParamSessionToken);
+      map.remove(keyVarCreatedAt);
+      map.remove(keyVarUpdatedAt);
+      map.remove(keyVarClassName);
+      map.remove(keyVarAcl);
+      map.remove(keyParamSessionToken);
     }
 
     return map;
   }
 
   @override
-  String toString() => JsonEncoder().convert(toJson());
+  String toString() => json.encode(toJson());
 
   @protected
   fromJson(Map objectData) {
@@ -70,9 +66,9 @@ abstract class ParseBase {
       } else if (key == keyVarObjectId) {
         objectId = value;
       } else if (key == keyVarCreatedAt) {
-        createdAt = stringToDateTime(value);
+        set<DateTime>(keyVarCreatedAt, DateTime.parse(value));
       } else if (key == keyVarUpdatedAt) {
-        updatedAt = stringToDateTime(value);
+        set<DateTime>(keyVarUpdatedAt, DateTime.parse(value));
       } else {
         getObjectData()[key] = parseDecode(value);
       }
@@ -83,7 +79,7 @@ abstract class ParseBase {
 
   /// Creates a copy of this class
   @protected
-  copy() => fromJson(JsonDecoder().convert(toJson()));
+  copy() => fromJson(json.decode(toJson()));
 
   /// Sets all the objects variables
   @protected
@@ -135,7 +131,9 @@ abstract class ParseBase {
   /// Replicates Android SDK pin process and saves object to storage
   Future<bool> pin() async {
     if (objectId != null) {
-      await ParseCoreData().getStore().setString(objectId, JsonEncoder().convert(toJson()));
+      await ParseCoreData()
+          .getStore()
+          .setString(objectId, json.encode(toJson()));
       return true;
     } else {
       return false;
@@ -163,7 +161,7 @@ abstract class ParseBase {
       var itemFromStore = ParseCoreData().getStore().getString(objectId);
 
       if (itemFromStore != null) {
-        var map = JsonDecoder().convert(itemFromStore);
+        var map = json.decode(itemFromStore);
 
         if (map != null) {
           return fromJson(map);
diff --git a/lib/src/objects/parse_object.dart b/lib/src/objects/parse_object.dart
index 8ad2a9093..66b75736f 100644
--- a/lib/src/objects/parse_object.dart
+++ b/lib/src/objects/parse_object.dart
@@ -1,8 +1,7 @@
 part of flutter_parse_sdk;
 
 class ParseObject extends ParseBase implements ParseCloneable {
-
-  ParseObject.clone(String className): this('className');
+  ParseObject.clone(String className) : this('className');
 
   @override
   clone(Map map) => ParseObject.clone(className)..fromJson(map);
@@ -16,18 +15,18 @@ class ParseObject extends ParseBase implements ParseCloneable {
   /// [String] className refers to the Table Name in your Parse Server,
   /// [bool] debug will overwrite the current default debug settings and
   /// [ParseHttpClient] can be overwritten to create your own HTTP Client
-  ParseObject(String className, {bool debug: false}): super() {
+  ParseObject(String className, {bool debug: false}) : super() {
     setClassName(className);
     _path = "$keyEndPointClasses$className";
     setClient(ParseHTTPClient());
     setDebug(isDebugEnabled(objectLevelDebug: debug));
   }
 
-  void setDebug(bool debug){
+  void setDebug(bool debug) {
     _debug = debug;
   }
 
-  void setClient(ParseHTTPClient client){
+  void setClient(ParseHTTPClient client) {
     _client = client;
   }
 
@@ -57,7 +56,8 @@ class ParseObject extends ParseBase implements ParseCloneable {
   Future<ParseResponse> create() async {
     try {
       var uri = _client.data.serverUrl + "$_path";
-      var result = await _client.post(uri, body: toJson(forApiRQ: true));
+      var body = json.encode(toJson(forApiRQ: true));
+      var result = await _client.post(uri, body: body);
       return handleResponse(result, ParseApiRQ.create);
     } on Exception catch (e) {
       return handleException(e, ParseApiRQ.create);
@@ -71,7 +71,8 @@ class ParseObject extends ParseBase implements ParseCloneable {
     } else {
       try {
         var uri = "${ParseCoreData().serverUrl}$_path/$objectId";
-        var result = await _client.put(uri, body: toJson(forApiRQ: true));
+        var body = json.encode(toJson(forApiRQ: true));
+        var result = await _client.put(uri, body: body);
         return handleResponse(result, ParseApiRQ.save);
       } on Exception catch (e) {
         return handleException(e, ParseApiRQ.save);
@@ -107,7 +108,8 @@ class ParseObject extends ParseBase implements ParseCloneable {
     ParseResponse parseResponse = ParseResponse.handleResponse(this, response);
 
     if (_debug) {
-      logger(ParseCoreData().appName, className, type.toString(), parseResponse);
+      logger(
+          ParseCoreData().appName, className, type.toString(), parseResponse);
     }
 
     return parseResponse;
@@ -119,7 +121,8 @@ class ParseObject extends ParseBase implements ParseCloneable {
     ParseResponse parseResponse = ParseResponse.handleException(exception);
 
     if (_debug) {
-      logger(ParseCoreData().appName, className, type.toString(), parseResponse);
+      logger(
+          ParseCoreData().appName, className, type.toString(), parseResponse);
     }
 
     return parseResponse;
diff --git a/lib/src/objects/parse_response.dart b/lib/src/objects/parse_response.dart
index 102a5ca49..7c4cb22ec 100644
--- a/lib/src/objects/parse_response.dart
+++ b/lib/src/objects/parse_response.dart
@@ -19,7 +19,7 @@ class ParseResponse {
     if (apiResponse != null) {
       parseResponse.statusCode = apiResponse.statusCode;
 
-      if (apiResponse.statusCode != 200) {
+      if (apiResponse.statusCode != 200 && apiResponse.statusCode != 201) {
         return _handleError(parseResponse, apiResponse);
       } else if (apiResponse.body == "{\"results\":[]}"){
         return _handleSuccessWithNoResults(parseResponse, 1, "Successful request, but no results found");
diff --git a/lib/src/objects/parse_user.dart b/lib/src/objects/parse_user.dart
index 9bda3cef4..2781b07d2 100644
--- a/lib/src/objects/parse_user.dart
+++ b/lib/src/objects/parse_user.dart
@@ -106,7 +106,7 @@ class ParseUser extends ParseBase implements ParseCloneable {
           headers: {
             keyHeaderRevocableSession: "1",
           },
-          body: JsonEncoder().convert(bodyData));
+          body: json.encode(bodyData));
 
       _handleResponse(response, ParseApiRQ.signUp);
       return this;
@@ -151,8 +151,7 @@ class ParseUser extends ParseBase implements ParseCloneable {
     try {
       final response = await _client.post(
           "${_client.data.serverUrl}$keyEndPointVerificationEmail",
-          body: JsonEncoder().convert({keyVarEmail: emailAddress}));
-
+          body: json.encode({keyVarEmail: emailAddress}));
       return _handleResponse(response, ParseApiRQ.verificationEmailRequest);
     } on Exception catch (e) {
       return _handleException(e, ParseApiRQ.verificationEmailRequest);
@@ -164,7 +163,7 @@ class ParseUser extends ParseBase implements ParseCloneable {
     try {
       final response = await _client.post(
           "${_client.data.serverUrl}$keyEndPointRequestPasswordReset",
-          body: JsonEncoder().convert({keyVarEmail: emailAddress}));
+          body: json.encode({keyVarEmail: emailAddress}));
       return _handleResponse(response, ParseApiRQ.requestPasswordReset);
     } on Exception catch (e) {
       return _handleException(e, ParseApiRQ.requestPasswordReset);
@@ -180,10 +179,9 @@ class ParseUser extends ParseBase implements ParseCloneable {
       return signUp();
     } else {
       try {
-        Map map = toJson(forApiRQ: true);
-        final response = await _client.put(
-            _client.data.serverUrl + "$path/$objectId",
-            body: map);
+        var uri = _client.data.serverUrl + "$path/$objectId";
+        var body = json.encode(toJson(forApiRQ: true), toEncodable: dateTimeEncoder);
+        final response = await _client.put(uri, body: body);
         return _handleResponse(response, ParseApiRQ.save);
       } on Exception catch (e) {
         return _handleException(e, ParseApiRQ.save);
diff --git a/lib/src/utils/parse_decoder.dart b/lib/src/utils/parse_decoder.dart
index 98b4c6588..9bb66ed5b 100644
--- a/lib/src/utils/parse_decoder.dart
+++ b/lib/src/utils/parse_decoder.dart
@@ -50,7 +50,7 @@ dynamic parseDecode(dynamic value) {
   switch (map["__type"]) {
     case "Date":
       String iso = map["iso"];
-      return stringToDateTime(iso);
+      return DateTime.parse(iso);
     case "Bytes":
       String val = map["base64"];
       return base64.decode(val);
diff --git a/lib/src/utils/parse_encoder.dart b/lib/src/utils/parse_encoder.dart
index 770c54442..4fc52a7ca 100644
--- a/lib/src/utils/parse_encoder.dart
+++ b/lib/src/utils/parse_encoder.dart
@@ -1,5 +1,13 @@
 part of flutter_parse_sdk;
 
+/// Custom encoder for DateTime
+dynamic dateTimeEncoder(dynamic item) {
+  if(item is DateTime) {
+    return item.toIso8601String();
+  }
+  return item;
+}
+
 bool isValidType(dynamic value) {
   return value == null ||
       value is String ||
@@ -24,7 +32,7 @@ dynamic parseEncode(dynamic value) {
   }
 
   if (value is ParseObject) {
-    return value.toJson;
+    return _encodeObject(value);
   }
 
   if (value is ParseUser) {
@@ -38,6 +46,10 @@ dynamic parseEncode(dynamic value) {
   return value;
 }
 
+String _encodeObject(ParseObject object){
+  return "{'__type': 'Pointer', $keyVarClassName: ${object.className}, $keyVarObjectId: ${object.objectId}}";
+}
+
 Map<String, dynamic> _encodeDate(DateTime date) {
-  return <String, dynamic>{"__type": "Date", "iso": dateTimeToString(date)};
+  return <String, dynamic>{"__type": "Date", "iso": date.toIso8601String()};
 }
diff --git a/lib/src/utils/parse_utils_date.dart b/lib/src/utils/parse_utils_date.dart
deleted file mode 100644
index c0073abbd..000000000
--- a/lib/src/utils/parse_utils_date.dart
+++ /dev/null
@@ -1,51 +0,0 @@
-part of flutter_parse_sdk;
-
-/// Converts a [String] into a [DateTime] from a Parse Server format
-DateTime stringToDateTime(String date) {
-  if (date == null) return null;
-
-  try {
-    return DateTime.parse(date);
-  } on FormatException {
-    return null;
-  }
-}
-
-/// Serialize [DateTime] into an ISO-8601 full-precision extended format representation.
-String dateTimeToString(DateTime datetime) {
-  if (datetime == null) return null;
-
-  if (!datetime.isUtc) {
-    datetime = datetime.toUtc();
-  }
-
-  String y = _fourDigits(datetime.year);
-  String m = _twoDigits(datetime.month);
-  String d = _twoDigits(datetime.day);
-  String h = _twoDigits(datetime.hour);
-  String min = _twoDigits(datetime.minute);
-  String sec = _twoDigits(datetime.second);
-  String ms = _threeDigits(datetime.millisecond);
-
-  return "$y-$m-${d}T$h:$min:$sec.${ms}Z";
-}
-
-String _fourDigits(int n) {
-  int absN = n.abs();
-  String sign = n < 0 ? "-" : "";
-  if (absN >= 1000) return "$n";
-  if (absN >= 100) return "${sign}0$absN";
-  if (absN >= 10) return "${sign}00$absN";
-  return "${sign}000$absN";
-}
-
-String _threeDigits(int n) {
-  if (n >= 100) return "$n";
-  if (n >= 10) return "0$n";
-  return "00$n";
-}
-
-String _twoDigits(int n) {
-  if (n >= 10) return "$n";
-return "0$n";
-}
\ No newline at end of file
diff --git a/lib/src/utils/parse_utils_objects.dart b/lib/src/utils/parse_utils_objects.dart
deleted file mode 100644
index da253939f..000000000
--- a/lib/src/utils/parse_utils_objects.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-part of flutter_parse_sdk;
-
-/// Populates the base object data from a server response
-populateObjectBaseData(ParseBase object, Map<String, dynamic> objectData) {
-  object.set(keyVarObjectId, objectData[keyVarObjectId]);
-  object.set(keyVarCreatedAt, stringToDateTime(objectData[keyVarCreatedAt]));
-  object.set(keyVarObjectId, stringToDateTime(objectData[keyVarUpdatedAt]));
-  return object;
-}