From 6a1157507549963c14b09334869d58f68991df41 Mon Sep 17 00:00:00 2001
From: Phill <phill.wiggins@gmail.com>
Date: Sun, 13 Jan 2019 15:56:20 +0000
Subject: [PATCH] Version 1.0.5 Corrected merge issues.

---
 .idea/libraries/Dart_Packages.xml      | 146 ++++++-
 .idea/vcs.xml                          |   2 +-
 .idea/workspace.xml                    | 518 +++++++++++++++++--------
 lib/src/objects/parse_object.dart      |   3 +-
 lib/src/objects/parse_user.dart        | 316 +++++++++++----
 lib/src/utils/parse_logger.dart        | 100 ++---
 lib/src/utils/parse_utils_date.dart    |  51 ---
 lib/src/utils/parse_utils_objects.dart |   9 -
 8 files changed, 775 insertions(+), 370 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/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 97a3d9f67..73f68eb5a 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -1,5 +1,149 @@
 <component name="libraryTable">
-  <library name="Dart Packages">
+  <library name="Dart Packages" type="DartPackagesLibraryType">
+    <properties>
+      <option name="packageNameToDirsMap">
+        <entry key="async">
+          <value>
+            <list>
+              <option value="C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/async-2.0.8/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="charcode">
+          <value>
+            <list>
+              <option value="C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.2/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="collection">
+          <value>
+            <list>
+              <option value="C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.14.11/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="convert">
+          <value>
+            <list>
+              <option value="C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/convert-2.1.1/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="crypto">
+          <value>
+            <list>
+              <option value="C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.6/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="cupertino_icons">
+          <value>
+            <list>
+              <option value="C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="flutter">
+          <value>
+            <list>
+              <option value="C:/Programming/Flutter/packages/flutter/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="http">
+          <value>
+            <list>
+              <option value="C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0+1/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="http_parser">
+          <value>
+            <list>
+              <option value="C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="meta">
+          <value>
+            <list>
+              <option value="C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.1.6/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="path">
+          <value>
+            <list>
+              <option value="C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/path-1.6.2/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="shared_preferences">
+          <value>
+            <list>
+              <option value="C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.4.3/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="sky_engine">
+          <value>
+            <list>
+              <option value="C:/Programming/Flutter/bin/cache/pkg/sky_engine/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="source_span">
+          <value>
+            <list>
+              <option value="C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.5.0/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="stream_channel">
+          <value>
+            <list>
+              <option value="C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.8/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="string_scanner">
+          <value>
+            <list>
+              <option value="C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.4/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="term_glyph">
+          <value>
+            <list>
+              <option value="C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.1.0/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="typed_data">
+          <value>
+            <list>
+              <option value="C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="vector_math">
+          <value>
+            <list>
+              <option value="C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.0.8/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="web_socket_channel">
+          <value>
+            <list>
+              <option value="C:/Programming/Flutter/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.9/lib" />
+            </list>
+          </value>
+        </entry>
+      </option>
+    </properties>
     <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" />
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1ddfb..94a25f7f4 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 54e4d0a5c..933415f45 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -11,7 +11,15 @@
   </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 beforePath="$PROJECT_DIR$/example/android/gradlew" beforeDir="false" afterPath="$PROJECT_DIR$/example/android/gradlew" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/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_user.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/objects/parse_user.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/utils/parse_logger.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/src/utils/parse_logger.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/utils/parse_utils_date.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/src/utils/parse_utils_objects.dart" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/.idea/shelf/" />
