diff --git a/index.html b/index.html
index 19d0dee..ab424f1 100644
--- a/index.html
+++ b/index.html
@@ -19,9 +19,21 @@ <h1>Welcome to Tic Tac Toe</h1>
       <table>
         <tr>
           <!-- the onclick calls a function called "handleClick" and passes itself to it -->
-          <td id='top-left' onclick="handleClick(this)" ></td>
-          <td id='top-middle'></td>
-          <td></td>
+          <td id='0-0' onclick="handleClick(this)"></td>
+          <td id='0-1' onclick="handleClick(this)"></td>
+          <td id='0-2' onclick="handleClick(this)"></td>
+        </tr>
+        <tr>
+          <!-- the onclick calls a function called "handleClick" and passes itself to it -->
+          <td id='1-0' onclick="handleClick(this)" ></td>
+          <td id='1-1' onclick="handleClick(this)"></td>
+          <td id='1-2' onclick="handleClick(this)"></td>
+        </tr>
+        <tr>
+          <!-- the onclick calls a function called "handleClick" and passes itself to it -->
+          <td id='2-0' onclick="handleClick(this)" ></td>
+          <td id='2-1' onclick="handleClick(this)"></td>
+          <td id='2-2' onclick="handleClick(this)"></td>
         </tr>
         <!-- @TODO create new rows and cells for the rest of your TTT board. -->
         <!-- @TODO give each new cell an id & an event listener to call the "handleClick" function -->
diff --git a/scripts.js b/scripts.js
index ba09e74..b07bc9b 100644
--- a/scripts.js
+++ b/scripts.js
@@ -7,62 +7,43 @@
     // next to each @TODO you will find tasks that need to be finished
 
 // The variable will change from X to O based on what player turn it is. We need to hold this so we can place an X or O on the board when they're clicked.
+let board = [
+  ["","",""],
+  ["","",""],
+  ["","",""]]
 let currentMarker = 'X'
+let turns = 0
+let gameOver = false
 
