diff --git a/MarsWater/MarsWater.xcodeproj/project.pbxproj b/MarsWater/MarsWater.xcodeproj/project.pbxproj
index a2f82e3..49484c6 100644
--- a/MarsWater/MarsWater.xcodeproj/project.pbxproj
+++ b/MarsWater/MarsWater.xcodeproj/project.pbxproj
@@ -7,9 +7,11 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		3D06E65D1BC4BA4400FBEEC5 /* TaskCreationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D06E65C1BC4BA4400FBEEC5 /* TaskCreationViewController.m */; };
+		3D0D8A521BC7FDCD00A76706 /* ListCreationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D0D8A511BC7FDCD00A76706 /* ListCreationViewController.m */; };
+		3D0D8A551BC8096E00A76706 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3D0D8A531BC8096E00A76706 /* Main.storyboard */; };
 		8DA86CA91BC1AE57006C50BC /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DA86CA81BC1AE57006C50BC /* main.m */; };
 		8DA86CAC1BC1AE57006C50BC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DA86CAB1BC1AE57006C50BC /* AppDelegate.m */; };
-		8DA86CB21BC1AE57006C50BC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8DA86CB01BC1AE57006C50BC /* Main.storyboard */; };
 		8DA86CB51BC1AE57006C50BC /* MarsWater.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 8DA86CB31BC1AE57006C50BC /* MarsWater.xcdatamodeld */; };
 		8DA86CB71BC1AE57006C50BC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8DA86CB61BC1AE57006C50BC /* Assets.xcassets */; };
 		8DA86CBA1BC1AE57006C50BC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8DA86CB81BC1AE57006C50BC /* LaunchScreen.storyboard */; };
@@ -22,11 +24,15 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		3D06E65B1BC4BA4400FBEEC5 /* TaskCreationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TaskCreationViewController.h; sourceTree = "<group>"; };
+		3D06E65C1BC4BA4400FBEEC5 /* TaskCreationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TaskCreationViewController.m; sourceTree = "<group>"; };
+		3D0D8A501BC7FDCD00A76706 /* ListCreationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListCreationViewController.h; sourceTree = "<group>"; };
+		3D0D8A511BC7FDCD00A76706 /* ListCreationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ListCreationViewController.m; sourceTree = "<group>"; };
+		3D0D8A541BC8096E00A76706 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		8DA86CA41BC1AE57006C50BC /* MarsWater.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MarsWater.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		8DA86CA81BC1AE57006C50BC /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		8DA86CAA1BC1AE57006C50BC /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		8DA86CAB1BC1AE57006C50BC /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		8DA86CB11BC1AE57006C50BC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		8DA86CB41BC1AE57006C50BC /* MarsWater.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = MarsWater.xcdatamodel; sourceTree = "<group>"; };
 		8DA86CB61BC1AE57006C50BC /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		8DA86CB91BC1AE57006C50BC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -75,6 +81,9 @@
 		8DA86CA61BC1AE57006C50BC /* MarsWater */ = {
 			isa = PBXGroup;
 			children = (
+				3D0D8A531BC8096E00A76706 /* Main.storyboard */,
+				3D0D8A501BC7FDCD00A76706 /* ListCreationViewController.h */,
+				3D0D8A511BC7FDCD00A76706 /* ListCreationViewController.m */,
 				8DA86CD11BC1B329006C50BC /* Model */,
 				8DA86CAA1BC1AE57006C50BC /* AppDelegate.h */,
 				8DA86CAB1BC1AE57006C50BC /* AppDelegate.m */,
@@ -82,12 +91,13 @@
 				8DA86CD31BC1B8E4006C50BC /* ListsTableViewController.m */,
 				8DA86CD51BC1B904006C50BC /* ListCreationTableViewController.h */,
 				8DA86CD61BC1B904006C50BC /* ListCreationTableViewController.m */,
-				8DA86CB01BC1AE57006C50BC /* Main.storyboard */,
 				8DA86CB61BC1AE57006C50BC /* Assets.xcassets */,
 				8DA86CB81BC1AE57006C50BC /* LaunchScreen.storyboard */,
 				8DA86CBB1BC1AE57006C50BC /* Info.plist */,
 				8DA86CB31BC1AE57006C50BC /* MarsWater.xcdatamodeld */,
 				8DA86CA71BC1AE57006C50BC /* Supporting Files */,
+				3D06E65B1BC4BA4400FBEEC5 /* TaskCreationViewController.h */,
+				3D06E65C1BC4BA4400FBEEC5 /* TaskCreationViewController.m */,
 			);
 			path = MarsWater;
 			sourceTree = "<group>";
@@ -146,6 +156,7 @@
 				TargetAttributes = {
 					8DA86CA31BC1AE57006C50BC = {
 						CreatedOnToolsVersion = 7.0.1;
+						DevelopmentTeam = 3358H79N3F;
 					};
 				};
 			};
@@ -172,9 +183,9 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3D0D8A551BC8096E00A76706 /* Main.storyboard in Resources */,
 				8DA86CBA1BC1AE57006C50BC /* LaunchScreen.storyboard in Resources */,
 				8DA86CB71BC1AE57006C50BC /* Assets.xcassets in Resources */,
-				8DA86CB21BC1AE57006C50BC /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -186,9 +197,11 @@
 			buildActionMask = 2147483647;
 			files = (
 				8DA86CB51BC1AE57006C50BC /* MarsWater.xcdatamodeld in Sources */,
+				3D0D8A521BC7FDCD00A76706 /* ListCreationViewController.m in Sources */,
 				8DA86CAC1BC1AE57006C50BC /* AppDelegate.m in Sources */,
 				8DB2F6EA1BC1E75500E58E65 /* Task+CoreDataProperties.m in Sources */,
 				8DA86CD41BC1B8E4006C50BC /* ListsTableViewController.m in Sources */,
+				3D06E65D1BC4BA4400FBEEC5 /* TaskCreationViewController.m in Sources */,
 				8DB2F6E71BC1E75500E58E65 /* List.m in Sources */,
 				8DB2F6E91BC1E75500E58E65 /* Task.m in Sources */,
 				8DA86CD71BC1B904006C50BC /* ListCreationTableViewController.m in Sources */,
@@ -200,10 +213,10 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXVariantGroup section */
-		8DA86CB01BC1AE57006C50BC /* Main.storyboard */ = {
+		3D0D8A531BC8096E00A76706 /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
-				8DA86CB11BC1AE57006C50BC /* Base */,
+				3D0D8A541BC8096E00A76706 /* Base */,
 			);
 			name = Main.storyboard;
 			sourceTree = "<group>";
@@ -303,10 +316,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				INFOPLIST_FILE = MarsWater/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.MarsWater;
+				PRODUCT_BUNDLE_IDENTIFIER = com.accesscode.zovfreullia.MarsWater;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "";
 			};
 			name = Debug;
 		};