@@ -71,60 +79,99 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="parse_base.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_base.dart">
+      <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="187">
-              <caret line="71" column="14" lean-forward="true" selection-start-line="71" selection-start-column="14" selection-end-line="71" selection-end-column="14" />
+            <state relative-caret-position="333">
+              <caret line="34" column="37" selection-start-line="34" selection-start-column="33" selection-end-line="34" selection-end-column="37" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="parse_query.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/network/parse_query.dart">
+      <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="195">
-              <caret line="130" column="3" lean-forward="true" selection-start-line="130" selection-start-column="3" selection-end-line="130" selection-end-column="3" />
+            <state relative-caret-position="1870">
+              <caret line="110" column="13" selection-start-line="110" selection-start-column="13" selection-end-line="110" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="parse_http_client.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/network/parse_http_client.dart">
+      <file leaf-file-name="parse.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/parse.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="51">
-              <caret line="3" column="27" selection-start-line="3" selection-start-column="27" selection-end-line="3" selection-end-column="27" />
+            <state relative-caret-position="1462">
+              <caret line="86" column="24" selection-start-line="86" selection-start-column="24" selection-end-line="86" selection-end-column="24" />
+              <folding>
+                <element signature="e#28#48#0" expanded="true" />
+                <element signature="e#264#301#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="parse_enum_api_rq.dart" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/src/enums/parse_enum_api_rq.dart">
+      <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="329">
+              <caret line="44" column="33" selection-start-line="44" selection-start-column="33" selection-end-line="44" selection-end-column="33" />
+              <folding>
+                <element signature="e#0#39#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <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="187">
-              <caret line="11" column="14" lean-forward="true" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" />
+              <caret line="11" column="45" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" />
             </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">
+      <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="102">
-              <caret line="6" column="13" lean-forward="true" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+            <state relative-caret-position="4675">
+              <caret line="275" column="1" selection-start-line="275" selection-start-column="1" selection-end-line="275" selection-end-column="1" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="parse.dart" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/parse.dart">
+      <file leaf-file-name="application_constants.dart" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/example/lib/application_constants.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="63">
-              <caret line="45" column="34" selection-end-line="104" />
-              <folding>
-                <element signature="e#28#48#0" expanded="true" />
-                <element signature="e#264#301#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="68">
+              <caret line="4" column="85" selection-start-line="4" selection-start-column="85" selection-end-line="4" selection-end-column="85" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="parse_logger.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_logger.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="349">
+              <caret line="29" column="1" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="http_impl.dart" pinned="false" current-in-tab="false">
+        <entry file="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/_http/http_impl.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="139">
+              <caret line="2120" column="8" selection-start-line="2120" selection-start-column="8" selection-end-line="2120" selection-end-column="8" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="parse_http_client.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/src/network/parse_http_client.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="289">
+              <caret line="17" column="19" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
             </state>
           </provider>
         </entry>
@@ -155,6 +202,7 @@
       <find>Json()</find>
       <find>saV</find>
       <find>save</find>
+      <find>Json</find>
     </findStrings>
     <replaceStrings>
       <replace>part</replace>
@@ -168,7 +216,7 @@
     <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" />
+        <entry key="$PROJECT_DIR$" value="master" />
       </map>
     </option>
   </component>
@@ -208,21 +256,21 @@
         <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/utils/parse_logger.dart" />
         <option value="$PROJECT_DIR$/lib/src/utils/parse_utils.dart" />
         <option value="$PROJECT_DIR$/example/lib/diet_plan.dart" />
-        <option value="$PROJECT_DIR$/example/lib/application_constants.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" />
+        <option value="$PROJECT_DIR$/lib/src/objects/parse_object.dart" />
+        <option value="$PROJECT_DIR$/lib/src/objects/parse_user.dart" />
+        <option value="$PROJECT_DIR$/lib/src/utils/parse_logger.dart" />
+        <option value="$PROJECT_DIR$/example/lib/application_constants.dart" />
       </list>
     </option>
   </component>
@@ -244,6 +292,17 @@
               <item name="flutter_parse_sdk" type="b2602c69:ProjectViewProjectNode" />
               <item name="flutter_parse_sdk" 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" />
+            </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>
           </expand>
           <select />
         </subPane>
