diff --git a/README.md b/README.md
index f229958..24d7cd3 100644
--- a/README.md
+++ b/README.md
@@ -1,98 +1,21 @@
-Assignment 2 - Short Stack: Basic Two-tier Web Application using HTML/CSS/JS and Node.js  
-===
-
-Due: September 8th, by 11:59 AM.
-
-This assignment aims to introduce you to creating a prototype two-tiered web application. 
-Your application will include the use of HTML, CSS, JavaScript, and Node.js functionality, with active communication between the client and the server over the life of a user session.
-
-Baseline Requirements
----
-
-There is a large range of application areas and possibilities that meet these baseline requirements. 
-Try to 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 (complete at least two) 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>` or `<ol>` could also work and might be simpler to work with. Alternatively, you can create a single-page app (see Technical Acheivements) but this is not a requirement.
-- All pages should [validate](https://validator.w3.org)
-- If your app contains multple pages, they should all be accessible from the homepage (index.html)
-
-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, and also creates the required `Derived Fields` in your data. 
-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 2022 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-yourGithubUsername` so we can find it.
-6. Modify the README to the specifications below, and delete all of the instructions originally found in this README.
-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.
+## Pokemon Monotype Info
+My app provides type information for monotype pokemon based on the type given.
+It takes in a name and type and adds them to the table along with types they are strong against and types strong against them.
+In order for the application to work the second input must have a valid pokemon type with no spaces.
 
 ## Technical Achievements
-- **Tech Achievement 1**: Using a combination of...
+- **Tech Achievement 1**: My app uses a one page application where the data is displayed on the main page
+which is always updated as soon as it reaches the server.
 
 ### Design/Evaluation Achievements
 - **Design Achievement 1**: 