@@ -314,10 +331,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				INFOPLIST_FILE = MarsWater/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.MarsWater;
+				PRODUCT_BUNDLE_IDENTIFIER = com.accesscode.zovfreullia.MarsWater;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "";
 			};
 			name = Release;
 		};
diff --git a/MarsWater/MarsWater/Assets.xcassets/Contents.json b/MarsWater/MarsWater/Assets.xcassets/Contents.json
new file mode 100644
index 0000000..da4a164
--- /dev/null
+++ b/MarsWater/MarsWater/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/MarsWater/MarsWater/Assets.xcassets/TronGlow7.imageset/Contents.json b/MarsWater/MarsWater/Assets.xcassets/TronGlow7.imageset/Contents.json
new file mode 100644
index 0000000..57d4cf6
--- /dev/null
+++ b/MarsWater/MarsWater/Assets.xcassets/TronGlow7.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "TronGlow7.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/MarsWater/MarsWater/Assets.xcassets/TronGlow7.imageset/TronGlow7.png b/MarsWater/MarsWater/Assets.xcassets/TronGlow7.imageset/TronGlow7.png
new file mode 100644
index 0000000..4cec0cd
Binary files /dev/null and b/MarsWater/MarsWater/Assets.xcassets/TronGlow7.imageset/TronGlow7.png differ
diff --git a/MarsWater/MarsWater/Assets.xcassets/bluesci.imageset/Contents.json b/MarsWater/MarsWater/Assets.xcassets/bluesci.imageset/Contents.json
new file mode 100644
index 0000000..f2ac36d
--- /dev/null
+++ b/MarsWater/MarsWater/Assets.xcassets/bluesci.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "bluesci.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/MarsWater/MarsWater/Assets.xcassets/bluesci.imageset/bluesci.png b/MarsWater/MarsWater/Assets.xcassets/bluesci.imageset/bluesci.png
new file mode 100644
index 0000000..39352bd
Binary files /dev/null and b/MarsWater/MarsWater/Assets.xcassets/bluesci.imageset/bluesci.png differ
diff --git a/MarsWater/MarsWater/Assets.xcassets/denim1.imageset/Contents.json b/MarsWater/MarsWater/Assets.xcassets/denim1.imageset/Contents.json
new file mode 100644
index 0000000..a7b00dc
--- /dev/null
+++ b/MarsWater/MarsWater/Assets.xcassets/denim1.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "denim1.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/MarsWater/MarsWater/Assets.xcassets/denim1.imageset/denim1.jpg b/MarsWater/MarsWater/Assets.xcassets/denim1.imageset/denim1.jpg
new file mode 100644
index 0000000..ea0f6d9
Binary files /dev/null and b/MarsWater/MarsWater/Assets.xcassets/denim1.imageset/denim1.jpg differ
diff --git a/MarsWater/MarsWater/Assets.xcassets/geometrybg.imageset/Contents.json b/MarsWater/MarsWater/Assets.xcassets/geometrybg.imageset/Contents.json
new file mode 100644
index 0000000..2b4064a
--- /dev/null
+++ b/MarsWater/MarsWater/Assets.xcassets/geometrybg.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "geometrybg.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/MarsWater/MarsWater/Assets.xcassets/geometrybg.imageset/geometrybg.jpg b/MarsWater/MarsWater/Assets.xcassets/geometrybg.imageset/geometrybg.jpg
new file mode 100644
index 0000000..194e98e
Binary files /dev/null and b/MarsWater/MarsWater/Assets.xcassets/geometrybg.imageset/geometrybg.jpg differ
diff --git a/MarsWater/MarsWater/Assets.xcassets/purple.imageset/Contents.json b/MarsWater/MarsWater/Assets.xcassets/purple.imageset/Contents.json
new file mode 100644
index 0000000..cd1e70e
--- /dev/null
+++ b/MarsWater/MarsWater/Assets.xcassets/purple.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "purple.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/MarsWater/MarsWater/Assets.xcassets/purple.imageset/purple.jpg b/MarsWater/MarsWater/Assets.xcassets/purple.imageset/purple.jpg
new file mode 100644
index 0000000..560d74e
Binary files /dev/null and b/MarsWater/MarsWater/Assets.xcassets/purple.imageset/purple.jpg differ
diff --git a/MarsWater/MarsWater/Assets.xcassets/scifi.imageset/Contents.json b/MarsWater/MarsWater/Assets.xcassets/scifi.imageset/Contents.json
new file mode 100644
index 0000000..2df9c21
--- /dev/null
+++ b/MarsWater/MarsWater/Assets.xcassets/scifi.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "scifi.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/MarsWater/MarsWater/Assets.xcassets/scifi.imageset/scifi.jpg b/MarsWater/MarsWater/Assets.xcassets/scifi.imageset/scifi.jpg
new file mode 100644
index 0000000..14347ad
Binary files /dev/null and b/MarsWater/MarsWater/Assets.xcassets/scifi.imageset/scifi.jpg differ
diff --git a/MarsWater/MarsWater/Assets.xcassets/terminal.imageset/Contents.json b/MarsWater/MarsWater/Assets.xcassets/terminal.imageset/Contents.json
new file mode 100644
index 0000000..71ca72e
--- /dev/null
+++ b/MarsWater/MarsWater/Assets.xcassets/terminal.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "terminal.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/MarsWater/MarsWater/Assets.xcassets/terminal.imageset/terminal.png b/MarsWater/MarsWater/Assets.xcassets/terminal.imageset/terminal.png
new file mode 100644
index 0000000..21a2308
Binary files /dev/null and b/MarsWater/MarsWater/Assets.xcassets/terminal.imageset/terminal.png differ
diff --git a/MarsWater/MarsWater/Assets.xcassets/whitebg.imageset/Contents.json b/MarsWater/MarsWater/Assets.xcassets/whitebg.imageset/Contents.json
new file mode 100644
index 0000000..671a83f
--- /dev/null
+++ b/MarsWater/MarsWater/Assets.xcassets/whitebg.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "whitebg.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/MarsWater/MarsWater/Assets.xcassets/whitebg.imageset/whitebg.png b/MarsWater/MarsWater/Assets.xcassets/whitebg.imageset/whitebg.png
new file mode 100644
index 0000000..b689917
Binary files /dev/null and b/MarsWater/MarsWater/Assets.xcassets/whitebg.imageset/whitebg.png differ
diff --git a/MarsWater/MarsWater/Base.lproj/LaunchScreen.storyboard b/MarsWater/MarsWater/Base.lproj/LaunchScreen.storyboard
index 2e721e1..9105557 100644
--- a/MarsWater/MarsWater/Base.lproj/LaunchScreen.storyboard
+++ b/MarsWater/MarsWater/Base.lproj/LaunchScreen.storyboard
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9046" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9035"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
diff --git a/MarsWater/MarsWater/Base.lproj/Main.storyboard b/MarsWater/MarsWater/Base.lproj/Main.storyboard
index 13ead89..cd34722 100644
--- a/MarsWater/MarsWater/Base.lproj/Main.storyboard
+++ b/MarsWater/MarsWater/Base.lproj/Main.storyboard
@@ -1,46 +1,51 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="OKe-ND-dH3">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9046" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="OKe-ND-dH3">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9035"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <scenes>
         <!--Lists-->
         <scene sceneID="aZ6-4b-Rkh">
             <objects>
                 <tableViewController id="8Sk-kJ-ZKe" customClass="ListsTableViewController" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="DtT-yE-Cpd">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="59" sectionHeaderHeight="28" sectionFooterHeight="28" id="DtT-yE-Cpd">
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <animations/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ListCellIdentifier" textLabel="t2E-b6-cF0" detailTextLabel="v9C-RD-f0m" style="IBUITableViewCellStyleSubtitle" id="12f-5V-ccn">
-                                <rect key="frame" x="0.0" y="92" width="600" height="44"/>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ListCellIdentifier" textLabel="t2E-b6-cF0" detailTextLabel="v9C-RD-f0m" rowHeight="59" style="IBUITableViewCellStyleSubtitle" id="12f-5V-ccn">
+                                <rect key="frame" x="0.0" y="92" width="600" height="59"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="12f-5V-ccn" id="yoQ-Vw-tyH">
-                                    <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="600" height="58"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="t2E-b6-cF0">
-                                            <rect key="frame" x="15" y="5" width="32" height="20"/>
+                                            <rect key="frame" x="15" y="12" width="32" height="20"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <animations/>
                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Subtitle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="v9C-RD-f0m">