@@ -269,7 +328,7 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="SearchEverywhereHistoryKey" value="READ&#9;FILE&#9;file://C:/Users/phill/Desktop/Flutter Home Apps/flutter_parse_sdk/README.md&#10;README&#9;FILE&#9;file://C:/Users/phill/Desktop/Flutter Home Apps/flutter_parse_sdk/example/README.md&#10;application&#9;FILE&#9;file://C:/Users/phill/Desktop/Flutter Home Apps/flutter_parse_sdk/example/lib/application_constants.dart&#10;dietpla&#9;FILE&#9;file://C:/Users/phill/Desktop/Flutter Home Apps/flutter_parse_sdk/example/lib/diet_plan.dart&#10;main&#9;FILE&#9;file://C:/Users/phill/Desktop/Flutter Home Apps/flutter_parse_sdk/example/lib/main.dart&#10;parse.dart&#9;FILE&#9;file://C:/Users/phill/Desktop/Flutter Home Apps/flutter_parse_sdk/lib/parse.dart&#10;parse_consta&#9;FILE&#9;file://C:/Users/phill/Desktop/Flutter Home Apps/flutter_parse_sdk/lib/src/base/parse_constants.dart&#10;parse_en&#9;FILE&#9;file://C:/Users/phill/Desktop/Flutter Home Apps/flutter_parse_sdk/lib/src/enums/parse_enum_api_rq.dart&#10;parse_cli&#9;FILE&#9;file://C:/Users/phill/Desktop/Flutter Home Apps/flutter_parse_sdk/lib/src/network/parse_http_client.dart&#10;parse_q&#9;FILE&#9;file://C:/Users/phill/Desktop/Flutter Home Apps/flutter_parse_sdk/lib/src/network/parse_query.dart&#10;parse_base&#9;FILE&#9;file://C:/Users/phill/Desktop/Flutter Home Apps/flutter_parse_sdk/lib/src/objects/parse_base.dart&#10;parse_err&#9;FILE&#9;file://C:/Users/phill/Desktop/Flutter Home Apps/flutter_parse_sdk/lib/src/objects/parse_error.dart&#10;parse_ob&#9;FILE&#9;file://C:/Users/phill/Desktop/Flutter Home Apps/flutter_parse_sdk/lib/src/objects/parse_object.dart&#10;parse&#9;FILE&#9;file://C:/Users/phill/Desktop/Flutter Home Apps/flutter_parse_sdk/lib/src/objects/parse_response.dart&#10;parse_us&#9;FILE&#9;file://C:/Users/phill/Desktop/Flutter Home Apps/flutter_parse_sdk/lib/src/objects/parse_user.dart&#10;parselog&#9;FILE&#9;file://C:/Users/phill/Desktop/Flutter Home Apps/flutter_parse_sdk/lib/src/utils/parse_logger.dart&#10;parse_utils&#9;FILE&#9;file://C:/Users/phill/Desktop/Flutter Home Apps/flutter_parse_sdk/lib/src/utils/parse_utils.dart&#10;pubs&#9;FILE&#9;file://C:/Users/phill/Desktop/Flutter Home Apps/flutter_parse_sdk/pubspec.yaml&#10;flutter_plu&#9;FILE&#9;file://C:/Users/phill/Desktop/Flutter Home Apps/flutter_parse_sdk/.idea/libraries/Flutter_Plugins.xml&#10;httpClient&#9;null&#9;null&#10;HttpClient&#9;null&#9;null" />
+    <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" />
@@ -277,7 +336,7 @@
     <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="settings.editor.selected.configurable" value="preferences.sourceCode.Dart" />
+    <property name="settings.editor.selected.configurable" value="flutter.settings" />
     <property name="show.migrate.to.gradle.popup" value="false" />
   </component>
   <component name="RecentsManager">
@@ -289,6 +348,121 @@
       <recent name="C:\Users\phill\Desktop\Flutter Home Apps\flutter_parse_sdk\lib\objects" />
     </key>
   </component>
