diff --git a/MarsWater/MarsWater.xcodeproj/project.pbxproj b/MarsWater/MarsWater.xcodeproj/project.pbxproj
index a2f82e3..ea962d7 100644
--- a/MarsWater/MarsWater.xcodeproj/project.pbxproj
+++ b/MarsWater/MarsWater.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		895332B61BC840F800FCAD52 /* TasksTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 895332B51BC840F800FCAD52 /* TasksTableViewController.m */; settings = {ASSET_TAGS = (); }; };
+		895332B91BC8428600FCAD52 /* TaskCreationTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 895332B81BC8428600FCAD52 /* TaskCreationTableViewController.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 */; };
@@ -22,6 +24,10 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		895332B41BC840F800FCAD52 /* TasksTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TasksTableViewController.h; sourceTree = "<group>"; };
+		895332B51BC840F800FCAD52 /* TasksTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TasksTableViewController.m; sourceTree = "<group>"; };
+		895332B71BC8428600FCAD52 /* TaskCreationTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TaskCreationTableViewController.h; sourceTree = "<group>"; };
+		895332B81BC8428600FCAD52 /* TaskCreationTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TaskCreationTableViewController.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>"; };
@@ -56,6 +62,13 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		89DE602A1BC85BD50029B2B5 /* LISTS VS TASKS */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = "LISTS VS TASKS";
+			sourceTree = "<group>";
+		};
 		8DA86C9B1BC1AE57006C50BC = {
 			isa = PBXGroup;
 			children = (
@@ -78,6 +91,11 @@
 				8DA86CD11BC1B329006C50BC /* Model */,
 				8DA86CAA1BC1AE57006C50BC /* AppDelegate.h */,
 				8DA86CAB1BC1AE57006C50BC /* AppDelegate.m */,
+				895332B41BC840F800FCAD52 /* TasksTableViewController.h */,
+				895332B51BC840F800FCAD52 /* TasksTableViewController.m */,
+				895332B71BC8428600FCAD52 /* TaskCreationTableViewController.h */,
+				895332B81BC8428600FCAD52 /* TaskCreationTableViewController.m */,
+				89DE602A1BC85BD50029B2B5 /* LISTS VS TASKS */,
 				8DA86CD21BC1B8E4006C50BC /* ListsTableViewController.h */,
 				8DA86CD31BC1B8E4006C50BC /* ListsTableViewController.m */,
 				8DA86CD51BC1B904006C50BC /* ListCreationTableViewController.h */,
@@ -187,10 +205,12 @@
 			files = (
 				8DA86CB51BC1AE57006C50BC /* MarsWater.xcdatamodeld in Sources */,
 				8DA86CAC1BC1AE57006C50BC /* AppDelegate.m in Sources */,
+				895332B91BC8428600FCAD52 /* TaskCreationTableViewController.m in Sources */,
 				8DB2F6EA1BC1E75500E58E65 /* Task+CoreDataProperties.m in Sources */,
 				8DA86CD41BC1B8E4006C50BC /* ListsTableViewController.m in Sources */,
 				8DB2F6E71BC1E75500E58E65 /* List.m in Sources */,
 				8DB2F6E91BC1E75500E58E65 /* Task.m in Sources */,
+				895332B61BC840F800FCAD52 /* TasksTableViewController.m in Sources */,
 				8DA86CD71BC1B904006C50BC /* ListCreationTableViewController.m in Sources */,
 				8DA86CA91BC1AE57006C50BC /* main.m in Sources */,
 				8DB2F6E81BC1E75500E58E65 /* List+CoreDataProperties.m in Sources */,
diff --git a/MarsWater/MarsWater/Base.lproj/Main.storyboard b/MarsWater/MarsWater/Base.lproj/Main.storyboard
index 13ead89..d48dd65 100644
--- a/MarsWater/MarsWater/Base.lproj/Main.storyboard
+++ b/MarsWater/MarsWater/Base.lproj/Main.storyboard
@@ -8,32 +8,32 @@
         <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="61" 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" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="ListCellIdentifier" textLabel="t2E-b6-cF0" detailTextLabel="v9C-RD-f0m" rowHeight="61" style="IBUITableViewCellStyleSubtitle" id="12f-5V-ccn">
+                                <rect key="frame" x="0.0" y="92" width="600" height="61"/>
                                 <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="60.5"/>
                                     <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="13" width="33.5" height="19.5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <animations/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                            <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
                                             <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="v9C-RD-f0m">
-                                            <rect key="frame" x="15" y="25" width="41" height="14"/>
+                                            <rect key="frame" x="15" y="32.5" width="47" height="16"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <animations/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                             <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
@@ -41,6 +41,9 @@
                                     <animations/>
                                 </tableViewCellContentView>
                                 <animations/>
+                                <connections>
+                                    <segue destination="1Og-bT-gIC" kind="show" id="901-ep-3fr"/>
+                                </connections>
                             </tableViewCell>
                         </prototypes>
                         <connections>
@@ -58,7 +61,83 @@
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="0Yt-Q8-86U" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1013" y="355"/>
+            <point key="canvasLocation" x="897" y="355"/>
+        </scene>
+        <!--Tasks-->
+        <scene sceneID="A7Y-lU-Uhj">
+            <objects>
+                <tableViewController id="1Og-bT-gIC" customClass="TasksTableViewController" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="61" sectionHeaderHeight="28" sectionFooterHeight="28" id="0He-Pm-oIW">
+                        <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="none" indentationWidth="10" reuseIdentifier="TaskCellIdentifier" textLabel="vgg-g5-aYi" detailTextLabel="hTV-jy-jyb" rowHeight="61" style="IBUITableViewCellStyleSubtitle" id="1xs-Ww-GOX">
+                                <rect key="frame" x="0.0" y="92" width="600" height="61"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1xs-Ww-GOX" id="5IK-iu-dCU">
+                                    <rect key="frame" x="0.0" y="0.0" width="600" height="60.5"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="vgg-g5-aYi">
+                                            <rect key="frame" x="15" y="13" width="33.5" height="19.5"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <animations/>
+                                            <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
+                                            <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="hTV-jy-jyb">
+                                            <rect key="frame" x="15" y="32.5" width="47" height="16"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <animations/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                    </subviews>
+                                    <animations/>
+                                </tableViewCellContentView>
+                                <animations/>
+                            </tableViewCell>
+                        </prototypes>
+                        <sections/>
+                        <connections>
+                            <outlet property="dataSource" destination="1Og-bT-gIC" id="9TV-pn-kaD"/>
+                            <outlet property="delegate" destination="1Og-bT-gIC" id="BGQ-be-hPX"/>
+                        </connections>
+                    </tableView>
+                    <toolbarItems/>
+                    <navigationItem key="navigationItem" title="Tasks" id="zzy-mD-3kk">
+                        <barButtonItem key="rightBarButtonItem" systemItem="add" id="Usk-fN-GbM">
+                            <connections>
+                                <segue destination="rFc-yY-1ZZ" kind="presentation" id="FjZ-II-dC7"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                    <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="SfY-fc-jwg" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="897" y="1088"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="Rpd-Rq-P2X">
+            <objects>
+                <navigationController id="rFc-yY-1ZZ" sceneMemberID="viewController">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="HY7-yx-pZd">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <animations/>
+                    </navigationBar>
+                    <connections>
+                        <segue destination="BEO-xu-2zJ" kind="relationship" relationship="rootViewController" id="2bh-xY-cjI"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="eHi-1l-EcP" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1581" y="1097"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="B7A-b0-IE6">
@@ -75,7 +154,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="1572" y="355"/>
         </scene>
         <!--List Creation Table View Controller-->
         <scene sceneID="Nx5-Rb-hgB">
@@ -93,7 +172,7 @@
                                         <rect key="frame" x="0.0" y="99" 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"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8mM-q1-xYS">
@@ -103,7 +182,7 @@
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                                     <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">
+                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter list title here..." textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="pGs-E0-Itl">
                                                     <rect key="frame" x="61" y="7" width="524" height="30"/>
                                                     <animations/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -126,7 +205,7 @@
                                         <rect key="frame" x="0.0" y="143" 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"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sGy-ER-6Wl">
@@ -213,7 +292,7 @@
                 </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="2243" y="355"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="5nr-jx-cZX">
@@ -232,5 +311,67 @@
             </objects>
             <point key="canvasLocation" x="193" y="355"/>
         </scene>
+        <!--Task Creation Table View Controller-->
+        <scene sceneID="C6A-Im-DHg">
+            <objects>
+                <tableViewController id="BEO-xu-2zJ" customClass="TaskCreationTableViewController" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="wEi-me-MnV">
+                        <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"/>
+                        <sections>
+                            <tableViewSection id="nYH-UV-Lxy">
+                                <cells>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="tjy-lA-YLW">
+                                        <rect key="frame" x="0.0" y="99" width="600" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tjy-lA-YLW" id="aUJ-7D-I6a">
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="U3S-mh-6Vx">
+                                                    <rect key="frame" x="15" y="11" width="38" height="21"/>
+                                                    <animations/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter task title here..." textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="hMU-AP-DSe">
+                                                    <rect key="frame" x="61" y="7" width="524" height="30"/>
+                                                    <animations/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                    <textInputTraits key="textInputTraits"/>
+                                                </textField>
+                                            </subviews>
+                                            <animations/>
+                                            <constraints>
+                                                <constraint firstAttribute="trailing" secondItem="hMU-AP-DSe" secondAttribute="trailing" constant="15" id="3hD-4d-QDz"/>
+                                                <constraint firstItem="U3S-mh-6Vx" firstAttribute="leading" secondItem="aUJ-7D-I6a" secondAttribute="leading" constant="15" id="77L-6T-fqn"/>
+                                                <constraint firstItem="U3S-mh-6Vx" firstAttribute="centerY" secondItem="aUJ-7D-I6a" secondAttribute="centerY" id="CBk-br-o0A"/>
+                                                <constraint firstItem="hMU-AP-DSe" firstAttribute="leading" secondItem="U3S-mh-6Vx" secondAttribute="trailing" constant="8" id="Url-fa-JIZ"/>
+                                                <constraint firstItem="hMU-AP-DSe" firstAttribute="leading" secondItem="U3S-mh-6Vx" secondAttribute="trailing" constant="8" id="q5K-Vw-MBK"/>
+                                                <constraint firstItem="hMU-AP-DSe" firstAttribute="centerY" secondItem="aUJ-7D-I6a" secondAttribute="centerY" id="sjD-SC-G2t"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <animations/>
+                                    </tableViewCell>
+                                </cells>
+                            </tableViewSection>
+                        </sections>
+                        <connections>
+                            <outlet property="dataSource" destination="BEO-xu-2zJ" id="Q5d-td-rhJ"/>
+                            <outlet property="delegate" destination="BEO-xu-2zJ" id="f88-il-GuG"/>
+                        </connections>
+                    </tableView>
+                    <navigationItem key="navigationItem" id="Mhp-N2-Dgc"/>
+                    <connections>
+                        <outlet property="titleTextField" destination="hMU-AP-DSe" id="2ek-pP-ZKg"/>
+                    </connections>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="FY1-3x-R8S" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2243" y="1097"/>
+        </scene>
     </scenes>
 </document>
diff --git a/MarsWater/MarsWater/ListCreationTableViewController.m b/MarsWater/MarsWater/ListCreationTableViewController.m
index 0ecf6e9..1b71bbb 100644
--- a/MarsWater/MarsWater/ListCreationTableViewController.m
+++ b/MarsWater/MarsWater/ListCreationTableViewController.m
@@ -57,7 +57,14 @@ - (void)save {
 }
 
 - (IBAction)colorButtonTapped:(UIButton *)sender {
+    
     self.list.color = sender.backgroundColor;
 }
 
+
+
+
+
+
+
 @end
diff --git a/MarsWater/MarsWater/ListsTableViewController.m b/MarsWater/MarsWater/ListsTableViewController.m
index 8a2659c..83dd4d9 100644
--- a/MarsWater/MarsWater/ListsTableViewController.m
+++ b/MarsWater/MarsWater/ListsTableViewController.m
@@ -8,10 +8,11 @@
 
 #import <CoreData/CoreData.h>
 #import "ListsTableViewController.h"
+#import "TasksTableViewController.h"
 #import "AppDelegate.h"
 #import "List.h"
 
-@interface ListsTableViewController () <NSFetchedResultsControllerDelegate>
+@interface ListsTableViewController () <NSFetchedResultsControllerDelegate, UITableViewDelegate, UITableViewDataSource>
 
 @property (nonatomic) NSFetchedResultsController *fetchedResultsController;
 
@@ -20,6 +21,7 @@ @interface ListsTableViewController () <NSFetchedResultsControllerDelegate>
 @implementation ListsTableViewController
 
 - (void)viewDidLoad {
+    
     [super viewDidLoad];
     
     
@@ -53,6 +55,7 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+    
     return self.fetchedResultsController.fetchedObjects.count;
 }
 
@@ -65,12 +68,28 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     cell.detailTextLabel.text = [list.createdAt description];
     
     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{
+    
+    if ([segue.identifier isEqualToString:@"taskSegue"]) {
+        NSIndexPath *indexPath = [self.tableView indexPathForSelectedRow];
+        
+        TasksTableViewController *tvcForTasks = segue.destinationViewController;
+        tvcForTasks.list = 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..9a24fb0 100644
--- a/MarsWater/MarsWater/MarsWater.xcdatamodeld/MarsWater.xcdatamodel/contents
+++ b/MarsWater/MarsWater/MarsWater.xcdatamodeld/MarsWater.xcdatamodel/contents
@@ -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="150"/>
     </elements>
 </model>
\ No newline at end of file
diff --git a/MarsWater/MarsWater/Task+CoreDataProperties.h b/MarsWater/MarsWater/Task+CoreDataProperties.h
index 2cc11d7..0f8ae2d 100644
--- a/MarsWater/MarsWater/Task+CoreDataProperties.h
+++ b/MarsWater/MarsWater/Task+CoreDataProperties.h
@@ -21,6 +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) id color;
 @property (nullable, nonatomic, retain) List *list;
 
 @end
diff --git a/MarsWater/MarsWater/Task+CoreDataProperties.m b/MarsWater/MarsWater/Task+CoreDataProperties.m
index 1ea972c..a9c26e2 100644
--- a/MarsWater/MarsWater/Task+CoreDataProperties.m
+++ b/MarsWater/MarsWater/Task+CoreDataProperties.m
@@ -20,5 +20,6 @@ @implementation Task (CoreDataProperties)
 @dynamic priority;
 @dynamic completedAt;
 @dynamic list;
+//@dynamic color;
 
 @end
diff --git a/MarsWater/MarsWater/TaskCreationTableViewController.h b/MarsWater/MarsWater/TaskCreationTableViewController.h
new file mode 100644
index 0000000..bd196e7
--- /dev/null
+++ b/MarsWater/MarsWater/TaskCreationTableViewController.h
@@ -0,0 +1,13 @@
+//
+//  TaskCreationTableViewController.h
+//  MarsWater
+//
+//  Created by Lauren Caponong on 10/9/15.
+//  Copyright © 2015 Michael Kavouras. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface TaskCreationTableViewController : UITableViewController
+
+@end
diff --git a/MarsWater/MarsWater/TaskCreationTableViewController.m b/MarsWater/MarsWater/TaskCreationTableViewController.m
new file mode 100644
index 0000000..6b7fe31
--- /dev/null
+++ b/MarsWater/MarsWater/TaskCreationTableViewController.m
@@ -0,0 +1,83 @@
+//
+//  TaskCreationTableViewController.m
+//  MarsWater
+//
+//  Created by Lauren Caponong on 10/9/15.
+//  Copyright © 2015 Michael Kavouras. All rights reserved.
+//
+
+#import <CoreData/CoreData.h>
+#import "TaskCreationTableViewController.h"
+#import "Task.h"
+#import "AppDelegate.h"
+
+
+// TASK PROPERTIES
+
+    //@property (nullable, nonatomic, retain) NSString *taskDescription;
+    //@property (nullable, nonatomic, retain) NSDate *createdAt;
+    //@property (nullable, nonatomic, retain) NSDate *dueAt;
+    //@property (nullable, nonatomic, retain) NSDate *updatedAt;
+    //@property (nullable, nonatomic, retain) NSNumber *priority;
+    //@property (nullable, nonatomic, retain) NSDate *completedAt;
+    //@property (nullable, nonatomic, retain) id color;
+    //@property (nullable, nonatomic, retain) List *list;
+
+
+
+
+@interface TaskCreationTableViewController ()
+
+@property (weak, nonatomic) IBOutlet UITextField *titleTextField;
+@property (nonatomic) Task *task;
+
+@end
+
+
+
+@implementation TaskCreationTableViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    [self setupNavigationBar];
+    
+    AppDelegate *delegate = [UIApplication sharedApplication].delegate;
+    
+    self.task = [NSEntityDescription insertNewObjectForEntityForName:@"Task" inManagedObjectContext:delegate.managedObjectContext];
+}
+
+- (void)setupNavigationBar {
+    
+    self.navigationItem.title = @"Create New Task";
+    
+    self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(cancel)];
+    
+    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave target:self action:@selector(save)];
+    
+    // set the right button to save
+}
+
+- (void)cancel {
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+- (void)save {
+    self.task.taskDescription = self.titleTextField.text;
+    self.task.createdAt = [NSDate date];
+    
+    AppDelegate *delegate = [UIApplication sharedApplication].delegate;
+    [delegate.managedObjectContext save:nil];
+    
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+//- (IBAction)colorButtonTapped:(UIButton *)sender {
+//    
+//    self.task.color = sender.backgroundColor;
+//    
+//}
+
+    
+@end
+
diff --git a/MarsWater/MarsWater/TasksTableViewController.h b/MarsWater/MarsWater/TasksTableViewController.h
new file mode 100644
index 0000000..f74b6e0
--- /dev/null
+++ b/MarsWater/MarsWater/TasksTableViewController.h
@@ -0,0 +1,16 @@
+//
+//  TasksTableViewController.h
+//  MarsWater
+//
+//  Created by Lauren Caponong on 10/9/15.
+//  Copyright © 2015 Michael Kavouras. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "List.h"
+
+@interface TasksTableViewController : UITableViewController
+
+@property (nonatomic) List *list;
+
+@end
diff --git a/MarsWater/MarsWater/TasksTableViewController.m b/MarsWater/MarsWater/TasksTableViewController.m
new file mode 100644
index 0000000..b07ab7f
--- /dev/null
+++ b/MarsWater/MarsWater/TasksTableViewController.m
@@ -0,0 +1,84 @@
+//
+//  TasksTableViewController.m
+//  MarsWater
+//
+//  Created by Lauren Caponong on 10/9/15.
+//  Copyright © 2015 Michael Kavouras. All rights reserved.
+//
+
+#import <CoreData/CoreData.h>
+#import "TasksTableViewController.h"
+#import "AppDelegate.h"
+#import "Task.h"
+
+@interface TasksTableViewController () <NSFetchedResultsControllerDelegate, UITableViewDataSource, UITableViewDelegate>
+
+@property (nonatomic) NSFetchedResultsController *fetchedResultsController;
+
+@end
+
+@implementation TasksTableViewController
+
+- (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];
+    
+    Task *task = self.fetchedResultsController.fetchedObjects[indexPath.row];
+
+//    cell.backgroundColor = (UIColor *)task.color;
+    
+    cell.textLabel.text = task.taskDescription;
+    
+    NSString *taskCreatedAtTime = [task.createdAt description];
+    cell.detailTextLabel.text = taskCreatedAtTime;
+    
+    return cell;
+}
+
+
+
+- (void)controller:(NSFetchedResultsController *)controller didChangeObject:(id)anObject atIndexPath:(NSIndexPath *)indexPath forChangeType:(NSFetchedResultsChangeType)type newIndexPath:(NSIndexPath *)newIndexPath {
+    
+    [self.tableView reloadData];
+}
+
+
+
+
+@end
\ No newline at end of file