-                                            <rect key="frame" x="15" y="25" width="41" height="14"/>
+                                            <rect key="frame" x="15" y="32" width="41" height="14"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <animations/>
                                             <fontDescription key="fontDescription" type="system" pointSize="11"/>
-                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                     </subviews>
                                     <animations/>
                                 </tableViewCellContentView>
                                 <animations/>
+                                <connections>
+                                    <segue destination="xtD-KB-VgR" kind="show" identifier="TaskCreation" id="bMU-Bg-DE7"/>
+                                </connections>
                             </tableViewCell>
                         </prototypes>
                         <connections>
@@ -70,12 +75,120 @@
                         <animations/>
                     </navigationBar>
                     <connections>
-                        <segue destination="1vt-jb-oNz" kind="relationship" relationship="rootViewController" id="0ov-5F-jQn"/>
+                        <segue destination="t2G-T0-pxT" kind="relationship" relationship="rootViewController" id="Tnc-uV-U6x"/>
                     </connections>
                 </navigationController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="1Mx-vf-Pe1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1760" y="205"/>
+            <point key="canvasLocation" x="1734" y="-15"/>
+        </scene>
+        <!--Task Creation View Controller-->
+        <scene sceneID="fbS-IF-fl9">
+            <objects>
+                <viewController id="xtD-KB-VgR" customClass="TaskCreationViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="GaZ-2K-ce6"/>
+                        <viewControllerLayoutGuide type="bottom" id="bsd-M8-iYV"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="NAX-k5-fB1">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qFx-CJ-lqm">
+                                <rect key="frame" x="0.0" y="64" width="600" height="110"/>
+                                <subviews>
+                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter Task Here" textAlignment="center" minimumFontSize="17" background="whitebg" translatesAutoresizingMaskIntoConstraints="NO" id="AvH-yI-RRb">
+                                        <rect key="frame" x="8" y="20" width="486" height="70"/>
+                                        <color key="backgroundColor" red="0.9234080509" green="0.89621684540000002" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                        <fontDescription key="fontDescription" type="system" weight="light" pointSize="20"/>
+                                        <textInputTraits key="textInputTraits"/>
+                                    </textField>
+                                    <button opaque="NO" alpha="0.90000000000000002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Rod-LN-PGo">
+                                        <rect key="frame" x="494" y="20" width="98" height="70"/>
+                                        <color key="backgroundColor" red="0.0" green="0.26629974902461562" blue="0.56131628787878785" alpha="1" colorSpace="calibratedRGB"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="98" id="AHD-dl-xfg"/>
+                                        </constraints>
+                                        <fontDescription key="fontDescription" name="HelveticaNeue-Medium" family="Helvetica Neue" pointSize="20"/>
+                                        <size key="titleShadowOffset" width="2.2250738585072014e-308" height="2"/>
+                                        <state key="normal" title="Submit" backgroundImage="denim1">
+                                            <color key="titleColor" red="0.92340805094273748" green="0.89621684541175883" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="titleShadowColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                        </state>
+                                        <connections>
+                                            <action selector="addingNewTask:" destination="xtD-KB-VgR" eventType="touchUpInside" id="FyN-AW-Ws2"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstItem="Rod-LN-PGo" firstAttribute="leading" secondItem="AvH-yI-RRb" secondAttribute="trailing" id="1zA-DV-f4f"/>
+                                    <constraint firstAttribute="height" constant="110" id="GbK-Fk-fIv"/>
+                                    <constraint firstItem="Rod-LN-PGo" firstAttribute="top" secondItem="qFx-CJ-lqm" secondAttribute="top" constant="20" id="RWf-a2-cAL"/>
+                                    <constraint firstAttribute="bottom" secondItem="AvH-yI-RRb" secondAttribute="bottom" constant="20" id="avD-l2-GaZ"/>
+                                    <constraint firstItem="AvH-yI-RRb" firstAttribute="top" secondItem="qFx-CJ-lqm" secondAttribute="top" constant="20" id="g65-fE-eia"/>
+                                    <constraint firstAttribute="trailing" secondItem="Rod-LN-PGo" secondAttribute="trailing" constant="8" id="vf2-nv-9lI"/>
+                                    <constraint firstAttribute="bottom" secondItem="Rod-LN-PGo" secondAttribute="bottom" constant="20" id="x8F-v2-bxn"/>
+                                    <constraint firstItem="AvH-yI-RRb" firstAttribute="leading" secondItem="qFx-CJ-lqm" secondAttribute="leading" constant="8" id="zlH-hM-Kb7"/>
+                                </constraints>
+                            </view>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="4Ns-0l-XMe">
+                                <rect key="frame" x="0.0" y="175" width="600" height="425"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <prototypes>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TaskIdentifier" textLabel="wwy-YD-aOT" style="IBUITableViewCellStyleDefault" id="oic-FZ-z6I">
+                                        <rect key="frame" x="0.0" y="28" width="600" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="oic-FZ-z6I" id="iOj-EK-dZk">
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="wwy-YD-aOT">
+                                                    <rect key="frame" x="15" y="0.0" width="570" height="43"/>
+                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                </prototypes>
+                            </tableView>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstAttribute="trailingMargin" secondItem="qFx-CJ-lqm" secondAttribute="trailing" constant="20" id="Iu3-MD-KtD"/>
+                            <constraint firstItem="qFx-CJ-lqm" firstAttribute="leading" secondItem="NAX-k5-fB1" secondAttribute="leadingMargin" constant="20" id="Ltx-gA-WgG"/>
+                            <constraint firstItem="4Ns-0l-XMe" firstAttribute="leading" secondItem="NAX-k5-fB1" secondAttribute="leading" id="NuV-Ly-xNY"/>
+                            <constraint firstItem="qFx-CJ-lqm" firstAttribute="top" secondItem="GaZ-2K-ce6" secondAttribute="bottom" id="Scf-fE-oDW"/>
+                            <constraint firstAttribute="trailing" secondItem="4Ns-0l-XMe" secondAttribute="trailing" id="W4m-8r-14G"/>
+                            <constraint firstItem="4Ns-0l-XMe" firstAttribute="top" secondItem="qFx-CJ-lqm" secondAttribute="bottom" constant="1" id="YKN-P5-xzR"/>
+                            <constraint firstAttribute="trailing" secondItem="qFx-CJ-lqm" secondAttribute="trailing" id="jlZ-Aw-ew4"/>
+                            <constraint firstItem="qFx-CJ-lqm" firstAttribute="leading" secondItem="NAX-k5-fB1" secondAttribute="leading" id="mZx-ys-D0v"/>
+                            <constraint firstItem="bsd-M8-iYV" firstAttribute="top" secondItem="4Ns-0l-XMe" secondAttribute="bottom" id="mnt-SR-dFu"/>
+                        </constraints>
+                        <variation key="default">
+                            <mask key="constraints">
+                                <exclude reference="Iu3-MD-KtD"/>
+                                <exclude reference="Ltx-gA-WgG"/>
+                            </mask>
+                        </variation>
+                    </view>
+                    <navigationItem key="navigationItem" id="hvI-OK-RaK">
+                        <barButtonItem key="rightBarButtonItem" systemItem="done" id="hV0-7b-Nku">
+                            <connections>
+                                <action selector="doneWithTasks:" destination="xtD-KB-VgR" id="sHp-Oy-bHK"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                    <connections>
+                        <outlet property="tableView" destination="4Ns-0l-XMe" id="PVY-91-QcU"/>
+                        <outlet property="taskTextField" destination="AvH-yI-RRb" id="9v9-zD-xyz"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="c4E-nW-BwM" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1449" y="1180"/>
         </scene>
         <!--List Creation Table View Controller-->
         <scene sceneID="Nx5-Rb-hgB">