-
-
-
-// this "handleClick" function is called when a box is clicked. Here, "element" will hold the same value as "this" does in the HTML. 
-// "this" is a special word in JS but "element" could have been "thing" or "el" or whatever we wanted it to be as long as we use it again in the "console.log" statement
 const handleClick = (element) => {
 
   // this uses the "log" method on the "console" to log out the element's id so we can see it with our human eyes
-  console.log(`The element you clicked on has an id:  ${element.id}`)
+  // console.log(`The element you clicked on has an id:  ${element.id}`)
 
-  // this next line prevents an X being changed to an O or an O being changed to an X by...
-  //  checking to see if the square clicked has anything in it, if not continue
-  if(!document.getElementById(element.id).innerHTML){
+  if((!document.getElementById(element.id).innerHTML) && (!gameOver)){
     addMarker(element.id)
   }
 }
 
 
-
-
-
-
-
-
-
-
-
 // this function places the "currentMarker" inside the HTML element that was clicked and calls the "changeMarker" function.
 const addMarker = (id) => {
 
-  // @TODO-1: Open the console tab in your Chrome Inspector Tool and click on the top-left square to see what's logged to the console. 
-  console.log(`*** The current marker is:  ${currentMarker}. ***`)
-  console.log(`Therefore, a  "${currentMarker}"  should be placed in the square with the id:  ${id}`)
+  // if(currentMarker === 'X'){
+  //   document.getElementById.
+  // }
   
-  // @TODO-2: Build a line of code that will set the innerHTML property of the element that was clicked to the "currentMarker"
+  const row = parseInt(id.charAt(0))
+  const column = parseInt(id.charAt(2))
+  board[row][column]= currentMarker
+  document.getElementById(id).innerHTML = currentMarker
   
-  // @TODO-2.5: MIX & MATCH, You will need the following pieces of code to build that line:
-  // = currentMarker
-  // .getElementById(id)
-  // document
-  // .innerHTML 
-
-  changeMarker()
+  checkForWin()
+  turns ++
 }
 
 
 
-
-
-
-
-
-
-
 // This "changeMarker" function changes "X" to "O" in the "currentMarker" variable or "O" to "X"
 const changeMarker = () => {
   if(currentMarker === "X"){
@@ -74,33 +55,101 @@ const changeMarker = () => {
 
 
 
+// This "resetBoard" function is called when the user clicks on the "Restart" button.
+const resetBoard = () => {
+  
+    
+    const squares = document.getElementsByTagName("TD")
+  
+  for (i=0; i < squares.length; i++) {
+    // console.log(squares[i].id)
+    squares[i].innerHTML = null
+  }  
+  board = [
+    ["","",""],
+    ["","",""],
+    ["","",""]]
+
+  currentMarker = "X"
+  gameOver = false
+  turns = 0
+}
 
 
 
+const checkForWin = () => {
+  if(horizontalWin() || verticalWin() || diagonalWin()) {
+    gameOver = true
+    
+    
+    setTimeout(function() {window.alert(`Player ${currentMarker} won! Click Restart to play again!`)}, 100)
+  } 
+  
+  else if(turns === 8){
+    gameOver = true
+    setTimeout(function() {window.alert('It is a tie! Click Restart to play again!')}, 100)
+  }
+  else {
+    changeMarker()
+   
+  }
+}
 
+const horizontalWin = () => {
+  if((board[0][0] == "X" && board[0][1] == "X" && board[0][2] == "X") 
+        || (board[0][0] == "O" && board[0][1] == "O" && board[0][2] == "O")){
+      return true
+    }
 
+  else if((board[1][0] == "X" && board[1][1] == "X" && board[1][2] == "X") 
+  || (board[1][0] == "O" && board[1][1] == "O" && board[1][2] == "O")){
+      return true
+  }
 
+  else if((board[2][0] == "X" && board[2][1] == "X" && board[2][2] == "X") 
+  || (board[2][0] == "O" && board[2][1] == "O" && board[2][2] == "O")){
+      return true
+  }
 
-// This "resetBoard" function is called when the user clicks on the "Restart" button.
-const resetBoard = () => {
-  
-  // @TODO-3: To make your "Restart" button work you'll need to build a line of code here that:
-      // collects all of the "td" elements into an HTML Collection: https://www.w3schools.com/jsref/dom_obj_htmlcollection.asp  
-    
-  // @TODO-3.5: MIX & MATCH, You will need the following pieces of code to build that line:
-  // squares
-  // .getElementsByTagName("TD")
-  // =
-  // document
-  // const
-  
-  // loops over the HTML Collection of TDs and clears out the Xs and Os
-  for (i=0; i < squares.length; i++) {
+  else{
+    return false
+  }
+}
 
-    // will log out the id of each square as it loops over them.
-    console.log(squares[i].id)
+const verticalWin = () => {
+  if((board[0][0] == "X" && board[1][0] == "X" && board[2][0] == "X") 
+        || (board[0][0] == "O" && board[1][0] == "O" && board[2][0] == "O")){
+      return true
+    }
 
-    // sets the innerHTML to null to replace the "X" or "O"
-    squares[i].innerHTML = null
-  }  
+  else if((board[0][1] == "X" && board[1][1] == "X" && board[2][1] == "X") 
+  || (board[0][1] == "O" && board[1][1] == "O" && board[2][1] == "O")){
+      return true
+  }
+
+  else if((board[0][2] == "X" && board[1][2] == "X" && board[2][2] == "X") 
+  || (board[0][2] == "O" && board[1][2] == "O" && board[2][2] == "O")){
+      return true
+  }
+
+  else{
+    return false
+  }
+
+}
+
+const diagonalWin = () => {
+  if((board[0][0] == "X" && board[1][1] == "X" && board[2][2] == "X") 
+        || (board[0][0] == "O" && board[1][1] == "O" && board[2][2] == "O")){
+      return true
+    }
+
+  else if((board[0][2] == "X" && board[1][1] == "X" && board[2][0] == "X") 
+  || (board[0][2] == "O" && board[1][1] == "O" && board[2][0] == "O")){
+      return true
+  }
+
+  else{
+    return false
+  }
 }
\ No newline at end of file
diff --git a/tictactoe.css b/tictactoe.css
index 981de05..d6da03e 100644
--- a/tictactoe.css
+++ b/tictactoe.css
@@ -13,4 +13,5 @@ td {
 
 table {
   margin: auto auto;
+  /* color: blue; */
 }
\ No newline at end of file