diff --git a/.glitch-assets b/.glitch-assets
new file mode 100644
index 00000000..e69de29b
diff --git a/README.md b/README.md
index 3945c152..8b7e2e18 100755
--- a/README.md
+++ b/README.md
@@ -1,93 +1,15 @@
-Assignment 2 - Short Stack: Basic Two-tier Web Application using HTML/CSS/JS and Node.js  
-===
+# Assignment 2 - Short Stack: Basic Two-tier Web Application using HTML/CSS/JS and Node.js  
 
-Due: September 16th, by 11:59 PM.
+Malek ElShakhs
+https://glitch.com/~a2-mlshax
 
-This assignment aims to introduce you to the concepts and practice involved in creating a prototype (i.e. not deployment ready) two-tiered web application. The baseline aims of this assignment involve creating an application that demonstrates the use of several specific pieces of HTML, CSS, JavaScript, and Node.js functionality.
+For the assignment, I created a simple todo list. I used a ul for the tasks although I totally should have just used a table, oh well. I used CSS element, class, and id selectors as well as multiple gridboxes and used the Google Lato font for all text. The due date field is determined by the priority and the current date.
 
-Baseline Requirements
----
+This is not my best code ever, I am truly sorry for any pain it causes.
 
-Note that there is a very large range of application areas and possibilities that meet these baseline requirements. Make your application do something useful! A todo list, storing / retrieving high scores for a very simple game, have a little fun with it.
-
-Your application is required to implement the following functionalities:
-
-- a `Server` which not only serves files, but also maintains a tabular dataset with 3 or more fields related to your application
-- a `Results` functionality which shows the entire dataset residing in the server's memory
-- a `Form/Entry` functionality which allows a user to add, modify, or delete data items residing in the server's memory
-- a `Server Logic` which, upon receiving new or modified "incoming" data, includes and uses a function that adds at least one additional derived field to this incoming data before integrating it with the existing dataset
-- the `Derived field` for a new row of data must be computed based on fields already existing in the row. For example, a `todo` dataset with `task`, `priority`, and `creation_date` may generate a new field `deadline` by looking at `creation_date` and `priority`
-
-Your application is required to demonstrate the use of the following concepts:
-
-HTML:
-- One or more [HTML Forms](https://developer.mozilla.org/en-US/docs/Learn/HTML/Forms), with any combination of form tags appropriate for the user input portion of the application
-- A results page displaying all data currently available on the server. You will most likely use a `<table>` tag for this, but `<ul>` could also work and might be simpler to work with.
-- All pages should [validate](https://validator.w3.org)
-
-CSS:
-- CSS styling of the primary visual elements in the application
-- Various CSS Selector functionality must be demonstrated:
-    - Element selectors
-    - ID selectors
-    - Class selectors
-- CSS positioning and styling of the primary visual elements in the application:
-    - Use of either a CSS grid or flexbox for layout
-    - Rules defining fonts for all text used; no default fonts! Be sure to use a web safe font or a font from a web service like [Google Fonts](http://fonts.google.com/)
-
-- CSS defined in a maintainable, readable form, in external stylesheets 
-
-JavaScript:
-- At minimum, a small amount of front-end JavaScript to get / fetch data from the server; a sample is provided in this repository.
-
-Node.js:
-- An HTTP Server that delivers all necessary files and data for the application. A starting point is provided in this repository.
-
-Deliverables
----
-
-Do the following to complete this assignment and acheive a base grade of 85%:
-
-1. Fork the starting project code (make sure to fork the 2020 repo!). This repo contains some starter code that may be used or discarded as needed.
-2. Implement your project with the above requirements.
-3. Test your project to make sure that when someone goes to your main page, it displays correctly.
-4. Deploy your project to Glitch, and fill in the appropriate fields in your package.json file.
-5. Ensure that your project has the proper naming scheme `a2-yourname` so we can find it.
-6. Modify the README to the specifications below.
-7. Create and submit a Pull Request to the original repo. Label the pull request as follows: a2-gitusername-firstname-lastname
-
-Acheivements
----
-
-Below are suggested technical and design achievements. You can use these to help boost your grade up to an A and customize the assignment to your personal interests. These are recommended acheivements, but feel free to create/implement your own... just make sure you thoroughly describe what you did in your README and why it was challenging. ALL ACHIEVEMENTS MUST BE DESCRIBED IN YOUR README IN ORDER TO GET CREDIT FOR THEM.
-
-*Technical*
-- (10 points) Create a single-page app that both provides a form for users to submit data and always shows the current state of the server-side data. To put it another way, when the user submits data, the server should respond sending back the updated data (including the derived field calculated on the server) and the client should then update its data display.
-
-*Design/UX*
-- (5 points per person, with a max of 10 points) Test your user interface with other students in the class. Define a specific task for them to complete (ideally something short that takes <10 minutes), and then use the [think-aloud protocol](https://en.wikipedia.org/wiki/Think_aloud_protocol) to obtain feedback on your design (talk-aloud is also find). Important considerations when designing your study:
-
-1. Make sure you start the study by clearly stating the task that you expect your user to accomplish.
-2. You shouldn't provide any verbal instructions on how to use your interface / accomplish the task you give them. Make sure that your interface is clear enough that users can figure it out without any instruction, or provide text instructions from within the interface itself. 
-3. If users get stuck to the point where they give up, you can then provde instruction so that the study can continue, but make sure to discuss this in your README. You won't lose any points for this... all feedback is good feedback!
-
-You'll need to use sometype of collaborative software that will enable you both to see the test subject's screen and listen to their voice as they describe their thoughts. After completing each study, briefly (one to two sentences for each question) address the following in your README:
-
-1. Provide the last name of each student you conduct the evaluation with.
-2. What problems did the user have with your design?
-3. What comments did they make that surprised you?
-4. What would you change about the interface based on their feedback?
-
-*You do not need to actually make changes based on their feedback*. This acheivement is designed to help gain experience testing user interfaces. If you run two user studies, you should answer two sets of questions. 
-
-Sample Readme (delete the above when you're ready to submit, and modify the below so with your links and descriptions)
----
-
-## Your Web Application Title
-Include a very brief summary of your project here. Be sure to include the CSS positioning technique you used, and any required instructions to use your application.
-
-## Technical Achievements
-- **Tech Achievement 1**: Using a combination of...
+### Technical Achievements
+- **Tech Achievement 1**: I added the functionality to delete tasks using a delete button next to the task, however, I did not implement modifying tasks.
+- **Tech Achievement 2**: The site is a single page which has the form and live updates as you add or delete tasks.
 
 ### Design/Evaluation Achievements
-- **Design Achievement 1**: 
+- Did not do the Design Achievement
diff --git a/package.json b/package.json
index 988f135f..106fd90b 100755
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
-  "name": "",
-  "version": "",
-  "description": "",
-  "author": "",
+  "name": "TODO",
+  "version": "1.0",
+  "description": "A Simple TODO List Application",
+  "author": "Malek ElShakhs",
   "scripts": {
     "start": "node server.improved.js"
   },
   "dependencies": {
-    "mime": "^2.4.4"
+    "mime": "^2.4.6"
   }
 }
diff --git a/public/css/style.css b/public/css/style.css
index d5f842ab..1b38d098 100755
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -1 +1,37 @@
-/*Style your own assignment! This is fun! */
\ No newline at end of file
+body{
+  font-family: 'Lato', sans-serif;
+}
+form{
+  display: flex;
+  justify-content: center;
+}
+input{
+  margin-right: 10px;
+  font-family: 'Lato', sans-serif;
+}
+li{
+  margin: 5px;
+  display: flex;
+}
+task, date, due{
+  width: 25%
+}
+priority{
+  width: 20%
+}
+p{
+  margin-right: 17%;
+}
+button{
+  font-family: 'Lato', sans-serif;
+}
+.deleteButton{
+  background-color: #E97451;
+}
+#submitButton{
+  background-color: #AEB7FD;
+}
+#titles{
+  display: flex;
+  justify-content: left;
+}
diff --git a/public/index.html b/public/index.html
index c56d620e..429b3842 100755
--- a/public/index.html
+++ b/public/index.html
@@ -1,41 +1,24 @@
 <!doctype html>
+<link rel="stylesheet" href="css/style.css">
+<link href="https://fonts.googleapis.com/css2?family=Lato&display=swap" rel="stylesheet">
 <html lang="en">
   <head>
     <title>CS4241 Assignment 2</title>
     <meta charset="utf-8">
+    <script src="js/scripts.js"></script>
   </head>
   <body>
     <form action="">
-      <input type='text' id='yourname' value="your name here">
-      <button>submit</button>
+      <input type="text" id="task" value="" placeholder="task name">
+      <input type="text" id="priority" value="" placeholder="priority (low number = high)">
+      <button id="submitButton">Add Task</button>
     </form>
+    <ul id="titles">
+      <p>Task Name</p>
+      <p>Priority</p>
+      <p>Start Date</p>
+      <p>Finish By</p>
+    </ul>
+    <ul id="taskList"></ul>
   </body>
-  <script>
-
-  const submit = function( e ) {
-    // prevent default form action from being carried out
-    e.preventDefault()
-
-    const input = document.querySelector( '#yourname' ),
-          json = { yourname: input.value },
-          body = JSON.stringify( json )
-
-    fetch( '/submit', {
-      method:'POST',
-      body 
-    })
-    .then( function( response ) {
-      // do something with the reponse 
-      console.log( response )
-    })
-
-    return false
-  }
-
-  window.onload = function() {
-    const button = document.querySelector( 'button' )
-    button.onclick = submit
-  }
-
-  </script>
 </html>
diff --git a/public/js/scripts.js b/public/js/scripts.js
index de052eae..1c41b3ea 100755
--- a/public/js/scripts.js
+++ b/public/js/scripts.js
@@ -1,3 +1,114 @@
 // Add some Javascript code here, to run on the front end.
 
-console.log("Welcome to assignment 2!")
\ No newline at end of file
+console.log("Welcome to assignment 2!")
+
+var todos = []
+
+const updateData = function(e){
+  console.log('Getting')
+ 
+  fetch( '/appData', {
+    method: 'GET'
+  })
+  .then( function( response ) {
+
+    return (response.json())
+    
+  }).then(function(data) {
+    
+    todos = data;
+    console.log(todos);
+    document.querySelector('#taskList').innerHTML = '';
+    todos.forEach(
+      element => document.querySelector('#taskList').innerHTML += 
+      '<li><task>' + element.task + '</task><priority>' + element.priority + 
+      '</priority><date>' + element.date + '</date><due>' + element.due + '</due>' +
+      '<button onclick=\'deleteTask(event)\' class=\'deleteButton\'>Delete</button</li>'
+    );
+  })
+  
+  return false
+}
+
+const submitTask = function( e ) {
+  // prevent default form action from being carried out
+  e.preventDefault()
+  
+  var today = new Date();
+  var date = today.getFullYear()+'-'+(today.getMonth()+1)+'-'+today.getDate();
+
+  const taskInput = document.querySelector( '#task' )
+  const priorityInput = document.querySelector('#priority')
+
+  var dueDate = new Date();
+  dueDate.setDate(dueDate.getDate() + parseInt(priorityInput.value))
+  var due = dueDate.getFullYear()+'-'+(dueDate.getMonth()+1)+'-'+dueDate.getDate(),
+        
+  json = { task: taskInput.value , priority: priorityInput.value, date: date, due: due},
+  body = JSON.stringify( json )
+
+  fetch( '/submit', {
+    method:'POST',
+    body
+  })
+  .then( function( response ) {
+
+    return (response.json())
+    
+  }).then(function(data) {
+    
+    todos = data;
+    console.log(todos);
+    document.querySelector('#taskList').innerHTML = '';
+    todos.forEach(
+      element => document.querySelector('#taskList').innerHTML += 
+      '<li><task>' + element.task + '</task><priority>' + element.priority + 
+      '</priority><date>' + element.date + '</date><due>' + element.due + '</due>' +
+      '<button onclick=\'deleteTask(event)\' class=\'deleteButton\'>Delete</button</li>'
+    );
+  })
+
+  return false
+}
+
+function deleteTask(event) {
+  
+  var item = event.target.parentElement
+  
+  var eTask = item.getElementsByTagName("task")[0].innerHTML
+  var ePriority = item.getElementsByTagName("priority")[0].innerHTML
+  var eDate = item.getElementsByTagName("date")[0].innerHTML
+  var eDue = item.getElementsByTagName("due")[0].innerHTML
+  
+  var json = { task: eTask , priority: ePriority, date: eDate , due: eDue}
+  var body = JSON.stringify(json)
+  
+  console.log(body)
+  
+  fetch( '/delete', {
+    method:'POST',
+    body
+  })
+  .then( function( response ) {
+
+    return (response.json())
+    
+  }).then(function(data) {
+    
+    todos = data;
+    console.log(todos);
+    document.querySelector('#taskList').innerHTML = '';
+    todos.forEach(
+      element => document.querySelector('#taskList').innerHTML += 
+      '<li><task>' + element.task + '</task><priority>' + element.priority + 
+      '</priority><date>' + element.date + '</date><due>' + element.due + '</due>' +
+      '<button onclick=\'deleteTask(event)\' class=\'deleteButton\'>Delete</button</li>'
+    );
+  })
+}
+
+window.onload = function() {
+  updateData()
+  const button = document.querySelector( '#submitButton' )
+  button.onclick = submitTask
+}
diff --git a/server.improved.js b/server.improved.js
index 26673fc0..6537bcf5 100644
--- a/server.improved.js
+++ b/server.improved.js
@@ -7,9 +7,7 @@ const http = require( 'http' ),
       port = 3000
 
 const appdata = [
-  { 'model': 'toyota', 'year': 1999, 'mpg': 23 },
-  { 'model': 'honda', 'year': 2004, 'mpg': 30 },
-  { 'model': 'ford', 'year': 1987, 'mpg': 14} 
+  {'task': 'Example Task', 'priority': '2', 'date': '2020-9-16', 'due': '2020-9-18'}
 ]
 
 const server = http.createServer( function( request,response ) {
@@ -25,26 +23,72 @@ const handleGet = function( request, response ) {
 
   if( request.url === '/' ) {
     sendFile( response, 'public/index.html' )
+  }
+  else if(request.url === '/appData'){
+    console.log('Sending: ' + appdata)
+    response.write(JSON.stringify(appdata));
+    response.end();
   }else{
     sendFile( response, filename )
   }
 }
 
 const handlePost = function( request, response ) {
-  let dataString = ''
+  if(request.url === '/submit') {
+    let dataString = ''
+
+    request.on( 'data', function( data ) {
+        dataString += data 
+    })
+
+    request.on( 'end', function() {
+      console.log('Data in Server: ')
+      console.log( JSON.parse( dataString ) )
 
-  request.on( 'data', function( data ) {
-      dataString += data 
-  })
+      appdata[appdata.length] = JSON.parse(dataString);
 
-  request.on( 'end', function() {
-    console.log( JSON.parse( dataString ) )
+      // ... do something with the data here!!
 
-    // ... do something with the data here!!!
+      var data = JSON.stringify(appdata);
+      console.log('Sending: ' + appdata);
 
-    response.writeHead( 200, "OK", {'Content-Type': 'text/plain' })
-    response.end()
-  })
+      response.writeHead( 200, "OK", {'Content-Type': 'text/plain' })
+      response.write(data)
+      console.log(data)
+      response.end()
+    })
+  }
+  else if(request.url === '/delete') {
+    console.log('Delete')
+    let dataString = ''
+
+    request.on( 'data', function( data ) {
+        dataString += data 
+    })
+    
+    request.on( 'end', function() {
+      var data = JSON.parse(dataString)
+
+      var index = -1;
+      for(var i = 0; i < appdata.length; i++) {
+        if(appdata[i].task == data.task && appdata[i].priority == data.priority
+          && appdata[i].date == data.date && appdata[i].due == data.due) {
+          index = i;
+          break;
+        }
+      }
+      appdata.splice(index, 1)
+      
+      var data = JSON.stringify(appdata);
+      console.log('Sending: ' + appdata);
+      
+      response.writeHead( 200, "OK", {'Content-Type': 'text/plain' })
+      response.write(data)
+      console.log(data)
+      response.end()
+    })
+    
+  }
 }
 
 const sendFile = function( response, filename ) {
diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml
new file mode 100644
index 00000000..f6d7ea4f
--- /dev/null
+++ b/shrinkwrap.yaml
@@ -0,0 +1,15 @@
+dependencies:
+  mime: 2.4.6
+packages:
+  /mime/2.4.6:
+    dev: false
+    engines:
+      node: '>=4.0.0'
+    hasBin: true
+    resolution:
+      integrity: sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
+registry: 'https://registry.npmjs.org/'
+shrinkwrapMinorVersion: 9
+shrinkwrapVersion: 3
+specifiers:
+  mime: ^2.4.4