@@ -85,12 +198,12 @@
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <animations/>
-                        <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+                        <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
                         <sections>
                             <tableViewSection id="fjY-Uh-Pld">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="9ih-Ft-6US">
-                                        <rect key="frame" x="0.0" y="99" width="600" height="44"/>
+                                        <rect key="frame" x="0.0" y="35" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9ih-Ft-6US" id="D81-aa-EW3">
                                             <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
@@ -100,7 +213,7 @@
                                                     <rect key="frame" x="15" y="11" width="38" height="21"/>
                                                     <animations/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="pGs-E0-Itl">
@@ -123,7 +236,7 @@
                                         <animations/>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="2b6-f2-gJX">
-                                        <rect key="frame" x="0.0" y="143" width="600" height="44"/>
+                                        <rect key="frame" x="0.0" y="79" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2b6-f2-gJX" id="CR3-wx-WPA">
                                             <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
@@ -213,7 +326,220 @@
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="LXj-oa-ep0" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2405" y="205"/>
+            <point key="canvasLocation" x="2465" y="-291"/>
+        </scene>
+        <!--List Creation View Controller-->
+        <scene sceneID="PkS-HO-iKJ">
+            <objects>
+                <viewController id="t2G-T0-pxT" customClass="ListCreationViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="QoO-fr-Ky3"/>
+                        <viewControllerLayoutGuide type="bottom" id="1z6-q6-sXj"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="md9-l2-nDC">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView userInteractionEnabled="NO" alpha="0.20000000000000001" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="geometrybg" translatesAutoresizingMaskIntoConstraints="NO" id="39j-ea-uu4">
+                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                            </imageView>
+                            <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kLP-qI-NBY">
+                                <rect key="frame" x="0.0" y="99" width="600" height="250"/>
+                                <subviews>
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bluesci" translatesAutoresizingMaskIntoConstraints="NO" id="6XA-Md-R9g">
+                                        <rect key="frame" x="255" y="106" width="90" height="90"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="90" id="TTd-e4-vFX"/>
+                                            <constraint firstAttribute="width" constant="90" id="yz2-qB-aVT"/>
+                                        </constraints>
+                                    </imageView>
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bluesci" translatesAutoresizingMaskIntoConstraints="NO" id="ou7-HO-lfs">
+                                        <rect key="frame" x="255" y="8" width="90" height="90"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="90" id="Q1M-4C-L3y"/>
+                                            <constraint firstAttribute="height" constant="90" id="djh-Js-tt7"/>
+                                        </constraints>
+                                    </imageView>
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bluesci" translatesAutoresizingMaskIntoConstraints="NO" id="jZA-Uy-5d0">
+                                        <rect key="frame" x="355" y="106" width="90" height="90"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="90" id="hiw-9K-V2z"/>
+                                            <constraint firstAttribute="height" constant="90" id="py2-ov-vs1"/>
+                                        </constraints>
+                                    </imageView>
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bluesci" translatesAutoresizingMaskIntoConstraints="NO" id="uMh-3i-cqB">
+                                        <rect key="frame" x="355" y="8" width="90" height="90"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="90" id="Zod-Fp-Vuj"/>
+                                            <constraint firstAttribute="width" constant="90" id="h6c-WI-zq3"/>
+                                        </constraints>
+                                    </imageView>
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bluesci" translatesAutoresizingMaskIntoConstraints="NO" id="VmP-4e-kYa">
+                                        <rect key="frame" x="155" y="106" width="90" height="90"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="90" id="AZu-q6-B6C"/>
+                                            <constraint firstAttribute="height" constant="90" id="d2d-Sn-Ijm"/>
+                                        </constraints>
+                                    </imageView>
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bluesci" translatesAutoresizingMaskIntoConstraints="NO" id="sBA-kw-cfg">
+                                        <rect key="frame" x="155" y="8" width="90" height="90"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="90" id="8sI-QR-inE"/>
+                                            <constraint firstAttribute="width" constant="90" id="nK1-jT-xF9"/>
+                                        </constraints>
+                                    </imageView>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qeK-vn-PII">
+                                        <rect key="frame" x="275" y="28" width="50" height="50"/>
+                                        <color key="backgroundColor" red="1" green="0.40000000596046448" blue="0.40000000596046448" alpha="1" colorSpace="calibratedRGB"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="50" id="y13-we-vcn"/>
+                                            <constraint firstAttribute="width" constant="50" id="yDV-iF-Yoo"/>
+                                        </constraints>
+                                        <connections>
+                                            <action selector="marsWaterColorButton:" destination="t2G-T0-pxT" eventType="touchUpInside" id="MJ2-Qd-k9h"/>
+                                        </connections>
+                                    </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DhL-ZO-kDv">
+                                        <rect key="frame" x="375" y="28" width="50" height="50"/>
+                                        <color key="backgroundColor" red="0.44746439322711251" green="0.54515280755031914" blue="0.8994041982323232" alpha="1" colorSpace="calibratedRGB"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="50" id="22e-L9-nLx"/>
+                                            <constraint firstAttribute="height" constant="50" id="8q9-Zc-Qsq"/>
+                                        </constraints>
+                                        <connections>
+                                            <action selector="marsWaterColorButton:" destination="t2G-T0-pxT" eventType="touchUpInside" id="7HR-C8-AEJ"/>
+                                        </connections>
+                                    </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jQ5-6d-s3o">
+                                        <rect key="frame" x="375" y="126" width="50" height="50"/>
+                                        <color key="backgroundColor" red="0.6360579508904014" green="0.87738715277777779" blue="0.50247078272519818" alpha="1" colorSpace="calibratedRGB"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="50" id="2gK-Oc-pfi"/>
+                                            <constraint firstAttribute="width" constant="50" id="jLl-Wa-TGO"/>
+                                        </constraints>
+                                        <connections>
+                                            <action selector="marsWaterColorButton:" destination="t2G-T0-pxT" eventType="touchUpInside" id="0Z5-dY-lcI"/>
+                                        </connections>
+                                    </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="udo-7K-D7B">
+                                        <rect key="frame" x="275" y="126" width="50" height="50"/>
+                                        <color key="backgroundColor" red="0.80000001192092896" green="1" blue="0.40000000596046448" alpha="1" colorSpace="calibratedRGB"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="50" id="LjA-cQ-3m8"/>
+                                            <constraint firstAttribute="height" constant="50" id="tud-9W-Pbj"/>
+                                        </constraints>
+                                        <connections>
+                                            <action selector="marsWaterColorButton:" destination="t2G-T0-pxT" eventType="touchUpInside" id="13E-la-SxH"/>
+                                        </connections>
+                                    </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8qq-mA-mTl">
+                                        <rect key="frame" x="175" y="126" width="50" height="50"/>
+                                        <color key="backgroundColor" red="0.50196081399917603" green="0.0" blue="0.50196081399917603" alpha="1" colorSpace="calibratedRGB"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="50" id="YB8-c5-naT"/>
+                                            <constraint firstAttribute="width" constant="50" id="gLy-yq-uOp"/>
+                                        </constraints>
+                                        <connections>
+                                            <action selector="marsWaterColorButton:" destination="t2G-T0-pxT" eventType="touchUpInside" id="4dx-Zp-j6k"/>
+                                        </connections>
+                                    </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ukv-Wc-top">
+                                        <rect key="frame" x="175" y="28" width="50" height="50"/>
+                                        <color key="backgroundColor" red="0.0" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="50" id="JoL-3A-bsJ"/>
+                                            <constraint firstAttribute="width" constant="50" id="cbI-9v-BjC"/>
+                                        </constraints>
+                                        <connections>
+                                            <action selector="marsWaterColorButton:" destination="t2G-T0-pxT" eventType="touchUpInside" id="0P4-F8-cav"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstItem="6XA-Md-R9g" firstAttribute="leading" secondItem="VmP-4e-kYa" secondAttribute="trailing" constant="10" id="3t9-lu-K75"/>
+                                    <constraint firstItem="uMh-3i-cqB" firstAttribute="leading" secondItem="ou7-HO-lfs" secondAttribute="trailing" constant="10" id="4jc-Vk-AlC"/>
+                                    <constraint firstAttribute="bottom" secondItem="udo-7K-D7B" secondAttribute="bottom" constant="74" id="64t-TZ-17U"/>
+                                    <constraint firstItem="6XA-Md-R9g" firstAttribute="centerX" secondItem="kLP-qI-NBY" secondAttribute="centerX" id="6cl-Yq-3VL"/>
+                                    <constraint firstItem="jQ5-6d-s3o" firstAttribute="leading" secondItem="6XA-Md-R9g" secondAttribute="trailing" constant="30" id="8O9-BE-OPc"/>
+                                    <constraint firstItem="6XA-Md-R9g" firstAttribute="top" secondItem="ou7-HO-lfs" secondAttribute="bottom" constant="8" id="I2b-g6-adr"/>
+                                    <constraint firstAttribute="bottom" secondItem="jQ5-6d-s3o" secondAttribute="bottom" constant="74" id="J29-XY-OIj"/>
+                                    <constraint firstItem="sBA-kw-cfg" firstAttribute="top" secondItem="kLP-qI-NBY" secondAttribute="top" constant="8" id="Jdn-a3-6iu"/>
+                                    <constraint firstItem="VmP-4e-kYa" firstAttribute="top" secondItem="Ukv-Wc-top" secondAttribute="bottom" constant="28" id="M7U-8d-4rA"/>
+                                    <constraint firstItem="DhL-ZO-kDv" firstAttribute="top" secondItem="kLP-qI-NBY" secondAttribute="top" constant="28" id="MIT-m0-l5p"/>
+                                    <constraint firstItem="udo-7K-D7B" firstAttribute="top" secondItem="ou7-HO-lfs" secondAttribute="bottom" constant="28" id="Mrg-cs-rwm"/>
+                                    <constraint firstItem="jZA-Uy-5d0" firstAttribute="leading" secondItem="6XA-Md-R9g" secondAttribute="trailing" constant="10" id="OeW-Rj-rLv"/>
+                                    <constraint firstItem="jZA-Uy-5d0" firstAttribute="top" secondItem="uMh-3i-cqB" secondAttribute="bottom" constant="8" id="PTH-Sx-74A"/>
+                                    <constraint firstAttribute="height" constant="250" id="SPB-hi-uYX"/>
+                                    <constraint firstItem="ou7-HO-lfs" firstAttribute="centerX" secondItem="kLP-qI-NBY" secondAttribute="centerX" id="TIv-NX-mE8"/>
+                                    <constraint firstAttribute="bottom" secondItem="8qq-mA-mTl" secondAttribute="bottom" constant="74" id="VBi-om-8vZ"/>
+                                    <constraint firstItem="qeK-vn-PII" firstAttribute="centerX" secondItem="kLP-qI-NBY" secondAttribute="centerX" id="VZr-Iw-FLk"/>
+                                    <constraint firstItem="VmP-4e-kYa" firstAttribute="top" secondItem="sBA-kw-cfg" secondAttribute="bottom" constant="8" id="W8I-Gj-vgA"/>
+                                    <constraint firstAttribute="bottom" secondItem="6XA-Md-R9g" secondAttribute="bottom" constant="54" id="WWB-9a-aEe"/>
+                                    <constraint firstAttribute="bottom" secondItem="VmP-4e-kYa" secondAttribute="bottom" constant="54" id="Wlx-d3-yDn"/>
+                                    <constraint firstItem="Ukv-Wc-top" firstAttribute="top" secondItem="kLP-qI-NBY" secondAttribute="top" constant="28" id="cU0-sO-d6T"/>
+                                    <constraint firstItem="6XA-Md-R9g" firstAttribute="leading" secondItem="8qq-mA-mTl" secondAttribute="trailing" constant="30" id="jTK-kq-7H8"/>
+                                    <constraint firstItem="jZA-Uy-5d0" firstAttribute="top" secondItem="DhL-ZO-kDv" secondAttribute="bottom" constant="28" id="mz1-tS-Dkq"/>
+                                    <constraint firstItem="qeK-vn-PII" firstAttribute="top" secondItem="kLP-qI-NBY" secondAttribute="top" constant="28" id="nah-qR-rBk"/>
+                                    <constraint firstItem="DhL-ZO-kDv" firstAttribute="leading" secondItem="ou7-HO-lfs" secondAttribute="trailing" constant="30" id="rn8-20-KAB"/>
+                                    <constraint firstItem="ou7-HO-lfs" firstAttribute="top" secondItem="kLP-qI-NBY" secondAttribute="top" constant="8" id="sKV-El-exk"/>
+                                    <constraint firstItem="ou7-HO-lfs" firstAttribute="leading" secondItem="Ukv-Wc-top" secondAttribute="trailing" constant="30" id="tOG-07-NrP"/>
+                                    <constraint firstItem="uMh-3i-cqB" firstAttribute="top" secondItem="kLP-qI-NBY" secondAttribute="top" constant="8" id="uPt-zY-xyU"/>
+                                    <constraint firstItem="ou7-HO-lfs" firstAttribute="leading" secondItem="sBA-kw-cfg" secondAttribute="trailing" constant="10" id="uYu-4o-STB"/>
+                                    <constraint firstItem="udo-7K-D7B" firstAttribute="centerX" secondItem="kLP-qI-NBY" secondAttribute="centerX" id="wzH-sI-Qap"/>
+                                </constraints>
+                            </view>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="bluesci" translatesAutoresizingMaskIntoConstraints="NO" id="KFW-MP-bti">
+                                <rect key="frame" x="200" y="357" width="200" height="70"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="200" id="pQY-Qn-KdN"/>
+                                    <constraint firstAttribute="height" constant="70" id="rpm-Qb-aS1"/>
+                                </constraints>
+                            </imageView>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="EqU-cE-zLv">
+                                <rect key="frame" x="230" y="377" width="140" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="56f-zf-4FF"/>
+                                    <constraint firstAttribute="width" constant="140" id="jir-sh-wfD"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                            </textField>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstItem="39j-ea-uu4" firstAttribute="leading" secondItem="md9-l2-nDC" secondAttribute="leading" id="0Th-DY-lu3"/>
+                            <constraint firstItem="KFW-MP-bti" firstAttribute="top" secondItem="kLP-qI-NBY" secondAttribute="bottom" constant="8" id="5RM-MS-Ma8"/>
+                            <constraint firstItem="kLP-qI-NBY" firstAttribute="leading" secondItem="md9-l2-nDC" secondAttribute="leading" id="6cd-TN-k9g"/>
+                            <constraint firstItem="EqU-cE-zLv" firstAttribute="centerX" secondItem="39j-ea-uu4" secondAttribute="centerX" id="6q7-9Z-9JJ"/>
+                            <constraint firstItem="39j-ea-uu4" firstAttribute="top" secondItem="md9-l2-nDC" secondAttribute="top" id="A3x-fd-cdz"/>
+                            <constraint firstItem="kLP-qI-NBY" firstAttribute="top" secondItem="QoO-fr-Ky3" secondAttribute="bottom" constant="35" id="CY0-5S-v0O"/>
+                            <constraint firstItem="KFW-MP-bti" firstAttribute="centerX" secondItem="39j-ea-uu4" secondAttribute="centerX" id="DNL-v0-X6A"/>
+                            <constraint firstAttribute="trailing" secondItem="kLP-qI-NBY" secondAttribute="trailing" id="LlD-eJ-aME"/>
+                            <constraint firstItem="EqU-cE-zLv" firstAttribute="top" secondItem="kLP-qI-NBY" secondAttribute="bottom" constant="28" id="RU1-MF-CRi"/>
+                            <constraint firstItem="1z6-q6-sXj" firstAttribute="top" secondItem="39j-ea-uu4" secondAttribute="bottom" id="daR-J7-8bL"/>
+                            <constraint firstAttribute="trailing" secondItem="39j-ea-uu4" secondAttribute="trailing" id="qqG-UH-zAS"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" id="wnc-iV-T5V">
+                        <barButtonItem key="leftBarButtonItem" title="Save" id="MfI-pO-B4y">
+                            <connections>
+                                <action selector="save:" destination="t2G-T0-pxT" id="6mM-27-Xx2"/>
+                            </connections>
+                        </barButtonItem>
+                        <barButtonItem key="rightBarButtonItem" title="Cancel" id="EWS-kC-7Wm">
+                            <connections>
+                                <action selector="cancel:" destination="t2G-T0-pxT" id="LNg-Zs-34L"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                    <connections>
+                        <outlet property="listTextField" destination="EqU-cE-zLv" id="eIb-NA-Mhn"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="4lX-cm-zBI" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2465" y="371"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="5nr-jx-cZX">
@@ -233,4 +559,10 @@
             <point key="canvasLocation" x="193" y="355"/>
         </scene>
     </scenes>
