diff --git a/README.md b/README.md
index 3945c152..65aa31a5 100755
--- a/README.md
+++ b/README.md
@@ -1,93 +1,9 @@
-Assignment 2 - Short Stack: Basic Two-tier Web Application using HTML/CSS/JS and Node.js  
-===
-
-Due: September 16th, by 11:59 PM.
-
-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.
-
-Baseline Requirements
----
-
-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.
+https://a2-ryanbirchfield.glitch.me/
+## Can they drink? Database
+My website is a database wherein patrons will enter their information and then owners will be able to look at the data and have whether or not that person is legally able to drink be printed. I used the flexbox CSS in order to position the website, as well as Roboto and Anton fonts.
 
 ## Technical Achievements
-- **Tech Achievement 1**: Using a combination of...
+- **Tech Achievement 1**: By updating a table with the most up to date data on every submit, the full database will be shown. This table can be revealed or hidden based on clicking the show data button, though it is always updating even when hidden.
 
 ### Design/Evaluation Achievements
-- **Design Achievement 1**: 
+- **Design Achievement 1**: 1. Larson 2. Not much feedback when submitting, colors unnapealing, would like table to be shown on website load instead of behind button. 3. Did not think the button would have been a commenting point as I thought it would have been a wanted feature. 4. I would add tactile feedback to button press as well as update colors.
diff --git a/public/css/style.css b/public/css/style.css
index d5f842ab..929a9b7e 100755
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -1 +1,47 @@
-/*Style your own assignment! This is fun! */
\ No newline at end of file
+/*Style your own assignment! This is fun! */
+@import url('https://fonts.googleapis.com/css2?family=Anton&family=Roboto&display=swap');
+
+.grid-container{
+  display:grid;
+  grid-row-gap:30px;
+}
+
+body{
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  background-color: #7F91F0;
+}
+h2{
+  color: #F0BB05;
+  font-family: Anton;
+  letter-spacing: 2px;
+}
+h4{
+  color: #F0BB05;
+  font-family: Roboto;
+}
+input{
+  background-color: #73C8F0;
+  font-family: Roboto;
+}
+button{
+  background-color: #67F0CE;
+  font-family: Roboto;
+}
+.results{
+  padding-left: -100px;
+}
+#results{
+  border-collapse: collapse;
+  width: 400px;
+  font-family: Roboto;
+}
+th, td{
+  background-color: #73C8F0;
+  border: 3px solid #F06F46;
+  padding: 5px;
+  text-align: center;
+  font-family: Roboto;
+}
diff --git a/public/index.html b/public/index.html
index c56d620e..b9ac5b6f 100755
--- a/public/index.html
+++ b/public/index.html
@@ -1,41 +1,109 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
   <head>
     <title>CS4241 Assignment 2</title>
-    <meta charset="utf-8">
-  </head>
-  <body>
-    <form action="">
-      <input type='text' id='yourname' value="your name here">
-      <button>submit</button>
-    </form>
-  </body>
-  <script>
-
-  const submit = function( e ) {
-    // prevent default form action from being carried out
-    e.preventDefault()
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="/css/style.css" />
+    <script>
+      let numAccessed = 0;
+      function addLine(item, index) {}
+      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 )
+        const input = document.querySelector("#yourname"),
+          input2 = document.querySelector("#age"),
+          input3 = document.querySelector("#homestate"),
+          json = {
+            yourname: input.value,
+            age: input2.value,
+            homestate: input3.value
+          },
+          body = JSON.stringify(json);
 
-    fetch( '/submit', {
-      method:'POST',
-      body 
-    })
-    .then( function( response ) {
-      // do something with the reponse 
-      console.log( response )
-    })
+        fetch("/submit", {
+          method: "POST",
+          body
+        })
+          .then(function(response) {
+            // do something with the reponse
+            return response.json();
+          })
+          .then(function(json) {
+            console.log(json);
+            numAccessed = 0;
+            var tableStart = 1;
+            var initTable = document.getElementById("results");
+            var rowCount = initTable.rows.length;
+            for (var i = tableStart; i < rowCount; i++) {
+              initTable.deleteRow(tableStart);
+            }
+            for (index in json) {
+              var table = document.getElementById("results");
+              var row = table.insertRow(numAccessed + 1);
+              var cell = row.insertCell(0);
+              var cell2 = row.insertCell(1);
+              var cell3 = row.insertCell(2);
+              var cell4 = row.insertCell(3);
+              cell.innerHTML = json[index].yourname;
+              cell2.innerHTML = json[index].age;
+              cell3.innerHTML = json[index].homestate;
+              cell4.innerHTML = json[index].isLegal;
+              numAccessed++;
+            }
+          });
 
-    return false
-  }
+        return false;
+      };
 
-  window.onload = function() {
-    const button = document.querySelector( 'button' )
-    button.onclick = submit
-  }
-
-  </script>
+      window.onload = function() {
+        const button = document.querySelector("button");
+        button.onclick = submit;
+      };
+      function showResults() {
+        var table = document.getElementById("results");
+        if (table.style.display === "none") {
+          table.style.display = "block";
+        } else {
+          table.style.display = "none";
+        }
+      }
+    </script>
+  </head>
+  <body>
+    <div class="grid-container">
+      <div class="grid-item">
+        <h2>
+          Drinker Database
+        </h2>
+        <h4>
+          Enter Your information Below
+        </h4>
+      </div>
+      <div class="grid-item">
+        <form>
+          <input type="text" id="yourname" value="Name" /><br /><br />
+          <input type="text" id="age" value="Age" /><br /><br />
+          <input type="text" id="homestate" value="Birth State" /><br />
+          <button>submit</button>
+        </form>
+      </div>
+      <div class="results">
+        <button onclick="showResults()">
+          Show Data
+        </button>
+        <table id="results" style="display:none;">
+          <thead>
+            <tr>
+              <th>Name</th>
+              <th>Age</th>
+              <th>State</th>
+              <th>Can they Drink?</th>
+            </tr>
+          </thead>
+          <tbody></tbody>
+        </table>
+      </div>
+    </div>
+  </body>
 </html>
diff --git a/server.improved.js b/server.improved.js
index 26673fc0..9493cf90 100644
--- a/server.improved.js
+++ b/server.improved.js
@@ -6,11 +6,7 @@ const http = require( 'http' ),
       dir  = 'public/',
       port = 3000
 
-const appdata = [
-  { 'model': 'toyota', 'year': 1999, 'mpg': 23 },
-  { 'model': 'honda', 'year': 2004, 'mpg': 30 },
-  { 'model': 'ford', 'year': 1987, 'mpg': 14} 
-]
+const dataStorage = []
 
 const server = http.createServer( function( request,response ) {
   if( request.method === 'GET' ) {
@@ -29,21 +25,26 @@ const handleGet = function( request, response ) {
     sendFile( response, filename )
   }
 }
-
+//let dataStorage= []
 const handlePost = function( request, response ) {
-  let dataString = ''
+  
 
   request.on( 'data', function( data ) {
-      dataString += data 
+      const dataStuff = JSON.parse(data)
+      var canDrink = parseInt(dataStuff.age) >= 21
+      if(canDrink){
+        dataStuff.isLegal = "Yes"
+      }
+      else{
+        dataStuff.isLegal = "No"
+      }
+      dataStorage.push ( dataStuff )
   })
 
   request.on( 'end', function() {
-    console.log( JSON.parse( dataString ) )
-
     // ... do something with the data here!!!
-
     response.writeHead( 200, "OK", {'Content-Type': 'text/plain' })
-    response.end()
+    response.end( JSON.stringify( dataStorage ))
   })
 }
 
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