+  <component name="RestoreUpdateTree" date="Moments ago" ActionInfo="_Update">
+    <UpdatedFiles>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Updated from server" />
+        <option name="myStatusName" value="Changed on server" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="CHANGED_ON_SERVER" />
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Updated" />
+          <option name="myStatusName" value="Changed" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="UPDATED" />
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/.idea/workspace.xml</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/example/android/gradlew</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/lib/src/objects/parse_user.dart</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/lib/src/utils/parse_logger.dart</PATH>
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Created" />
+          <option name="myStatusName" value="Created" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="CREATED" />
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/lib/src/utils/parse_utils_date.dart</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/lib/src/utils/parse_utils_objects.dart</PATH>
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Deleted" />
+          <option name="myStatusName" value="Deleted" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="true" />
+          <option name="myId" value="REMOVED_FROM_REPOSITORY" />
+        </FILE-GROUP>
+        <FILE-GROUP>
+          <option name="myUpdateName" value="Restored" />
+          <option name="myStatusName" value="Will be restored" />
+          <option name="mySupportsDeletion" value="false" />
+          <option name="myCanBeAbsent" value="false" />
+          <option name="myId" value="RESTORED" />
+        </FILE-GROUP>
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Modified" />
+        <option name="myStatusName" value="Modified" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MODIFIED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Skipped" />
+        <option name="myStatusName" value="Skipped" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="SKIPPED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Merged with conflicts" />
+        <option name="myStatusName" value="Will be merged with conflicts" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MERGED_WITH_CONFLICTS" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Merged with tree conflicts" />
+        <option name="myStatusName" value="Merged with tree conflicts" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Merged with property conflicts" />
+        <option name="myStatusName" value="Will be merged with property conflicts" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Merged" />
+        <option name="myStatusName" value="Will be merged" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="MERGED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Not in repository" />
+        <option name="myStatusName" value="Not in repository" />
+        <option name="mySupportsDeletion" value="true" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="UNKNOWN" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Locally added" />
+        <option name="myStatusName" value="Locally added" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="LOCALLY_ADDED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Locally removed" />
+        <option name="myStatusName" value="Locally removed" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="LOCALLY_REMOVED" />
+      </FILE-GROUP>
+      <FILE-GROUP>
+        <option name="myUpdateName" value="Switched" />
+        <option name="myStatusName" value="Switched" />
+        <option name="mySupportsDeletion" value="false" />
+        <option name="myCanBeAbsent" value="false" />
+        <option name="myId" value="SWITCHED" />
+      </FILE-GROUP>
+    </UpdatedFiles>
+  </component>
   <component name="RunDashboard">
     <option name="ruleStates">
       <list>
@@ -481,29 +655,30 @@
     <frame x="-8" y="0" width="1544" height="1043" extended-state="0" />
     <editor active="true" />
     <layout>
+      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.33985165" side_tool="true" weight="0.41557017" />
+      <window_info anchor="bottom" id="Dart Analysis" order="7" sideWeight="0.4962913" weight="0.3267544" />
+      <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 id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.7134187" weight="0.3859649" />
       <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.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.6601483" weight="0.41557017" />
-      <window_info anchor="bottom" id="Version Control" order="12" sideWeight="0.49308175" visible="true" weight="0.3267544" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.6601483" visible="true" weight="0.31030703" />
+      <window_info anchor="bottom" id="Version Control" order="12" sideWeight="0.49308175" weight="0.3267544" />
       <window_info anchor="bottom" id="Terminal" order="13" sideWeight="0.49566475" weight="0.3234649" />
-      <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.30950776" />
+      <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.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 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="bottom" id="Message" order="0" />
+      <window_info id="Build Variants" order="4" side_tool="true" />
       <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.33985165" side_tool="true" weight="0.41557017" />
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.30950776" />
       <window_info anchor="bottom" id="Flutter Performance" order="11" side_tool="true" />
@@ -512,11 +687,10 @@
       <window_info anchor="bottom" id="Dart Analysis" order="7" sideWeight="0.4962913" weight="0.3267544" />
       <window_info anchor="right" id="Flutter Inspector" order="3" />
       <window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49359408" weight="0.26535088" />