+    <resources>
+        <image name="bluesci" width="600" height="600"/>
+        <image name="denim1" width="236" height="236"/>
+        <image name="geometrybg" width="640" height="1136"/>
+        <image name="whitebg" width="300" height="300"/>
+    </resources>
 </document>
diff --git a/MarsWater/MarsWater/List+CoreDataProperties.h b/MarsWater/MarsWater/List+CoreDataProperties.h
index 9ce8d06..ccbccbd 100644
--- a/MarsWater/MarsWater/List+CoreDataProperties.h
+++ b/MarsWater/MarsWater/List+CoreDataProperties.h
@@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nullable, nonatomic, retain) NSString *title;
 @property (nullable, nonatomic, retain) NSDate *createdAt;
 @property (nullable, nonatomic, retain) id color;
-@property (nullable, nonatomic, retain) NSArray *task;
+@property (nullable, nonatomic, retain) NSOrderedSet *task;
 
 @end
 
diff --git a/MarsWater/MarsWater/ListCreationViewController.h b/MarsWater/MarsWater/ListCreationViewController.h
new file mode 100644
index 0000000..79321b5
--- /dev/null
+++ b/MarsWater/MarsWater/ListCreationViewController.h
@@ -0,0 +1,13 @@
+//
+//  ListCreationViewController.h
+//  MarsWater
+//
+//  Created by Fatima Zenine Villanueva on 10/9/15.
+//  Copyright © 2015 Michael Kavouras. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface ListCreationViewController : UIViewController
+
+@end
diff --git a/MarsWater/MarsWater/ListCreationViewController.m b/MarsWater/MarsWater/ListCreationViewController.m
new file mode 100644
index 0000000..cd80e11
--- /dev/null
+++ b/MarsWater/MarsWater/ListCreationViewController.m
@@ -0,0 +1,69 @@
+//
+//  ListCreationViewController.m
+//  MarsWater
+//
+//  Created by Fatima Zenine Villanueva on 10/9/15.
+//  Copyright © 2015 Michael Kavouras. All rights reserved.
+//
+
+#import <CoreData/CoreData.h>
+#import "AppDelegate.h"
+#import "List.h"
+#import "ListCreationViewController.h"
+
+@interface ListCreationViewController ()
+
+@property (weak, nonatomic) IBOutlet UITextField *listTextField;
+
+@property (nonatomic) List *list;
+
+@end
+
+@implementation ListCreationViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    AppDelegate *delegate = [UIApplication sharedApplication].delegate;
+    
+    self.list = [NSEntityDescription insertNewObjectForEntityForName:@"List" inManagedObjectContext:delegate.managedObjectContext];
+}
+- (IBAction)cancel:(UIBarButtonItem *)sender {
+    
+    self.list.color = nil;
+    self.list.title = nil;
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+- (IBAction)marsWaterColorButton:(UIButton *)sender {
+    self.list.color = sender.backgroundColor;
+}
+
+- (IBAction)save:(UIBarButtonItem *)sender {
+    
+    self.list.title = self.listTextField.text;
+    self.list.createdAt = [NSDate date];
+    
+    AppDelegate *delegate = [UIApplication sharedApplication].delegate;
+    [delegate.managedObjectContext save:nil];
+    
+    [self dismissViewControllerAnimated:YES completion:nil];
+    
+}
+
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+}
+
+/*
+ #pragma mark - Navigation
+ 
+ // In a storyboard-based application, you will often want to do a little preparation before navigation
+ - (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+ // Get the new view controller using [segue destinationViewController].
+ // Pass the selected object to the new view controller.
+ }
+ */
+
+@end
diff --git a/MarsWater/MarsWater/ListsTableViewController.m b/MarsWater/MarsWater/ListsTableViewController.m
index 8a2659c..03e9cce 100644
--- a/MarsWater/MarsWater/ListsTableViewController.m
+++ b/MarsWater/MarsWater/ListsTableViewController.m
@@ -10,6 +10,7 @@
 #import "ListsTableViewController.h"
 #import "AppDelegate.h"
 #import "List.h"
