diff --git a/MarsWater/MarsWater.xcodeproj/project.pbxproj b/MarsWater/MarsWater.xcodeproj/project.pbxproj
index 61d423d..8c80ba7 100644
--- a/MarsWater/MarsWater.xcodeproj/project.pbxproj
+++ b/MarsWater/MarsWater.xcodeproj/project.pbxproj
@@ -7,21 +7,35 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		5133F2D51BC21ADE0001A8EB /* List.m in Sources */ = {isa = PBXBuildFile; fileRef = 5133F2CE1BC21ADE0001A8EB /* List.m */; settings = {ASSET_TAGS = (); }; };
+		5133F2D61BC21ADE0001A8EB /* List+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 5133F2D01BC21ADE0001A8EB /* List+CoreDataProperties.m */; settings = {ASSET_TAGS = (); }; };
+		5133F2D71BC21ADE0001A8EB /* Task.m in Sources */ = {isa = PBXBuildFile; fileRef = 5133F2D21BC21ADE0001A8EB /* Task.m */; settings = {ASSET_TAGS = (); }; };
+		5133F2D81BC21ADE0001A8EB /* Task+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 5133F2D41BC21ADE0001A8EB /* Task+CoreDataProperties.m */; settings = {ASSET_TAGS = (); }; };
+		5133F2DB1BC2219A0001A8EB /* TaskListTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5133F2DA1BC2219A0001A8EB /* TaskListTableViewController.m */; settings = {ASSET_TAGS = (); }; };
+		518510531BC89D8A00A45E70 /* TaskCreationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 518510521BC89D8A00A45E70 /* TaskCreationViewController.m */; settings = {ASSET_TAGS = (); }; };
 		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 */; };