-      <window_info id="Build Variants" order="4" side_tool="true" />
+      <window_info anchor="bottom" id="Logcat" order="8" sideWeight="0.49905124" weight="0.5562914" />
       <window_info anchor="bottom" id="Find" order="1" sideWeight="0.49898854" weight="0.32785088" />
       <window_info anchor="right" id="Android WiFi ADB" order="7" weight="0.32908162" />
       <window_info anchor="right" id="Palette&#9;" order="8" />
-      <window_info anchor="right" id="Device File Explorer" order="5" side_tool="true" />
       <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.7134187" weight="0.3859649" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info id="Image Layers" order="5" />
@@ -530,7 +704,7 @@
       <window_info id="Capture Tool" order="7" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Logcat" order="8" sideWeight="0.49905124" weight="0.5562914" />
+      <window_info anchor="right" id="Device File Explorer" order="5" side_tool="true" />
       <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.6601483" visible="true" weight="0.41557017" />
       <window_info anchor="bottom" id="Terminal" order="13" sideWeight="0.49566475" weight="0.3242938" />
       <window_info id="Captures" order="6" weight="0.25" />
@@ -604,11 +778,6 @@
           <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>183</line>
-          <option name="timeStamp" value="54" />
-        </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
         <breakpoint type="dart-exception">
@@ -693,8 +862,14 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_utils_objects.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="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/src/objects/parse_geo_point.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="141">
@@ -709,6 +884,20 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_error.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <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/src/utils/parse_utils.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="153">
+          <caret line="9" column="15" selection-start-line="9" selection-start-column="15" selection-end-line="9" selection-end-column="15" />
+        </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">
@@ -718,7 +907,7 @@
     </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">
+        <state relative-caret-position="360">
           <caret line="44" column="7" selection-start-line="44" selection-start-column="7" selection-end-line="44" selection-end-column="7" />
         </state>
       </provider>
@@ -730,65 +919,17 @@
         </state>
       </provider>
     </entry>
-    <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="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/lib/diet_plan.dart">
+    <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="20" selection-start-line="20" selection-end-line="20" />
-          <folding>
-            <element signature="e#0#19#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <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>
-      <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 relative-caret-position="204">
+          <caret line="12" column="26" selection-start-line="12" selection-start-column="20" selection-end-line="12" selection-end-column="26" />
         </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/lib/application_constants.dart">
+    <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="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$/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>
-      <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" />
+          <caret line="4" column="2" selection-start-line="4" selection-start-column="2" selection-end-line="4" selection-end-column="2" />
         </state>
       </provider>
     </entry>
@@ -820,13 +961,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="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://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">
@@ -834,123 +968,157 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_utils_date.dart" />
-    <entry file="file://$PROJECT_DIR$/example/.idea/libraries/Flutter_Plugins.xml">
+    <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_decoder.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="8" column="12" lean-forward="true" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
+        <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$/.idea/libraries/Flutter_Plugins.xml">
+    <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_utils_date.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="8" column="12" lean-forward="true" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
-        </state>
+        <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+    <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_base.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="14" column="28" lean-forward="true" selection-start-line="14" selection-start-column="28" selection-end-line="14" selection-end-column="28" />
+        <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>
-    <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_utils.dart">
+    <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="170">
-          <caret line="10" column="1" lean-forward="true" selection-start-line="10" selection-start-column="1" selection-end-line="10" selection-end-column="1" />
+        <state relative-caret-position="187">
+          <caret line="11" column="14" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_logger.dart">
+    <entry file="file://$PROJECT_DIR$/example/lib/diet_plan.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
+        <state relative-caret-position="204">
+          <caret line="14" column="18" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="18" />
+          <folding>
+            <element signature="e#0#19#0" expanded="true" />
+          </folding>
         </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="93">
-          <caret line="32" lean-forward="true" selection-end-line="55" />
+    <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 relative-caret-position="136">
+            <caret line="8" selection-start-line="8" selection-end-line="8" />
+          </first_editor>
+          <second_editor />
         </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="51">