+#import "TaskCreationViewController.h"
 
 @interface ListsTableViewController () <NSFetchedResultsControllerDelegate>
 
@@ -64,13 +65,57 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     cell.textLabel.text = list.title;
     cell.detailTextLabel.text = [list.createdAt description];
     
+    if (list.task.count >= 1){
+        cell.detailTextLabel.text = [NSString stringWithFormat: @"Tasks: %lu " ,list.task.count];
+    }
     return cell;
 }
 
 - (void)controller:(NSFetchedResultsController *)controller didChangeObject:(id)anObject atIndexPath:(NSIndexPath *)indexPath forChangeType:(NSFetchedResultsChangeType)type newIndexPath:(NSIndexPath *)newIndexPath {
-   
+    
     [self.tableView reloadData];
 }
 
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    
+    // Make sure your segue name in storyboard is the same as this line
+    if ([[segue identifier] isEqualToString:@"TaskCreation"])
+    {
+        NSIndexPath *indexPath = [self.tableView indexPathForSelectedRow];
+        TaskCreationViewController *vc = segue.destinationViewController;
+        List *list = self.fetchedResultsController.fetchedObjects[indexPath.row];
+        vc.list = list;
+        
+        NSLog(@"segue list %@", vc.list);
+    }
+}
+
+
+- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if(editingStyle == UITableViewCellEditingStyleDelete)
+    {
+        NSManagedObjectContext *context =
+        [self.fetchedResultsController managedObjectContext];
+        
+        NSManagedObject *objectToBeDeleted =
+        [self.fetchedResultsController objectAtIndexPath:indexPath];
+        
+        [context deleteObject:objectToBeDeleted];
+        
+        AppDelegate *delegate = [UIApplication sharedApplication].delegate;
+        
+        [delegate.managedObjectContext save:nil];
+        
+        NSError *error = nil;
+        if (![context save:&error])
+        {
+            NSLog(@"Error deleting movie, %@", [error userInfo]);
+        }
+        
+        [self.tableView reloadData];
+    }
+}
+
 @end
 
