diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 7461e43..b6de5cc 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -5,63 +5,63 @@
         <entry key="analyzer">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/analyzer-0.31.2-alpha.2/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/analyzer-0.33.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="args">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/args-1.4.3/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/args-1.5.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="async">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.0.7/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.0.8/lib" />
             </list>
           </value>
         </entry>
         <entry key="boolean_selector">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.3/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="charcode">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="collection">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.14.6/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.14.11/lib" />
             </list>
           </value>
         </entry>
         <entry key="convert">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/convert-2.0.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="crypto">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.3/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.6/lib" />
             </list>
           </value>
         </entry>
         <entry key="csslib">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.4/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.6/lib" />
             </list>
           </value>
         </entry>
@@ -89,126 +89,133 @@
         <entry key="front_end">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.12/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.6/lib" />
             </list>
           </value>
         </entry>
         <entry key="glob">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/glob-1.1.5/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/glob-1.1.7/lib" />
             </list>
           </value>
         </entry>
         <entry key="html">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/html-0.13.3/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/html-0.13.3+3/lib" />
             </list>
           </value>
         </entry>
         <entry key="http">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+16/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0/lib" />
             </list>
           </value>
         </entry>
         <entry key="http_multi_server">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.4/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.5/lib" />
             </list>
           </value>
         </entry>
         <entry key="http_parser">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.2/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="io">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/io-0.3.2+1/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/io-0.3.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="js">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/js-0.6.1/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/js-0.6.1+1/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="json_rpc_2">
+          <value>
+            <list>
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/json_rpc_2-2.0.9/lib" />
             </list>
           </value>
         </entry>
         <entry key="kernel">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.0-alpha.12/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.6/lib" />
             </list>
           </value>
         </entry>
         <entry key="logging">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+2/lib" />
             </list>
           </value>
         </entry>
         <entry key="matcher">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.2+1/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3+1/lib" />
             </list>
           </value>
         </entry>
         <entry key="meta">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.1.5/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.1.6/lib" />
             </list>
           </value>
         </entry>
         <entry key="mime">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/mime-0.9.6/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/mime-0.9.6+2/lib" />
             </list>
           </value>
         </entry>
         <entry key="multi_server_socket">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/multi_server_socket-1.0.1/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/multi_server_socket-1.0.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="node_preamble">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.1/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="package_config">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.3/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.5/lib" />
             </list>
           </value>
         </entry>
         <entry key="package_resolver">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.6/lib" />
             </list>
           </value>
         </entry>
         <entry key="path">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.5.1/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.6.2/lib" />
             </list>
           </value>
         </entry>
@@ -222,56 +229,56 @@
         <entry key="plugin">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+2/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+3/lib" />
             </list>
           </value>
         </entry>
         <entry key="pool">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/pool-1.3.4/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/pool-1.3.6/lib" />
             </list>
           </value>
         </entry>
         <entry key="pub_semver">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.4.1/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.4.2/lib" />
             </list>
           </value>
         </entry>
         <entry key="quiver">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/quiver-0.29.0+1/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/quiver-2.0.0+1/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3+3/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf_packages_handler">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.3/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf_static">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.7/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.8/lib" />
             </list>
           </value>
         </entry>
         <entry key="shelf_web_socket">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2+4/lib" />
             </list>
           </value>
         </entry>
@@ -285,171 +292,180 @@
         <entry key="source_map_stack_trace">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.5/lib" />
             </list>
           </value>
         </entry>
         <entry key="source_maps">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.5/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.8/lib" />
             </list>
           </value>
         </entry>
         <entry key="source_span">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.4.0/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.4.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="sqflite">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-0.11.0/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-0.12.2+1/lib" />
             </list>
           </value>
         </entry>
         <entry key="stack_trace">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.2/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="stream_channel">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.6/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.8/lib" />
             </list>
           </value>
         </entry>
         <entry key="string_scanner">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.2/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="synchronized">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/synchronized-1.5.0+1/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/synchronized-1.5.3/lib" />
             </list>
           </value>
         </entry>
         <entry key="term_glyph">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.1/lib" />
             </list>
           </value>
         </entry>
         <entry key="test">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/test-0.12.37/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/test-1.3.4/lib" />
             </list>
           </value>
         </entry>
         <entry key="typed_data">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.5/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6/lib" />
             </list>
           </value>
         </entry>
         <entry key="utf">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+4/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+5/lib" />
             </list>
           </value>
         </entry>
         <entry key="vector_math">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.0.6/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.0.8/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="vm_service_client">
+          <value>
+            <list>
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/vm_service_client-0.2.6/lib" />
             </list>
           </value>
         </entry>
         <entry key="watcher">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+7/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+10/lib" />
             </list>
           </value>
         </entry>
         <entry key="web_socket_channel">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.7/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.9/lib" />
             </list>
           </value>
         </entry>
         <entry key="yaml">
           <value>
             <list>
-              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.13/lib" />
+              <option value="$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.15/lib" />
             </list>
           </value>
         </entry>
       </option>
     </properties>
     <CLASSES>
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/analyzer-0.31.2-alpha.2/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/args-1.4.3/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.0.7/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.3/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.1/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.14.6/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/convert-2.0.1/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.3/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.4/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/analyzer-0.33.0/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/args-1.5.0/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.0.8/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.4/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.2/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.14.11/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/convert-2.0.2/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/crypto-2.0.6/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.6/lib" />
       <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.0-alpha.12/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/glob-1.1.5/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/html-0.13.3/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.11.3+16/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.4/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.2/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/io-0.3.2+1/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/js-0.6.1/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.0-alpha.12/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+1/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.2+1/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.1.5/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/mime-0.9.6/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/multi_server_socket-1.0.1/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.1/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.3/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.2/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.5.1/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.6/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/glob-1.1.7/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/html-0.13.3+3/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.12.0/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/http_multi_server-2.0.5/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/http_parser-3.1.3/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/io-0.3.3/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/js-0.6.1+1/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/json_rpc_2-2.0.9/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.6/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+2/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3+1/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.1.6/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/mime-0.9.6+2/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/multi_server_socket-1.0.2/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.4/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.5/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.6/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.6.2/lib" />
       <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-0.4.1/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+2/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/pool-1.3.4/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.4.1/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/quiver-0.29.0+1/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.3/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.7/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.4/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.5/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.4.0/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-0.11.0/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.2/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.6/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.2/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/synchronized-1.5.0+1/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.0/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/test-0.12.37/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.5/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+4/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.0.6/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+7/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.7/lib" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.13/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+3/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/pool-1.3.6/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.4.2/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/quiver-2.0.0+1/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/shelf-0.7.3+3/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/shelf_packages_handler-1.0.4/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/shelf_static-0.2.8/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/shelf_web_socket-0.2.2+4/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.5/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.8/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.4.1/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-0.12.2+1/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.3/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.8/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.0.4/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/synchronized-1.5.3/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.0.1/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/test-1.3.4/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.1.6/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/utf-0.9.0+5/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.0.8/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/vm_service_client-0.2.6/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+10/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.9/lib" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.15/lib" />
       <root url="file://$USER_HOME$/flutter/bin/cache/pkg/sky_engine/lib" />
       <root url="file://$USER_HOME$/flutter/packages/flutter/lib" />
       <root url="file://$USER_HOME$/flutter/packages/flutter_test/lib" />
diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml
index 1322da4..dcfea84 100644
--- a/.idea/libraries/Flutter_Plugins.xml
+++ b/.idea/libraries/Flutter_Plugins.xml
@@ -2,7 +2,7 @@
   <library name="Flutter Plugins" type="FlutterPluginsLibraryType">
     <CLASSES>
       <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-0.4.1" />
-      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-0.11.0" />
+      <root url="file://$USER_HOME$/flutter/.pub-cache/hosted/pub.dartlang.org/sqflite-0.12.2+1" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f4f13bd..b09ad33 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,29 +6,24 @@
     </shared>
   </component>
   <component name="BookmarkManager">
-    <bookmark url="file://$PROJECT_DIR$/lib/pages/task_details.dart" description="getDate" line="90" />
+    <bookmark url="file://$PROJECT_DIR$/lib/pages/task_details.dart" description="getDate" line="91" />
+  </component>
+  <component name="CMakeSettings">
+    <configurations>
+      <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
+    </configurations>
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ae62d32a-113f-440f-8de0-488503444fde" name="Default" comment="">
-      <change beforePath="" afterPath="$PROJECT_DIR$/android/app/src/main/res/values/colors.xml" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/lib/pages/home_page.dart" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/lib/pages/new_list_page.dart" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/lib/pages/rename_list_page.dart" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/lib/pages/splash.dart" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/lib/pages/task_details.dart" />
-      <change beforePath="$PROJECT_DIR$/.idea/assetWizardSettings.xml" afterPath="$PROJECT_DIR$/.idea/assetWizardSettings.xml" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change beforePath="$PROJECT_DIR$/android/app/src/main/AndroidManifest.xml" afterPath="$PROJECT_DIR$/android/app/src/main/AndroidManifest.xml" />
-      <change beforePath="$PROJECT_DIR$/android/app/src/main/res/mipmap-hdpi/ic_launcher.png" afterPath="" />
-      <change beforePath="$PROJECT_DIR$/android/app/src/main/res/mipmap-mdpi/ic_launcher.png" afterPath="" />
-      <change beforePath="$PROJECT_DIR$/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png" afterPath="" />
-      <change beforePath="$PROJECT_DIR$/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png" afterPath="" />
-      <change beforePath="$PROJECT_DIR$/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" afterPath="" />
-      <change beforePath="$PROJECT_DIR$/lib/data/database_helper.dart" afterPath="$PROJECT_DIR$/lib/data/database_helper.dart" />
-      <change beforePath="$PROJECT_DIR$/lib/main.dart" afterPath="$PROJECT_DIR$/lib/main.dart" />
-      <change beforePath="$PROJECT_DIR$/lib/model/task.dart" afterPath="$PROJECT_DIR$/lib/model/task.dart" />
-      <change beforePath="$PROJECT_DIR$/lib/task_details.dart" afterPath="" />
-      <change beforePath="$PROJECT_DIR$/pubspec.yaml" afterPath="$PROJECT_DIR$/pubspec.yaml" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/data/database_helper.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/data/database_helper.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/main.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/pages/home_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/pages/home_page.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/pages/new_list_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/pages/new_list_page.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/pages/rename_list_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/pages/rename_list_page.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/pages/splash.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/pages/splash.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/pages/task_details.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/pages/task_details.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tasks.iml" beforeDir="false" afterPath="$PROJECT_DIR$/tasks.iml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.dart_tool/" />
     <ignored path="$PROJECT_DIR$/.idea/" />
@@ -43,12 +38,27 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="main.dart" pinned="false" current-in-tab="false">
+      <file leaf-file-name="main.dart" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/main.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="285">
-              <caret line="20" column="3" lean-forward="false" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
-              <folding />
+            <state relative-caret-position="345">
+              <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
+              <folding>
+                <element signature="e#0#39#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="widget_test.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/test/widget_test.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="195">
+              <caret line="13" column="41" lean-forward="true" selection-start-line="13" selection-start-column="41" selection-end-line="13" selection-end-column="41" />
+              <folding>
+                <element signature="e#0#1048#0" expanded="true" />
+                <element signature="e#354#393#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -56,21 +66,17 @@
       <file leaf-file-name="splash.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/pages/splash.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="165">
-              <caret line="14" column="8" lean-forward="false" selection-start-line="14" selection-start-column="8" selection-end-line="14" selection-end-column="8" />
-              <folding />
+            <state relative-caret-position="45">
+              <caret line="4" column="10" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="home_page.dart" pinned="false" current-in-tab="true">
+      <file leaf-file-name="home_page.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/pages/home_page.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="366">
-              <caret line="490" column="107" lean-forward="false" selection-start-line="490" selection-start-column="107" selection-end-line="490" selection-end-column="107" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="75">
+              <caret line="6" column="37" lean-forward="true" selection-start-line="6" selection-start-column="37" selection-end-line="6" selection-end-column="37" />
             </state>
           </provider>
         </entry>
@@ -78,9 +84,8 @@
       <file leaf-file-name="rename_list_page.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/pages/rename_list_page.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="30">
-              <caret line="3" column="12" lean-forward="false" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="12" />
-              <folding />
+            <state relative-caret-position="15">
+              <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
             </state>
           </provider>
         </entry>
@@ -88,9 +93,8 @@
       <file leaf-file-name="new_list_page.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/pages/new_list_page.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="165">
-              <caret line="12" column="37" lean-forward="false" selection-start-line="12" selection-start-column="37" selection-end-line="12" selection-end-column="37" />
-              <folding />
+            <state relative-caret-position="30">
+              <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
             </state>
           </provider>
         </entry>
@@ -98,9 +102,11 @@
       <file leaf-file-name="task_details.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/pages/task_details.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1935">
-              <caret line="133" column="76" lean-forward="false" selection-start-line="133" selection-start-column="76" selection-end-line="133" selection-end-column="76" />
-              <folding />
+            <state relative-caret-position="180">
+              <caret line="13" column="11" lean-forward="true" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="11" />
+              <folding>
+                <element signature="e#0#20#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -108,8 +114,8 @@
       <file leaf-file-name="database_helper.dart" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/data/database_helper.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1395">
-              <caret line="99" column="30" lean-forward="false" selection-start-line="99" selection-start-column="30" selection-end-line="99" selection-end-column="30" />
+            <state relative-caret-position="150">
+              <caret line="10" column="46" selection-start-line="10" selection-start-column="46" selection-end-line="10" selection-end-column="46" />
               <folding>
                 <element signature="e#0#20#0" expanded="true" />
               </folding>
@@ -117,6 +123,15 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="task.dart" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/model/task.dart">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="105">
+              <caret line="7" column="7" selection-start-line="7" selection-start-column="7" selection-end-line="7" selection-end-column="7" />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -129,7 +144,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>tablena</find>
       <find>void _getTasks()</find>
       <find>getTab</find>
       <find>_getTasks()</find>
@@ -159,6 +173,7 @@
       <find>onnewtasksave</find>
       <find>detailsbut</find>
       <find>stack</find>
+      <find>package:tasks</find>
     </findStrings>
     <replaceStrings>
       <replace>pendingTaskList</replace>
@@ -176,11 +191,6 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
-  <component name="GradleLocalSettings">
-    <option name="externalProjectsViewState">
-      <projects_view />
-    </option>
-  </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
@@ -193,26 +203,25 @@
         <option value="$PROJECT_DIR$/lib/model/task.dart" />
         <option value="$PROJECT_DIR$/lib/test_task.dart" />
         <option value="$PROJECT_DIR$/pubspec.yaml" />
-        <option value="$PROJECT_DIR$/lib/main.dart" />
-        <option value="$PROJECT_DIR$/lib/pages/new_list_page.dart" />
-        <option value="$PROJECT_DIR$/lib/pages/splash.dart" />
         <option value="$PROJECT_DIR$/android/app/src/main/res/drawable/ic_launcher.xml" />
         <option value="$PROJECT_DIR$/android/app/src/main/AndroidManifest.xml" />
         <option value="$PROJECT_DIR$/android/app/src/main/res/drawable-anydpi-v6/ic_launcher.xml" />
         <option value="$PROJECT_DIR$/android/app/src/main/res/values/colors.xml" />
-        <option value="$PROJECT_DIR$/lib/pages/rename_list_page.dart" />
-        <option value="$PROJECT_DIR$/lib/pages/task_details.dart" />
-        <option value="$PROJECT_DIR$/lib/data/database_helper.dart" />
         <option value="$PROJECT_DIR$/lib/new_task_sheet.dart" />
+        <option value="$PROJECT_DIR$/lib/data/database_helper.dart" />
         <option value="$PROJECT_DIR$/lib/pages/home_page.dart" />
+        <option value="$PROJECT_DIR$/lib/pages/new_list_page.dart" />
+        <option value="$PROJECT_DIR$/lib/pages/rename_list_page.dart" />
+        <option value="$PROJECT_DIR$/lib/pages/splash.dart" />
+        <option value="$PROJECT_DIR$/lib/pages/task_details.dart" />
+        <option value="$PROJECT_DIR$/lib/main.dart" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="1" />
-    <option name="y" value="1" />
-    <option name="width" value="1364" />
-    <option name="height" value="736" />
+  <component name="ProjectFrameBounds">
+    <option name="y" value="23" />
+    <option name="width" value="1920" />
+    <option name="height" value="1177" />
   </component>
   <component name="ProjectInspectionProfilesVisibleTreeState">
     <entry key="Project Default">
@@ -245,68 +254,46 @@
   </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="AndroidView" />
-      <pane id="Scratches" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
             <path>
-              <item name="tasks" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tasks" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tasks" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tasks" type="462c0819:PsiDirectoryNode" />
-              <item name="android" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tasks" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tasks" type="462c0819:PsiDirectoryNode" />
-              <item name="assets" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="tasks" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tasks" type="462c0819:PsiDirectoryNode" />
-              <item name="assets" type="462c0819:PsiDirectoryNode" />
-              <item name="images" type="462c0819:PsiDirectoryNode" />
+              <item name="Tasks" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Tasks" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="tasks" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tasks" type="462c0819:PsiDirectoryNode" />
+              <item name="Tasks" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Tasks" type="462c0819:PsiDirectoryNode" />
               <item name="lib" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="tasks" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tasks" type="462c0819:PsiDirectoryNode" />
+              <item name="Tasks" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Tasks" type="462c0819:PsiDirectoryNode" />
               <item name="lib" type="462c0819:PsiDirectoryNode" />
               <item name="data" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="tasks" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tasks" type="462c0819:PsiDirectoryNode" />
+              <item name="Tasks" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Tasks" type="462c0819:PsiDirectoryNode" />
               <item name="lib" type="462c0819:PsiDirectoryNode" />
               <item name="model" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="tasks" type="b2602c69:ProjectViewProjectNode" />
-              <item name="tasks" type="462c0819:PsiDirectoryNode" />
+              <item name="Tasks" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Tasks" type="462c0819:PsiDirectoryNode" />
               <item name="lib" type="462c0819:PsiDirectoryNode" />
               <item name="pages" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="Tasks" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Tasks" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -315,11 +302,11 @@
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="dart.analysis.tool.window.force.activate" value="false" />
-    <property name="show.migrate.to.gradle.popup" value="false" />
     <property name="io.flutter.reload.alreadyRun" value="true" />
-    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="settings.editor.selected.configurable" value="flutter.settings" />
+    <property name="show.migrate.to.gradle.popup" value="false" />
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
@@ -345,8 +332,6 @@
   </component>
   <component name="RunManager">
     <configuration default="true" type="AndroidJUnit" factoryName="Android 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="PACKAGE_NAME" />
@@ -356,38 +341,16 @@
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
       <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>
-      <envs />
       <patterns />
     </configuration>
     <configuration default="true" type="Application" factoryName="Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-    </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
     </configuration>
     <configuration default="true" type="TestNG" factoryName="TestNG">
-      <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" />
@@ -400,15 +363,12 @@
       <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
       <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <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" />
-      <envs />
       <properties />
       <listeners />
     </configuration>
@@ -431,9 +391,6 @@
       <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
     </configuration>
   </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
-  </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -448,74 +405,74 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="1" y="1" width="1366" height="737" extended-state="6" />
+    <frame x="0" y="23" width="1920" height="1177" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="true" content_ui="tabs" />
-      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32899022" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24592833" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21824104" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Flutter Outline" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18806647" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Device File Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
-      <window_info id="Flutter Inspector" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18882175" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32736155" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info anchor="bottom" id="Android Profiler" order="7" show_stripe_button="false" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="8" />
+      <window_info id="Image Layers" order="7" />
+      <window_info id="Build Variants" order="2" side_tool="true" />
+      <window_info anchor="right" id="Capture Analysis" order="5" />
+      <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
+      <window_info anchor="bottom" id="Dart Analysis" order="8" weight="0.32899022" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.24592833" />
+      <window_info anchor="bottom" id="Version Control" order="9" />
+      <window_info anchor="bottom" id="Terminal" order="11" weight="0.21824104" />
+      <window_info anchor="right" id="Flutter Outline" order="3" />
+      <window_info anchor="bottom" id="Logcat" order="10" />
+      <window_info id="Captures" order="5" />
+      <window_info id="Capture Tool" order="3" />
+      <window_info id="Designer" order="4" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18796591" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="right" id="Device File Explorer" order="4" side_tool="true" />
+      <window_info anchor="right" id="Theme Preview" order="6" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info id="Favorites" order="6" side_tool="true" />
+      <window_info anchor="right" id="Flutter Inspector" order="7" weight="0.18882175" />
+      <window_info anchor="bottom" id="Messages" order="13" weight="0.32736155" />
+      <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="right" id="Preview" order="9" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <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" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="bottom" id="Find" order="1" />
     </layout>
     <layout-to-restore>