-		8DA86CCD1BC1B31C006C50BC /* List+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DA86CC61BC1B31C006C50BC /* List+CoreDataProperties.m */; settings = {ASSET_TAGS = (); }; };
-		8DA86CCE1BC1B31C006C50BC /* List.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DA86CC81BC1B31C006C50BC /* List.m */; settings = {ASSET_TAGS = (); }; };
-		8DA86CCF1BC1B31C006C50BC /* Task+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DA86CCA1BC1B31C006C50BC /* Task+CoreDataProperties.m */; settings = {ASSET_TAGS = (); }; };
-		8DA86CD01BC1B31C006C50BC /* Task.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DA86CCC1BC1B31C006C50BC /* Task.m */; settings = {ASSET_TAGS = (); }; };
 		8DA86CD41BC1B8E4006C50BC /* ListsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DA86CD31BC1B8E4006C50BC /* ListsTableViewController.m */; settings = {ASSET_TAGS = (); }; };
 		8DA86CD71BC1B904006C50BC /* ListCreationTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DA86CD61BC1B904006C50BC /* ListCreationTableViewController.m */; settings = {ASSET_TAGS = (); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		5133F2CD1BC21ADE0001A8EB /* List.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = List.h; sourceTree = "<group>"; };
+		5133F2CE1BC21ADE0001A8EB /* List.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = List.m; sourceTree = "<group>"; };
+		5133F2CF1BC21ADE0001A8EB /* List+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "List+CoreDataProperties.h"; sourceTree = "<group>"; };
+		5133F2D01BC21ADE0001A8EB /* List+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "List+CoreDataProperties.m"; sourceTree = "<group>"; };
+		5133F2D11BC21ADE0001A8EB /* Task.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Task.h; sourceTree = "<group>"; };
+		5133F2D21BC21ADE0001A8EB /* Task.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Task.m; sourceTree = "<group>"; };
+		5133F2D31BC21ADE0001A8EB /* Task+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Task+CoreDataProperties.h"; sourceTree = "<group>"; };
+		5133F2D41BC21ADE0001A8EB /* Task+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Task+CoreDataProperties.m"; sourceTree = "<group>"; };
+		5133F2D91BC2219A0001A8EB /* TaskListTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TaskListTableViewController.h; sourceTree = "<group>"; };
+		5133F2DA1BC2219A0001A8EB /* TaskListTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TaskListTableViewController.m; sourceTree = "<group>"; };
+		518510511BC89D8A00A45E70 /* TaskCreationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TaskCreationViewController.h; sourceTree = "<group>"; };
+		518510521BC89D8A00A45E70 /* TaskCreationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TaskCreationViewController.m; 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>"; };
@@ -31,14 +45,6 @@
 		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>"; };
 		8DA86CBB1BC1AE57006C50BC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		8DA86CC51BC1B31C006C50BC /* List+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "List+CoreDataProperties.h"; path = "../List+CoreDataProperties.h"; sourceTree = "<group>"; };
-		8DA86CC61BC1B31C006C50BC /* List+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "List+CoreDataProperties.m"; path = "../List+CoreDataProperties.m"; sourceTree = "<group>"; };
-		8DA86CC71BC1B31C006C50BC /* List.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = List.h; path = ../List.h; sourceTree = "<group>"; };
-		8DA86CC81BC1B31C006C50BC /* List.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = List.m; path = ../List.m; sourceTree = "<group>"; };
-		8DA86CC91BC1B31C006C50BC /* Task+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Task+CoreDataProperties.h"; path = "../Task+CoreDataProperties.h"; sourceTree = "<group>"; };
-		8DA86CCA1BC1B31C006C50BC /* Task+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "Task+CoreDataProperties.m"; path = "../Task+CoreDataProperties.m"; sourceTree = "<group>"; };
-		8DA86CCB1BC1B31C006C50BC /* Task.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Task.h; path = ../Task.h; sourceTree = "<group>"; };
-		8DA86CCC1BC1B31C006C50BC /* Task.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Task.m; path = ../Task.m; sourceTree = "<group>"; };
 		8DA86CD21BC1B8E4006C50BC /* ListsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListsTableViewController.h; sourceTree = "<group>"; };
 		8DA86CD31BC1B8E4006C50BC /* ListsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ListsTableViewController.m; sourceTree = "<group>"; };
 		8DA86CD51BC1B904006C50BC /* ListCreationTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListCreationTableViewController.h; sourceTree = "<group>"; };
@@ -83,11 +89,15 @@
 				8DA86CD51BC1B904006C50BC /* ListCreationTableViewController.h */,
 				8DA86CD61BC1B904006C50BC /* ListCreationTableViewController.m */,
 				8DA86CB01BC1AE57006C50BC /* Main.storyboard */,
+				5133F2D91BC2219A0001A8EB /* TaskListTableViewController.h */,
+				5133F2DA1BC2219A0001A8EB /* TaskListTableViewController.m */,
 				8DA86CB61BC1AE57006C50BC /* Assets.xcassets */,
 				8DA86CB81BC1AE57006C50BC /* LaunchScreen.storyboard */,
 				8DA86CBB1BC1AE57006C50BC /* Info.plist */,
 				8DA86CB31BC1AE57006C50BC /* MarsWater.xcdatamodeld */,
 				8DA86CA71BC1AE57006C50BC /* Supporting Files */,
+				518510511BC89D8A00A45E70 /* TaskCreationViewController.h */,
+				518510521BC89D8A00A45E70 /* TaskCreationViewController.m */,
 			);
 			path = MarsWater;
 			sourceTree = "<group>";