-          <caret line="31" lean-forward="true" selection-start-line="31" selection-end-line="31" />
+    <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="119">
+            <caret line="7" selection-start-line="7" selection-end-line="7" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+      <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/src/objects/parse_user.dart">
+    <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="255">
+            <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+      <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$/.idea/workspace.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="8" lean-forward="true" selection-end-line="276" />
+        <state relative-caret-position="357">
+          <caret line="21" column="11" selection-start-line="21" selection-start-column="11" selection-end-line="21" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_response.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="126">
-          <caret line="43" column="45" lean-forward="true" selection-start-line="43" selection-start-column="45" selection-end-line="43" selection-end-column="45" />
+        <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="901">
+          <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_object.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_response.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="61" column="30" lean-forward="true" selection-start-line="61" selection-start-column="30" selection-end-line="61" selection-end-column="30" />
+        <state relative-caret-position="187">
+          <caret line="11" column="45" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_error.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_user.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="82">
-          <caret line="10" column="8" selection-end-line="78" selection-end-column="1" />
+        <state relative-caret-position="4675">
+          <caret line="275" column="1" selection-start-line="275" selection-start-column="1" selection-end-line="275" selection-end-column="1" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/objects/parse_base.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/utils/parse_logger.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="71" column="14" lean-forward="true" selection-start-line="71" selection-start-column="14" selection-end-line="71" selection-end-column="14" />
+        <state relative-caret-position="349">
+          <caret line="29" column="1" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/network/parse_query.dart">
+    <entry file="file://C:/Programming/Flutter/bin/cache/dart-sdk/lib/_http/http_impl.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="130" column="3" lean-forward="true" selection-start-line="130" selection-start-column="3" selection-end-line="130" selection-end-column="3" />
+        <state relative-caret-position="139">
+          <caret line="2120" column="8" selection-start-line="2120" selection-start-column="8" selection-end-line="2120" selection-end-column="8" />
         </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="51">
-          <caret line="3" column="27" selection-start-line="3" selection-start-column="27" selection-end-line="3" selection-end-column="27" />
+        <state relative-caret-position="289">
+          <caret line="17" column="19" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/enums/parse_enum_api_rq.dart">
+    <entry file="file://$PROJECT_DIR$/lib/src/base/parse_constants.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="11" column="14" lean-forward="true" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" />
+        <state relative-caret-position="333">
+          <caret line="34" column="37" selection-start-line="34" selection-start-column="33" selection-end-line="34" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/src/base/parse_constants.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="13" lean-forward="true" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+        <state relative-caret-position="329">
+          <caret line="44" column="33" selection-start-line="44" selection-start-column="33" selection-end-line="44" selection-end-column="33" />
+          <folding>
+            <element signature="e#0#39#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/parse.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="63">
-          <caret line="45" column="34" selection-end-line="104" />
+        <state relative-caret-position="1462">
+          <caret line="86" column="24" selection-start-line="86" selection-start-column="24" selection-end-line="86" selection-end-column="24" />
           <folding>
             <element signature="e#28#48#0" expanded="true" />
             <element signature="e#264#301#0" expanded="true" />
@@ -958,6 +1126,20 @@
         </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="1870">
+          <caret line="110" column="13" selection-start-line="110" selection-start-column="13" selection-end-line="110" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <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" column="85" selection-start-line="4" selection-start-column="85" selection-end-line="4" selection-end-column="85" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/lib/src/objects/parse_object.dart b/lib/src/objects/parse_object.dart
index 66b75736f..dec498398 100644
--- a/lib/src/objects/parse_object.dart
+++ b/lib/src/objects/parse_object.dart
@@ -108,8 +108,7 @@ 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;
diff --git a/lib/src/objects/parse_user.dart b/lib/src/objects/parse_user.dart
index 7c4cb22ec..19e8e02cb 100644
--- a/lib/src/objects/parse_user.dart
+++ b/lib/src/objects/parse_user.dart
@@ -1,92 +1,276 @@
 part of flutter_parse_sdk;
 