diff --git a/MarsWater/MarsWater/MarsWater.xcdatamodeld/MarsWater.xcdatamodel/contents b/MarsWater/MarsWater/MarsWater.xcdatamodeld/MarsWater.xcdatamodel/contents
index 116441d..59cc3ea 100644
--- a/MarsWater/MarsWater/MarsWater.xcdatamodeld/MarsWater.xcdatamodel/contents
+++ b/MarsWater/MarsWater/MarsWater.xcdatamodeld/MarsWater.xcdatamodel/contents
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="8195" systemVersion="15A284" minimumToolsVersion="Automatic">
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="9048" systemVersion="14E46" minimumToolsVersion="Automatic">
     <entity name="List" representedClassName="List" syncable="YES">
         <attribute name="color" optional="YES" attributeType="Transformable" syncable="YES"/>
         <attribute name="createdAt" optional="YES" attributeType="Date" syncable="YES"/>
@@ -16,7 +16,7 @@
         <relationship name="list" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="List" inverseName="task" inverseEntity="List" syncable="YES"/>
     </entity>
     <elements>
-        <element name="Task" positionX="-63" positionY="-18" width="128" height="148"/>
-        <element name="List" positionX="144" positionY="-18" width="128" height="103"/>
+        <element name="List" positionX="88" positionY="23" width="128" height="103"/>
+        <element name="Task" positionX="-126" positionY="-22" width="128" height="148"/>
     </elements>
 </model>
