diff --git a/react-fb-tictactoe/package.json b/react-fb-tictactoe/package.json
index 8927e3a5..e03acde1 100644
--- a/react-fb-tictactoe/package.json
+++ b/react-fb-tictactoe/package.json
@@ -13,4 +13,4 @@
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject"
   }
-}
\ No newline at end of file
+}
diff --git a/react-fb-tictactoe/src/TicTacToe/index.js b/react-fb-tictactoe/src/TicTacToe/index.js
index 56944d57..5ecbcdbe 100644
--- a/react-fb-tictactoe/src/TicTacToe/index.js
+++ b/react-fb-tictactoe/src/TicTacToe/index.js
@@ -2,34 +2,48 @@ import React, { Component } from 'react';
 import './TicTacToe.css'
 
 
-/*
- * Changes from original tutorial
- *  - Here we import Component, so we can replace
- *    class Square extends React.Component
- *    with
- *    class Square extends Component
- */
-class Square extends Component {
-  render() {
-    return (
-      <button className="square">
-        {/* TODO */}
-      </button>
+function Square(props){
+  return (
+    <button className="square" onClick={props.onClick}>
+         {props.value}
+    </button>
     );
-  }
 }
 
 class Board extends Component {
   renderSquare(i) {
-    return <Square />;
+    return (<Square 
+    value={this.props.squares[i]}
+    onClick={()=> this.props.onClick(i)}
+    />
+    );
   }
 
   render() {
-    const status = 'Next player: X';
+    /*Another way to fill the board*/
+    // const winner = calculateWinner(this.state.squares);
+    // let status;
+    // var rows =[];
+    // var cells = [];
+    // var numbers = 0;
+    // for(var i = 0; i < 3; i++)
+    // {
+    //   for(var j = 0; j < 3; j++)
+    //   {
+    //     cells.push(this.renderSquare(numbers));
+    //     numbers++;
+    //   }
+    //   rows.push(<div key={i} className="board-row">{cells}</div>)
+    //   cells = [];
+    // }
 
     return (
+      /*
+        <div>
+          {rows}
+        </div>
+      */
       <div>
-        <div className="status">{status}</div>
         <div className="board-row">
           {this.renderSquare(0)}
           {this.renderSquare(1)}
@@ -51,15 +65,88 @@ class Board extends Component {
 }
 
 class Game extends Component {
+  constructor(){
+    super();
+    this.state = {
+      history: [
+      {
+        squares: Array(9).fill(null),
+      }
+      ],
+      stepNumber: 0,
+      xIsNext: true,
+    };
+  }
+
+  jumpTo(step){
+    this.setState({
+      stepNumber: step,
+      xIsNext: (step % 2) === 0
+    });
+  }
+
+  handleClick(i){
+    const history = this.state.history.slice(0, this.state.stepNumber + 1);
+    const current = history[history.length - 1];
+    const squares = current.squares.slice();
+
+    if(calculateWinner(squares) || squares[i])
+    {
+      return;
+    }
+
+    squares[i] = this.state.xIsNext ? 'X' : 'O';
+    
+    this.setState(
+    {
+      history: history.concat([{
+              squares: squares,
+            }]),
+      stepNumber: history.length,
+      xIsNext: !this.state.xIsNext,
+    });
+  }
+
   render() {
+    const history = this.state.history;
+    const current = history[this.state.stepNumber];
+    const winner = calculateWinner(current.squares);
+
+    const moves = history.map((step, move) =>
+    {
+      const desc= move ?
+      'Move #' + move :
+      'Game start';
+
+      return(
+        <li key={moves}>  
+          <a href="#" onClick={() => this.jumpTo(move)}>{desc}</a>
+        </li>
+        );
+    });
+
+    let status;
+
+    if(winner)
+    {
+       status = 'Winner: ' + winner; 
+    }
+    else
+    {
+       status = 'Next player: ' + (this.state.xIsNext ? 'X' : 'O');
+    }
+
     return (
       <div className="game">
         <div className="game-board">
-          <Board />
+          <Board
+            squares ={current.squares}
+            onClick = {(i) => this.handleClick(i)}
+          />
         </div>
         <div className="game-info">
-          <div>{/* status */}</div>
-          <ol>{/* todo */}</ol>
+          <div>{status}</div>
+          <ol>{moves}</ol>
         </div>
       </div>
     );
@@ -67,3 +154,30 @@ class Game extends Component {
 }
 
 export default Game;
+
+
+function calculateWinner(squares)
+{
+  const lines = [
+    [0, 1, 2],
+    [3, 4, 5],
+    [6, 7, 8],
+    [0, 3, 6],
+    [1, 4, 7],
+    [2, 5, 8],
+    [0, 4, 8],
+    [2, 4, 6],
+  ];
+
+  for(let i = 0; i < lines.length; i++)
+  {
+    const [a, b, c] = lines[i];
+
+    if(squares[a] && squares[a] === squares[b] && squares[a] === squares[c])
+    {
+      return squares[a];
+    }
+  }
+  return null;
+}
+