-class ParseResponse {
-  bool success = false;
-  int statusCode = -1;
-  dynamic result;
-  ParseError error;
+class ParseUser extends ParseBase implements ParseCloneable {
 
-  /// Handles all the ParseObject responses
+  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
   ///
-  /// 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 && apiResponse.statusCode != 201) {
-        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;
+  /// 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;
 
-  /// 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;
+      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: json.encode(bodyData));
+
+      _handleResponse(response, ParseApiRQ.signUp);
+      return this;
+    } on Exception catch (e) {
+      return _handleException(e, ParseApiRQ.signUp);
+    }
   }
 
-  /// 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;
+  /// 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);
+    }
   }
 
-  /// 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;
+  /// Removes the current user from the session data
+  logout() {
+    _client.data.sessionId = null;
+    setObjectData(null);
   }
 
-  /// Handles successful response with results
-  static ParseResponse _handleSuccess(ParseResponse response, dynamic object, String responseBody) {
-    response.success = true;
+  /// Sends a verification email to the users email address
+  verificationEmailRequest() async {
+    try {
+      final response = await _client.post(
+          "${_client.data.serverUrl}$keyEndPointVerificationEmail",
+          body: json.encode({keyVarEmail: emailAddress}));
+      return _handleResponse(response, ParseApiRQ.verificationEmailRequest);
+    } on Exception catch (e) {
+      return _handleException(e, ParseApiRQ.verificationEmailRequest);
+    }
+  }
 
-    var map = JsonDecoder().convert(responseBody) as Map;
+  /// Sends a password reset email to the users email address
+  requestPasswordReset() async {
+    try {
+      final response = await _client.post(
+          "${_client.data.serverUrl}$keyEndPointRequestPasswordReset",
+          body: json.encode({keyVarEmail: emailAddress}));
+      return _handleResponse(response, ParseApiRQ.requestPasswordReset);
+    } on Exception catch (e) {
+      return _handleException(e, ParseApiRQ.requestPasswordReset);
+    }
+  }
 
-    if (map != null && map.length == 1 && map.containsKey('results')) {
-      response.result = _handleMultipleResults(object, map.entries.first.value);
+  /// 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 {
-      response.result = _handleSingleResult(object, map);
+      try {
+        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);
+      }
+    }
+  }
+
+  /// 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 response;
+    return null;
   }
 
-  /// Handles a response with a multiple result object
-  static _handleMultipleResults(dynamic object, dynamic map) {
-    var resultsList = List();
+  /// Gets a list of all users (limited return)
+  static Future<ParseResponse> all() async {
 
-    for (var value in map) {
-      resultsList.add(_handleSingleResult(object, value));
-    }
+    var emptyUser = ParseUser(null, null, null);
+
+    try {
+      final response = await ParseHTTPClient().get(
+          "${ParseCoreData().serverUrl}/$path");
+
+      ParseResponse parseResponse = ParseResponse.handleResponse(emptyUser, response);
 
-    return resultsList;
+      if (ParseCoreData().debug) {
+        logger(ParseCoreData().appName, keyClassUser, ParseApiRQ.getAll.toString(), parseResponse);
+      }
+
+      return parseResponse;
+    } on Exception catch (e) {
+      return ParseResponse.handleException(e);
+    }
   }
 
-  /// 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);
+  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;
+    }
+  }
+}
\ No newline at end of file
diff --git a/lib/src/utils/parse_logger.dart b/lib/src/utils/parse_logger.dart
index 9bb66ed5b..14f5a63fa 100644
--- a/lib/src/utils/parse_logger.dart
+++ b/lib/src/utils/parse_logger.dart
@@ -1,74 +1,30 @@
 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 DateTime.parse(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;
-}
+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_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 2c59d29e0..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(OBJECT_ID, objectData[OBJECT_ID]);
-  object.set(CREATED_AT, stringToDateTime(objectData[CREATED_AT]));
-  object.set(OBJECT_ID, stringToDateTime(objectData[UPDATED_AT]));
-  return object;
-}