-      <window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="true" content_ui="tabs" />
-      <window_info id="Dart Analysis" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32899022" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Flutter Outline" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Device File Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32736155" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23289903" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32736155" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1918429" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
-      <window_info id="Flutter Inspector" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18882175" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" order="4" />
+      <window_info anchor="bottom" id="Dart Analysis" order="8" weight="0.32899022" />
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.23289903" />
+      <window_info id="Build Variants" order="2" side_tool="true" />
+      <window_info id="Image Layers" order="7" />
+      <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="6" side_tool="true" />
+      <window_info id="Captures" order="5" />
+      <window_info id="Capture Tool" order="3" />
+      <window_info anchor="right" id="Capture Analysis" order="5" />
+      <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
+      <window_info anchor="right" id="Flutter Inspector" order="7" visible="true" weight="0.18882175" />
+      <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="9" />
+      <window_info anchor="bottom" id="Terminal" order="11" weight="0.32736155" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1918429" />
+      <window_info anchor="bottom" id="Messages" order="13" weight="0.32736155" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="8" />
+      <window_info anchor="right" id="Theme Preview" order="6" />
+      <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" />
     </layout-to-restore>
   </component>
   <component name="VcsContentAnnotationSettings">
@@ -523,23 +480,14 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="5" />
+      <option name="time" value="6" />
     </breakpoint-manager>
-    <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/lib/main.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="476">
-          <caret line="28" column="19" lean-forward="false" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
@@ -547,16 +495,17 @@
     <entry file="file://$PROJECT_DIR$/lib/task_view.dart" />
     <entry file="file://$PROJECT_DIR$/lib/main.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
+        <state>
+          <folding>
+            <element signature="e#0#39#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="476">
-          <caret line="28" column="19" lean-forward="false" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
@@ -564,16 +513,17 @@
     <entry file="file://$PROJECT_DIR$/lib/task_view.dart" />
     <entry file="file://$PROJECT_DIR$/lib/main.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
+        <state>
+          <folding>
+            <element signature="e#0#39#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="476">
-          <caret line="28" column="19" lean-forward="false" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
+          <caret line="28" column="19" selection-start-line="28" selection-start-column="19" selection-end-line="28" selection-end-column="19" />
         </state>
       </provider>
     </entry>
@@ -581,9 +531,10 @@
     <entry file="file://$PROJECT_DIR$/lib/task_view.dart" />
     <entry file="file://$PROJECT_DIR$/lib/main.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
+        <state>
+          <folding>
+            <element signature="e#0#39#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -592,8 +543,10 @@
     <entry file="file://$PROJECT_DIR$/lib/main.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1309">
-          <caret line="77" column="41" lean-forward="false" selection-start-line="77" selection-start-column="41" selection-end-line="77" selection-end-column="41" />
-          <folding />
+          <caret line="77" column="41" selection-start-line="77" selection-start-column="41" selection-end-line="77" selection-end-column="41" />
+          <folding>
+            <element signature="e#0#39#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -601,216 +554,203 @@
     <entry file="file://$PROJECT_DIR$/lib/task_data.dart" />
     <entry file="file://$PROJECT_DIR$/lib/main.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
+        <state>
+          <folding>
+            <element signature="e#0#39#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/main.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
+        <state>
+          <folding>
+            <element signature="e#0#39#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/.metadata">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
+        <state />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pubspec.lock">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
+        <state />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/tasks.iml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
+        <state />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/tasks_android.iml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
+        <state />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/.packages">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="15" column="45" lean-forward="false" selection-start-line="15" selection-start-column="45" selection-end-line="15" selection-end-column="45" />
+        <state>
+          <caret line="15" column="45" selection-start-line="15" selection-start-column="45" selection-end-line="15" selection-end-column="45" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/android/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
+        <state />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/android/gradle.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
+        <state />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/ios/Flutter/Generated.xcconfig">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="120">
-          <caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
+          <caret line="8" selection-start-line="8" selection-end-line="8" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/android/local.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="39" lean-forward="false" selection-start-line="0" selection-start-column="39" selection-end-line="0" selection-end-column="39" />
+        <state>
+          <caret column="39" selection-start-column="39" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/android/settings.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
+        <state />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/task_data.dart" />
     <entry file="file://$PROJECT_DIR$/lib/task_view.dart" />
     <entry file="file://$USER_HOME$/flutter/packages/flutter/lib/src/widgets/framework.dart" />
     <entry file="file://$PROJECT_DIR$/lib/test_task.dart" />
-    <entry file="file://$PROJECT_DIR$/lib/model/task.dart">
+    <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" column="7" lean-forward="false" selection-start-line="7" selection-start-column="7" selection-end-line="7" selection-end-column="7" />
-          <folding />
-        </state>
+        <state />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
+    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="121">
+          <caret line="26" column="12" selection-start-line="26" selection-start-column="12" selection-end-line="26" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pubspec.yaml">
+    <entry file="file://$PROJECT_DIR$/android/app/src/main/res/drawable/ic_launcher.xml" />
+    <entry file="file://$PROJECT_DIR$/android/app/src/main/AndroidManifest.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="121">
-          <caret line="26" column="12" lean-forward="false" selection-start-line="26" selection-start-column="12" selection-end-line="26" selection-end-column="12" />
+        <state relative-caret-position="136">
+          <caret line="18" column="17" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/main.dart">
+    <entry file="file://$PROJECT_DIR$/android/app/src/main/res/values/colors.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="20" column="3" lean-forward="false" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
-          <folding />
+        <state relative-caret-position="30">
+          <caret line="2" column="48" selection-start-line="2" selection-start-column="48" selection-end-line="2" selection-end-column="48" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/pages/new_list_page.dart">
+    <entry file="file://$PROJECT_DIR$/android/app/src/main/res/drawable-anydpi-v6/ic_launcher.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="12" column="37" lean-forward="false" selection-start-line="12" selection-start-column="37" selection-end-line="12" selection-end-column="37" />
-          <folding />
+        <state relative-caret-position="75">
+          <caret line="5" column="10" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/pages/splash.dart">
+    <entry file="file://$PROJECT_DIR$/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="14" column="8" lean-forward="false" selection-start-line="14" selection-start-column="8" selection-end-line="14" selection-end-column="8" />
-          <folding />
+        <state relative-caret-position="105">
+          <caret line="9" column="19" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/android/app/src/main/res/drawable/ic_launcher.xml" />
-    <entry file="file://$PROJECT_DIR$/android/app/src/main/AndroidManifest.xml">
+    <entry file="file://$PROJECT_DIR$/android/app/src/main/java/io/github/thelazyindian/tasks/MainActivity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="18" column="17" lean-forward="false" selection-start-line="18" selection-start-column="17" selection-end-line="18" selection-end-column="17" />
+        <state relative-caret-position="60">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/android/app/src/main/res/values/colors.xml">
+    <entry file="file://$PROJECT_DIR$/lib/new_task_sheet.dart" />
+    <entry file="file://$PROJECT_DIR$/lib/data/database_helper.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="48" lean-forward="false" selection-start-line="2" selection-start-column="48" selection-end-line="2" selection-end-column="48" />
+        <state relative-caret-position="150">
+          <caret line="10" column="46" selection-start-line="10" selection-start-column="46" selection-end-line="10" selection-end-column="46" />
+          <folding>
+            <element signature="e#0#20#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/android/app/src/main/res/drawable-anydpi-v6/ic_launcher.xml">
+    <entry file="file://$PROJECT_DIR$/lib/model/task.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="10" lean-forward="false" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
+        <state relative-caret-position="105">
+          <caret line="7" column="7" selection-start-line="7" selection-start-column="7" selection-end-line="7" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/pages/rename_list_page.dart">
+    <entry file="file://$PROJECT_DIR$/lib/pages/home_page.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="3" column="12" lean-forward="false" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="12" />
-          <folding />
+        <state relative-caret-position="75">
+          <caret line="6" column="37" lean-forward="true" selection-start-line="6" selection-start-column="37" selection-end-line="6" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/pages/task_details.dart">
+    <entry file="file://$PROJECT_DIR$/lib/pages/new_list_page.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1935">
-          <caret line="133" column="76" lean-forward="false" selection-start-line="133" selection-start-column="76" selection-end-line="133" selection-end-column="76" />
-          <folding />
+        <state relative-caret-position="30">
+          <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java">
+    <entry file="file://$PROJECT_DIR$/lib/pages/rename_list_page.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="9" column="19" lean-forward="false" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="19" />
+        <state relative-caret-position="15">
+          <caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/android/app/src/main/java/io/github/thelazyindian/tasks/MainActivity.java">
+    <entry file="file://$PROJECT_DIR$/lib/pages/splash.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+        <state relative-caret-position="45">
+          <caret line="4" column="10" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/data/database_helper.dart">
+    <entry file="file://$PROJECT_DIR$/lib/pages/task_details.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1395">
-          <caret line="99" column="30" lean-forward="false" selection-start-line="99" selection-start-column="30" selection-end-line="99" selection-end-column="30" />
+        <state relative-caret-position="180">
+          <caret line="13" column="11" lean-forward="true" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="11" />
           <folding>
             <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/new_task_sheet.dart">
+    <entry file="file://$PROJECT_DIR$/test/widget_test.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="16" lean-forward="false" selection-start-line="4" selection-start-column="16" selection-end-line="4" selection-end-column="16" />
-          <folding />
+        <state relative-caret-position="195">
+          <caret line="13" column="41" lean-forward="true" selection-start-line="13" selection-start-column="41" selection-end-line="13" selection-end-column="41" />
+          <folding>
+            <element signature="e#0#1048#0" expanded="true" />
+            <element signature="e#354#393#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/pages/home_page.dart">
+    <entry file="file://$PROJECT_DIR$/lib/main.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="366">
-          <caret line="490" column="107" lean-forward="false" selection-start-line="490" selection-start-column="107" selection-end-line="490" selection-end-column="107" />
+        <state relative-caret-position="345">
+          <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
           <folding>