@@ -103,14 +113,14 @@
 		8DA86CD11BC1B329006C50BC /* Model */ = {
 			isa = PBXGroup;
 			children = (
-				8DA86CC51BC1B31C006C50BC /* List+CoreDataProperties.h */,
-				8DA86CC61BC1B31C006C50BC /* List+CoreDataProperties.m */,
-				8DA86CC71BC1B31C006C50BC /* List.h */,
-				8DA86CC81BC1B31C006C50BC /* List.m */,
-				8DA86CC91BC1B31C006C50BC /* Task+CoreDataProperties.h */,
-				8DA86CCA1BC1B31C006C50BC /* Task+CoreDataProperties.m */,
-				8DA86CCB1BC1B31C006C50BC /* Task.h */,
-				8DA86CCC1BC1B31C006C50BC /* Task.m */,
+				5133F2CD1BC21ADE0001A8EB /* List.h */,
+				5133F2CE1BC21ADE0001A8EB /* List.m */,
+				5133F2CF1BC21ADE0001A8EB /* List+CoreDataProperties.h */,
+				5133F2D01BC21ADE0001A8EB /* List+CoreDataProperties.m */,
+				5133F2D11BC21ADE0001A8EB /* Task.h */,
+				5133F2D21BC21ADE0001A8EB /* Task.m */,
+				5133F2D31BC21ADE0001A8EB /* Task+CoreDataProperties.h */,
+				5133F2D41BC21ADE0001A8EB /* Task+CoreDataProperties.m */,
 			);
 			name = Model;
 			sourceTree = "<group>";
@@ -186,13 +196,15 @@
 			buildActionMask = 2147483647;
 			files = (
 				8DA86CB51BC1AE57006C50BC /* MarsWater.xcdatamodeld in Sources */,
-				8DA86CCF1BC1B31C006C50BC /* Task+CoreDataProperties.m in Sources */,
 				8DA86CAC1BC1AE57006C50BC /* AppDelegate.m in Sources */,
+				5133F2D61BC21ADE0001A8EB /* List+CoreDataProperties.m in Sources */,
+				5133F2D71BC21ADE0001A8EB /* Task.m in Sources */,
+				518510531BC89D8A00A45E70 /* TaskCreationViewController.m in Sources */,
+				5133F2DB1BC2219A0001A8EB /* TaskListTableViewController.m in Sources */,
 				8DA86CD41BC1B8E4006C50BC /* ListsTableViewController.m in Sources */,
-				8DA86CD01BC1B31C006C50BC /* Task.m in Sources */,
-				8DA86CCE1BC1B31C006C50BC /* List.m in Sources */,
+				5133F2D51BC21ADE0001A8EB /* List.m in Sources */,
 				8DA86CD71BC1B904006C50BC /* ListCreationTableViewController.m in Sources */,
-				8DA86CCD1BC1B31C006C50BC /* List+CoreDataProperties.m in Sources */,
+				5133F2D81BC21ADE0001A8EB /* Task+CoreDataProperties.m in Sources */,
 				8DA86CA91BC1AE57006C50BC /* main.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -340,6 +352,7 @@
 				8DA86CC01BC1AE57006C50BC /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 
diff --git a/MarsWater/MarsWater/Base.lproj/LaunchScreen.storyboard b/MarsWater/MarsWater/Base.lproj/LaunchScreen.storyboard
index 2e721e1..5a9c4a6 100644
--- a/MarsWater/MarsWater/Base.lproj/LaunchScreen.storyboard
+++ b/MarsWater/MarsWater/Base.lproj/LaunchScreen.storyboard
@@ -1,7 +1,7 @@
 <?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="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
diff --git a/MarsWater/MarsWater/Base.lproj/Main.storyboard b/MarsWater/MarsWater/Base.lproj/Main.storyboard
index 13ead89..60e1b82 100644
--- a/MarsWater/MarsWater/Base.lproj/Main.storyboard
+++ b/MarsWater/MarsWater/Base.lproj/Main.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="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="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="OKe-ND-dH3">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <scenes>
         <!--Lists-->
@@ -14,11 +15,11 @@
                         <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">
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" 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"/>
                                 <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="567" height="43"/>
                                     <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">
@@ -41,6 +42,9 @@
                                     <animations/>
                                 </tableViewCellContentView>
                                 <animations/>
+                                <connections>
+                                    <segue destination="wuz-ns-SZK" kind="show" identifier="Tasks" id="Dej-7I-Xs1"/>
+                                </connections>
                             </tableViewCell>
                         </prototypes>
                         <connections>
@@ -60,6 +64,57 @@
             </objects>
             <point key="canvasLocation" x="1013" y="355"/>
         </scene>
+        <!--Tasks-->
+        <scene sceneID="Hid-X4-dHT">
+            <objects>
+                <tableViewController id="wuz-ns-SZK" customClass="TaskListTableViewController" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="K4O-yc-sDE">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <prototypes>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TaskCellIdentifier" textLabel="y24-xT-fVX" detailTextLabel="gyg-si-ijZ" style="IBUITableViewCellStyleSubtitle" id="iMe-zr-K1E">
+                                <rect key="frame" x="0.0" y="92" width="600" height="44"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="iMe-zr-K1E" id="9P0-yo-N6p">
+                                    <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="y24-xT-fVX">
+                                            <rect key="frame" x="15" y="5" width="32" height="20"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Subtitle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="gyg-si-ijZ">
+                                            <rect key="frame" x="15" y="25" width="41" height="14"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                    </subviews>
+                                </tableViewCellContentView>
+                            </tableViewCell>
+                        </prototypes>
+                        <connections>
+                            <outlet property="dataSource" destination="wuz-ns-SZK" id="jcZ-hv-r36"/>
+                            <outlet property="delegate" destination="wuz-ns-SZK" id="Mzx-Oc-imE"/>
+                        </connections>
+                    </tableView>
+                    <navigationItem key="navigationItem" title="Tasks" id="eyL-Ml-aZE">
+                        <barButtonItem key="rightBarButtonItem" systemItem="add" id="5PZ-XG-iGB">
+                            <connections>
+                                <segue destination="QJo-6o-30C" kind="show" id="Hy1-3N-DI3"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="9E1-fJ-SBH" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1013" y="1094"/>
+        </scene>
         <!--Navigation Controller-->
         <scene sceneID="B7A-b0-IE6">
             <objects>
@@ -75,7 +130,7 @@
                 </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="1760" y="355"/>
         </scene>
         <!--List Creation Table View Controller-->
         <scene sceneID="Nx5-Rb-hgB">
@@ -213,7 +268,68 @@
                 </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="2453" y="373"/>
+        </scene>
+        <!--Task Creation View Controller-->
+        <scene sceneID="Nay-6V-N6q">
+            <objects>
+                <viewController id="QJo-6o-30C" customClass="TaskCreationViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="HMg-oh-wtW"/>
+                        <viewControllerLayoutGuide type="bottom" id="8DE-QZ-hLO"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="yKS-gF-vdM">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter description" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="OFY-qL-mN8">
+                                <rect key="frame" x="20" y="72" width="560" height="30"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                            </textField>
+                            <datePicker contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="sM1-dJ-s6r">
+                                <rect key="frame" x="20" y="146" width="560" height="183"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="183" id="mEd-im-tRP"/>
+                                </constraints>
+                                <date key="date" timeIntervalSinceReferenceDate="466132012.93718201">
+                                    <!--2015-10-10 01:06:52 +0000-->
+                                </date>
+                            </datePicker>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Due Date:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Oh7-Sm-WFk">
+                                <rect key="frame" x="20" y="117" width="76" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstItem="Oh7-Sm-WFk" firstAttribute="top" secondItem="OFY-qL-mN8" secondAttribute="bottom" constant="15" id="3XI-q5-uQ5"/>
+                            <constraint firstItem="OFY-qL-mN8" firstAttribute="trailing" secondItem="yKS-gF-vdM" secondAttribute="trailingMargin" id="JoI-kS-WrR"/>
+                            <constraint firstItem="OFY-qL-mN8" firstAttribute="top" secondItem="HMg-oh-wtW" secondAttribute="bottom" constant="8" id="QA4-q6-xs9"/>
+                            <constraint firstItem="OFY-qL-mN8" firstAttribute="leading" secondItem="yKS-gF-vdM" secondAttribute="leadingMargin" id="XeH-NT-yrX"/>
+                            <constraint firstItem="sM1-dJ-s6r" firstAttribute="top" secondItem="Oh7-Sm-WFk" secondAttribute="bottom" constant="8" id="bkr-bv-dYV"/>
+                            <constraint firstItem="sM1-dJ-s6r" firstAttribute="leading" secondItem="yKS-gF-vdM" secondAttribute="leading" constant="20" id="vGi-l3-ixg"/>
+                            <constraint firstItem="Oh7-Sm-WFk" firstAttribute="leading" secondItem="yKS-gF-vdM" secondAttribute="leadingMargin" id="vLo-Pv-trE"/>
+                            <constraint firstAttribute="trailing" secondItem="sM1-dJ-s6r" secondAttribute="trailing" constant="20" id="y8f-fj-ys5"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" id="5Kp-YZ-YN9">
+                        <barButtonItem key="rightBarButtonItem" title="Create" id="6zh-ku-BPB">
+                            <connections>
+                                <action selector="createTapped:" destination="QJo-6o-30C" id="ldJ-5v-Tg5"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                    <connections>
+                        <outlet property="datePicker" destination="sM1-dJ-s6r" id="vXZ-uI-lhr"/>
+                        <outlet property="descriptionField" destination="OFY-qL-mN8" id="eUv-QQ-enU"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="6If-F0-Xpj" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1727" y="1094"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="5nr-jx-cZX">
diff --git a/MarsWater/MarsWater/ListsTableViewController.m b/MarsWater/MarsWater/ListsTableViewController.m
index 8a2659c..caa73ca 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 "TaskListTableViewController.h"
 
 @interface ListsTableViewController () <NSFetchedResultsControllerDelegate>
 
@@ -72,5 +73,18 @@ - (void)controller:(NSFetchedResultsController *)controller didChangeObject:(id)
     [self.tableView reloadData];
 }
 
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender
+{
+    if ([[segue identifier] isEqualToString:@"Tasks"]) {
+        
+        TaskListTableViewController *vc = [segue destinationViewController];
+        
+        NSIndexPath *indexPath = [self.tableView indexPathForCell:sender];
+        
+        vc.task = self.fetchedResultsController.fetchedObjects[indexPath.row];
+    }
+
+}
+
 @end
 
diff --git a/MarsWater/MarsWater/MarsWater.xcdatamodeld/MarsWater.xcdatamodel/contents b/MarsWater/MarsWater/MarsWater.xcdatamodeld/MarsWater.xcdatamodel/contents
index 116441d..a813449 100644
--- a/MarsWater/MarsWater/MarsWater.xcdatamodeld/MarsWater.xcdatamodel/contents
+++ b/MarsWater/MarsWater/MarsWater.xcdatamodeld/MarsWater.xcdatamodel/contents
@@ -1,10 +1,10 @@
 <?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="8195" systemVersion="14F27" 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"/>
         <attribute name="title" optional="YES" attributeType="String" syncable="YES"/>
-        <relationship name="task" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="Task" inverseName="list" inverseEntity="Task" syncable="YES"/>
+        <relationship name="task" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="Task" inverseName="list" inverseEntity="Task" syncable="YES"/>
     </entity>
     <entity name="Task" representedClassName="Task" syncable="YES">
         <attribute name="completedAt" 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="Task" positionX="-63" positionY="-18" width="128" height="148"/>
     </elements>
 </model>
\ No newline at end of file
diff --git a/MarsWater/MarsWater/TaskCreationViewController.h b/MarsWater/MarsWater/TaskCreationViewController.h
new file mode 100644
index 0000000..d45cb07
--- /dev/null
+++ b/MarsWater/MarsWater/TaskCreationViewController.h
@@ -0,0 +1,13 @@
+//
+//  TaskCreationViewController.h
+//  MarsWater
+//
+//  Created by Natalia Estrella on 10/9/15.
+//  Copyright © 2015 Michael Kavouras. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface TaskCreationViewController : UIViewController
+
+@end
diff --git a/MarsWater/MarsWater/TaskCreationViewController.m b/MarsWater/MarsWater/TaskCreationViewController.m
new file mode 100644
index 0000000..95e283f
--- /dev/null
+++ b/MarsWater/MarsWater/TaskCreationViewController.m
@@ -0,0 +1,45 @@
+//
+//  TaskCreationViewController.m
+//  MarsWater
+//
+//  Created by Natalia Estrella on 10/9/15.
+//  Copyright © 2015 Michael Kavouras. All rights reserved.
+//
+
+#import <CoreData/CoreData.h>
+#import "TaskCreationViewController.h"
+#import "AppDelegate.h"
+#import "Task.h"
+
+@interface TaskCreationViewController ()
+@property (weak, nonatomic) IBOutlet UITextField *descriptionField;
+@property (weak, nonatomic) IBOutlet UIDatePicker *datePicker;
+
+@end
+
+@implementation TaskCreationViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+}
+
+
+
+- (IBAction)createTapped:(id)sender {
+    
+    AppDelegate *delegate = [UIApplication sharedApplication].delegate;
+    Task *task = [NSEntityDescription insertNewObjectForEntityForName:@"Task" inManagedObjectContext:delegate.managedObjectContext];
+
+    task.taskDescription = self.descriptionField.text;
+    task.createdAt = [NSDate date];
+    task.updatedAt = [NSDate date];
+    task.dueAt = self.datePicker.date;
+    task.priority = @(1);
+    
+    [delegate.managedObjectContext save:nil];
+    
+    [self.navigationController popViewControllerAnimated:YES];
+}
+
+@end
diff --git a/MarsWater/MarsWater/TaskListTableViewController.h b/MarsWater/MarsWater/TaskListTableViewController.h
new file mode 100644
index 0000000..fc31436
--- /dev/null
+++ b/MarsWater/MarsWater/TaskListTableViewController.h
@@ -0,0 +1,16 @@
+//
+//  TaskListTableViewController.h
+//  MarsWater
+//
+//  Created by Natalia Estrella on 10/4/15.
+//  Copyright © 2015 Michael Kavouras. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "Task.h"
+
+@interface TaskListTableViewController : UITableViewController
+
+@property (nonatomic) Task *task;
+
+@end
diff --git a/MarsWater/MarsWater/TaskListTableViewController.m b/MarsWater/MarsWater/TaskListTableViewController.m
new file mode 100644
index 0000000..0480ca2
--- /dev/null
+++ b/MarsWater/MarsWater/TaskListTableViewController.m
@@ -0,0 +1,85 @@
+//
+//  TaskListTableViewController.m
+//  MarsWater
+//
+//  Created by Natalia Estrella on 10/4/15.
+//  Copyright © 2015 Michael Kavouras. All rights reserved.
+//
+
+#import "TaskListTableViewController.h"
+#import "ListsTableViewController.h"
+#import "AppDelegate.h"
+#import "Task.h"
+#import "TaskListTableViewController.h"
+
+@interface TaskListTableViewController () <NSFetchedResultsControllerDelegate>
+
+@property (nonatomic) NSFetchedResultsController *fetchedResultsController;
+
+@end
+
+@implementation TaskListTableViewController
+
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    
+    AppDelegate *delegate = [UIApplication sharedApplication].delegate;
+    
+    // 1) create an instance of NSFetchRequest with an entity name
+    NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] initWithEntityName:@"Task"];
+    
+    
+    // 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];
+    
+    [self.tableView reloadData];
+}
+
+
+#pragma mark - Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    return self.fetchedResultsController.fetchedObjects.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier: @"TaskCellIdentifier" forIndexPath:indexPath];
+    
+    NSDateFormatter *dateFormatter = [NSDateFormatter new];
+    dateFormatter.timeStyle = kCFDateFormatterMediumStyle;
+    
+    Task *task = self.fetchedResultsController.fetchedObjects[indexPath.row];
+    cell.textLabel.text = task.taskDescription;
+    cell.detailTextLabel.text = [NSString stringWithFormat:@"Due at %@", [dateFormatter stringFromDate:task.dueAt]];
+    
+    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
+{
+
+}
+
+
+@end