\ No newline at end of file
diff --git a/MarsWater/MarsWater/Task+CoreDataProperties.h b/MarsWater/MarsWater/Task+CoreDataProperties.h
index 2cc11d7..7d7b5a9 100644
--- a/MarsWater/MarsWater/Task+CoreDataProperties.h
+++ b/MarsWater/MarsWater/Task+CoreDataProperties.h
@@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nullable, nonatomic, retain) NSDate *updatedAt;
 @property (nullable, nonatomic, retain) NSNumber *priority;
 @property (nullable, nonatomic, retain) NSDate *completedAt;
-@property (nullable, nonatomic, retain) List *list;
+@property (nullable, nonatomic, retain) NSManagedObject *list;
 
 @end
 
diff --git a/MarsWater/MarsWater/TaskCreationViewController.h b/MarsWater/MarsWater/TaskCreationViewController.h
new file mode 100644
index 0000000..ec2bca5
--- /dev/null
+++ b/MarsWater/MarsWater/TaskCreationViewController.h
@@ -0,0 +1,17 @@
+//
+//  TaskCreationViewController.h
+//  MarsWater
+//
+//  Created by Fatima Zenine Villanueva on 10/6/15.
+//  Copyright © 2015 Michael Kavouras. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "List.h"
+
+@interface TaskCreationViewController : UIViewController
+
+@property (nonatomic) List *list;
+
+
+@end
diff --git a/MarsWater/MarsWater/TaskCreationViewController.m b/MarsWater/MarsWater/TaskCreationViewController.m
new file mode 100644
index 0000000..0e3bdbf
--- /dev/null
+++ b/MarsWater/MarsWater/TaskCreationViewController.m
@@ -0,0 +1,117 @@
+//
+//  TaskCreationViewController.m
+//  MarsWater
+//
+//  Created by Fatima Zenine Villanueva on 10/6/15.
+//  Copyright © 2015 Michael Kavouras. All rights reserved.
+//
+
+#import "TaskCreationViewController.h"
+#import "Task.h"
+#import "List.h"
+#import "AppDelegate.h"
+
+@interface TaskCreationViewController () <UITableViewDataSource, UITableViewDelegate, NSFetchedResultsControllerDelegate>
+
+@property (nonatomic) NSFetchedResultsController *fetchedResultsController;
+
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+@property (weak, nonatomic) IBOutlet UITextField *taskTextField;
+
+@property (nonatomic) NSMutableOrderedSet *testSet;
+
+
+@property (nonatomic) Task *task;
+
+@end
+
+@implementation TaskCreationViewController
+
+- (void)viewDidLoad {
+    self.tableView.delegate = self;
+    self.tableView.dataSource = self;
+    self.edgesForExtendedLayout = UIRectEdgeNone;
+    
+    AppDelegate *delegate = [UIApplication sharedApplication].delegate;
+    
+    self.task = [NSEntityDescription insertNewObjectForEntityForName:@"Task" inManagedObjectContext:delegate.managedObjectContext];
+    
+    self.testSet = [[NSMutableOrderedSet alloc]init];
+    
+    
+    // 1) create an instance of NSFetchRequest with an entity name
+    NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] initWithEntityName:@"List"];
+    
+    
+    // 2) create a sort descriptor
+    NSSortDescriptor *sort = [[NSSortDescriptor alloc] initWithKey:@"createdAt" ascending:NO];
+    
+    // 3) set the sortDescriptors on the fetchRequest
+    fetchRequest.sortDescriptors = @[sort];
+    
+    // 4) create a fetchedResultsController with a fetchRequest and a managedObjectContext,
+    self.fetchedResultsController = [[NSFetchedResultsController alloc] initWithFetchRequest:fetchRequest managedObjectContext:delegate.managedObjectContext sectionNameKeyPath:nil cacheName:nil];
+    
+    self.fetchedResultsController.delegate = self;
+    
+    [self.fetchedResultsController performFetch:nil];
+
+    
+    [super viewDidLoad];
+}
+
+
+- (IBAction)addingNewTask:(UIButton *)sender
+{
+    AppDelegate *delegate = [UIApplication sharedApplication].delegate;
+    
+    self.task = [NSEntityDescription insertNewObjectForEntityForName:@"Task" inManagedObjectContext:delegate.managedObjectContext];
+    
+    self.task.taskDescription = self.taskTextField.text;
+    
+    self.task.createdAt = [NSDate date];
+    
+    self.testSet = self.list.task.mutableCopy;
+    
+    [self.testSet addObject:self.task];
+    
+    self.list.task = self.testSet;
+    
+    [delegate.managedObjectContext save:nil];
+    
+    [self.tableView reloadData];
+    
+}
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return self.list.task.count;
+}
+
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier: @"TaskIdentifier" forIndexPath:indexPath];
+    
+    Task *cellTask = self.list.task[indexPath.row];
+    
+    cell.textLabel.text = cellTask.taskDescription;
+    
+    return cell;
+}
+
+- (IBAction)doneWithTasks:(UIBarButtonItem *)sender {
+    
+    [self.navigationController popToRootViewControllerAnimated:YES];
+}
+
+- (void)controller:(NSFetchedResultsController *)controller didChangeObject:(id)anObject atIndexPath:(NSIndexPath *)indexPath forChangeType:(NSFetchedResultsChangeType)type newIndexPath:(NSIndexPath *)newIndexPath {
+    
+    [self.tableView reloadData];
+}
+
+
+
+@end