diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..9bbf1f77
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+.DS_Store
+node_modules
+package-lock.json
+
diff --git a/README.md b/README.md
index 493995c1..08f95127 100644
--- a/README.md
+++ b/README.md
@@ -1,100 +1,27 @@
-Assignment 2 - Short Stack: Basic Two-tier Web Application using HTML/CSS/JS and Node.js  
-===
 
-Due: September 11th, by 11:59 AM.
+# a2-SmeeBoi: 
+Sameer Desai 
+Glitch: https://a2-smeeboi-sameer-desai.glitch.me/
 
-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.
+Random number "game". 
 
-Baseline Requirements
----
+Create player name and color with form inputs. Then "game" generates a random number between 1-100 for the score. Then this player info name, color, score gets sent to server.
 
-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.
+Server creates rank derived field by looking at all player's score and assigning rank for each player. Now all players info gets sent back to client and displayed under Results section with added rank derived field.
 
-Your application is required to implement the following functionalities:
+Then user can delete players with delete button which deletes player info on server and server also fixes rank of all players. 
 
-- 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 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`
+Then user can edit player name with edit button which edits player info on server and will change all players with that name.
 
-Your application is required to demonstrate the use of the following concepts:
+NOTE: Need to scroll down to see results. Not enough time to fix :(
 
-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 2023 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. Remember, the highest grade you can get on any individual assignment is a 100%.
-
-*Technical*
-- (5 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.
-
-- (5 points) In addition to a form enabling adding and deleting data on the server, also add the ability to modify existing data.
-
-*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 fine). 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, or conduct the studies in person. 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...
+- **Tech Achievement 1**: none
 
 ### Design/Evaluation Achievements
-- **Design Achievement 1**: 
+- **Design Achievement 1**:
+Flexbox, Used Jost Google Font,
+CSS animate header to move up and down,
+Button outline on hover
+
diff --git a/package.json b/package.json
index 988f135f..0e9515fa 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
-  "name": "",
+  "name": "a2-SmeeBoi",
   "version": "",
-  "description": "",
-  "author": "",
+  "description": "Spacebar Game",
+  "author": "Sameer Desai",
   "scripts": {
     "start": "node server.improved.js"
   },
diff --git a/public/css/main.css b/public/css/main.css
index 7cf6207b..16c1a5c5 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -1,4 +1,88 @@
+*{
+  margin: 0px;
+  padding: 0px;
+  border: 0px;
+  font-family: 'Josefin Sans', sans-serif;
+font-family: 'Jost', sans-serif;
+}
+
 body {
-  background:black;
-  color:white;
-}
\ No newline at end of file
+  background:white;
+  color:black;
+font-size: 3rem;
+}
+
+#container {
+  min-height: 100vh;
+  min-width: 100vw;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+
+#playerList {
+  font-size: 1rem;
+  margin-top: 0px;
+  margin-bottom: 0px;
+}
+
+li{
+  size: 1rem;
+  margin-top: 0px;
+  margin-bottom: 0px;
+}
+
+
+#input-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 10px;
+}
+
+
+h1.vert-move {
+  -webkit-animation: mover 1.0s infinite  alternate;
+  animation: mover 0.8s infinite  alternate;
+}
+
+@keyframes mover {
+  0% { transform: translateY(0); }
+  100% { transform: translateY(-8px); }
+}
+
+input{
+width: 70%;
+height: 80%;
+font-size: 60%;
+border: none;
+  outline: none;
+  border-bottom: 1px solid black;
+
+}
+
+
+button {
+  margin-top: 20px;
+  margin-left: 10px;
+  align-items: center;
+  background-color: white;
+  border-radius: 12px;
+  cursor: pointer;
+  font-size: 1.2rem;
+  outline: none;
+  padding: 0.5rem 0.5rem;
+  text-align: center;
+  text-decoration: none;
+  transition: box-shadow .2s,-webkit-box-shadow .2s;
+  white-space: nowrap;
+  border: 0;
+  user-select: none;
+  -webkit-user-select: none;
+  touch-action: manipulation;
+}
+
+button:hover {
+  box-shadow: #121212 0 0 0 3px, transparent 0 0 0 0;
+}
diff --git a/public/index.html b/public/index.html
index b6de0443..ef254a6d 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,18 +1,39 @@
 <!doctype html>
 <html lang="en">
-  <head>
-    <title>CS4241 Assignment 2</title>
-    <meta charset="utf-8">
-    <script src="js/main.js"></script>
-    <link rel="stylesheet" href="css/main.css">
-    
-    <!-- get rid of favicon error -->
-    <link rel="shortcut icon" href="data:image/x-icon;," type="image/x-icon"> 
-  </head>
-  <body>
-    <form>
-      <input type="text" id="yourname" value="your name here">
-      <button>submit</button>
-    </form>
-  </body>
-</html>
+
+<head>
+  <title>a2-SmeeBoi</title>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+  <script src="js/main.js"></script>
+  <link rel="stylesheet" href="css/main.css">
+
+  <!-- get rid of favicon error -->
+  <link rel="icon" href="data:;base64,iVBORw0KGgo=">
+
+  <link rel="preconnect" href="https://fonts.googleapis.com">
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+  <link href="https://fonts.googleapis.com/css2?family=Josefin+Sans:wght@300&family=Jost&display=swap" rel="stylesheet">
+</head>
+
+
+<body>
+  <div id="container">
+    <h1 class="vert-move">Spacebar Game</h1>
+
+    <div id="input-container">
+      <label for="yourname">Player name:</label>
+      <input type="text" id="yourname">
+      <label for="color">Color:</label>
+      <input type="text" id="color">
+      <button id="playbutton">Play</button>
+    </div>
+
+    <p> Player Results</p>
+  </div>
+
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/public/js/main.js b/public/js/main.js
index a569258f..6e54d2ff 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -1,27 +1,147 @@
-// FRONT-END (CLIENT) JAVASCRIPT HERE
-
-const submit = async function( event ) {
-  // stop form submission from trying to load
-  // a new .html page for displaying results...
-  // this was the original browser behavior and still
-  // remains to this day
-  event.preventDefault()
-  
-  const input = document.querySelector( '#yourname' ),
-        json = { yourname: input.value },
-        body = JSON.stringify( json )
-
-  const response = await fetch( '/submit', {
-    method:'POST',
-    body 
+'use strict'
+
+// CLIENT CODE
+
+let playerList = undefined;
+
+// Random int between min and max
+function randomNum(min, max) {
+  return Math.floor(Math.random() * (max - min + 1)) + min;
+}
+
+// When play button is clicked, submit form data to server
+const submit = async function (event) {
+  event.preventDefault(); // Stop page defualt reload behavior
+
+  // hide div with input-container
+  const inputContainer = document.querySelector('#input-container');
+  inputContainer.style.display = 'none';
+
+  const name = document.querySelector('#yourname'); // get form input element with id=yourname
+  const color = document.querySelector('#color');
+
+  let formData = {}  // json for client data
+  formData.name = name.value
+  formData.color = color.value
+  formData.score = randomNum(1, 100); // Add random score between 1-100
+
+  const response = await fetch('/submit', { // Send client data to server 
+    method: 'POST',
+    body: JSON.stringify(formData) // Convert clientData to JSON string
   })
 
-  const text = await response.text()
+  let serverData = await response.json() // Get server response
+  console.log('SERVER DATA (after add player):')
+  console.log(serverData) // Print current server data
+  populateList(serverData); // Populate list of players in html with server data
+}
+
+// Populate list of players in html with server data
+function populateList(serverData) {
+
+
+
+  playerList = document.getElementById('playerList');
+  if (playerList) {
+    playerList.remove();  // Reset player list by removing old list
+  }
+
+  playerList = document.createElement('ol'); // Ordered list of players 
+  playerList.id = 'playerList';
+
+  // document.body.appendChild(playerList);
+
+  // add playerList to body inside the div with id=container
+  let container = document.getElementById('container');
+  container.appendChild(playerList);
+
+  // For each player in server data, create a list item
+  serverData.forEach(d => {
+    const player = document.createElement('li') // Player list item
 
-  console.log( 'text:', text )
+    // Add edit button
+    const editButton = document.createElement('button')
+    editButton.innerHTML = 'Edit'
+    editButton.class = 'editButton'
+
+    // Add delete button
+    const deleteButton = document.createElement('button')
+    deleteButton.innerHTML = 'Delete'
+    deleteButton.class = 'deleteButton'
+
+    // Server Data to be displayed in list player
+    player.innerHTML = `Name: ${d.name}, Color: ${d.color}, Score: ${d.score}, Rank: ${d.rank}`
+    player.className = 'player'
+    player.id = `${d.name}`; // Set id of player list item to name of player
+
+    // Add buttons in li player
+    player.appendChild(editButton)
+    player.appendChild(deleteButton)
+
+    // Add player <li> to list <ol>
+    playerList.appendChild(player)
+  })
 }
 
-window.onload = function() {
-   const button = document.querySelector("button");
-  button.onclick = submit;
+// When page loads, add event listeners to buttons
+window.onload = function () {
+  const playbutton = document.querySelector('#playbutton');
+  playbutton.onclick = submit;
+
+  // Delete button clicked
+  document.addEventListener('click', function (e) {
+    if (e.target && e.target.class == 'deleteButton') {
+      let player = e.target.closest('.player');
+      if (confirm(`Are you sure you want to delete Player: ${deletePlayer.name}?`) == true) {
+        deletePlayer(player.id); // player id is name of player
+      }
+    }
+  });
+
+  // Edit button clicked
+  document.addEventListener('click', function (e) {
+    if (e.target && e.target.class == 'editButton') {
+      let player = e.target.closest('.player');
+      editPlayer(player.id); // player id is name of player
+    }
+  });
+
+}
+
+// Edit player name on server
+async function editPlayer(playerName) {
+  let newName = prompt("Enter new name:", "New Name"); // Get new name from user
+  if (newName == null || newName == "") {
+    alert("Player name not changed"); // If user cancels or enters empty string, do nothing
+  } else {
+    let editPlayer = {}
+    editPlayer.name = playerName
+    editPlayer.newName = newName // New name to be changed to
+
+    const response = await fetch('/edit', {
+      method: 'PUT',
+      body: JSON.stringify(editPlayer)
+    })
+
+    let serverData = await response.json()
+    console.log('SERVER DATA (after edit):');
+    console.log(serverData);
+    populateList(serverData);
+  }
+}
+
+// Delete player from server
+async function deletePlayer(playerName) {
+  let deletePlayer = {}
+  deletePlayer.name = playerName // Player name to be deleted
+
+  const response = await fetch('/delete', {
+    method: 'DELETE',
+    body: JSON.stringify(deletePlayer)
+  })
+
+  let serverData = await response.json()
+  console.log('SERVER DATA (after delete):');
+  console.log(serverData);
+  populateList(serverData);
 }
\ No newline at end of file
diff --git a/server.improved.js b/server.improved.js
index 9ac27fb8..f33213d7 100644
--- a/server.improved.js
+++ b/server.improved.js
@@ -1,74 +1,153 @@
-const http = require( 'http' ),
-      fs   = require( 'fs' ),
-      // IMPORTANT: you must run `npm install` in the directory for this assignment
-      // to install the mime library if you're testing this on your local machine.
-      // However, Glitch will install it automatically by looking in your package.json
-      // file.
-      mime = require( 'mime' ),
-      dir  = 'public/',
-      port = 3000
-
-const appdata = [
-  { 'model': 'toyota', 'year': 1999, 'mpg': 23 },
-  { 'model': 'honda', 'year': 2004, 'mpg': 30 },
-  { 'model': 'ford', 'year': 1987, 'mpg': 14} 
+'use strict'
+
+// SERVER CODE
+
+const http = require('http'), // http server core module
+  fs = require('fs'), // needed for loading static files
+  // IMPORTANT: you must run `npm install` in the directory for this assignment
+  // to install the mime library if you're testing this on your local machine.
+  // However, Glitch will install it automatically by looking in your package.json
+  // file.
+  mime = require('mime'), // mime to determine file type from file name extension
+  dir = 'public/', // directory where static files are stored
+  port = 3000 // 3000 is the port where the server is listening
+
+// serverPlayerLog is the test data that is stored on server
+let serverPlayerLog = [
+  { name: 'example-player', color: 'red', score: 0, rank: 0 }
 ]
 
-const server = http.createServer( function( request,response ) {
-  if( request.method === 'GET' ) {
-    handleGet( request, response )    
-  }else if( request.method === 'POST' ){
-    handlePost( request, response ) 
+// Create http server
+const server = http.createServer(function (request, response) {
+  if (request.method === 'GET') { // client requests a resource
+    handleGet(request, response)
+  } else if (request.method === 'POST') { // client is adding data to server
+    handlePost(request, response)
+  } else if (request.method === 'DELETE') { // client is deleting data
+    handleDelete(request, response)
+  } else if (request.method === 'PUT') { // client is editing data
+    handlePut(request, response)
   }
 })
 
-const handleGet = function( request, response ) {
-  const filename = dir + request.url.slice( 1 ) 
-
-  if( request.url === '/' ) {
-    sendFile( response, 'public/index.html' )
-  }else{
-    sendFile( response, filename )
+// Client requests a resource
+const handleGet = function (request, response) {
+  const filename = dir + request.url.slice(1)  // remove leading '/' from URL
+  if (request.url === '/') {
+    sendFile(response, 'public/index.html') // send index.html to client
+  } else {
+    sendFile(response, filename) // send requested file to client
   }
 }
 
-const handlePost = function( request, response ) {
-  let dataString = ''
+// Client is adding data to server
+const handlePost = function (request, response) {
+  let clientDataString = ''
+  request.on('data', function (data) { // add data to clientDataString as it comes in
+    clientDataString += data
+  })
+
+  request.on('end', function () { // end when client is done sending data
+    let clientData = {}
+    clientData = JSON.parse(clientDataString) // parse clientDataString into JSON object
+
+    let newPlayer = {
+      name: clientData.name,
+      color: clientData.color,
+      score: clientData.score,
+      rank: 0,
+    }
+
+    serverPlayerLog.push(newPlayer) // add new player to serverPlayerLog array
+
+    // Sort serverPlayerLog by score and add rank to each player
+    serverPlayerLog.sort((a, b) => (a.score < b.score) ? 1 : -1)
+    serverPlayerLog.forEach((player, index) => {
+      player.rank = index + 1;
+    })
+
+    response.writeHead(200, "OK", { 'Content-Type': 'text/json' }) // send response to client
+    response.end(JSON.stringify(serverPlayerLog))
+  })
+}
+
 
-  request.on( 'data', function( data ) {
-      dataString += data 
+
+// Client is deleting data from server
+const handleDelete = function (request, response) {
+  let clientDataString = ''
+  request.on('data', function (data) { // add data to clientDataString as it comes in
+    clientDataString += data
   })
 
-  request.on( 'end', function() {
-    console.log( JSON.parse( dataString ) )
+  request.on('end', function () { // end when client is done sending data
+
+    let clientData = {}
+    clientData = JSON.parse(clientDataString) // parse clientDataString into JSON object
+    let playerToDelete = clientData;
+
+    // Delete player from serverPlayerLog
+    serverPlayerLog.forEach(player => {
+      if (playerToDelete.name === player.name) {
+        serverPlayerLog.splice(serverPlayerLog.indexOf(player), 1)
+      }
+    })
 
-    // ... do something with the data here!!!
+    // Sort serverPlayerLog by score
+    serverPlayerLog.sort((a, b) => (a.score < b.score) ? 1 : -1)
+    serverPlayerLog.forEach((player, index) => {
+      player.rank = index + 1;
+    })
 
-    response.writeHead( 200, "OK", {'Content-Type': 'text/plain' })
-    response.end('test')
+    response.writeHead(200, "OK", { 'Content-Type': 'text/json' }) // send response to client
+    response.end(JSON.stringify(serverPlayerLog))
   })
 }
 
-const sendFile = function( response, filename ) {
-   const type = mime.getType( filename ) 
+// Client is editing data on server
+const handlePut = function (request, response) {
+
+  let clientDataString = ''
+
+  request.on('data', function (data) { // add data to clientDataString as it comes in
+    clientDataString += data
+  })
 
-   fs.readFile( filename, function( err, content ) {
+  request.on('end', function () { // end when client is done sending data
+    let clientData = {}
+    clientData = JSON.parse(clientDataString) // parse clientDataString into JSON object
 
-     // if the error = null, then we've loaded the file successfully
-     if( err === null ) {
+    let playerToEdit = clientData.name;
+    let newName = clientData.newName;
 
-       // status code: https://httpstatuses.com
-       response.writeHeader( 200, { 'Content-Type': type })
-       response.end( content )
+    // loop through serverPlayerLog and edit player with matching name
+    serverPlayerLog.forEach(player => {
+      if (playerToEdit === player.name) {
+        player.name = newName;
+      }
+    })
 
-     }else{
+    response.writeHead(200, "OK", { 'Content-Type': 'text/json' }) // send response to client
+    response.end(JSON.stringify(serverPlayerLog))
+  })
 
-       // file not found, error code 404
-       response.writeHeader( 404 )
-       response.end( '404 Error: File Not Found' )
+}
 
-     }
-   })
+// Send file to client (called by handleGet when client requests a resource)
+const sendFile = function (response, fileName) {
+  const type = mime.getType(fileName);
+
+  fs.readFile(fileName, function (err, content) {
+    if (err === null) { // No error means file exists
+      // status code: https://httpstatuses.com
+      response.writeHeader(200, { 'Content-Type': type })
+      response.end(content);
+    } else {
+      response.writeHeader(404);
+      response.end('404 Error: File Not Found');
+    }
+  })
 }
 
-server.listen( process.env.PORT || port )
+server.listen(process.env.PORT || port)
+