+- Subject 1
+  1. Odell
+  2. The form text was not back text and thus had to be deleted
+  3. Their reaction to the error text when an invalid type was entered
+  4. I changed it to be back text
+- Subject 2
+  1. Flibbert
+  2. Second input was unclear what parameters it accepts
+  3. They really liked the color backgrounds on the type column
+  4. I would add an info/userguide to the site to inform users on the restrictions.
diff --git a/public/css/style.css b/public/css/style.css
index d5f842a..317c4ef 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -1 +1,103 @@
-/*Style your own assignment! This is fun! */
\ No newline at end of file
+/*Style your own assignment! This is fun! */
+body{
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+
+h1 {
+  font-family: "Gill Sans MT", Calibri, sans-serif;
+}
+button {
+  font-family: "Gill Sans MT", Calibri, sans-serif;
+}
+input{
+  font-family: "Gill Sans MT", Calibri, sans-serif;
+  font-size: 14pt;
+}
+form{
+  margin: 15px;
+}
+table, tr, td, th {
+  font-family: "Gill Sans MT", Calibri, sans-serif;
+  border: 1px solid black;
+  border-collapse: collapse;
+  text-align: center;
+  padding: 4px;
+}
+.normal {
+  background-color: #A8A77A;
+}
+.fire {
+  background-color: #EE8130;
+}
+.water {
+  background-color: #6390F0;
+}
+.electric {
+  background-color: #F7D02C;
+}
+.grass {
+  background-color: #7AC74C;
+}
+.ice {
+  background-color: #96D9D6;
+}
+.fighting {
+  background-color: #C22E28;
+}
+.poison {
+  background-color: #A33EA1;
+}
+.ground {
+  background-color: #E2BF65;
+}
+.flying {
+  background-color: #A98FF3;
+}
+.psychic {
+  background-color: #F95587;
+}
+.bug {
+  background-color: #A6B91A;
+}
+.rock {
+  background-color: #B6A136;
+}
+.ghost {
+  background-color: #735797;
+}
+.dragon {
+  background-color: #6F35FC;
+}
+.dark {
+  background-color: #705746;
+}
+.steel {
+  background-color: #B7B7CE;
+}
+.fairy {
+  background-color: #D685AD;
+}
+
+
+/*Normal Type: A8A77A
+Fire Type: EE8130
+Water Type: 6390F0
+Electric Type: F7D02C
+Grass Type: 7AC74C
+Ice Type: 96D9D6
+Fighting Type: C22E28
+Poison Type: A33EA1
+Ground Type: E2BF65
+Flying Type: A98FF3
+Psychic Type: F95587
+Bug Type: A6B91A
+Rock Type: B6A136
+Ghost Type: 735797
+Dragon Type: 6F35FC
+Dark Type: 705746
+Steel Type: B7B7CE
+Fairy Type: D685AD
+*/
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index c56d620..fd0f782 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2,31 +2,49 @@
 <html lang="en">
   <head>
     <title>CS4241 Assignment 2</title>
+    <link rel="stylesheet" href="css/style.css"/>
     <meta charset="utf-8">
   </head>
   <body>
+    <h1>
+        Pokémon Monotype Info
+    </h1>
     <form action="">
-      <input type='text' id='yourname' value="your name here">
+      <input type="text" id="yourmon" placeholder="Your Pokémon here" value="">
+      <input type="text" id="type" placeholder="Your Pokémon type here" value="">
       <button>submit</button>
     </form>
+    
+    <table id="datatable">
+      <tr>
+        <th> Name </th>
+        <th> Type </th>
+        <th> Strong Against </th>
+        <th> Weak To </th>
+      </tr>
+    </table>
   </body>
   <script>
-
+    let currentId = 0;
   const submit = function( e ) {
     // prevent default form action from being carried out
+    let bob = e
+    debugger
     e.preventDefault()
 
-    const input = document.querySelector( '#yourname' ),
-          json = { yourname: input.value },
+    const input1 = document.querySelector( '#yourmon' ),
+          input2 = document.querySelector( '#type' ),
+          json = { yourmon: input1.value, type: input2.value, },
           body = JSON.stringify( json )
 
     fetch( '/submit', {
       method:'POST',
       body 
     })
-    .then( function( response ) {
+    .then(async function( response ) {
       // do something with the reponse 
-      console.log( response )
+      let data = await response.json()
+      addRow(data.yourmon, data.type, data.str, data.wk)
     })
 
     return false
@@ -36,6 +54,38 @@
     const button = document.querySelector( 'button' )
     button.onclick = submit
   }
-
+    
+  const addRow = function( name, type, str, wk ) {
+    const table = document.getElementById('datatable')
+    const row = table.insertRow()
+    row.id = currentId.toString()
+    const nameCell = row.insertCell(0)
+    const typeCell = row.insertCell(1)
+    const strCell = row.insertCell(2)
+    const wkCell = row.insertCell(3)
+    const delCell  = row.insertCell(4)
+    nameCell.innerHTML = name
+    typeCell.innerHTML = type
+    typeCell.className = type.toLowerCase()
+    strCell.innerHTML  = str
+    wkCell.innerHTML   = wk
+    
+    
+    const delButton = document.createElement('input')
+    delButton.type  = "button"
+    delButton.value = "remove"
+    delButton.onclick = function() { delRow( row.id ) }
+    delCell.appendChild(delButton)
+    
+    currentId++
+  }
+  
+  const delRow = function( id ){
+    const table = document.getElementById('datatable')
+    table.deleteRow( document.getElementById( id ).rowIndex )
+  }
+  
+  
+  
   </script>
 </html>
diff --git a/server.improved.js b/server.improved.js
index 26673fc..99ee4a5 100644
--- a/server.improved.js
+++ b/server.improved.js
@@ -6,10 +6,36 @@ const http = require( 'http' ),
       dir  = 'public/',
       port = 3000
 
+const starters = [
+  { 'pokémon': 'bulbasaur', 'type': "Grass",},
+  { 'pokémon': 'squirtle', 'type': "Water"},
+  { 'pokémon': 'charmander', 'type': "Fire"},
+  { 'pokémon': 'pikachu', 'type': "Electric"},
+  { 'pokémon': 'chikorita', 'type': "Grass",},
+  { 'pokémon': 'totodile', 'type': "Water"},
+  { 'pokémon': 'cyndaquil', 'type': "Fire"},
+  { 'pokémon': 'treeko', 'type': "Grass",},
+  { 'pokémon': 'mudkip', 'type': "Water"},
+  { 'pokémon': 'torchic', 'type': "Fire"},
+  { 'pokémon': 'turtwig', 'type': "Grass",},
+  { 'pokémon': 'piplup', 'type': "Water"},
+  { 'pokémon': 'chimchar', 'type': "Fire"},
+  { 'pokémon': 'snivy', 'type': "Grass",},
+  { 'pokémon': 'oshawott', 'type': "Water"},
+  { 'pokémon': 'tepig', 'type': "Fire"},
+  { 'pokémon': 'chespin', 'type': "Grass",},
+  { 'pokémon': 'froakie', 'type': "Water"},
+  { 'pokémon': 'fennekin', 'type': "Fire"},
+  { 'pokémon': 'rowlet', 'type': "Grass",},
+  { 'pokémon': 'popplio', 'type': "Water"},
+  { 'pokémon': 'litten', 'type': "Fire"},
+  { 'pokémon': 'grookey', 'type': "Grass",},
+  { 'pokémon': 'sobble', 'type': "Water"},
+  { 'pokémon': 'scorbunny', 'type': "Fire"}
+]
+
 const appdata = [
-  { 'model': 'toyota', 'year': 1999, 'mpg': 23 },
-  { 'model': 'honda', 'year': 2004, 'mpg': 30 },
-  { 'model': 'ford', 'year': 1987, 'mpg': 14} 
+  
 ]
 
 const server = http.createServer( function( request,response ) {
@@ -38,12 +64,92 @@ const handlePost = function( request, response ) {
   })
 
   request.on( 'end', function() {
-    console.log( JSON.parse( dataString ) )
-
     // ... do something with the data here!!!
-
+    let data = JSON.parse( dataString )
+    
+    switch ( data.type.toLowerCase()){
+      case "normal":
+        data.str = "None"
+        data.wk  = "Fighting"
+        break
+      case "fire":
+        data.str = "Grass, Ice, Bug, Steel"
+        data.wk  = "Water, Ground, Rock"
+        break
+        case "water":
+        data.str = "Fire, Ground, Rock"
+        data.wk  = "Electric, Grass"
+        break
+      case "electric":
+        data.str = "Water, Flying"
+        data.wk  = "Ground"
+        break
+      case "grass":
+        data.str = "Water, Ground, Rock"
+        data.wk  = "Fire, Ice, Poison, Flying, Bug"
+        break
+      case "ice":
+        data.str = "Grass, Ground, Flying, Dragon"
+        data.wk  = "Fire, Fighting, Rock, Steel"
+        break
+      case "fighting":
+        data.str = "Normal, Ice, Rock, Dark, Steel"
+        data.wk  = "Flying, Psychic, Fairy"
+        break
+      case "poison":
+        data.str = "Grass, Fairy"
+        data.wk  = "Ground, Psychic"
+        break
+      case "ground":
+        data.str = "Fire, Electric, Poison, Rock, Steel"
+        data.wk  = "Water, Grass, Ice"
+        break
+      case "flying":
+        data.str = "Grass, Fighting, Bug"
+        data.wk  = "Electric, Ice, Rock"
+        break
+      case "psychic":
+        data.str = "Fighting, Poison"
+        data.wk  = "Bug, Ghost, Dark"
+        break
+      case "bug":
+        data.str = "Grass, Psychic, Dark"
+        data.wk  = "Fire, Flying, Rock"
+        break
+      case "rock":
+        data.str = "Fire, Ice, Flying, Bug"
+        data.wk  = "Water, Grass, Fighting, Ground, Steel"
+        break
+      case "ghost":
+        data.str = "Psychic, Ghost"
+        data.wk  = "Ghost, Dark"
+        break
+      case "dragon":
+        data.str = "Dragon"
+        data.wk  = "Ice, Dragon, Fairy"
+        break
+      case "dark":
+        data.str = "Psychic, Ghost"
+        data.wk  = "Fighting, Bug, Fairy"
+        break
+      case "steel":
+        data.str = "Ice, Rock, Fairy"
+        data.wk  = "Fire, Fighting, Ground"
+        break
+      case "fairy":
+        data.str = "Fighting, Dragon, Dark"
+        data.wk  = "Poison, Steel"
+        break
+      default:
+        data.type = "???"
+        data.str  = "???"
+        data.wk   = "???"
+        break
+    }
+
+    appdata.push(JSON.stringify( data ))
     response.writeHead( 200, "OK", {'Content-Type': 'text/plain' })
-    response.end()
+    response.end( JSON.stringify( data ) )
   })
 }
 
diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml
new file mode 100644
index 0000000..43c1986
--- /dev/null
+++ b/shrinkwrap.yaml
@@ -0,0 +1,15 @@
+dependencies:
+  mime: 2.6.0
+packages:
+  /mime/2.6.0:
+    dev: false
+    engines:
+      node: '>=4.0.0'
+    hasBin: true
+    resolution:
+      integrity: sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
+registry: 'https://registry.npmjs.org/'
+shrinkwrapMinorVersion: 9
+shrinkwrapVersion: 3
+specifiers:
+  mime: ^2.4.4