-            <element signature="e#0#20#0" expanded="true" />
+            <element signature="e#0#39#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/assets/images/completed.png b/assets/images/completed.png
new file mode 100644
index 0000000..43c6dae
Binary files /dev/null and b/assets/images/completed.png differ
diff --git a/assets/images/new_list.png b/assets/images/new_list.png
new file mode 100644
index 0000000..0c842f9
Binary files /dev/null and b/assets/images/new_list.png differ
diff --git a/flutter_01.log b/flutter_01.log
new file mode 100644
index 0000000..4c4d47c
--- /dev/null
+++ b/flutter_01.log
@@ -0,0 +1,101 @@
+Flutter crash report; please file at https://github.com/flutter/flutter/issues.
+
+## command
+
+flutter packages get
+
+## exception
+
+YamlException: Error on line 47, column 3: Expected ':'.
+  # An image asset can refer to one or more resolution-specific "variants", see
+  ^
+
+```
+#0      Scanner._staleSimpleKeys (package:yaml/src/scanner.dart:491:9)
+#1      Scanner._fetchMoreTokens (package:yaml/src/scanner.dart:325:9)
+#2      Scanner.peek (package:yaml/src/scanner.dart:317:27)
+#3      Parser._parseBlockSequenceEntry (package:yaml/src/parser.dart:355:26)
+#4      Parser._stateMachine (package:yaml/src/parser.dart:77:16)
+#5      Parser.parse (package:yaml/src/parser.dart:47:19)
+#6      Loader._loadSequence (package:yaml/src/loader.dart:142:23)
+#7      Loader._loadNode (package:yaml/src/loader.dart:84:16)
+#8      Loader._loadMapping (package:yaml/src/loader.dart:165:19)
+#9      Loader._loadNode (package:yaml/src/loader.dart:86:16)
+#10     Loader._loadMapping (package:yaml/src/loader.dart:165:19)
+#11     Loader._loadNode (package:yaml/src/loader.dart:86:16)
+#12     Loader._loadDocument (package:yaml/src/loader.dart:62:20)
+#13     Loader.load (package:yaml/src/loader.dart:54:20)
+#14     loadYamlDocument (package:yaml/yaml.dart:51:25)
+#15     loadYamlNode (package:yaml/yaml.dart:42:5)
+#16     loadYaml (package:yaml/yaml.dart:34:5)
+#17     FlutterManifest.createFromString (package:flutter_tools/src/flutter_manifest.dart:42:28)
+<asynchronous suspension>
+#18     FlutterManifest.createFromPath (package:flutter_tools/src/flutter_manifest.dart:36:12)
+<asynchronous suspension>
+#19     FlutterProject._readManifest (package:flutter_tools/src/project.dart:128:60)
+<asynchronous suspension>
+#20     FlutterProject.fromDirectory (package:flutter_tools/src/project.dart:42:44)
+<asynchronous suspension>
+#21     FlutterProject.fromPath (package:flutter_tools/src/project.dart:57:58)
+#22     PackagesGetCommand.runCommand (package:flutter_tools/src/commands/packages.dart:83:61)
+<asynchronous suspension>
+#23     FlutterCommand.verifyThenRunCommand (package:flutter_tools/src/runner/flutter_command.dart:383:18)
+#24     _asyncThenWrapperHelper.<anonymous closure> (dart:async/runtime/libasync_patch.dart:77:64)
+#25     _rootRunUnary (dart:async/zone.dart:1132:38)
+#26     _CustomZone.runUnary (dart:async/zone.dart:1029:19)
+#27     _FutureListener.handleValue (dart:async/future_impl.dart:129:18)
+#28     Future._propagateToListeners.handleValueCallback (dart:async/future_impl.dart:642:45)
+#29     Future._propagateToListeners (dart:async/future_impl.dart:671:32)
+#30     Future._complete (dart:async/future_impl.dart:476:7)
+#31     _SyncCompleter.complete (dart:async/future_impl.dart:51:12)
+#32     _AsyncAwaitCompleter.complete.<anonymous closure> (dart:async/runtime/libasync_patch.dart:33:20)
+#33     _rootRun (dart:async/zone.dart:1124:13)
+#34     _CustomZone.run (dart:async/zone.dart:1021:19)
+#35     _CustomZone.bindCallback.<anonymous closure> (dart:async/zone.dart:947:23)
+#36     _microtaskLoop (dart:async/schedule_microtask.dart:41:21)
+#37     _startMicrotaskLoop (dart:async/schedule_microtask.dart:50:5)
+#38     _runPendingImmediateCallback (dart:isolate/runtime/libisolate_patch.dart:115:13)
+#39     _RawReceivePortImpl._handleMessage (dart:isolate/runtime/libisolate_patch.dart:172:5)
+```
+
+## flutter doctor
+
+```
+[✓] Flutter (Channel beta, v0.10.2, on Mac OS X 10.13.6 17G3025, locale en-US)
+    • Flutter version 0.10.2 at /Users/developer/flutter
+    • Framework revision d8cbb80206 (3 weeks ago), 2018-10-26 01:30:21 -0400
+    • Engine revision 6c2ade9fa2
+    • Dart version 2.1.0-dev.8.0.flutter-bf26f760b1
+
+[✓] Android toolchain - develop for Android devices (Android SDK 28.0.3)
+    • Android SDK at /Users/developer/Library/Android/sdk
+    • Android NDK location not configured (optional; useful for native profiling support)
+    • Platform android-28, build-tools 28.0.3
+    • Java binary at: /Applications/Android Studio.app/Contents/jre/jdk/Contents/Home/bin/java
+    • Java version OpenJDK Runtime Environment (build 1.8.0_152-release-1136-b06)
+    • All Android licenses accepted.
+
+[!] iOS toolchain - develop for iOS devices (Xcode 10.1)
+    • Xcode at /Applications/Xcode.app/Contents/Developer
+    • Xcode 10.1, Build version 10B61
+    ✗ libimobiledevice and ideviceinstaller are not installed. To install, run:
+        brew install --HEAD libimobiledevice
+        brew install ideviceinstaller
+    • ios-deploy 1.9.2
+    • CocoaPods version 1.5.3
+
+[✓] Android Studio (version 3.2)
+    • Android Studio at /Applications/Android Studio.app/Contents
+    • Flutter plugin version 30.0.1
+    • Dart plugin version 181.5656
+    • Java version OpenJDK Runtime Environment (build 1.8.0_152-release-1136-b06)
+
+[✓] VS Code (version 1.28.2)
+    • VS Code at /Applications/Visual Studio Code.app/Contents
+    • Flutter extension version 2.20.0
+
+[✓] Connected device (1 available)
+    • iPhone XR • 8740478D-307D-484F-BF6D-0C7D1967344D • ios • iOS 12.1 (simulator)
+
+! Doctor found issues in 1 category.
+```
diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig
index 0b2d479..c242b3d 100644
--- a/ios/Flutter/Debug.xcconfig
+++ b/ios/Flutter/Debug.xcconfig
@@ -1 +1,2 @@
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig
index 0b2d479..6f07b31 100644
--- a/ios/Flutter/Release.xcconfig
+++ b/ios/Flutter/Release.xcconfig
@@ -1 +1,2 @@
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
diff --git a/ios/Podfile b/ios/Podfile
new file mode 100644
index 0000000..7c6cb6f
--- /dev/null
+++ b/ios/Podfile
@@ -0,0 +1,63 @@
+# Uncomment this line to define a global platform for your project
+# platform :ios, '9.0'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+def parse_KV_file(file, separator='=')
+  file_abs_path = File.expand_path(file)
+  if !File.exists? file_abs_path
+    return [];
+  end
+  pods_ary = []
+  skip_line_start_symbols = ["#", "/"]
+  File.foreach(file_abs_path) { |line|
+      next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ }
+      plugin = line.split(pattern=separator)
+      if plugin.length == 2
+        podname = plugin[0].strip()
+        path = plugin[1].strip()
+        podpath = File.expand_path("#{path}", file_abs_path)
+        pods_ary.push({:name => podname, :path => podpath});
+      else
+        puts "Invalid plugin specification: #{line}"
+      end
+  }
+  return pods_ary
+end
+
+target 'Runner' do
+  # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock
+  # referring to absolute paths on developers' machines.
+  system('rm -rf .symlinks')
+  system('mkdir -p .symlinks/plugins')
+
+  # Flutter Pods
+  generated_xcode_build_settings = parse_KV_file('./Flutter/Generated.xcconfig')
+  if generated_xcode_build_settings.empty?
+    puts "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter packages get is executed first."
+  end
+  generated_xcode_build_settings.map { |p|
+    if p[:name] == 'FLUTTER_FRAMEWORK_DIR'
+      symlink = File.join('.symlinks', 'flutter')
+      File.symlink(File.dirname(p[:path]), symlink)
+      pod 'Flutter', :path => File.join(symlink, File.basename(p[:path]))
+    end
+  }
+
+  # Plugin Pods
+  plugin_pods = parse_KV_file('../.flutter-plugins')
+  plugin_pods.map { |p|
+    symlink = File.join('.symlinks', 'plugins', p[:name])
+    File.symlink(p[:path], symlink)
+    pod p[:name], :path => File.join(symlink, 'ios')
+  }
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      config.build_settings['ENABLE_BITCODE'] = 'NO'
+    end
+  end
+end
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
new file mode 100644
index 0000000..d9e59d9
--- /dev/null
+++ b/ios/Podfile.lock
@@ -0,0 +1,37 @@
+PODS:
+  - Flutter (1.0.0)
+  - FMDB (2.7.5):
+    - FMDB/standard (= 2.7.5)
+  - FMDB/standard (2.7.5)
+  - path_provider (0.0.1):
+    - Flutter
+  - sqflite (0.0.1):
+    - Flutter
+    - FMDB (~> 2.7.2)
+
+DEPENDENCIES:
+  - Flutter (from `.symlinks/flutter/ios`)
+  - path_provider (from `.symlinks/plugins/path_provider/ios`)
+  - sqflite (from `.symlinks/plugins/sqflite/ios`)
+
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - FMDB
+
+EXTERNAL SOURCES:
+  Flutter:
+    :path: ".symlinks/flutter/ios"
+  path_provider:
+    :path: ".symlinks/plugins/path_provider/ios"
+  sqflite:
+    :path: ".symlinks/plugins/sqflite/ios"
+
+SPEC CHECKSUMS:
+  Flutter: 9d0fac939486c9aba2809b7982dfdbb47a7b0296
+  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
+  path_provider: 09407919825bfe3c2deae39453b7a5b44f467873
+  sqflite: 801b6b0983f722fa29baf00d1476e4556ada6de4
+
+PODFILE CHECKSUM: 1e5af4103afd21ca5ead147d7b81d06f494f51a2
+
+COCOAPODS: 1.5.3
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index c643ab1..b821459 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -1,438 +1,506 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
-		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
-		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
-		9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
-		9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB31CF90195004384FC /* Generated.xcconfig */; };
-		978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
-		97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
-		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
-		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
-		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		9705A1C41CF9048500538489 /* Embed Frameworks */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "";
-			dstSubfolderSpec = 10;
-			files = (
-				3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */,
-				9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */,
-			);
-			name = "Embed Frameworks";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
-		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
-		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
-		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
-		7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
-		7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
-		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
-		9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
-		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		97C146EB1CF9000F007C117D /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
-				3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		9740EEB11CF90186004384FC /* Flutter */ = {
-			isa = PBXGroup;
-			children = (
-				2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
-				3B80C3931E831B6300D905FE /* App.framework */,
-				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
-				9740EEBA1CF902C7004384FC /* Flutter.framework */,
-				9740EEB21CF90195004384FC /* Debug.xcconfig */,
-				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
-				9740EEB31CF90195004384FC /* Generated.xcconfig */,
-			);
-			name = Flutter;
-			sourceTree = "<group>";
-		};
-		97C146E51CF9000F007C117D = {
-			isa = PBXGroup;
-			children = (
-				9740EEB11CF90186004384FC /* Flutter */,
-				97C146F01CF9000F007C117D /* Runner */,
-				97C146EF1CF9000F007C117D /* Products */,
-				CF3B75C9A7D2FA2A4C99F110 /* Frameworks */,
-			);
-			sourceTree = "<group>";
-		};
-		97C146EF1CF9000F007C117D /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				97C146EE1CF9000F007C117D /* Runner.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		97C146F01CF9000F007C117D /* Runner */ = {
-			isa = PBXGroup;
-			children = (
-				7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */,
-				7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */,
-				97C146FA1CF9000F007C117D /* Main.storyboard */,
-				97C146FD1CF9000F007C117D /* Assets.xcassets */,
-				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
-				97C147021CF9000F007C117D /* Info.plist */,
-				97C146F11CF9000F007C117D /* Supporting Files */,
-				1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
-				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
-			);
-			path = Runner;
-			sourceTree = "<group>";
-		};
-		97C146F11CF9000F007C117D /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				97C146F21CF9000F007C117D /* main.m */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		97C146ED1CF9000F007C117D /* Runner */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
-			buildPhases = (
-				9740EEB61CF901F6004384FC /* Run Script */,
-				97C146EA1CF9000F007C117D /* Sources */,
-				97C146EB1CF9000F007C117D /* Frameworks */,
-				97C146EC1CF9000F007C117D /* Resources */,
-				9705A1C41CF9048500538489 /* Embed Frameworks */,
-				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = Runner;
-			productName = Runner;
-			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		97C146E61CF9000F007C117D /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0910;
-				ORGANIZATIONNAME = "The Chromium Authors";
-				TargetAttributes = {
-					97C146ED1CF9000F007C117D = {
-						CreatedOnToolsVersion = 7.3.1;
-					};
-				};
-			};
-			buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				Base,
-			);
-			mainGroup = 97C146E51CF9000F007C117D;
-			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				97C146ED1CF9000F007C117D /* Runner */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		97C146EC1CF9000F007C117D /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
-				9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
-				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
-				9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
-				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
-				2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
-				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Thin Binary";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
-		};
-		9740EEB61CF901F6004384FC /* Run Script */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		97C146EA1CF9000F007C117D /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */,
-				97C146F31CF9000F007C117D /* main.m in Sources */,
-				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
-		97C146FA1CF9000F007C117D /* Main.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				97C146FB1CF9000F007C117D /* Base */,
-			);
-			name = Main.storyboard;
-			sourceTree = "<group>";
-		};
-		97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				97C147001CF9000F007C117D /* Base */,
-			);
-			name = LaunchScreen.storyboard;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		97C147031CF9000F007C117D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MTL_ENABLE_DEBUG_INFO = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		97C147041CF9000F007C117D /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				SDKROOT = iphoneos;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		97C147061CF9000F007C117D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CURRENT_PROJECT_VERSION = 1;
-				ENABLE_BITCODE = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Flutter",
-				);
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Flutter",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = io.github.thelazyindian.tasks;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				VERSIONING_SYSTEM = "apple-generic";
-			};
-			name = Debug;
-		};
-		97C147071CF9000F007C117D /* Release */ = {
-			isa = XCBuildConfiguration;
-			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
-			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CURRENT_PROJECT_VERSION = 1;
-				ENABLE_BITCODE = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Flutter",
-				);
-				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Flutter",
-				);
-				PRODUCT_BUNDLE_IDENTIFIER = io.github.thelazyindian.tasks;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				VERSIONING_SYSTEM = "apple-generic";
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				97C147031CF9000F007C117D /* Debug */,
-				97C147041CF9000F007C117D /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				97C147061CF9000F007C117D /* Debug */,
-				97C147071CF9000F007C117D /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 97C146E61CF9000F007C117D /* Project object */;
-}
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
+		2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
+		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
+		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		8622989EDE39C571F1D63599 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 65B07F8E60686D358073FE50 /* libPods-Runner.a */; };
+		9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
+		9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
+		9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB31CF90195004384FC /* Generated.xcconfig */; };
+		978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
+		97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
+		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
+		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
+		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		9705A1C41CF9048500538489 /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */,
+				9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
+		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
+		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
+		65B07F8E60686D358073FE50 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
+		7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
+		7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
+		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
+		9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
+		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
+		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		97C146EB1CF9000F007C117D /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
+				3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
+				8622989EDE39C571F1D63599 /* libPods-Runner.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		0244B7B9A1774AB64D07371A /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
+		1EEA5ACB56F256EFCD06DBF9 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				65B07F8E60686D358073FE50 /* libPods-Runner.a */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		9740EEB11CF90186004384FC /* Flutter */ = {
+			isa = PBXGroup;
+			children = (
+				2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
+				3B80C3931E831B6300D905FE /* App.framework */,
+				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
+				9740EEBA1CF902C7004384FC /* Flutter.framework */,
+				9740EEB21CF90195004384FC /* Debug.xcconfig */,
+				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
+				9740EEB31CF90195004384FC /* Generated.xcconfig */,
+			);
+			name = Flutter;
+			sourceTree = "<group>";
+		};
+		97C146E51CF9000F007C117D = {
+			isa = PBXGroup;
+			children = (
+				9740EEB11CF90186004384FC /* Flutter */,
+				97C146F01CF9000F007C117D /* Runner */,
+				97C146EF1CF9000F007C117D /* Products */,
+				0244B7B9A1774AB64D07371A /* Pods */,
+				1EEA5ACB56F256EFCD06DBF9 /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		97C146EF1CF9000F007C117D /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				97C146EE1CF9000F007C117D /* Runner.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		97C146F01CF9000F007C117D /* Runner */ = {
+			isa = PBXGroup;
+			children = (
+				7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */,
+				7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */,
+				97C146FA1CF9000F007C117D /* Main.storyboard */,
+				97C146FD1CF9000F007C117D /* Assets.xcassets */,
+				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
+				97C147021CF9000F007C117D /* Info.plist */,
+				97C146F11CF9000F007C117D /* Supporting Files */,
+				1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
+				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
+			);
+			path = Runner;
+			sourceTree = "<group>";
+		};
+		97C146F11CF9000F007C117D /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				97C146F21CF9000F007C117D /* main.m */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		97C146ED1CF9000F007C117D /* Runner */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
+			buildPhases = (
+				78B378F4A02D032B881E5BC5 /* [CP] Check Pods Manifest.lock */,
+				9740EEB61CF901F6004384FC /* Run Script */,
+				97C146EA1CF9000F007C117D /* Sources */,
+				97C146EB1CF9000F007C117D /* Frameworks */,
+				97C146EC1CF9000F007C117D /* Resources */,
+				9705A1C41CF9048500538489 /* Embed Frameworks */,
+				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+				8A69D6C2406943101D36D83E /* [CP] Embed Pods Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = Runner;
+			productName = Runner;
+			productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		97C146E61CF9000F007C117D /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0910;
+				ORGANIZATIONNAME = "The Chromium Authors";
+				TargetAttributes = {
+					97C146ED1CF9000F007C117D = {
+						CreatedOnToolsVersion = 7.3.1;
+						DevelopmentTeam = 9FK3425VTA;
+					};
+				};
+			};
+			buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 97C146E51CF9000F007C117D;
+			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				97C146ED1CF9000F007C117D /* Runner */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		97C146EC1CF9000F007C117D /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
+				9740EEB51CF90195004384FC /* Generated.xcconfig in Resources */,
+				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
+				9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
+				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
+				2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
+				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Thin Binary";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
+		};
+		78B378F4A02D032B881E5BC5 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		8A69D6C2406943101D36D83E /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
+				"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		9740EEB61CF901F6004384FC /* Run Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		97C146EA1CF9000F007C117D /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */,
+				97C146F31CF9000F007C117D /* main.m in Sources */,
+				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		97C146FA1CF9000F007C117D /* Main.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				97C146FB1CF9000F007C117D /* Base */,
+			);
+			name = Main.storyboard;
+			sourceTree = "<group>";
+		};
+		97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				97C147001CF9000F007C117D /* Base */,
+			);
+			name = LaunchScreen.storyboard;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		97C147031CF9000F007C117D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		97C147041CF9000F007C117D /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		97C147061CF9000F007C117D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 9FK3425VTA;
+				ENABLE_BITCODE = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Flutter",
+				);
+				INFOPLIST_FILE = Runner/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Flutter",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = io.github.thelazyindian.tasks;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Debug;
+		};
+		97C147071CF9000F007C117D /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = 9FK3425VTA;
+				ENABLE_BITCODE = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Flutter",
+				);
+				INFOPLIST_FILE = Runner/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Flutter",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = io.github.thelazyindian.tasks;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				97C147031CF9000F007C117D /* Debug */,
+				97C147041CF9000F007C117D /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				97C147061CF9000F007C117D /* Debug */,
+				97C147071CF9000F007C117D /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 97C146E61CF9000F007C117D /* Project object */;
+}
diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata
index 59c6d39..21a3cc1 100644
--- a/ios/Runner.xcworkspace/contents.xcworkspacedata
+++ b/ios/Runner.xcworkspace/contents.xcworkspacedata
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "group:Runner.xcodeproj">
-   </FileRef>
-</Workspace>
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:Runner.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
new file mode 100644
index 0000000..949b678
--- /dev/null
+++ b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildSystemType</key>
+	<string>Original</string>
+</dict>
+</plist>
diff --git a/lib/containers/app_bar/main_list.dart b/lib/containers/app_bar/main_list.dart
new file mode 100644
index 0000000..4c65271
--- /dev/null
+++ b/lib/containers/app_bar/main_list.dart
@@ -0,0 +1,28 @@
+import 'package:flutter/material.dart';
+
+class MainListAppBar extends StatelessWidget {
+  final String name;
+  MainListAppBar({this.name});
+  @override
+  Widget build(BuildContext context) {
+    return SliverAppBar(
+      backgroundColor: Colors.white,
+      expandedHeight: 85.0,
+      floating: false,
+      snap: false,
+      elevation: 0.0,
+      flexibleSpace: FlexibleSpaceBar(
+        title: (name != "" && name != null)
+            ? Text(
+                name,
+                style: TextStyle(
+                  color: Colors.black,
+                  fontSize: 25.0,
+                  fontWeight: FontWeight.w400,
+                ),
+              )
+            : Text(""),
+      ),
+    );
+  }
+}
diff --git a/lib/containers/bottom_sheet/menu.dart b/lib/containers/bottom_sheet/menu.dart
new file mode 100644
index 0000000..41d7480
--- /dev/null
+++ b/lib/containers/bottom_sheet/menu.dart
@@ -0,0 +1,182 @@
+import 'package:flutter/material.dart';
+
+class MenuWidget extends StatelessWidget {
+  final List<String> listNames;
+  final String activeList;
+  final ValueChanged<String> listChange;
+  final VoidCallback createList;
+  MenuWidget(
+      {this.listNames, this.listChange, this.createList, this.activeList});
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      //height: 530.0,
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.only(
+          topLeft: const Radius.circular(10.0),
+          topRight: const Radius.circular(10.0),
+        ),
+      ),
+      child: SafeArea(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          //mainAxisAlignment: MainAxisAlignment.end,
+          children: <Widget>[
+            // UserAccountsDrawerHeader(
+            //   currentAccountPicture: DecoratedBox(
+            //     decoration: BoxDecoration(
+            //       image: DecorationImage(
+            //         image: AssetImage("assets/user/satya_profile.png"),
+            //       ),
+            //     ),
+            //   ),
+            //   margin: EdgeInsets.all(0.0),
+            //   accountEmail: Text(
+            //     "satyabrat.me@gmail.com",
+            //     style: TextStyle(
+            //       color: Colors.black,
+            //     ),
+            //   ),
+            //   accountName: Text(
+            //     "Satyabrat Sahoo",
+            //     style: TextStyle(
+            //       color: Colors.black,
+            //     ),
+            //   ),
+            //   decoration: BoxDecoration(
+            //     color: Colors.white,
+            //   ),
+            // ),
+            Divider(
+              height: 4.0,
+              indent: 2.0,
+            ),
+            SizedBox(
+              height: listNames.length > 3 ? 200.0 : null,
+              child: Scrollbar(
+                child: ListView.builder(
+                    shrinkWrap: true,
+                    itemCount: listNames.length,
+                    itemBuilder: (context, index) {
+                      final _listItem = listNames[index];
+                      return GestureDetector(
+                        onTap: () {
+                          listChange(_listItem);
+                          Navigator.pop(context);
+                        },
+                        child: Padding(
+                          child: DecoratedBox(
+                            decoration: BoxDecoration(
+                              color: (activeList == _listItem)
+                                  ? Color(0x4D90CAF9)
+                                  : Colors.white,
+                              borderRadius: BorderRadius.only(
+                                topRight: Radius.circular(30.0),
+                                bottomRight: Radius.circular(30.0),
+                              ),
+                            ),
+                            child: ListTile(
+                              selected: true,
+                              title: Text(
+                                _listItem,
+                                style: TextStyle(
+                                  color: (activeList == _listItem)
+                                      ? Colors.blueAccent
+                                      : Colors.black,
+                                  fontWeight: FontWeight.w700,
+                                ),
+                              ),
+                            ),
+                          ),
+                          padding: EdgeInsets.only(
+                              // left: 8.0,
+                              top: 8.0,
+                              bottom: 8.0,
+                              right: 10.0),
+                        ),
+                      );
+                    }),
+              ),
+            ),
+            Divider(
+              height: 4.0,
+            ),
+            ListTile(
+              leading: Icon(
+                Icons.add,
+              ),
+              title: Text(
+                "Create list",
+                style: TextStyle(
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+              onTap: createList,
+            ),
+            Divider(
+              height: 4.0,
+            ),
+            ListTile(
+              leading: Icon(
+                Icons.feedback,
+              ),
+              title: Text(
+                "Send feedback",
+                style: TextStyle(
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+            ),
+            Divider(
+              height: 4.0,
+            ),
+            ListTile(
+              title: Text(
+                "Open-source licenses",
+                style: TextStyle(
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+            ),
+            Divider(
+              height: 4.0,
+            ),
+            Padding(
+              padding: EdgeInsets.only(top: 6.0, bottom: 6.0),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: <Widget>[
+                  Text(
+                    "Privacy Policy",
+                    style: TextStyle(
+                      fontSize: 13.0,
+                      fontWeight: FontWeight.w700,
+                    ),
+                  ),
+                  Container(
+                    width: 25.0,
+                    child: Icon(
+                      Icons.arrow_drop_down_circle,
+                      size: 5.0,
+                    ),
+                  ),
+                  //new Icon(
+                  //Icons.,
+                  //),
+                  Text(
+                    "Terms of service",
+                    style: TextStyle(
+                      fontSize: 13.0,
+                      fontWeight: FontWeight.w700,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/containers/bottom_sheet/more.dart b/lib/containers/bottom_sheet/more.dart
new file mode 100644
index 0000000..df099f3
--- /dev/null
+++ b/lib/containers/bottom_sheet/more.dart
@@ -0,0 +1,129 @@
+import 'package:flutter/material.dart';
+
+enum SortBy { custom, date }
+
+class MoreWidget extends StatelessWidget {
+  final VoidCallback renameList, deleteList, deleteCompletedTasks;
+  final bool canDelete;
+  final int completedTasksCount;
+  final SortBy sort;
+  final ValueChanged<SortBy> sortChanged;
+  MoreWidget({
+    this.renameList,
+    this.deleteList,
+    this.deleteCompletedTasks,
+    this.canDelete,
+    this.completedTasksCount,
+    this.sort,
+    this.sortChanged,
+  });
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: EdgeInsets.only(
+        left: 5.0,
+        right: 5.0,
+        top: 5.0,
+        bottom: 5.0,
+      ),
+      decoration: BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.only(
+              topLeft: const Radius.circular(10.0),
+              topRight: const Radius.circular(10.0))),
+      child: SafeArea(
+        child: Wrap(
+          children: <Widget>[
+            ListTile(
+              title: const Text(
+                'Sort By',
+                style: TextStyle(
+                  fontSize: 14.0,
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+            ),
+            ListTile(
+              leading: Container(
+                width: 4.0,
+              ),
+              title: const Text(
+                'My Order',
+                style: TextStyle(
+                  fontSize: 14.0,
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+              onTap: () {
+                sortChanged(SortBy.custom);
+                Navigator.pop(context);
+              },
+              trailing: sort != null && sort == SortBy.custom
+                  ? Icon(Icons.check)
+                  : Icon(Icons.info, color: Colors.transparent),
+            ),
+            ListTile(
+              leading: Container(
+                width: 4.0,
+              ),
+              title: const Text(
+                'Date',
+                style: TextStyle(
+                  fontSize: 14.0,
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+              onTap: () {
+                sortChanged(SortBy.date);
+                Navigator.pop(context);
+              },
+              trailing: sort != null && sort == SortBy.date
+                  ? Icon(Icons.check)
+                  : Icon(Icons.info, color: Colors.transparent),
+            ),
+            Divider(
+              height: 10.0,
+            ),
+            ListTile(
+              title: const Text(
+                'Rename List',
+                style: TextStyle(
+                  fontSize: 14.0,
+                  fontWeight: FontWeight.w700,
+                ),
+              ),
+              onTap: renameList,
+            ),
+            ListTile(
+              title: Text(
+                'Delete List',
+                style: TextStyle(
+                  fontSize: 14.0,
+                  fontWeight: FontWeight.w700,
+                  color: canDelete ?? true ? Colors.black : Colors.grey,
+                ),
+              ),
+              enabled: canDelete ?? true,
+              onTap: deleteList,
+            ),
+            ListTile(
+              title: Text(
+                'Delete all completed tasks',
+                style: TextStyle(
+                  fontSize: 14.0,
+                  fontWeight: FontWeight.w700,
+                  color: completedTasksCount != null && completedTasksCount > 0
+                      ? Colors.black
+                      : Colors.grey,
+                ),
+              ),
+              onTap: completedTasksCount != null && completedTasksCount > 0
+                  ? deleteCompletedTasks
+                  : null,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/containers/lists/completed.dart b/lib/containers/lists/completed.dart
new file mode 100644
index 0000000..aa1e031
--- /dev/null
+++ b/lib/containers/lists/completed.dart
@@ -0,0 +1,67 @@
+import 'package:flutter/material.dart';
+import '../../model/task.dart';
+import '../../pages/task_details.dart';
+
+class CompletedList extends StatelessWidget {
+  final List<Task> items;
+  final String listName;
+  final VoidCallback listRefresh;
+  final ValueChanged<Task> restoreTask;
+  CompletedList(
+      {this.items, this.listRefresh, this.listName, this.restoreTask});
+  @override
+  Widget build(BuildContext context) {
+    if (items == null || items.isEmpty) return SliverFillRemaining();
+    return SliverToBoxAdapter(
+      child: ExpansionTile(
+        title: Text('Completed (${items.length})'),
+        backgroundColor: Colors.white,
+        children: <Widget>[
+          Container(
+            height: 70.0 * items.length,
+            child: ListView.builder(
+              itemCount: items.length,
+              shrinkWrap: true,
+              itemBuilder: (context, index) {
+                final item = items[index];
+                return Column(
+                  mainAxisSize: MainAxisSize.min,
+                  mainAxisAlignment: MainAxisAlignment.start,
+                  children: <Widget>[
+                    Container(
+                      padding: EdgeInsets.only(left: 16.0, right: 16.0),
+                      child: ListTile(
+                        leading: IconButton(
+                          icon: Icon(Icons.check, color: Colors.blue),
+                          onPressed: () => restoreTask(item),
+                        ),
+                        title: Text(
+                          item.title,
+                          style:
+                              TextStyle(decoration: TextDecoration.lineThrough),
+                        ),
+                        subtitle: item?.subtitle == null ||
+                                (item?.subtitle?.isEmpty ?? true)
+                            ? null
+                            : Text(item.subtitle),
+                        onTap: () async {
+                          var route = MaterialPageRoute(
+                              builder: (BuildContext context) {
+                            return TaskDetailsPage(listName, item);
+                          });
+                          var value = await Navigator.of(context).push(route);
+                          if (value != null) listRefresh();
+                        },
+                      ),
+                    ),
+                  ],
+                );
+              },
+            ),
+          ),
+          Divider(height: 1.0),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/containers/lists/pending.dart b/lib/containers/lists/pending.dart
new file mode 100644
index 0000000..3a6fa56
--- /dev/null
+++ b/lib/containers/lists/pending.dart
@@ -0,0 +1,78 @@
+import 'package:flutter/material.dart';
+import '../../model/task.dart';
+import '../../widgets/date_widget.dart';
+import '../../pages/task_details.dart';
+
+class PendingList extends StatelessWidget {
+  final List<Task> items;
+  final ValueChanged<Task> dismissedTask;
+  final VoidCallback listRefresh;
+  final String listName;
+  PendingList(
+      {this.items, this.dismissedTask, this.listRefresh, this.listName});
+  @override
+  Widget build(BuildContext context) {
+    return SliverList(
+      delegate: SliverChildListDelegate(
+        List<Dismissible>.generate(
+          items.length,
+          (int index) {
+            final item = items[index];
+            return Dismissible(
+              direction: DismissDirection.startToEnd,
+              key: Key(item.id.toString()),
+              onDismissed: (direction) => dismissedTask(item),
+              background: Container(
+                color: Colors.blue,
+              ),
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: <Widget>[
+                  Container(
+                    // padding: EdgeInsets.only(
+                    //   left: 5.0,
+                    //   right: 5.0,
+                    // ),
+                    child: ListTile(
+                      onTap: () async {
+                        var route =
+                            MaterialPageRoute(builder: (BuildContext context) {
+                          return TaskDetailsPage(listName, item);
+                        });
+                        var detailsPage =
+                            await Navigator.of(context).push(route);
+                        if (detailsPage != null) {
+                          listRefresh();
+                        }
+                      },
+                      leading: IconButton(
+                        icon: Icon(Icons.radio_button_unchecked),
+                        onPressed: () => dismissedTask(item),
+                      ),
+                      title: Text(item?.title ?? ""),
+                      subtitle: item?.subtitle == null ||
+                              (item?.subtitle?.isEmpty ?? true)
+                          ? null
+                          : Text(item.subtitle),
+                    ),
+                  ),
+                  item.date != null
+                      ? ListTile(
+                          leading: Icon(Icons.info, color: Colors.transparent),
+                          title: Row(
+                            mainAxisSize: MainAxisSize.min,
+                            children: <Widget>[DateViewWidget(date: item.date)],
+                          ),
+                        )
+                      : Container(height: 0.0),
+                  Divider(height: 1.0),
+                ],
+              ),
+            );
+          },
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/data/data_handler.dart b/lib/data/data_handler.dart
new file mode 100644
index 0000000..b04d3e2
--- /dev/null
+++ b/lib/data/data_handler.dart
@@ -0,0 +1,139 @@
+import '../model/task.dart';
+import '../model/list.dart';
+import 'package:flutter/material.dart';
+
+// -- Lists --
+List<TaskList> _lists = [];
+
+List<TaskList> getLists() {
+  if (_lists == null || _lists.isEmpty) {
+    _lists.add(TaskList(name: "My Tasks", tasks: []));
+  }
+  return _lists;
+}
+
+TaskList getList(String name) {
+  TaskList _newList;
+  for (var _list in _lists) {
+    if (name == _list.name) {
+      _newList = _list;
+    }
+  }
+  if (_newList == null) {
+    addList(name);
+  }
+  for (var _list in _lists) {
+    if (name == _list.name) {
+      _newList = _list;
+    }
+  }
+  return _newList;
+}
+
+void addList(String name) {
+  var _list = TaskList(name: name, tasks: []);
+  _lists.add(_list);
+}
+
+void updateListName(String oldName, String name) {
+  for (var _list in _lists) {
+    if (oldName == _list.name) {
+      _list.name = name;
+    }
+  }
+}
+
+void removeList(String name) {
+  print("Lists: " + _lists?.length.toString() + " List: $name");
+  TaskList _toRemove;
+  for (var _list in _lists) {
+    if (name == _list.name) _toRemove = _list;
+  }
+  _lists.remove(_toRemove);
+}
+
+void updateList(String name, TaskList list) {
+  for (var _list in _lists) {
+    if (name == _list.name) {
+      _list = list;
+    }
+  }
+}
+
+void clearLists() {
+  _lists.clear();
+}
+
+// -- Tasks --
+
+void addTask(Task task, {@required String listName}) {
+  print("Adding Task: " + task?.title + " for: $listName");
+  var _tasks = getList(listName)?.tasks ?? [];
+  if (task != null) _tasks.add(task);
+}
+
+void removeTask(Task task, {@required String listName}) {
+  var _tasks = getList(listName)?.tasks ?? [];
+  if (task != null) _tasks.remove(task);
+}
+
+List<Task> getTasks(String listName) {
+  var _tasks = getList(listName)?.tasks ?? [];
+  return _tasks;
+}
+
+List<Task> getTasksByStatus(String status, {@required String listName}) {
+  var _tasks = getList(listName)?.tasks ?? [];
+  List<Task> _list = [];
+  for (var _task in _tasks) {
+    if (_task.status
+        .toUpperCase()
+        .trim()
+        .contains(status.toUpperCase().trim())) {
+      _list.add(_task);
+    }
+  }
+  return _list;
+}
+
+void clearTasks(String listName) {
+  var _tasks = getList(listName)?.tasks ?? [];
+  _tasks.clear();
+}
+
+Task getTask(int id, {@required String listName}) {
+  var _tasks = getList(listName)?.tasks ?? [];
+  for (var _task in _tasks) {
+    if (id == _task.id) return _task;
+  }
+  return null;
+}
+
+void updateTask(int id, Task task, {@required String listName}) {
+  var _tasks = getList(listName)?.tasks ?? [];
+  for (var _task in _tasks) {
+    if (id == _task.id) {
+      _task = task;
+    }
+  }
+}
+
+void clearCompletedTasks(String listName) {
+  var _tasks = getList(listName)?.tasks ?? [];
+  List<Task> removeTasks = [];
+
+  for (var _task in _tasks) {
+    if (_task.status == "COMPLETED") {
+      removeTasks.add(_task);
+    }
+  }
+  for (var _task in removeTasks) {
+    _tasks.remove(_task);
+  }
+}
+
+// -- Storage --
+enum StorageProvider { sqlLite, memory, firebase }
+
+// Default Storage
+StorageProvider storage = StorageProvider.memory;
diff --git a/lib/data/database_helper.dart b/lib/data/database_helper.dart
deleted file mode 100644
index 562f739..0000000
--- a/lib/data/database_helper.dart
+++ /dev/null
@@ -1,207 +0,0 @@
-import 'dart:async';
-import 'dart:io' as io;
-
-import 'package:path/path.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:sqflite/sqflite.dart';
-import 'package:tasks/model/task.dart';
-
-class DatabaseHelper {
-  static final DatabaseHelper _instance = new DatabaseHelper.internal();
-
-  factory DatabaseHelper() => _instance;
-
-  DatabaseHelper.internal();
-
-  static Database _db;
-  String _dbFileName = "task.db";
-  String _tableName = "My Tasks";
-  String _columnId = "id";
-  String _columnTask = "task";
-  String _columnStatus = "status";
-  String _columnDetails = "details";
-  String _columnDate = "date";
-
-  Future<Database> get db async {
-    if (_db != null) {
-      return _db;
-    }
-    _db = await initDb();
-    return _db;
-  }
-
-  static DatabaseHelper get() {
-    return _instance;
-  }
-
-  initDb() async {
-    print("Tasks: Running initDb");
-    io.Directory documentDirectory = await getApplicationDocumentsDirectory();
-    String path = join(documentDirectory.path, _dbFileName);
-    var ourDb = await openDatabase(
-      path,
-      version: 1,
-      onCreate: _onCreate,
-    );
-    return ourDb;
-  }
-
-  void _onCreate(Database db, int version) async {
-    await db.execute(
-        "CREATE TABLE $_tableName($_columnId INTEGER PRIMARY KEY, $_columnTask TEXT, $_columnStatus TEXT, $_columnDetails TEXT, $_columnDate TEXT)");
-    print("Table $_tableName is created");
-  }
-
-  Future<List<String>> getTables() async {
-    var dbClient = await db;
-    List<Map<String, dynamic>> tables = await dbClient
-        .rawQuery("SELECT * FROM sqlite_master WHERE type=\'table\';");
-
-    List<String> tableNames = new List();
-    if (tables != null) {
-      for (Map<String, dynamic> item in tables) {
-        if (item['name'] != "android_metadata") {
-          tableNames.add(item['name']);
-        }
-      }
-    }
-    return tableNames;
-  }
-
-  Future createTable(String _newTableName) async {
-    var dbClient = await db;
-    await dbClient.transaction((Transaction txn) {
-      txn.rawQuery(
-          "CREATE TABLE \'$_newTableName\'($_columnId INTEGER PRIMARY KEY,"
-          " $_columnTask TEXT, $_columnStatus TEXT,"
-          " $_columnDetails TEXT, $_columnDate TEXT)");
-    });
-    print("Created table with name: $_newTableName");
-  }
-
-  Future renameTable(String _oldTableName, String _newTableName) async {
-    var dbClient = await db;
-    await dbClient.transaction((Transaction txn) {
-      txn.rawQuery(
-          "ALTER TABLE \'$_oldTableName\' RENAME TO \'$_newTableName\';");
-    });
-  }
-
-  Future deleteTable(String tblName) async {
-    var dbClient = await db;
-    await dbClient.transaction((Transaction txn) {
-      txn.rawQuery("DROP TABLE \'$tblName\'");
-    });
-  }
-
-  Future saveTask(Task task, String tblName) async {
-    var dbClient = await db;
-    await dbClient.transaction((Transaction txn) async {
-      txn.insert("\'$tblName\'", task.toMap());
-    });
-  }
-
-  Future deleteTableTask(Task task, String tblName) async {
-    var dbClient = await db;
-    await dbClient.transaction((Transaction txn) async {
-      txn.delete(tblName);
-    });
-  }
-
-  Future deleteTask(int taskId, String tblName) async {
-    var dbClient = await db;
-    await dbClient.transaction((Transaction txn) async {
-      await txn
-          .rawDelete('DELETE FROM \'$tblName\' WHERE $_columnId = \'$taskId\'');
-    });
-  }
-
-  Future deleteCompletedTask(String tblName) async {
-    var dbClient = await db;
-    await dbClient.transaction((Transaction txn) async {
-      await txn.rawDelete(
-          'DELETE FROM \'$tblName\' WHERE $_columnStatus = \'COMPLETED\';');
-    });
-  }
-
-  Future updateTask(String task, String tblName) async {
-    var dbClient = await db;
-    await dbClient.transaction((Transaction txn) async {
-      await txn.rawUpdate(
-          'UPDATE \'$tblName\' SET $_columnStatus = \'COMPLETED\' WHERE $_columnTask = \'$task\';');
-    });
-  }
-
-  Future updateDateByID(int taskId, String taskDate, String tblName) async {
-    var dbClient = await db;
-    await dbClient.transaction((Transaction txn) async {
-      print("Date Update to: $taskDate for task id: $taskId");
-      await txn.rawUpdate(
-          'UPDATE \'$tblName\' SET $_columnDate = \'$taskDate\' WHERE $_columnId = \'$taskId\';');
-    });
-  }
-
-  Future updateDetailsByID(
-      int taskId, String task, String details, String tblName) async {
-    var dbClient = await db;
-
-    print("Id: $taskId Task: $task Details: $details");
-
-    if (details != null) {
-      await dbClient.transaction((Transaction txn) async {
-        print("Details Update to: $details for task id: $taskId");
-        await txn.rawUpdate(
-            'UPDATE \'$tblName\' SET $_columnDetails = \'$details\' WHERE $_columnId = \'$taskId\';');
-      });
-    } else if (details == null) {
-      await dbClient.transaction((Transaction txn) async {
-        print("Details Update to: $details for task id: $taskId");
-        await txn.rawUpdate(
-            'UPDATE \'$tblName\' SET $_columnDetails = null WHERE $_columnId = \'$taskId\';');
-      });
-    }
-
-    if (task != null) {
-      await dbClient.transaction((Transaction txn) async {
-        print("Task Update to: $task for task id: $taskId");
-        await txn.rawUpdate(
-            'UPDATE \'$tblName\' SET $_columnTask = \'$task\' WHERE $_columnId = \'$taskId\';');
-      });
-    } else if (task == null) {
-      await dbClient.transaction((Transaction txn) async {
-        print("Task Update to: $task for task id: $taskId");
-        await txn.rawUpdate(
-            'UPDATE \'$tblName\' SET $_columnTask = null WHERE $_columnId = \'$taskId\';');
-      });
-    }
-  }
-
-  Future<List<Task>> getTasksByStatus(String tblName, String status) async {
-    var dbClient = await db;
-    List<Map<String, dynamic>> result = await dbClient.rawQuery(
-        'SELECT * FROM \'$tblName\' WHERE $_columnStatus = \'$status\'');
-
-    List<Task> tasks = new List();
-    for (Map<String, dynamic> item in result) {
-      var myTask = new Task.fromMap(item);
-      tasks.add(myTask);
-    }
-    return tasks;
-  }
-
-  Future<Task> getTaskById(String tblName, int id) async {
-    var dbClient = await db;
-    List<Map<String, dynamic>> result = await dbClient
-        .rawQuery('SELECT * FROM \'$tblName\' WHERE $_columnId = \'$id\'');
-
-    Task task;
-    for (Map<String, dynamic> item in result) {
-      task = new Task.fromMap(item);
-      print("DatabaseHelper: ${task.task}");
-    }
-
-    return task;
-  }
-
-  Future close() async => _db.close();
-}
diff --git a/lib/data/providers/sql_lite.dart b/lib/data/providers/sql_lite.dart
new file mode 100644
index 0000000..65375dd
--- /dev/null
+++ b/lib/data/providers/sql_lite.dart
@@ -0,0 +1,280 @@
+// import 'dart:async';
+// import 'dart:io' as io;
+
+// import 'package:path/path.dart';
+// import 'package:path_provider/path_provider.dart';
+// import 'package:sqflite/sqflite.dart';
+
+// import '../model/task.dart';
+
+// class DatabaseHelper {
+//   static final DatabaseHelper _instance = DatabaseHelper.internal();
+
+//   factory DatabaseHelper() => _instance;
+
+//   DatabaseHelper.internal();
+
+//   static Database _db;
+//   String _dbFileName = "task.db";
+//   String _tableName = "My Tasks";
+//   String _columnId = "id";
+//   String _columnTask = "task";
+//   String _columnStatus = "status";
+//   String _columnDetails = "details";
+//   String _columnDate = "date";
+
+//   Future<Database> get db async {
+//     if (_db != null) {
+//       return _db;
+//     }
+//     _db = await initDb();
+//     return _db;
+//   }
+
+//   static DatabaseHelper get() {
+//     return _instance;
+//   }
+
+//   initDb() async {
+//     print("Tasks: Running initDb");
+//     io.Directory documentDirectory = await getApplicationDocumentsDirectory();
+//     String path = join(documentDirectory.path, _dbFileName);
+//     var ourDb = await openDatabase(
+//       path,
+//       version: 1,
+//       onCreate: _onCreate,
+//     );
+//     return ourDb;
+//   }
+
+//   void _onCreate(Database db, int version) async {
+//     await db.execute(
+//         "CREATE TABLE '$_tableName' ($_columnId INTEGER PRIMARY KEY, $_columnTask TEXT, $_columnStatus TEXT, $_columnDetails TEXT, $_columnDate TEXT)");
+//     print("Table $_tableName is created");
+//   }
+
+//   Future<List<String>> getTables() async {
+//     var dbClient = await db;
+//     List<Map<String, dynamic>> tables = await dbClient
+//         .rawQuery("SELECT * FROM sqlite_master WHERE type=\'table\';");
+
+//     List<String> tableNames = List();
+//     if (tables != null) {
+//       for (Map<String, dynamic> item in tables) {
+//         if (item['name'] != "android_metadata") {
+//           tableNames.add(item['name']);
+//         }
+//       }
+//     }
+//     return tableNames;
+//   }
+
+//   Future createTable(String _newTableName) async {
+//     var dbClient = await db;
+//     await dbClient.transaction((Transaction txn) {
+//       txn.rawQuery(
+//           "CREATE TABLE '$_newTableName' ($_columnId INTEGER PRIMARY KEY,"
+//           " $_columnTask TEXT, $_columnStatus TEXT,"
+//           " $_columnDetails TEXT, $_columnDate TEXT)");
+//     });
+//     print("Created table with name: $_newTableName");
+//   }
+
+//   Future renameTable(String _oldTableName, String _newTableName) async {
+//     var dbClient = await db;
+//     await dbClient.transaction((Transaction txn) {
+//       txn.rawQuery(
+//           "ALTER TABLE \'$_oldTableName\' RENAME TO \'$_newTableName\';");
+//     });
+//   }
+
+//   Future deleteTable(String tblName) async {
+//     var dbClient = await db;
+//     await dbClient.transaction((Transaction txn) {
+//       txn.rawQuery("DROP TABLE \'$tblName\'");
+//     });
+//   }
+
+//   Future saveTask(Task task, String tblName) async {
+//     var dbClient = await db;
+//     await dbClient.transaction((Transaction txn) async {
+//       txn.insert("\'$tblName\'", task.toMap());
+//     });
+//   }
+
+//   Future deleteTableTask(Task task, String tblName) async {
+//     var dbClient = await db;
+//     await dbClient.transaction((Transaction txn) async {
+//       txn.delete(tblName);
+//     });
+//   }
+
+//   Future deleteTask(int taskId, String tblName) async {
+//     var dbClient = await db;
+//     await dbClient.transaction((Transaction txn) async {
+//       await txn
+//           .rawDelete('DELETE FROM \'$tblName\' WHERE $_columnId = \'$taskId\'');
+//     });
+//   }
+
+//   Future deleteCompletedTask(String tblName) async {
+//     var dbClient = await db;
+//     await dbClient.transaction((Transaction txn) async {
+//       await txn.rawDelete(
+//           'DELETE FROM \'$tblName\' WHERE $_columnStatus = \'COMPLETED\';');
+//     });
+//   }
+
+//   Future updateTask(String task, String tblName) async {
+//     var dbClient = await db;
+//     await dbClient.transaction((Transaction txn) async {
+//       await txn.rawUpdate(
+//           'UPDATE \'$tblName\' SET $_columnStatus = \'COMPLETED\' WHERE $_columnTask = \'$task\';');
+//     });
+//   }
+
+//   Future updateDateByID(int taskId, String taskDate, String tblName) async {
+//     var dbClient = await db;
+//     await dbClient.transaction((Transaction txn) async {
+//       print("Date Update to: $taskDate for task id: $taskId");
+//       await txn.rawUpdate(
+//           'UPDATE \'$tblName\' SET $_columnDate = \'$taskDate\' WHERE $_columnId = \'$taskId\';');
+//     });
+//   }
+
+//   Future updateDetailsByID(
+//       int taskId, String task, String details, String tblName) async {
+//     var dbClient = await db;
+
+//     print("Id: $taskId Task: $task Details: $details");
+
+//     if (details != null) {
+//       await dbClient.transaction((Transaction txn) async {
+//         print("Details Update to: $details for task id: $taskId");
+//         await txn.rawUpdate(
+//             'UPDATE \'$tblName\' SET $_columnDetails = \'$details\' WHERE $_columnId = \'$taskId\';');
+//       });
+//     } else if (details == null) {
+//       await dbClient.transaction((Transaction txn) async {
+//         print("Details Update to: $details for task id: $taskId");
+//         await txn.rawUpdate(
+//             'UPDATE \'$tblName\' SET $_columnDetails = null WHERE $_columnId = \'$taskId\';');
+//       });
+//     }
+
+//     if (task != null) {
+//       await dbClient.transaction((Transaction txn) async {
+//         print("Task Update to: $task for task id: $taskId");
+//         await txn.rawUpdate(
+//             'UPDATE \'$tblName\' SET $_columnTask = \'$task\' WHERE $_columnId = \'$taskId\';');
+//       });
+//     } else if (task == null) {
+//       await dbClient.transaction((Transaction txn) async {
+//         print("Task Update to: $task for task id: $taskId");
+//         await txn.rawUpdate(
+//             'UPDATE \'$tblName\' SET $_columnTask = null WHERE $_columnId = \'$taskId\';');
+//       });
+//     }
+//   }
+
+//   Future<List<Task>> getTasksByStatus(String tblName, String status) async {
+//     var dbClient = await db;
+//     List<Map<String, dynamic>> result = await dbClient.rawQuery(
+//         'SELECT * FROM \'$tblName\' WHERE $_columnStatus = \'$status\'');
+
+//     List<Task> tasks = List();
+//     for (Map<String, dynamic> item in result) {
+//       var myTask = Task.fromMap(item);
+//       tasks.add(myTask);
+//     }
+//     return tasks;
+//   }
+
+//   Future<Task> getTaskById(String tblName, int id) async {
+//     var dbClient = await db;
+//     List<Map<String, dynamic>> result = await dbClient
+//         .rawQuery('SELECT * FROM \'$tblName\' WHERE $_columnId = \'$id\'');
+
+//     Task task;
+//     for (Map<String, dynamic> item in result) {
+//       task = Task.fromMap(item);
+//       print("DatabaseHelper: ${task.task}");
+//     }
+
+//     return task;
+//   }
+
+//   Future close() async => _db.close();
+// }
+
+// -- Get Tasks --
+// print("Running _getTasks()");
+// if (listName != null && listName != "") {
+//   var dbClient = DatabaseHelper();
+//   dbClient.getTasksByStatus(listName, "PENDING").then((tasks) {
+//     if (tasks == null) return;
+//     setState(() {
+//       pendingTaskList.clear();
+//       pendingTaskList.addAll(tasks);
+//       //print(tasks.toString());
+//     });
+//   });
+
+//   dbClient.getTasksByStatus(listName, "COMPLETED").then((tasks) {
+//     if (tasks == null) return;
+//     setState(() {
+//       completedTaskList.clear();
+//       completedTaskList.addAll(tasks);
+//       //print(tasks.toString());
+//     });
+//   });
+// } else {
+//   print("var listName is null");
+// }
+
+// -- Get Tables --
+// DatabaseHelper.get().getTables().then((tableNames) {
+//   if (tableNames != null) {
+//     tblNames.clear();
+//     for (String item in tableNames) {
+//       setState(() {
+//         print(item);
+//         tblNames.add(item);
+//       });
+//     }
+//     activeList = tblNames[0];
+//     listName = tblNames[0];
+//     defaultListName = tblNames[0];
+//     _getTasks();
+//   } else
+//     print("getTables returned null");
+// });
+
+// -- Delete List --
+// await DatabaseHelper.get().deleteTable(activeList);
+
+// -- Delete COmpleted Tasks
+// await DatabaseHelper.get().deleteCompletedTask(activeList);
+
+// -- Task Save --
+// var db = DatabaseHelper();
+// db.saveTask(task, activeList);
+// //Navigator.pop(context);
+
+// -- Update Task --
+// var db = DatabaseHelper();
+// db.updateTask(task, activeList);
+
+// -- Add List --
+// await DatabaseHelper.get()
+//     .createTable(newListTitle)
+//     .then((_) {
+//   Navigator.pop(context);
+// });
+
+// -- Rename List --
+// await DatabaseHelper.get()
+//     .renameTable(oldListTitle, newListTitle)
+//     .then((_) {
+//   Navigator.pop(context);
+// });
diff --git a/lib/main.dart b/lib/main.dart
index 9c06daa..7dcf79b 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,22 +1,23 @@
 import 'package:flutter/material.dart';
-import 'package:tasks/pages/splash.dart';
+
+import 'pages/splash.dart';
 
 void main() => runApp(new TasksApp());
 
 class TasksApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    return new MaterialApp(
+    return MaterialApp(
       debugShowCheckedModeBanner: false,
       title: 'Tasks',
-      theme: new ThemeData(
+      theme: ThemeData(
         dividerColor: Colors.grey[300],
         primarySwatch: Colors.blue,
         canvasColor: Colors.transparent,
         dialogBackgroundColor: Colors.white,
         fontFamily: 'Raleway',
       ),
-      home: new TasksSplashPage(),
+      home: TasksSplashPage(),
     );
   }
 }
diff --git a/lib/model/list.dart b/lib/model/list.dart
new file mode 100644
index 0000000..d160e6b
--- /dev/null
+++ b/lib/model/list.dart
@@ -0,0 +1,8 @@
+import 'task.dart';
+
+class TaskList {
+   String name;
+  final List<Task> tasks;
+
+  TaskList({this.name, this.tasks});
+}
diff --git a/lib/model/task.dart b/lib/model/task.dart
index 6520860..9f04038 100644
--- a/lib/model/task.dart
+++ b/lib/model/task.dart
@@ -1,35 +1,55 @@
 class Task {
-  int _id;
-  String _task;
-  String _status;
-  String _date;
-  String _details;
-
-  Task(this._task, this._status, this._details);
-
-  Task.map(dynamic obj) {
-    this._task = obj['task'];
-    this._status = obj['status'];
-    this._details = obj['details'];
-  }
-
-  int get id => _id;
-  String get task => _task;
-  String get status => _status;
-  String get date => _date;
-  String get details => _details;
-
-  Map<String, dynamic> toMap() {
-    var map = new Map<String, dynamic>();
-    map['task'] = _task;
-    map['status'] = _status;
-    return map;
-  }
-
-  Task.fromMap(Map<String, dynamic> map) {
-    _id = map["id"];
-    _task = map["task"];
-    _status = map["status"];
-    _details = map["details"];
-  }
+  // int _id;
+  // String _task;
+  // String _status;
+  // String _date;
+  // String _details;
+
+  // Task(this._task, this._status, this._details, this._date);
+
+  final int id;
+  DateTime date;
+  String title, subtitle, status;
+  List<SubTask> subtasks;
+
+  Task(
+      {this.id,
+      this.date,
+      this.title,
+      this.subtitle,
+      this.status,
+      this.subtasks});
+
+  // Task.map(dynamic obj) {
+  //   this._task = obj['task'];
+  //   this._status = obj['status'];
+  //   this._details = obj['details'];
+  // }
+
+  // int get id => _id;
+  // String get task => _task;
+  // String get status => _status;
+  // String get date => _date;
+  // String get details => _details;
+
+  // Map<String, dynamic> toMap() {
+  //   var map = Map<String, dynamic>();
+  //   map['task'] = _task;
+  //   map['status'] = _status;
+  //   return map;
+  // }
+
+  // Task.fromMap(Map<String, dynamic> map) {
+  //   _id = map["id"];
+  //   _task = map["task"];
+  //   _status = map["status"];
+  //   _details = map["details"];
+  // }
+}
+
+class SubTask {
+  final int id;
+  DateTime date;
+  String title, subtitle, status;
+  SubTask({this.id, this.date, this.title, this.subtitle, this.status});
 }
diff --git a/lib/pages/add_task.dart b/lib/pages/add_task.dart
new file mode 100644
index 0000000..f079fb0
--- /dev/null
+++ b/lib/pages/add_task.dart
@@ -0,0 +1,136 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import '../widgets/fancy_fab.dart';
+import 'package:intl/intl.dart';
+import '../model/task.dart';
+import '../widgets/date_widget.dart';
+
+class AddTaskWidget extends StatefulWidget {
+  @override
+  AddTaskWidgetState createState() => AddTaskWidgetState();
+}
+
+class AddTaskWidgetState extends State<AddTaskWidget> {
+  final TextEditingController _controller = TextEditingController();
+  final TextEditingController _controllerDetails = TextEditingController();
+  final FocusNode _detailsFocus = FocusNode();
+  bool _showDetails = false;
+  DateTime _date;
+
+  @override
+  void initState() {
+    super.initState();
+    _showDetails = false;
+    _controller.clear();
+    _controllerDetails.clear();
+  }
+
+  @override
+  void dispose() {
+    _detailsFocus.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.only(
+              topLeft: const Radius.circular(10.0),
+              topRight: const Radius.circular(10.0))),
+      child: new Padding(
+        padding: const EdgeInsets.all(15.0),
+        child: new Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisSize: MainAxisSize.min,
+          children: <Widget>[
+            TextField(
+              controller: _controller,
+              autofocus: true,
+              decoration: InputDecoration(
+                border: InputBorder.none,
+                hintText: 'New Task',
+              ),
+              autocorrect: false,
+              keyboardType: TextInputType.text,
+            ),
+            _showDetails
+                ? TextField(
+                    controller: _controllerDetails,
+                    focusNode: _detailsFocus,
+                    decoration: InputDecoration(
+                      border: InputBorder.none,
+                      hintText: 'Add details',
+                      hintStyle: TextStyle(
+                        fontSize: 12.0,
+                      ),
+                    ),
+                    autocorrect: false,
+                    keyboardType: TextInputType.text,
+                  )
+                : Container(
+                    height: 0.0,
+                  ),
+            _date == null
+                ? Container(height: 0.0)
+                : DateViewWidget(
+                    date: _date,
+                    onClose: () {
+                      setState(() {
+                        _date = null;
+                      });
+                    },
+                  ),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: <Widget>[
+                FancyFab(
+                  icon: Icons.add,
+                  detailsPressed: () {
+                    setState(() => _showDetails = true);
+                    // FocusScope.of(context).requestFocus(_detailsFocus);
+                  },
+                  datePressed: () {
+                    showDatePicker(
+                      context: context,
+                      initialDate: _date ?? DateTime.now(),
+                      firstDate: (_date ?? DateTime.now())
+                          .subtract(Duration(days: 30)),
+                      lastDate:
+                          (_date ?? DateTime.now()).add(Duration(days: 365)),
+                    ).then((value) {
+                      if (value == null) return;
+                      print("Date: ${value.toIso8601String()}");
+                      setState(() {
+                        _date = value;
+                      });
+                    }).catchError((error) {
+                      print(error.toString());
+                    });
+                  },
+                ),
+                FlatButton(
+                  child: Text(
+                    'Save',
+                    style: TextStyle(
+                        color: Colors.blue, fontWeight: FontWeight.bold),
+                  ),
+                  onPressed: () {
+                    Navigator.pop(
+                        context,
+                        Task(
+                          title: _controller.text.toString(),
+                          subtitle: _controllerDetails.text.toString(),
+                          date: _date,
+                        ));
+                  },
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart
index 4d51fb2..c13c8ae 100644
--- a/lib/pages/home_page.dart
+++ b/lib/pages/home_page.dart
@@ -1,55 +1,62 @@
-import 'dart:async';
-
 import 'package:flutter/material.dart';
-import 'package:tasks/data/database_helper.dart';
-import 'package:tasks/model/task.dart';
-import 'package:tasks/pages/new_list_page.dart';
-import 'package:tasks/pages/rename_list_page.dart';
-import 'package:tasks/pages/task_details.dart';
+
+import '../model/task.dart';
+import '../pages/new_list_page.dart';
+import '../pages/rename_list_page.dart';
+import '../pages/add_task.dart';
+import '../data/data_handler.dart';
+import '../containers/bottom_sheet/more.dart';
+import '../containers/lists/completed.dart';
+import '../containers/lists/pending.dart';
+import '../containers/app_bar/main_list.dart';
+import '../widgets/image_widget.dart';
+import '../containers/bottom_sheet/menu.dart';
 
 class TasksHomePage extends StatefulWidget {
   @override
-  _TasksHomePageState createState() => new _TasksHomePageState();
+  _TasksHomePageState createState() => _TasksHomePageState();
 }
 
 enum DetailsWidgetStatus { OPEN, CLOSE }
 
 int taskDetailId;
-String _newTask = "";
-String _taskDetails = "";
-String _newTaskStatus = "PENDING";
-final List<Task> pendingTaskList = new List();
-final List<Task> completedTaskList = new List();
+final List<Task> pendingTaskList = List();
+final List<Task> completedTaskList = List();
 AnimationController detailsTapAnimationController;
-final _duration = new Duration(milliseconds: 300);
+final _duration = Duration(milliseconds: 300);
 DetailsWidgetStatus _detailsWidgetStatus = DetailsWidgetStatus.CLOSE;
-Future _bottomSheet;
-List<String> tblNames = new List();
+// Future _bottomSheet;
+List<String> tblNames = List();
 String listName = "";
 String activeList = "";
-String defaultListName = "";
-StatefulBuilder _builder;
+String defaultListName = "My Tasks";
+// StatefulBuilder _builder;
+SortBy _sort = SortBy.custom;
 StateSetter setSheetState;
 bool details = false;
 
 class _TasksHomePageState extends State<TasksHomePage>
     with TickerProviderStateMixin {
-  final GlobalKey scaffoldKey = new GlobalKey<ScaffoldState>();
+  final GlobalKey<ScaffoldState> scaffoldKey = GlobalKey<ScaffoldState>();
 
   @override
   void initState() {
     super.initState();
+    activeList = "My Tasks"; // Default List
+    listName = activeList;
+    defaultListName = activeList;
     detailsTapAnimationController =
-        new AnimationController(duration: _duration, vsync: this);
+        AnimationController(duration: _duration, vsync: this);
     detailsTapAnimationController.addListener(() {
       setSheetState(() {
         print("Animation: ${detailsTapAnimationController.value.toDouble()}");
-        _bottomSheet;
+        // _bottomSheet;
       });
     });
     _getTables();
   }
 
+  @override
   dispose() {
     super.dispose();
     detailsTapAnimationController.dispose();
@@ -57,144 +64,138 @@ class _TasksHomePageState extends State<TasksHomePage>
 
   @override
   Widget build(BuildContext context) {
-    _builder = new StatefulBuilder(
-      builder: (BuildContext context, kek) {
-        print(kek);
-        return new Text('');
-      },
-    );
-    return new Scaffold(
+    // _builder = StatefulBuilder(
+    //   builder: (BuildContext context, kek) {
+    //     print(kek);
+    //     return Text('');
+    //   },
+    // );
+    return Scaffold(
       key: scaffoldKey,
-      floatingActionButton: new FloatingActionButton.extended(
-        elevation: 3.0,
+      floatingActionButton: FloatingActionButton.extended(
+        elevation: 4.0,
         icon: const Icon(Icons.add),
-        label: const Text('Add a new task'),
+        label: const Text('Add a new task', maxLines: 1),
         onPressed: () {
-          _newTaskModalBottomSheet();
+          showModalBottomSheet<Task>(
+              context: context,
+              builder: (BuildContext context) {
+                return new AnimatedPadding(
+                  padding: MediaQuery.of(context).viewInsets,
+                  duration: const Duration(milliseconds: 100),
+                  curve: Curves.decelerate,
+                  child: new Container(
+                    alignment: Alignment.bottomCenter,
+                    child: Wrap(
+                      children: <Widget>[
+                        AddTaskWidget(),
+                      ],
+                    ),
+                  ),
+                );
+              }).then((newTask) {
+            if (newTask == null || newTask.title.isNotEmpty)
+              onNewTaskSave(newTask);
+          });
         },
       ),
       floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked,
-      bottomNavigationBar: new BottomAppBar(
-        elevation: 3.0,
-        hasNotch: false,
-        child: new Row(
+      bottomNavigationBar: BottomAppBar(
+        elevation: 25.0,
+        // hasNotch: false,
+        // shape: CircularNotchedRectangle(),
+        // notchMargin: 4.0,
+        child: Row(
           mainAxisSize: MainAxisSize.max,
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: <Widget>[
-            new IconButton(
+            IconButton(
               icon: const Icon(Icons.menu),
-              onPressed: () {
-                _modalBottomSheetMenu();
-              },
+              onPressed: _modalBottomSheetMenu,
             ),
-            new IconButton(
+            IconButton(
               icon: const Icon(Icons.more_vert),
-              onPressed: () {
-                _modalBottomSheetMore();
-              },
+              onPressed: _modalBottomSheetMore,
             )
           ],
         ),
       ),
       body: Container(
         color: Colors.white,
-        child: CustomScrollView(
-          slivers: <Widget>[
-            SliverAppBar(
-              backgroundColor: Colors.white,
-              expandedHeight: 85.0,
-              floating: false,
-              snap: false,
-              //centerTitle: true,
-              //title: Text ('My Tasks',
-              //style: TextStyle(color: Colors.black,),),
-              elevation: 0.0,
-              flexibleSpace: new FlexibleSpaceBar(
-                title: (listName != "" && listName != null)
-                    ? new Text(
-                        listName,
-                        style: TextStyle(
-                          color: Colors.black,
-                          fontSize: 25.0,
-                          fontWeight: FontWeight.w400,
-                        ),
-                      )
-                    : new Text(""),
-              ),
-            ),
-            SliverList(
-              delegate: SliverChildListDelegate(
-                List<Dismissible>.generate(
-                  pendingTaskList.length,
-                  (int index) {
-                    final item = pendingTaskList[index].task;
-                    return new Dismissible(
-                      direction: DismissDirection.startToEnd,
-                      key: Key(item),
-                      onDismissed: (direction) {
-                        print(index);
-                        completedTaskList.add(pendingTaskList[index]);
-                        pendingTaskList.removeAt(index);
-                        /*showSnackBar(
-                          new SnackBar(
-                            content:
-                                Text("${pendingTaskList.length} completed!"),
-                          ),
-                        );*/
-                        updateTaskStatus(item);
-                        _getTasks();
-                      },
-                      background: Container(
-                        color: Colors.blue,
-                      ),
-                      child: new Column(
-                        mainAxisAlignment: MainAxisAlignment.start,
-                        children: <Widget>[
-                          Padding(
-                            padding: EdgeInsets.only(
-                              left: 16.0,
-                              right: 16.0,
-                            ),
-                            child: new ListTile(
-                              onTap: () async {
-                                taskDetailId = pendingTaskList[index].id;
-                                var route = new MaterialPageRoute(
-                                    builder: (BuildContext context) {
-                                  return new TaskDetailsPage(
-                                      listName, taskDetailId);
-                                });
-                                var detailsPage =
-                                    await Navigator.of(context).push(route);
-                                if (detailsPage == null) {
-                                  _getTasks();
-                                }
-                              },
-                              leading: new Icon(Icons.radio_button_unchecked),
-                              title: (pendingTaskList[index].task != null)
-                                  ? new Text(pendingTaskList[index].task)
-                                  : new Text(""),
-                              subtitle: (pendingTaskList[index].details != null)
-                                  ? new Text(pendingTaskList[index].details)
-                                  : new Text(""),
-                            ),
-                          ),
-                          new Divider(
-                            height: 1.0,
-                          ),
-                        ],
-                      ),
-                    );
-                  },
-                ),
-              ),
-            ),
-            completedList(),
-          ],
+        child: SafeArea(
+          child: CustomScrollView(
+            slivers: <Widget>[
+              MainListAppBar(name: listName),
+              buildList(context),
+              buildCompletedImage(context),
+            ],
+          ),
         ),
       ),
     );
   }
 
+  bool showCompleted = false;
+  Widget buildList(BuildContext context) {
+    if (pendingTaskList == null || pendingTaskList.isEmpty) {
+      if (completedTaskList != null && completedTaskList.isNotEmpty) {
+        showCompleted = true;
+        return CompletedList(
+          items: completedTaskList,
+          listName: activeList,
+          listRefresh: () {
+            _getTasks();
+          },
+          restoreTask: (Task task) {
+            updateTaskStatus(task, undo: true);
+          },
+        );
+      } else {
+        showCompleted = false;
+        return SliverFillRemaining(
+            child: ImageWidget(
+          image: "assets/images/new_list.png",
+          title: 'A fresh start',
+          subtitle: 'Anything to Add?',
+        ));
+      }
+    }
+    showCompleted = false;
+    return PendingList(
+      items: pendingTaskList,
+      dismissedTask: (Task task) {
+        updateTaskStatus(task);
+        showInSnackBar("1 completed", task: task);
+      },
+      listRefresh: () {
+        _getTasks();
+      },
+      listName: activeList,
+    );
+  }
+
+  Widget buildCompletedImage(BuildContext context) {
+    if (showCompleted) {
+      return SliverFillRemaining(
+          child: ImageWidget(
+        image: "assets/images/completed.png",
+        title: 'Nicely Done!',
+        subtitle: "You've finished all your tasks.\nTake a second to recharge.",
+      ));
+    }
+
+    return CompletedList(
+      items: completedTaskList,
+      listName: activeList,
+      listRefresh: () {
+        _getTasks();
+      },
+      restoreTask: (Task task) {
+        updateTaskStatus(task, undo: true);
+      },
+    );
+  }
+
   void onTapUp(TapUpDetails tap) {
     if (_detailsWidgetStatus == DetailsWidgetStatus.CLOSE) {
       print("OPEN");
@@ -208,721 +209,196 @@ class _TasksHomePageState extends State<TasksHomePage>
     setState(() {});
   }
 
-  Widget dateButton() {
-    var scorePosition = detailsTapAnimationController.value * 100;
-    var scoreOpacity = detailsTapAnimationController.value;
-    return new Positioned(
-      child: new Opacity(
-        opacity: scoreOpacity,
-        child: new Container(
-          height: 32.0,
-          width: 32.0,
-          decoration: new ShapeDecoration(
-            shape: new RoundedRectangleBorder(side: BorderSide.none),
-          ),
-          child: new Center(
-            child: new Icon(
-              Icons.date_range,
-              color: Colors.blue,
-            ),
-          ),
-        ),
-      ),
-      left: scorePosition,
-    );
-  }
-
-  Widget detailsButton() {
-    var scorePosition = detailsTapAnimationController.value * 50;
-    var scoreOpacity = detailsTapAnimationController.value;
-    return new Positioned(
-      child: new GestureDetector(
-        onTapUp: (TapUpDetails tapUp) {
-          print('Tapup');
-          if (details == false) {
-            setSheetState(() {
-              details = true;
-            });
-          } else {
-            setSheetState(() {
-              details = false;
-            });
-          }
-        },
-        child: new Opacity(
-          opacity: scoreOpacity,
-          child: new Container(
-            height: 32.0,
-            width: 32.0,
-            decoration: new ShapeDecoration(
-              shape: new RoundedRectangleBorder(side: BorderSide.none),
-            ),
-            child: new Center(
-              child: new Icon(
-                Icons.format_list_numbered,
-                color: (details == false) ? Colors.blue : Colors.grey[400],
-              ),
-            ),
-          ),
-        ),
-      ),
-      left: scorePosition,
-    );
-  }
-
-  Widget kek() {
-    var rotation = detailsTapAnimationController.value == 0.0
-        ? detailsTapAnimationController.value
-        : detailsTapAnimationController.value + 25;
-    var mColor = detailsTapAnimationController.value == 0.0
-        ? Colors.blue
-        : Colors.blueGrey;
-    return new GestureDetector(
-      onTapUp: onTapUp,
-      child: new Transform.rotate(
-        angle: rotation,
-        child: new Container(
-          height: 32.0,
-          width: 32.0,
-          padding: new EdgeInsets.all(2.0),
-          decoration: new BoxDecoration(
-            borderRadius: BorderRadius.circular(30.0),
-            color: Colors.transparent,
-          ),
-          child: new Center(
-            child: new Icon(
-              Icons.add_circle,
-              color: mColor,
-              size: 26.0,
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-
-  BuildContext bottomSheetContext;
-
-  // TODO: Original one is this
-  /*void _newTaskModalBottomSheet() {
-    showModalBottomSheet(
-        context: context,
-        builder: (BuildContext contextt) {
-          return new StatefulBuilder(
-              builder: (BuildContext ctxt, StateSetter stateSetter) {
-            setSheetState = stateSetter;
-            return new AnimatedPadding(
-              padding: MediaQuery.of(context).viewInsets,
-              duration: const Duration(milliseconds: 100),
-              curve: Curves.decelerate,
-              child: new GestureDetector(
-                onTapUp: (TapUpDetails tap) {
-                  print('Tapped');
-                },
-                child: new Container(
-                  alignment: Alignment.bottomCenter,
-                  child: Wrap(
-                    children: <Widget>[
-                      new Container(
-                        decoration: new BoxDecoration(
-                            color: Colors.white,
-                            borderRadius: new BorderRadius.only(
-                                topLeft: const Radius.circular(10.0),
-                                topRight: const Radius.circular(10.0))),
-                        child: new Wrap(
-                          children: <Widget>[
-                            new Padding(
-                              padding: EdgeInsets.only(
-                                left: 20.0,
-                                top: 15.0,
-                                right: 20.0,
-                                bottom: 15.0,
-                              ),
-                              child: new Column(
-                                children: <Widget>[
-                                  new TextField(
-                                    onChanged: (newTask) {
-                                      _newTask = newTask;
-                                    },
-                                    onSubmitted: (newTask) {
-                                      onNewTaskSave();
-                                    },
-                                    autofocus: true,
-                                    decoration: new InputDecoration(
-                                      border: InputBorder.none,
-                                      hintText: 'New Task',
-                                    ),
-                                    autocorrect: false,
-                                    keyboardType: TextInputType.text,
-                                  ),
-                                  (details == true)
-                                      ? new TextField(
-                                          onChanged: (taskDetails) {
-                                            _taskDetails = taskDetails;
-                                          },
-                                          onSubmitted: (taskDetails) {
-                                            onNewTaskSave();
-                                          },
-                                          autofocus: true,
-                                          decoration: new InputDecoration(
-                                            border: InputBorder.none,
-                                            hintText: 'Add details',
-                                            hintStyle: TextStyle(
-                                              fontSize: 8.0,
-                                            ),
-                                          ),
-                                          autocorrect: false,
-                                          keyboardType: TextInputType.text,
-                                        )
-                                      : new Container(),
-                                  new Container(
-                                    height: 20.0,
-                                  ),
-                                  new Row(
-                                    mainAxisAlignment:
-                                        MainAxisAlignment.spaceBetween,
-                                    mainAxisSize: MainAxisSize.max,
-                                    children: <Widget>[
-                                      new Stack(
-                                        //alignment: AlignmentDirectional.center,
-                                        //overflow: Overflow.visible,
-                                        children: <Widget>[
-                                          detailsButton(),
-                                          dateButton(),
-                                          kek(),
-                                        ],
-                                      ),
-                                      new FlatButton(
-                                        onPressed: () {
-                                          onNewTaskSave();
-                                        },
-                                        child: const Text(
-                                          'Save',
-                                          style: TextStyle(
-                                            fontSize: 15.0,
-                                            color: Colors.blue,
-                                          ),
-                                        ),
-                                        color: Colors.white,
-                                        splashColor: Colors.blue,
-                                        textColor:
-                                            Theme.of(context).accentColor,
-                                      ),
-                                    ],
-                                  ),
-                                ],
-                              ),
-                            ),
-                          ],
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-            );
-          });
-        });
-  }*/
-
-  //TODO: This one is for debug
-  void _newTaskModalBottomSheet() {
-    showModalBottomSheet(
-        context: context,
-        builder: (BuildContext contextt) {
-          // return new StatefulBuilder(
-          //   builder: (BuildContext ctxt, StateSetter stateSetter) {
-          // setSheetState = stateSetter;
-          return new Column(
-            children: <Widget>[
-              new Stack(
-                children: <Widget>[
-                  new Container(
-                    decoration: new BoxDecoration(
-                      color: Colors.white,
-                      borderRadius: new BorderRadius.only(
-                        topLeft: const Radius.circular(10.0),
-                        topRight: const Radius.circular(10.0),
-                      ),
-                    ),
-                    child: Wrap(
-                      children: <Widget>[
-                        new TextField(
-                          onChanged: (newTask) {
-                            _newTask = newTask;
-                          },
-                          onSubmitted: (newTask) {
-                            onNewTaskSave();
-                          },
-                          autofocus: true,
-                          decoration: new InputDecoration(
-                            border: InputBorder.none,
-                            hintText: 'New Task',
-                          ),
-                          autocorrect: false,
-                          keyboardType: TextInputType.text,
-                        ),
-                        (details == true)
-                            ? new TextField(
-                                onChanged: (taskDetails) {
-                                  _taskDetails = taskDetails;
-                                },
-                                onSubmitted: (taskDetails) {
-                                  onNewTaskSave();
-                                },
-                                autofocus: true,
-                                decoration: new InputDecoration(
-                                  border: InputBorder.none,
-                                  hintText: 'Add details',
-                                  hintStyle: TextStyle(
-                                    fontSize: 8.0,
-                                  ),
-                                ),
-                                autocorrect: false,
-                                keyboardType: TextInputType.text,
-                              )
-                            : new Container(),
-                      ],
-                    ),
-                  ),
-                ],
-              ),
-              new AnimatedContainer(
-                height: MediaQuery.of(context).size.height * 0.4,
-                duration: new Duration(
-                  milliseconds: 300,
-                ),
-              ),
-            ],
-          );
-          //});
-        });
-  }
-
   void _modalBottomSheetMenu() {
     showModalBottomSheet(
+        // resizeToAvoidBottomPadding: true,
         context: context,
         builder: (builder) {
-          return new Container(
-            //height: 530.0,
-            decoration: new BoxDecoration(
-              color: Colors.white,
-              borderRadius: new BorderRadius.only(
-                topLeft: const Radius.circular(10.0),
-                topRight: const Radius.circular(10.0),
-              ),
-            ),
-            child: new Column(
-              mainAxisSize: MainAxisSize.min,
-              //mainAxisAlignment: MainAxisAlignment.end,
-              children: <Widget>[
-                /*UserAccountsDrawerHeader(
-                  currentAccountPicture: new DecoratedBox(
-                    decoration: new BoxDecoration(
-                      image: new DecorationImage(
-                        image: new AssetImage("assets/user/satya_profile.png"),
-                      ),
-                    ),
-                  ),
-                  margin: EdgeInsets.all(0.0),
-                  accountEmail: new Text(
-                    "satyabrat.me@gmail.com",
-                    style: TextStyle(
-                      color: Colors.black,
-                    ),
-                  ),
-                  accountName: new Text(
-                    "Satyabrat Sahoo",
-                    style: TextStyle(
-                      color: Colors.black,
-                    ),
-                  ),
-                  decoration: new BoxDecoration(
-                    color: Colors.white,
-                  ),
-                ),
-                new Divider(
-                  height: 4.0,
-                  indent: 2.0,
-                ),*/
-                new ListView.builder(
-                    shrinkWrap: true,
-                    itemCount: tblNames.length,
-                    itemBuilder: (context, index) {
-                      return new GestureDetector(
-                        onTap: () {
-                          listName = tblNames[index];
-                          activeList = listName;
-                          _getTasks();
-                          Navigator.pop(context);
-                        },
-                        child: Padding(
-                          child: new DecoratedBox(
-                            decoration: new BoxDecoration(
-                              color: (activeList == tblNames[index])
-                                  ? Color(0x4D90CAF9)
-                                  : Colors.white,
-                              borderRadius: new BorderRadius.only(
-                                topLeft: new Radius.circular(30.0),
-                                bottomLeft: new Radius.circular(30.0),
-                              ),
-                            ),
-                            child: new ListTile(
-                              selected: true,
-                              title: new Text(
-                                tblNames[index],
-                                style: TextStyle(
-                                  color: (activeList == tblNames[index])
-                                      ? Colors.blueAccent
-                                      : Colors.black,
-                                  fontWeight: FontWeight.w700,
-                                ),
-                              ),
-                            ),
-                          ),
-                          padding: EdgeInsets.only(
-                            left: 8.0,
-                            top: 8.0,
-                            bottom: 8.0,
-                          ),
-                        ),
-                      );
-                    }),
-                new Divider(
-                  height: 4.0,
-                ),
-                new ListTile(
-                  onTap: () async {
-                    Navigator.pop(context);
-                    var newListPage = await Navigator.push(context,
-                        new MaterialPageRoute(builder: (BuildContext context) {
-                      return new NewListPage();
-                    }));
-                    if (newListPage == null) {
-                      _getTables();
-                    }
-                  },
-                  leading: new Icon(
-                    Icons.add,
-                  ),
-                  title: new Text(
-                    "Create new list",
-                    style: TextStyle(
-                      fontWeight: FontWeight.w700,
-                    ),
-                  ),
-                ),
-                new Divider(
-                  height: 4.0,
-                ),
-                new ListTile(
-                  leading: new Icon(
-                    Icons.feedback,
-                  ),
-                  title: new Text(
-                    "Send feedback",
-                    style: TextStyle(
-                      fontWeight: FontWeight.w700,
-                    ),
-                  ),
-                ),
-                new Divider(
-                  height: 4.0,
-                ),
-                new ListTile(
-                  title: new Text(
-                    "Open-source licenses",
-                    style: TextStyle(
-                      fontWeight: FontWeight.w700,
-                    ),
-                  ),
-                ),
-                new Divider(
-                  height: 4.0,
-                ),
-                new Padding(
-                  padding: EdgeInsets.only(top: 6.0, bottom: 6.0),
-                  child: new Row(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: <Widget>[
-                      new Text(
-                        "Privacy Policy",
-                        style: TextStyle(
-                          fontSize: 13.0,
-                          fontWeight: FontWeight.w700,
-                        ),
-                      ),
-                      new Container(
-                        width: 25.0,
-                        child: new Icon(
-                          Icons.arrow_drop_down_circle,
-                          size: 5.0,
-                        ),
-                      ),
-                      //new Icon(
-                      //Icons.,
-                      //),
-                      new Text(
-                        "Terms of service",
-                        style: TextStyle(
-                          fontSize: 13.0,
-                          fontWeight: FontWeight.w700,
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ],
-            ),
+          return MenuWidget(
+            listNames: tblNames,
+            createList: () async {
+              Navigator.pop(context);
+              var newListPage = await Navigator.push(context,
+                  MaterialPageRoute(builder: (BuildContext context) {
+                return NewListPage();
+              }));
+              if (newListPage == null) {
+                _getTables();
+              }
+            },
+            activeList: activeList,
+            listChange: (String value) {
+              listName = value;
+              activeList = listName;
+              _getTasks();
+            },
           );
         });
   }
 
   void _modalBottomSheetMore() {
     showModalBottomSheet(
+      // resizeToAvoidBottomPadding: true,
       context: context,
       builder: (builder) {
-        return new Container(
-          padding: EdgeInsets.only(
-            left: 5.0,
-            right: 5.0,
-            top: 5.0,
-            bottom: 5.0,
-          ),
-          decoration: new BoxDecoration(
-              color: Colors.white,
-              borderRadius: new BorderRadius.only(
-                  topLeft: const Radius.circular(10.0),
-                  topRight: const Radius.circular(10.0))),
-          child: new Wrap(
-            children: <Widget>[
-              new ListTile(
-                title: const Text(
-                  'Sort By',
-                  style: TextStyle(
-                    fontSize: 14.0,
-                    fontWeight: FontWeight.w700,
-                  ),
-                ),
-              ),
-              new ListTile(
-                leading: new Container(
-                  width: 4.0,
-                ),
-                title: const Text(
-                  'My Order',
-                  style: TextStyle(
-                    fontSize: 14.0,
-                    fontWeight: FontWeight.w700,
-                  ),
-                ),
-                trailing: new Icon(Icons.check),
-              ),
-              new ListTile(
-                leading: new Container(
-                  width: 4.0,
-                ),
-                title: const Text(
-                  'Date',
-                  style: TextStyle(
-                    fontSize: 14.0,
-                    fontWeight: FontWeight.w700,
-                  ),
-                ),
-                trailing: new Icon(Icons.check),
-              ),
-              new Divider(
-                height: 10.0,
-              ),
-              new ListTile(
-                title: const Text(
-                  'Rename List',
-                  style: TextStyle(
-                    fontSize: 14.0,
-                    fontWeight: FontWeight.w700,
-                  ),
-                ),
-                onTap: () async {
-                  Navigator.pop(context);
-                  var renameListPage = await Navigator.push(context,
-                      new MaterialPageRoute(builder: (BuildContext context) {
-                    return new RenameListPage(activeList);
-                  }));
-                  if (renameListPage == null) {
-                    _getTables();
-                  }
-                },
-              ),
-              new ListTile(
-                title: new Text(
-                  'Delete List',
-                  style: TextStyle(
-                    fontSize: 14.0,
-                    fontWeight: FontWeight.w700,
-                    color:
-                        (tblNames.length > 1 && activeList != defaultListName)
-                            ? Colors.black
-                            : Colors.grey,
-                  ),
-                ),
-                enabled: true,
-                onTap: () async {
-                  if (tblNames.length > 1 && activeList != defaultListName) {
-                    Navigator.pop(context);
-                    await DatabaseHelper.get().deleteTable(activeList);
-                    activeList = defaultListName;
-                    listName = activeList;
-                    _getTables();
-                  }
-                },
-              ),
-              new ListTile(
-                title: const Text(
-                  'Delete all completed tasks',
-                  style: TextStyle(
-                    fontSize: 14.0,
-                    fontWeight: FontWeight.w700,
-                  ),
-                ),
-                onTap: () async {
-                  await DatabaseHelper.get().deleteCompletedTask(activeList);
-                  _getTasks();
-                  Navigator.pop(context);
-                },
-              ),
-            ],
-          ),
+        return MoreWidget(
+          sort: _sort,
+          sortChanged: (SortBy value) {
+            setState(() {
+              _sort = value;
+            });
+            _sortList(_sort);
+          },
+          completedTasksCount: completedTaskList?.length,
+          canDelete: activeList != tblNames[0],
+          renameList: () async {
+            Navigator.pop(context);
+            var renameListPage = await Navigator.push(context,
+                MaterialPageRoute(builder: (BuildContext context) {
+              return RenameListPage(activeList);
+            }));
+            if (renameListPage != null) {
+              tblNames.remove(activeList);
+              tblNames.add(renameListPage);
+              print(
+                  "Count: ${tblNames.length} Old: $activeList, New: $renameListPage");
+              setState(() {
+                activeList = renameListPage;
+                listName = activeList;
+              });
+              _getTasks();
+            }
+          },
+          deleteList: () async {
+            if (tblNames.length > 1 && activeList != defaultListName) {
+              Navigator.pop(context);
+              removeList(listName);
+              tblNames.remove(listName);
+              setState(() {
+                activeList = defaultListName;
+                listName = activeList;
+                _getTasks();
+              });
+            }
+          },
+          deleteCompletedTasks: () async {
+            clearCompletedTasks(activeList);
+            _getTasks();
+            Navigator.pop(context);
+          },
         );
       },
     );
   }
 
-  void onNewTaskSave() {
-    if (_newTask != null) {
-      var task = new Task(_newTask, _newTaskStatus, _taskDetails);
-      var db = new DatabaseHelper();
-      db.saveTask(task, activeList);
-      Navigator.pop(context);
+  void showInSnackBar(String value, {Task task}) {
+    scaffoldKey.currentState.showSnackBar(new SnackBar(
+        content: Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: <Widget>[
+        new Text(value),
+        FlatButton(
+          child: Text(
+            "Undo",
+            style: TextStyle(color: Colors.blue),
+          ),
+          onPressed: () {
+            updateTaskStatus(task, undo: true);
+            scaffoldKey.currentState?.hideCurrentSnackBar();
+          },
+        )
+      ],
+    )));
+  }
+
+  void onNewTaskSave(Task task) {
+    if (task != null) {
+      var _task = task;
+      _task.status = "PENDING";
+      addTask(task, listName: activeList);
       print("Task saved!");
-      print("$_newTask");
+      print("${task.title}");
       _getTasks();
     } else {
       print("Empty field!");
     }
   }
 
-  void updateTaskStatus(String task) {
-    var db = new DatabaseHelper();
-    db.updateTask(task, activeList);
-    print('Update Task');
+  void _sortList(SortBy sort) {
+    pendingTaskList.sort((Task a, Task b) {
+      if (sort == SortBy.date) {
+        return a.date.millisecondsSinceEpoch
+            .compareTo(b.date.millisecondsSinceEpoch);
+      }
+      return a.title.compareTo(b.title);
+    });
+    completedTaskList.sort((Task a, Task b) {
+      if (sort == SortBy.date) {
+        return a.date.millisecondsSinceEpoch
+            .compareTo(b.date.millisecondsSinceEpoch);
+      }
+      return a.title.compareTo(b.title);
+    });
+    setState(() {
+      print("List Sorted!");
+    });
   }
 
-  void _getTasks() {
-    print("Running _getTasks()");
-    if (listName != null && listName != "") {
-      var dbClient = new DatabaseHelper();
-      dbClient.getTasksByStatus(listName, "PENDING").then((tasks) {
-        if (tasks == null) return;
-        setState(() {
-          pendingTaskList.clear();
-          pendingTaskList.addAll(tasks);
-          //print(tasks.toString());
-        });
-      });
-
-      dbClient.getTasksByStatus(listName, "COMPLETED").then((tasks) {
-        if (tasks == null) return;
-        setState(() {
-          completedTaskList.clear();
-          completedTaskList.addAll(tasks);
-          //print(tasks.toString());
-        });
-      });
+  void updateTaskStatus(Task task, {bool undo = false}) {
+    var _task = task;
+    if (undo) {
+      _task.status = "PENDING";
+      completedTaskList.remove(task);
+      pendingTaskList.add(task);
     } else {
-      print("var listName is null");
+      _task.status = "COMPLETED";
+      pendingTaskList.remove(task);
+      completedTaskList.add(task);
     }
+    updateTask(task.id, _task, listName: activeList);
+    print('Update Task');
+    _getTasks();
   }
 
-  void _getTables() {
-    DatabaseHelper.get().getTables().then((tableNames) {
-      if (tableNames != null) {
-        tblNames.clear();
-        for (String item in tableNames) {
-          setState(() {
-            print(item);
-            tblNames.add(item);
-          });
-        }
-        activeList = tblNames[0];
-        listName = tblNames[0];
-        defaultListName = tblNames[0];
-        _getTasks();
-      } else
-        print("getTables returned null");
+  void _getTasks() {
+    print("Getting Tasks for: $listName");
+    var pendingTasks = getTasksByStatus("PENDING", listName: listName) ?? [];
+    print("Pending Tasks: " + pendingTasks?.length.toString());
+    setState(() {
+      pendingTaskList?.clear();
+      pendingTaskList?.addAll(pendingTasks);
+    });
+    var completedTasks =
+        getTasksByStatus("COMPLETED", listName: listName) ?? [];
+    print("Completed Tasks: " + completedTasks?.length.toString());
+    setState(() {
+      completedTaskList?.clear();
+      completedTaskList?.addAll(completedTasks);
     });
   }
 
-  Widget completedList() {
-    if (completedTaskList.isNotEmpty) {
-      return new SliverToBoxAdapter(
-        child: new ExpansionTile(
-          title: new Text(
-            'Completed (${completedTaskList.length})',
-          ),
-          backgroundColor: Colors.white,
-          children: <Widget>[
-            new Container(
-              height: 68.0 * completedTaskList.length,
-              child: new ListView.builder(
-                itemCount: completedTaskList.length,
-                itemBuilder: (context, index) {
-                  return new Column(
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    children: <Widget>[
-                      Padding(
-                        padding: EdgeInsets.only(
-                          left: 16.0,
-                          right: 16.0,
-                        ),
-                        child: new ListTile(
-                          onTap: () async {
-                            taskDetailId = completedTaskList[index].id;
-                            var route = new MaterialPageRoute(
-                                builder: (BuildContext context) {
-                              return new TaskDetailsPage(
-                                  listName, taskDetailId);
-                            });
-                            var detailsPage =
-                                await Navigator.of(context).push(route);
-                            if (detailsPage == null) {
-                              _getTasks();
-                            }
-                          },
-                          leading: new Icon(
-                            Icons.check,
-                            color: Colors.blue,
-                          ),
-                          title: new Text(
-                            completedTaskList[index].task,
-                            style: TextStyle(
-                              decoration: TextDecoration.lineThrough,
-                            ),
-                          ),
-                        ),
-                      ),
-                      new Divider(
-                        height: 1.0,
-                      ),
-                    ],
-                  );
-                },
-              ),
-            ),
-          ],
-        ),
-      );
+  void _getTables() {
+    print("Getting tables...");
+    var tableNames = getLists();
+    if (tableNames != null) {
+      tblNames.clear();
+      for (var item in tableNames) {
+        setState(() {
+          print(item.name);
+          tblNames.add(item.name);
+        });
+      }
+      if (tableNames == null || tableNames.isEmpty) {
+        setState(() {
+          var item = "My Tasks";
+          print(item);
+          tblNames.add(item);
+        });
+      }
+      _getTasks();
     } else {
-      return new SliverFillRemaining();
+      print("getTables returned null");
     }
+    _getTasks();
   }
 }
diff --git a/lib/pages/new_list_page.dart b/lib/pages/new_list_page.dart
index 97a2fe8..c4c287d 100644
--- a/lib/pages/new_list_page.dart
+++ b/lib/pages/new_list_page.dart
@@ -1,17 +1,19 @@
 import 'package:flutter/material.dart';
-import 'package:tasks/data/database_helper.dart';
+
+// import '../data/database_helper.dart';
+import '../data/data_handler.dart';
 
 class NewListPage extends StatefulWidget {
   @override
-  _NewListPageState createState() => new _NewListPageState();
+  _NewListPageState createState() => _NewListPageState();
 }
 
 class _NewListPageState extends State<NewListPage> {
-  final String _scaffoldTitle = "Create new list";
+  final String _scaffoldTitle = "Create New list";
   final String _listTitleInputHint = "Enter list title";
   final String _snackInvalidTitleMsg = "Enter a valid list title first";
   final String _appBarDoneAction = "Done";
-  final key = new GlobalKey<ScaffoldState>();
+  final key = GlobalKey<ScaffoldState>();
   String newListTitle = "";
 
   @override
@@ -21,21 +23,21 @@ class _NewListPageState extends State<NewListPage> {
 
   @override
   Widget build(BuildContext context) {
-    return new Scaffold(
+    return Scaffold(
         key: key,
         backgroundColor: Colors.grey[300],
-        appBar: new AppBar(
+        appBar: AppBar(
           elevation: 0.0,
           backgroundColor: Colors.white,
-          leading: new IconButton(
-              icon: new Icon(
+          leading: IconButton(
+              icon: Icon(
                 Icons.close,
                 color: Colors.grey,
               ),
               onPressed: () {
                 Navigator.pop(context);
               }),
-          title: new Text(
+          title: Text(
             _scaffoldTitle,
             style: TextStyle(
               color: Colors.black,
@@ -44,22 +46,18 @@ class _NewListPageState extends State<NewListPage> {
             ),
           ),
           actions: <Widget>[
-            new FlatButton(
+            FlatButton(
                 onPressed: () async {
                   if (newListTitle != null && newListTitle != "") {
                     print('Saving list title');
-                    await DatabaseHelper
-                        .get()
-                        .createTable(newListTitle)
-                        .then((_) {
-                      Navigator.pop(context);
-                    });
+                    addList(newListTitle);
+                    Navigator.pop(context);
                   } else {
                     key.currentState.showSnackBar(
-                        new SnackBar(content: new Text(_snackInvalidTitleMsg)));
+                        SnackBar(content: Text(_snackInvalidTitleMsg)));
                   }
                 },
-                child: new Text(
+                child: Text(
                   _appBarDoneAction,
                   style: TextStyle(
                     color: Theme.of(context).primaryColor,
@@ -68,25 +66,25 @@ class _NewListPageState extends State<NewListPage> {
                 ))
           ],
         ),
-        body: new Column(
+        body: Column(
           children: <Widget>[
-            new Divider(
+            Divider(
               height: 1.0,
             ),
-            new Container(
+            Container(
               padding: EdgeInsets.only(
                   left: 16.0, right: 16.0, top: 10.0, bottom: 10.0),
               color: Colors.white,
-              child: new Wrap(
+              child: Wrap(
                 children: <Widget>[
-                  new TextField(
+                  TextField(
                     onChanged: (listTitle) {
                       newListTitle = listTitle;
                     },
+                    autofocus: true,
                     decoration: InputDecoration(
                         border: InputBorder.none,
                         hintText: _listTitleInputHint),
-                    //autofocus: true,
                     enabled: true,
                   )
                 ],
diff --git a/lib/pages/rename_list_page.dart b/lib/pages/rename_list_page.dart
index 2eb7048..b56fcef 100644
--- a/lib/pages/rename_list_page.dart
+++ b/lib/pages/rename_list_page.dart
@@ -1,12 +1,14 @@
 import 'package:flutter/material.dart';
-import 'package:tasks/data/database_helper.dart';
+
+// import '../data/database_helper.dart';
+import '../data/data_handler.dart';
 
 class RenameListPage extends StatefulWidget {
   final String listTitle;
   RenameListPage(this.listTitle);
 
   @override
-  _RenameListPageState createState() => new _RenameListPageState();
+  _RenameListPageState createState() => _RenameListPageState();
 }
 
 class _RenameListPageState extends State<RenameListPage> {
@@ -14,7 +16,7 @@ class _RenameListPageState extends State<RenameListPage> {
   final String _listTitleInputHint = "Enter list title";
   final String _snackInvalidTitleMsg = "Enter a valid list title first";
   final String _appBarDoneAction = "Done";
-  final key = new GlobalKey<ScaffoldState>();
+  final key = GlobalKey<ScaffoldState>();
   String newListTitle = "";
   TextEditingController _oldListTitleController;
 
@@ -26,22 +28,22 @@ class _RenameListPageState extends State<RenameListPage> {
   @override
   Widget build(BuildContext context) {
     String oldListTitle = widget.listTitle;
-    _oldListTitleController = new TextEditingController(text: oldListTitle);
-    return new Scaffold(
+    _oldListTitleController = TextEditingController(text: oldListTitle);
+    return Scaffold(
         key: key,
         backgroundColor: Colors.grey[300],
-        appBar: new AppBar(
+        appBar: AppBar(
           elevation: 0.0,
           backgroundColor: Colors.white,
-          leading: new IconButton(
-              icon: new Icon(
+          leading: IconButton(
+              icon: Icon(
                 Icons.close,
                 color: Colors.grey,
               ),
               onPressed: () {
                 Navigator.pop(context);
               }),
-          title: new Text(
+          title: Text(
             _scaffoldTitle,
             style: TextStyle(
               color: Colors.black,
@@ -50,25 +52,21 @@ class _RenameListPageState extends State<RenameListPage> {
             ),
           ),
           actions: <Widget>[
-            new FlatButton(
+            FlatButton(
                 onPressed: () async {
                   if (newListTitle != null &&
                       newListTitle != "" &&
                       oldListTitle != null &&
                       oldListTitle != "") {
                     print('Saving list title');
-                    await DatabaseHelper
-                        .get()
-                        .renameTable(oldListTitle, newListTitle)
-                        .then((_) {
-                      Navigator.pop(context);
-                    });
+                    updateListName(oldListTitle, newListTitle);
+                    Navigator.pop(context, newListTitle);
                   } else {
                     key.currentState.showSnackBar(
-                        new SnackBar(content: new Text(_snackInvalidTitleMsg)));
+                        SnackBar(content: Text(_snackInvalidTitleMsg)));
                   }
                 },
-                child: new Text(
+                child: Text(
                   _appBarDoneAction,
                   style: TextStyle(
                     color: Theme.of(context).primaryColor,
@@ -77,25 +75,25 @@ class _RenameListPageState extends State<RenameListPage> {
                 ))
           ],
         ),
-        body: new Column(
+        body: Column(
           children: <Widget>[
-            new Divider(
+            Divider(
               height: 1.0,
             ),
-            new Container(
+            Container(
               padding: EdgeInsets.only(
                   left: 16.0, right: 16.0, top: 10.0, bottom: 10.0),
               color: Colors.white,
-              child: new Wrap(
+              child: Wrap(
                 children: <Widget>[
-                  new TextField(
+                  TextField(
                     onChanged: (listTitle) {
                       newListTitle = listTitle;
                     },
                     decoration: InputDecoration(
                         border: InputBorder.none,
                         hintText: _listTitleInputHint),
-                    //autofocus: true,
+                    autofocus: true,
                     enabled: true,
                     controller: _oldListTitleController,
                   )
diff --git a/lib/pages/splash.dart b/lib/pages/splash.dart
index fa2f599..e58357f 100644
--- a/lib/pages/splash.dart
+++ b/lib/pages/splash.dart
@@ -1,11 +1,12 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:tasks/pages/home_page.dart';
+
+import '../pages/home_page.dart';
 
 class TasksSplashPage extends StatefulWidget {
   @override
-  _TasksSplashPageState createState() => new _TasksSplashPageState();
+  _TasksSplashPageState createState() => _TasksSplashPageState();
 }
 
 class _TasksSplashPageState extends State<TasksSplashPage> {
@@ -14,9 +15,9 @@ class _TasksSplashPageState extends State<TasksSplashPage> {
     super.initState();
     Timer(Duration(seconds: 2), () {
       Navigator.pop(context);
-      Navigator.of(context).push(
-        new MaterialPageRoute(builder: (BuildContext context) {
-          return new TasksHomePage();
+      Navigator.of(context).pushReplacement(
+        MaterialPageRoute(builder: (BuildContext context) {
+          return TasksHomePage();
         }),
       );
     });
@@ -24,29 +25,29 @@ class _TasksSplashPageState extends State<TasksSplashPage> {
 
   @override
   Widget build(BuildContext context) {
-    return new Scaffold(
+    return Scaffold(
       body: Stack(
         fit: StackFit.expand,
         children: <Widget>[
-          new Container(
+          Container(
             color: Colors.white,
           ),
-          new Column(
+          Column(
             mainAxisAlignment: MainAxisAlignment.center,
             children: <Widget>[
-              new Image(
+              Image(
                 width: 150.0,
                 height: 150.0,
-                image: new AssetImage("assets/images/icon.png"),
+                image: AssetImage("assets/images/icon.png"),
               ),
             ],
           ),
-          new Column(
+          Column(
             mainAxisAlignment: MainAxisAlignment.end,
             children: <Widget>[
-              new Padding(
+              Padding(
                 padding: EdgeInsets.only(bottom: 30.0),
-                child: new Text(
+                child: Text(
                   "#TeamCardinal",
                   style: TextStyle(
                     color: Colors.grey,
diff --git a/lib/pages/task_details.dart b/lib/pages/task_details.dart
index 69490c9..4560b80 100644
--- a/lib/pages/task_details.dart
+++ b/lib/pages/task_details.dart
@@ -1,144 +1,149 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:tasks/data/database_helper.dart';
-import 'package:tasks/model/task.dart';
+import '../data/data_handler.dart';
+import '../model/task.dart';
+import '../widgets/date_widget.dart';
+
+// import '../data/database_helper.dart';
 
 class TaskDetailsPage extends StatefulWidget {
-  final int taskId;
   final String listName;
+  final Task task;
 
-  TaskDetailsPage(this.listName, this.taskId);
+  TaskDetailsPage(this.listName, this.task);
 
   @override
-  State<StatefulWidget> createState() => new TaskDetailsPageState();
+  State<StatefulWidget> createState() => TaskDetailsPageState();
 }
 
 class TaskDetailsPageState extends State<TaskDetailsPage> {
-  Task _task;
-  String _taskName;
+  Task task;
+  // String _taskName;
   TextDecoration _textFieldDecoration;
   Color _textFieldColor;
   bool _textFieldEnable;
   bool _textFieldFocus;
   TextField textInput;
-  String _taskDate;
-  String _details;
+  // String _taskDate;
+  // String _details;
   TextEditingController _detailsController, _taskController;
 
-  Future getTask() async {
-    DatabaseHelper
-        .get()
-        .getTaskById(widget.listName, widget.taskId)
-        .then((task) {
-      if (task == null) return;
-      setState(() {
-        _task = task;
-        _taskName = task.task;
-        _details = task.details;
+  Future _getTask() async {
+    // task = getTask(widget.task.id, listName: widget.listName);
+    task = widget.task;
+    // DatabaseHelper.get()
+    //     .getTaskById(widget.listName, widget.taskId)
+    //     .then((task) {
+    if (task == null) return;
+    setState(() {
+      // _task = task;
+      // _taskName = task.title;
+      // _details = task.subtitle;
 
-        if (_taskName != null) {
-          _taskController = new TextEditingController(
-            text: _taskName,
-          );
-        }
+      if (task.title != null) {
+        _taskController = TextEditingController(
+          text: task.title,
+        );
+      }
 
-        if (_details != null) {
-          _detailsController = new TextEditingController(
-            text: _details,
-          );
-        }
-        print(task.status);
-        print(_taskName);
-        if (task.status == "COMPLETED") {
-          _textFieldFocus = false;
-          _textFieldDecoration = TextDecoration.lineThrough;
-          _textFieldColor = Colors.grey;
-          _textFieldEnable = false;
+      if (task.subtitle != null) {
+        _detailsController = TextEditingController(
+          text: task.subtitle,
+        );
+      }
+      print(task.status);
+      print(task.title);
+      if (task.status == "COMPLETED") {
+        _textFieldFocus = false;
+        _textFieldDecoration = TextDecoration.lineThrough;
+        _textFieldColor = Colors.grey;
+        _textFieldEnable = false;
 
-          textInput = new TextField(
-            autofocus: _textFieldFocus,
-            style: TextStyle(
-              decoration: _textFieldDecoration,
-              fontSize: 35.0,
-              color: _textFieldColor,
-              fontWeight: FontWeight.w600,
-            ),
-            decoration: const InputDecoration(
-              border: InputBorder.none,
-            ),
-            enabled: _textFieldEnable,
-            controller: _taskController,
-          );
-        } else {
-          _textFieldFocus = true;
-          _textFieldDecoration = TextDecoration.none;
-          _textFieldColor = Colors.black;
-          _textFieldEnable = true;
+        textInput = TextField(
+          autofocus: _textFieldFocus,
+          style: TextStyle(
+            decoration: _textFieldDecoration,
+            fontSize: 35.0,
+            color: _textFieldColor,
+            fontWeight: FontWeight.w600,
+          ),
+          decoration: const InputDecoration(
+            border: InputBorder.none,
+          ),
+          enabled: _textFieldEnable,
+          controller: _taskController,
+        );
+      } else {
+        _textFieldFocus = true;
+        _textFieldDecoration = TextDecoration.none;
+        _textFieldColor = Colors.black;
+        _textFieldEnable = true;
 
-          textInput = new TextField(
-            onChanged: (value) {
-              setState(() {
-                _taskName = value;
-              });
-            },
-            autofocus: _textFieldFocus,
-            style: TextStyle(
-              decoration: _textFieldDecoration,
-              fontSize: 35.0,
-              color: _textFieldColor,
-              fontWeight: FontWeight.w600,
-            ),
-            decoration: const InputDecoration(
-              border: InputBorder.none,
-            ),
-            enabled: _textFieldEnable,
-            controller: _taskController,
-          );
-        }
-      });
+        textInput = TextField(
+          onChanged: (value) {
+            setState(() {
+              task.title = value;
+            });
+          },
+          autofocus: _textFieldFocus,
+          style: TextStyle(
+            decoration: _textFieldDecoration,
+            fontSize: 35.0,
+            color: _textFieldColor,
+            fontWeight: FontWeight.w600,
+          ),
+          decoration: const InputDecoration(
+            border: InputBorder.none,
+          ),
+          enabled: _textFieldEnable,
+          controller: _taskController,
+        );
+      }
     });
+    // });
   }
 
   @override
   void initState() {
-    getTask();
+    _getTask();
     super.initState();
   }
 
-  void updateDate(DateTime dt) {
-    print("updateDate: ${dt.toString()}");
-    _taskDate = dt.toString();
-    DatabaseHelper
-        .get()
-        .updateDateByID(widget.taskId, _taskDate, widget.listName);
-  }
+  // void updateDate(DateTime dt) {
+  //   print("updateDate: ${dt.toString()}");
+  //   _taskDate = dt.toString();
+  //   DatabaseHelper.get()
+  //       .updateDateByID(widget.taskId, _taskDate, widget.listName);
+  // }
 
   @override
   Widget build(BuildContext context) {
-    print("Taskname: $_taskName");
-    return new Scaffold(
+    print("Taskname: " + task.title);
+    return Scaffold(
       backgroundColor: Colors.white,
-      appBar: new AppBar(
-        leading: new IconButton(
-          icon: new Icon(Icons.arrow_back),
+      appBar: AppBar(
+        leading: IconButton(
+          icon: Icon(Icons.arrow_back),
           onPressed: () async {
-            await DatabaseHelper.get().updateDetailsByID(
-                widget.taskId, _taskName, _details, widget.listName);
-            Navigator.pop(context);
+            // await DatabaseHelper.get().updateDetailsByID(
+            //     widget.taskId, _taskName, _details, widget.listName);
+            updateTask(widget.task.id, task, listName: widget.listName);
+            Navigator.pop(context, true);
           },
         ),
         actions: <Widget>[
-          new GestureDetector(
+          GestureDetector(
             onTap: () {
-              DatabaseHelper.get().deleteTask(widget.taskId, widget.listName);
-              Navigator.pop(context);
+              // DatabaseHelper.get().deleteTask(widget.taskId, widget.listName);
+              removeTask(task, listName: widget.listName);
+              Navigator.pop(context, false);
             },
-            child: new Padding(
+            child: Padding(
               padding: EdgeInsets.only(
                 right: 16.0,
               ),
-              child: new Icon(Icons.delete),
+              child: Icon(Icons.delete),
             ),
           ),
         ],
@@ -146,39 +151,39 @@ class TaskDetailsPageState extends State<TaskDetailsPage> {
         elevation: 0.0,
         backgroundColor: Colors.white,
       ),
-      body: new Container(
+      body: Container(
         color: Colors.white,
-        child: new Padding(
+        child: Padding(
           padding: EdgeInsets.only(
             left: 20.0,
           ),
-          child: new Column(
+          child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: <Widget>[
-              new Row(
+              Row(
                 children: <Widget>[
-                  new Text(
+                  Text(
                     'My Tasks',
                     style: TextStyle(
                         color: Colors.blue, fontWeight: FontWeight.w700),
                   ),
-                  new IconButton(
+                  IconButton(
                     onPressed: () {},
-                    icon: new Icon(
+                    icon: Icon(
                       Icons.arrow_drop_down,
                       color: Colors.blue,
                     ),
                   ),
                 ],
               ),
-              _taskName == null ? new Container() : textInput,
-              new ListTile(
-                leading: new Icon(Icons.note),
-                title: new TextField(
+              task.title == null ? Container() : textInput,
+              ListTile(
+                leading: Icon(Icons.short_text),
+                title: TextField(
                   controller: _detailsController,
                   onChanged: (details) {
                     setState(() {
-                      _details = details;
+                      task.subtitle = details;
                     });
                   },
                   maxLines: 1,
@@ -188,55 +193,67 @@ class TaskDetailsPageState extends State<TaskDetailsPage> {
                 ),
               ),
               // TODO: Theme DatePicker dialog properly
-              new ListTile(
-                leading: new Icon(Icons.date_range),
+              ListTile(
+                leading: Icon(Icons.event_available),
                 onTap: () {
                   showDatePicker(
                     context: context,
-                    initialDate: new DateTime.now(),
-                    firstDate: new DateTime.now().subtract(Duration(
+                    initialDate: task?.date ?? DateTime.now(),
+                    firstDate: (task?.date ?? DateTime.now()).subtract(Duration(
                       days: 30,
                     )),
-                    lastDate: new DateTime.now().add(
-                      Duration(
-                        days: 30,
-                      ),
-                    ),
+                    lastDate:
+                        (task?.date ?? DateTime.now()).add(Duration(days: 365)),
                   ).then((value) {
                     if (value == null) return;
                     print("Date: ${value.toIso8601String()}");
                     setState(() {
-                      updateDate(value);
+                      // updateDate(value);
+                      task.date = value;
                     });
                   }).catchError((error) {
                     print(error.toString());
                   });
                 },
-                title: new Text('Date'),
+                title: task?.date != null
+                    ? Row(
+                        mainAxisSize: MainAxisSize.min,
+                        children: <Widget>[
+                          DateViewWidget(
+                            date: task.date,
+                            onClose: () {
+                              setState(() {
+                                task.date = null;
+                              });
+                            },
+                          ),
+                        ],
+                      )
+                    : Text('Add Date'),
               ),
-              _taskName != null && _textFieldEnable == true
-                  ? new Padding(
+              task.title != null && _textFieldEnable == true
+                  ? Padding(
                       padding: EdgeInsets.only(
                         left: 16.0,
                       ),
-                      child: new Row(
+                      child: Row(
                         children: <Widget>[
-                          new Icon(Icons.subdirectory_arrow_right),
-                          new Container(
+                          Icon(Icons.subdirectory_arrow_right),
+                          Container(
                             width: 16.0,
                           ),
-                          new RaisedButton(
+                          RaisedButton(
                             highlightElevation: 0.0,
                             elevation: 0.0,
                             splashColor: Colors.blue,
                             color: Colors.white,
                             onPressed: () {},
-                            child: new Text('Add subtasks'),
+                            child: Text('Add subtasks'),
                           ),
                         ],
                       ),
                     )
-                  : new Container(),
+                  : Container(),
             ],
           ),
         ),
diff --git a/lib/widgets/animated_icon.dart b/lib/widgets/animated_icon.dart
new file mode 100644
index 0000000..6aa51cd
--- /dev/null
+++ b/lib/widgets/animated_icon.dart
@@ -0,0 +1,64 @@
+import 'package:flutter/material.dart';
+
+class HighLightedIcon extends StatefulWidget {
+  final double size;
+  final AnimationController controller;
+
+  HighLightedIcon({
+    Key key,
+    this.size = 24.0,
+    this.controller,
+  }) : super(key: key);
+  @override
+  State<HighLightedIcon> createState() {
+    return new _AnimatedIconState();
+  }
+}
+
+class _AnimatedIconState extends State<HighLightedIcon>
+    with SingleTickerProviderStateMixin {
+  final double dx = 4.0;
+  Animation<Color> _buttonColor;
+  bool isOpened = false;
+
+  @override
+  initState() {
+    _buttonColor = ColorTween(
+      begin: Colors.blue,
+      end: Colors.red,
+    ).animate(CurvedAnimation(
+      parent: widget.controller,
+      curve: Interval(
+        0.00,
+        1.00,
+        curve: Curves.linear,
+      ),
+    ));
+
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return new Container(
+      child: new Center(
+        child: AnimatedCrossFade(
+          duration: const Duration(milliseconds: 20),
+          firstChild: Icon(
+            Icons.add_circle_outline,
+            size: 24,
+            color: _buttonColor.value,
+          ),
+          secondChild: Icon(
+            Icons.close,
+            size: 24,
+            color: _buttonColor.value,
+          ),
+          crossFadeState: _buttonColor.value == Colors.blue
+              ? CrossFadeState.showFirst
+              : CrossFadeState.showSecond,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/date_widget.dart b/lib/widgets/date_widget.dart
new file mode 100644
index 0000000..911ace1
--- /dev/null
+++ b/lib/widgets/date_widget.dart
@@ -0,0 +1,79 @@
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+
+class DateViewWidget extends StatelessWidget {
+  final VoidCallback onClose;
+  final DateTime date;
+
+  DateViewWidget({this.date, this.onClose});
+
+  String getDateLabel() {
+    if (date == null) return "";
+    if (DateTime.now().year == date.year) {
+      // -- Same Year --
+      if (DateTime.now().month == date.month) {
+        // -- Same Month --
+        if (DateTime.now().day == date.day) {
+          // -- Same Day --
+          return "Today";
+        }
+        if (DateTime.now().day == date.day - 1) {
+          // -- Same Day --
+          return "Tomorrow";
+        }
+        if (DateTime.now().day >= date.day + 1) {
+          // -- Same Day --
+          final count = DateTime.now().day - date.day;
+          if (count == 1) return "$count Day Ago";
+          return "$count Days Ago";
+        }
+        // return DateFormat('MM-dd').format(date);
+      }
+      return DateFormat('EEE, MMM d').format(date);
+    }
+    return DateFormat('MM-dd-yyyy').format(date);
+  }
+
+  Color getDateColor() {
+    // if (DateTime.now().year == date.year) {
+    //   if (DateTime.now().month == date.month) {
+    //     if (DateTime.now().day == date.day) {}
+    //   }
+    // }
+    if (DateTime.now().millisecondsSinceEpoch > date.millisecondsSinceEpoch) {
+      return Colors.red;
+    }
+    return Colors.blue;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: new BoxDecoration(
+          color: Colors.grey[200],
+          borderRadius: new BorderRadius.all(
+            const Radius.circular(5.0),
+          )),
+      child: Padding(
+        padding: EdgeInsets.all(4.0),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          children: <Widget>[
+            Icon(
+              Icons.event_available,
+              color: getDateColor(),
+            ),
+            Container(width: 5.0),
+            Text(getDateLabel()),
+            onClose == null
+                ? Container()
+                : IconButton(
+                    icon: Icon(Icons.close),
+                    onPressed: onClose,
+                  )
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/fancy_fab.dart b/lib/widgets/fancy_fab.dart
new file mode 100644
index 0000000..e020c89
--- /dev/null
+++ b/lib/widgets/fancy_fab.dart
@@ -0,0 +1,139 @@
+import 'package:flutter/material.dart';
+import 'animated_icon.dart';
+
+class FancyFab extends StatefulWidget {
+  final VoidCallback detailsPressed, datePressed;
+  final String tooltip;
+  final IconData icon;
+
+  FancyFab({this.detailsPressed, this.datePressed, this.tooltip, this.icon});
+
+  @override
+  _FancyFabState createState() => _FancyFabState();
+}
+
+class _FancyFabState extends State<FancyFab>
+    with SingleTickerProviderStateMixin {
+  bool isOpened = false;
+  AnimationController _animationController;
+  Animation<double> _translateButton;
+  Curve _curve = Curves.easeOut;
+  double _fabHeight = 55.0;
+
+  @override
+  initState() {
+    _animationController =
+        AnimationController(vsync: this, duration: Duration(milliseconds: 500))
+          ..addListener(() {
+            setState(() {});
+          });
+    _translateButton = Tween<double>(
+      begin: _fabHeight,
+      end: 0.0,
+    ).animate(CurvedAnimation(
+      parent: _animationController,
+      curve: Interval(
+        0.0,
+        0.75,
+        curve: _curve,
+      ),
+    ));
+    super.initState();
+  }
+
+  @override
+  dispose() {
+    _animationController.dispose();
+    super.dispose();
+  }
+
+  animate() {
+    if (!isOpened) {
+      _animationController.forward();
+    } else {
+      _animationController.reverse();
+    }
+    isOpened = !isOpened;
+  }
+
+  bool detailsPressed = false;
+  Widget details() {
+    return Container(
+      child: FloatingActionButton(
+        elevation: 0.0,
+        backgroundColor: Colors.transparent,
+        mini: true,
+        heroTag: "Details",
+        onPressed: () {
+          if (!detailsPressed) {
+            widget.detailsPressed();
+            detailsPressed = true;
+          }
+        },
+        tooltip: 'Details',
+        child: Icon(Icons.short_text,
+            color: detailsPressed ? Colors.grey : Colors.blue),
+      ),
+    );
+  }
+
+  Widget calendar() {
+    return Container(
+      child: FloatingActionButton(
+        elevation: 0.0,
+        backgroundColor: Colors.transparent,
+        mini: true,
+        heroTag: "Calendar",
+        onPressed: widget.datePressed,
+        tooltip: 'Add Date',
+        child: Icon(
+          Icons.event_available,
+          color: Colors.blue,
+        ),
+      ),
+    );
+  }
+
+  Widget toggle() {
+    return Container(
+      child: FloatingActionButton(
+        elevation: 0.0,
+        mini: true,
+        heroTag: "Toggle",
+        backgroundColor: Colors.white,
+        onPressed: animate,
+        tooltip: 'Toggle',
+        child: HighLightedIcon(
+          controller: _animationController,
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.start,
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: <Widget>[
+        toggle(),
+        Transform(
+          transform: Matrix4.translationValues(
+            0.0,
+            _translateButton.value,
+            0.0,
+          ),
+          child: details(),
+        ),
+        Transform(
+          transform: Matrix4.translationValues(
+            0.0,
+            _translateButton.value,
+            0.0,
+          ),
+          child: calendar(),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/image_widget.dart b/lib/widgets/image_widget.dart
new file mode 100644
index 0000000..d57f18b
--- /dev/null
+++ b/lib/widgets/image_widget.dart
@@ -0,0 +1,38 @@
+import 'package:flutter/material.dart';
+
+class ImageWidget extends StatelessWidget {
+  final String image, title, subtitle;
+  ImageWidget({this.subtitle, this.title, this.image});
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: <Widget>[
+          SizedBox(
+            height: 300.0,
+            width: 300.0,
+            child: Image.asset(
+              image,
+              fit: BoxFit.fitWidth,
+            ),
+          ),
+          Text(
+            title,
+            textAlign: TextAlign.center,
+            style: Theme.of(context).textTheme.title.copyWith(fontSize: 25.0),
+          ),
+          Container(height: 5.0),
+          Text(
+            subtitle,
+            textAlign: TextAlign.center,
+            style: Theme.of(context)
+                .textTheme
+                .subtitle
+                .copyWith(color: Colors.grey),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/pubspec.lock b/pubspec.lock
index e9efbc6..6cca7db 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,63 +7,63 @@ packages:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.31.2-alpha.2"
+    version: "0.33.0"
   args:
     dependency: transitive
     description:
       name: args
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.3"
+    version: "1.5.0"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.7"
+    version: "2.0.8"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.4"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.6"
+    version: "1.14.11"
   convert:
     dependency: transitive
     description:
       name: convert
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   crypto:
     dependency: transitive
     description:
       name: crypto
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.6"
   csslib:
     dependency: transitive
     description:
       name: csslib
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.14.4"
+    version: "0.14.6"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -87,126 +87,140 @@ packages:
       name: front_end
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.0-alpha.12"
+    version: "0.1.6"
   glob:
     dependency: transitive
     description:
       name: glob
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.5"
+    version: "1.1.7"
   html:
     dependency: transitive
     description:
       name: html
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.13.3"
+    version: "0.13.3+3"
   http:
     dependency: transitive
     description:
       name: http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.11.3+16"
+    version: "0.12.0"
   http_multi_server:
     dependency: transitive
     description:
       name: http_multi_server
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.4"
+    version: "2.0.5"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.1.2"
+    version: "3.1.3"
+  intl:
+    dependency: "direct main"
+    description:
+      name: intl
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.15.7"
   io:
     dependency: transitive
     description:
       name: io
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.2+1"
+    version: "0.3.3"
   js:
     dependency: transitive
     description:
       name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.1"
+    version: "0.6.1+1"
+  json_rpc_2:
+    dependency: transitive
+    description:
+      name: json_rpc_2
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.9"
   kernel:
     dependency: transitive
     description:
       name: kernel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0-alpha.12"
+    version: "0.3.6"
   logging:
     dependency: transitive
     description:
       name: logging
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.11.3+1"
+    version: "0.11.3+2"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.2+1"
+    version: "0.12.3+1"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.5"
+    version: "1.1.6"
   mime:
     dependency: transitive
     description:
       name: mime
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.6"
+    version: "0.9.6+2"
   multi_server_socket:
     dependency: transitive
     description:
       name: multi_server_socket
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   node_preamble:
     dependency: transitive
     description:
       name: node_preamble
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.1"
+    version: "1.4.4"
   package_config:
     dependency: transitive
     description:
       name: package_config
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.5"
   package_resolver:
     dependency: transitive
     description:
       name: package_resolver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.6"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.1"
+    version: "1.6.2"
   path_provider:
     dependency: "direct main"
     description:
@@ -220,56 +234,56 @@ packages:
       name: plugin
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0+2"
+    version: "0.2.0+3"
   pool:
     dependency: transitive
     description:
       name: pool
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.4"
+    version: "1.3.6"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.1"
+    version: "1.4.2"
   quiver:
     dependency: transitive
     description:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.29.0+1"
+    version: "2.0.0+1"
   shelf:
     dependency: transitive
     description:
       name: shelf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.7.3"
+    version: "0.7.3+3"
   shelf_packages_handler:
     dependency: transitive
     description:
       name: shelf_packages_handler
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.4"
   shelf_static:
     dependency: transitive
     description:
       name: shelf_static
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.7"
+    version: "0.2.8"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.2"
+    version: "0.2.2+4"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -281,112 +295,119 @@ packages:
       name: source_map_stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.4"
+    version: "1.1.5"
   source_maps:
     dependency: transitive
     description:
       name: source_maps
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.10.5"
+    version: "0.10.8"
   source_span:
     dependency: transitive
     description:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.4.0"
+    version: "1.4.1"
   sqflite:
     dependency: "direct main"
     description:
       name: sqflite
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.11.0"
+    version: "0.12.2+1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.2"
+    version: "1.9.3"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.6"
+    version: "1.6.8"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.4"
   synchronized:
     dependency: transitive
     description:
       name: synchronized
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.0+1"
+    version: "1.5.3"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.1"
   test:
     dependency: transitive
     description:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.37"
+    version: "1.3.4"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.5"
+    version: "1.1.6"
   utf:
     dependency: transitive
     description:
       name: utf
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.0+4"
+    version: "0.9.0+5"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.6"
+    version: "2.0.8"
+  vm_service_client:
+    dependency: transitive
+    description:
+      name: vm_service_client
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.6"
   watcher:
     dependency: transitive
     description:
       name: watcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.9.7+7"
+    version: "0.9.7+10"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.7"
+    version: "1.0.9"
   yaml:
     dependency: transitive
     description:
       name: yaml
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.13"
+    version: "2.1.15"
 sdks:
-  dart: ">=2.0.0-dev.52.0 <=2.0.0-dev.54.0.flutter-46ab040e58"
+  dart: ">=2.0.0 <3.0.0"
   flutter: ">=0.1.4 <2.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 0d6b02e..1b2d651 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,11 +4,12 @@ description: A clone of Google Tasks UI.
 dependencies:
   flutter:
     sdk: flutter
+  intl: ^0.15.7
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^0.1.2
-  sqflite: any
+  sqflite: ^0.12.2+1
   path_provider: ^0.4.0
 
 dev_dependencies:
@@ -41,9 +42,11 @@ flutter:
   assets:
     - assets/user/satya_profile.png
     - assets/images/icon.png
+    - assets/images/completed.png
+    - assets/images/new_list.png
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.io/assets-and-images/#resolution-aware.
 
   # For details regarding adding assets from package dependencies, see
-  # https://flutter.io/assets-and-images/#from-packages
+  # https://flutter.io/assets-and-images/#from-packages
\ No newline at end of file
diff --git a/screenshots/Simulator Screen Shot - iPhone XR - 2018-11-15 at 12.12.09.png b/screenshots/Simulator Screen Shot - iPhone XR - 2018-11-15 at 12.12.09.png
new file mode 100644
index 0000000..ecac71c
Binary files /dev/null and b/screenshots/Simulator Screen Shot - iPhone XR - 2018-11-15 at 12.12.09.png differ
diff --git a/screenshots/Simulator Screen Shot - iPhone XR - 2018-11-16 at 10.11.48.png b/screenshots/Simulator Screen Shot - iPhone XR - 2018-11-16 at 10.11.48.png
new file mode 100644
index 0000000..c893013
Binary files /dev/null and b/screenshots/Simulator Screen Shot - iPhone XR - 2018-11-16 at 10.11.48.png differ
diff --git a/screenshots/Simulator Screen Shot - iPhone XR - 2018-11-16 at 10.12.11.png b/screenshots/Simulator Screen Shot - iPhone XR - 2018-11-16 at 10.12.11.png
new file mode 100644
index 0000000..c2348ed
Binary files /dev/null and b/screenshots/Simulator Screen Shot - iPhone XR - 2018-11-16 at 10.12.11.png differ
diff --git a/screenshots/Simulator Screen Shot - iPhone XR - 2018-11-16 at 10.13.29.png b/screenshots/Simulator Screen Shot - iPhone XR - 2018-11-16 at 10.13.29.png
new file mode 100644
index 0000000..8c281d4
Binary files /dev/null and b/screenshots/Simulator Screen Shot - iPhone XR - 2018-11-16 at 10.13.29.png differ
diff --git a/screenshots/Simulator Screen Shot - iPhone XR - 2018-11-16 at 10.13.35.png b/screenshots/Simulator Screen Shot - iPhone XR - 2018-11-16 at 10.13.35.png
new file mode 100644
index 0000000..cec5810
Binary files /dev/null and b/screenshots/Simulator Screen Shot - iPhone XR - 2018-11-16 at 10.13.35.png differ
diff --git a/screenshots/Simulator Screen Shot - iPhone XR - 2018-11-16 at 10.13.39.png b/screenshots/Simulator Screen Shot - iPhone XR - 2018-11-16 at 10.13.39.png
new file mode 100644
index 0000000..7aee458
Binary files /dev/null and b/screenshots/Simulator Screen Shot - iPhone XR - 2018-11-16 at 10.13.39.png differ
diff --git a/tasks.iml b/tasks.iml
index 3ae446d..ed65719 100644
--- a/tasks.iml
+++ b/tasks.iml
@@ -9,6 +9,18 @@
       <excludeFolder url="file://$MODULE_DIR$/.idea" />
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/path_provider/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/path_provider/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/path_provider/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/path_provider/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/path_provider/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/path_provider/example/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/sqflite/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/sqflite/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/sqflite/build" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/sqflite/example/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/sqflite/example/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/ios/.symlinks/plugins/sqflite/example/build" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Dart SDK" level="project" />
diff --git a/test/widget_test.dart b/test/widget_test.dart
index 50a9080..7cc18a5 100644
--- a/test/widget_test.dart
+++ b/test/widget_test.dart
@@ -12,7 +12,7 @@ import 'package:tasks/main.dart';
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.
-    await tester.pumpWidget(new MyApp());
+    await tester.pumpWidget(TasksApp());
 
     // Verify that our counter starts at 0.
     expect(find.text('0'), findsOneWidget);