diff --git a/src/BoardSwitcher.js b/src/BoardSwitcher.js
index 61ad96f..d7eb9f4 100644
--- a/src/BoardSwitcher.js
+++ b/src/BoardSwitcher.js
@@ -1,36 +1,37 @@
-import React from 'react';
+import React, { useState } from "react";
 
-class Board extends React.Component {
-  render() {
-    let className = "board";
-    if (this.props.selected) {
-      className += " selected";
-    }
-    return (
-      <div className={className}>
-        {this.props.index + 1}
-      </div>
-    );
+const Board = ({ val, isSelected }) => {
+  if (val === isSelected) {
+    return <div className="board selected"> {val} </div>;
+  } else {
+    return <div className="board"> {val} </div>;
   }
-}
+};
 
-class BoardSwitcher extends React.Component {
-  render() {
-    let boards = [];
-    for (let ii = 0; ii < this.props.numBoards; ii++) {
-      let isSelected = ii === 0;
-      boards.push(
-        <Board index={ii} selected={isSelected} key={ii} />
-      );
+const BoardSwitcher = ({ numBoards }) => {
+  const [isSelected, setIsSelected] = useState(1);
+  let [numberOfBoards, setNumberOfBoards] = useState(numBoards);
+  let arr = [];
+  for (let i = 1; i <= numBoards; i++) {
+    arr.push(i);
+  }
+  const toggleFrame = () => {
+    setIsSelected(isSelected + 1);
+    if (isSelected > numberOfBoards - 1) {
+      setIsSelected(1);
     }
+  };
 
-    return (
-      <div>
-        <div className="boards">{boards}</div>
-        <button>Toggle</button>
+  return (
+    <div>
+      <div className="boards">
+        {arr.map((val) => {
+          return <Board val={val} isSelected={isSelected} />;
+        })}
       </div>
-    );
-  }
-}
+      <button onClick={toggleFrame}>Toggle</button>
+    </div>
+  );
+};
 
 export default BoardSwitcher;
diff --git a/src/index.css b/src/index.css
index 833a812..f251ed5 100644
--- a/src/index.css
+++ b/src/index.css
@@ -4,6 +4,19 @@ body {
   font-family: sans-serif;
 }
 
-.boards { margin: 20px 0; overflow: hidden; }
-.board { border: 5px solid #ccc; float: left; font: 700 24px HelveticaNeue, Helvetica, Arial; margin-right: 20px; padding: 20px; }
-.board.selected { border-color: #3BA8AA; }
+.boards {
+  margin: 20px 0;
+  overflow: hidden;
+}
+
+.board {
+  border: 5px solid #ccc;
+  float: left;
+  font: 700 24px HelveticaNeue, Helvetica, Arial;
+  margin-right: 20px;
+  padding: 20px;
+}
+
+.board.selected {
+  border-color: #3ba8aa;
+}