diff --git a/src/App.js b/src/App.js
index c6f16fc4..34d87c72 100644
--- a/src/App.js
+++ b/src/App.js
@@ -25,34 +25,94 @@ const generateSquares = () => {
   return squares;
 }
 
+
 const App = () => {
+  
 
   const [squares, setSquares] = useState(generateSquares());
-
+  const [player, setPlayer] = useState(PLAYER_1);
+  const [winner, setWinner] = useState("No one! it's a tie!!");
+    
   // Wave 2
   // You will need to create a method to change the square 
   //   When it is clicked on.
   //   Then pass it into the squares as a callback
+  const onClickCallback = (id) => {
+    const newSquares = [];
 
+    for (let row of squares) {
+      const newRow = [];
+      newSquares.push(newRow);
+      for (let col of row) {
+        const newCol = {...col}
+        if (newCol.id === id) {
+          if (newCol.value !== "" || 
+            winner === "Player 1" ||
+            winner === "Player 2") {
+            return;
+          }
+          newCol.value = player
+        };
+        newRow.push(newCol);
+      };
+    };
+    
+    setSquares(newSquares);
+    checkForWinner(newSquares);
+
+    const newPlayer = (player === PLAYER_1) ? PLAYER_2 : PLAYER_1
+    setPlayer(newPlayer);
+  }
 
-  const checkForWinner = () => {
+  const checkForWinner = (squares) => {
     // Complete in Wave 3
+    const values = squares.flat().map((square) => square.value);
+
+    const threeX = ['X','X','X'];
+    const threeO = ['O','O','O'];
+
+    if (arrayEquals([values[0],values[1],values[2]], threeX) ||
+      arrayEquals([values[3],values[4],values[5]], threeX) ||
+      arrayEquals([values[6],values[7],values[8]], threeX) ||
+      arrayEquals([values[0],values[3],values[6]], threeX) ||
+      arrayEquals([values[1],values[4],values[7]], threeX) ||
+      arrayEquals([values[2],values[5],values[8]], threeX) ||
+      arrayEquals([values[0],values[4],values[8]], threeX) ||
+      arrayEquals([values[2],values[4],values[6]], threeX)) {
+        return setWinner("Player 1")
+    } else if (arrayEquals([values[0],values[1],values[2]], threeO) ||
+        arrayEquals([values[3],values[4],values[5]], threeO) ||
+        arrayEquals([values[6],values[7],values[8]], threeO) ||
+        arrayEquals([values[0],values[3],values[6]], threeO) ||
+        arrayEquals([values[1],values[4],values[7]], threeO) ||
+        arrayEquals([values[2],values[5],values[8]], threeO) ||
+        arrayEquals([values[0],values[4],values[8]], threeO) ||
+        arrayEquals([values[2],values[4],values[6]], threeO)) {
+        return setWinner("Player 2")
+    } else {
+        return setWinner("No one! it's a tie!!")
+    };
+  }
 
+  const arrayEquals = (one, two) => {
+    return JSON.stringify(one) === JSON.stringify(two);
   }
 
   const resetGame = () => {
     // Complete in Wave 4
+    window.location.reload();
+    // found this on upmostly.com
   }
 
   return (
     <div className="App">
       <header className="App-header">
         <h1>React Tic Tac Toe</h1>
-        <h2>The winner is ... -- Fill in for wave 3 </h2>
-        <button>Reset Game</button>
+        <h2>The winner is {winner} </h2>
+        <button  onClick={resetGame}>Reset Game</button>
       </header>
       <main>
-        <Board squares={squares} />
+        <Board squares={squares} onClickCallback={onClickCallback} />
       </main>
     </div>
   );
diff --git a/src/components/Board.js b/src/components/Board.js
index 484198fe..27308ee5 100644
--- a/src/components/Board.js
+++ b/src/components/Board.js
@@ -4,9 +4,27 @@ import Square from './Square';
 import PropTypes from 'prop-types';
 
 
+
 const generateSquareComponents = (squares, onClickCallback) => {
   // Complete this for Wave 1
 
+  const squareBoxes = [];
+
+  for (let row of squares) {
+    for (let col of row) {
+      squareBoxes.push(
+        <Square 
+          id={col.id}
+          value={col.value}
+          onClickCallback={onClickCallback}
+          key={col.id}
+        />
+      );
+    };
+  };
+
+  return squareBoxes;
+
 }
 
 const Board = ({ squares, onClickCallback }) => {
diff --git a/src/components/Square.js b/src/components/Square.js
index 71f46b8c..a2744b45 100644
--- a/src/components/Square.js
+++ b/src/components/Square.js
@@ -7,8 +7,9 @@ const Square = (props) => {
   // For Wave 1 enable this 
   //  Component to alert a parent 
   //  component when it's clicked on.
+  const buttonClick = () => props.onClickCallback(props.id);
 
-  return <button
+  return <button onClick={buttonClick}
     className="square"
   >
     {props.value}