diff --git a/index.html b/index.html
index 345c634f7e7be5a81d8ec2f7e1613c97d5f352e6..a6cf3e18ed91df8d0f58ef1c1e1420f344dea219 100644
--- a/index.html
+++ b/index.html
@@ -1,8 +1,61 @@
<!DOCTYPE html>
<html>
-<head>
+ <head>
+ <meta charset="utf-8"/>
+ <link rel="stylesheet" href="monopoly/style.css">
+ </head>
+ <body>
+ <main>
+ <div id="container">
+ <div id="board"></div>
+ <span id="info">
+ <span id="infoCoa"></span>
+ <span id="infoNameText"><p id="infoName"></p></span>
+ <span id="infoOtherS"><p><b>Value:</b><p id="infoValue"></p></p></span>
+ <span id="infoOther"> <p><b>Dignity:</b><p id="infoDignity"></p></p> </span>
+ <span id="infoShareS">
+ <p><b>Shares:</b><p id="infoShares"></p></p>
+ </span>
+ <span id="infoOwnerText"><p><b>Owner:</b><p id="infoOwner"></p></p></span>
+ <button id="buyShare" onclick="Player.buyShare()">BUY SHARE</button>
+ </span>
+ <span id="console">
+ </span>
+ </main><selection>
+ <table id="entrepreneurs">
+ <caption><h3>ENTREPRENEURS</h3></caption>
+ <tr><th width='50%'>Name</th><th>Company</th><th title="Prudence">PRU</th><th title="Ambition">AMB</th><th title="Pride">PRI</th><th>Reputation</th><th>Tenure</th></tr>
+ </table>
+ </selection>
+ <selection>
+ <table id="companies">
+ <caption><h3>COMPANIES</h3></caption>
+ <tr><th width="31.95%">Name</th><th>Icon</th><th>Properties</th><th>Treasury</th><th>Total value</th></tr>
+ </table>
+ </selection>
+ <aside>
+ <table id="shares">
+ <caption><h3>SHARES</h3></caption>
+ <tr><th>Location</th><th>Company</th><th title="Current Value">C. value</th><th title="Original value">O. value</th><th>Options</th></tr>
+ </table>
+ </aside>
+ <aside>
+ <fieldset>
+ <legend><h3>PLAYER</h3></legend>
+ <table id="player">
+ <tr><th>Treasury:</th><td id="playerTreasury">a</td></tr>
+ <tr><th>Shares:</th><td id="playerShares"></td></tr>
+ <tr><th>Shares value:</th><td id="playerSharesValue"></td></tr>
+ <tr><th>Turn:</th><td id="playerTurn"></td></tr>
+ <tr><td colspan="2"><button id="turnButton" onclick="turn()">TURN</button></td></tr>
+ <tr><td colspan="2"> <button id="cashOutButton" onclick="Player.cashOut()">CASH OUT</button></td></tr>
+ <tr><td colspan="2"> <button id="reloadButton" onclick="reloadGame()">RELOAD</button></td></tr>
+ </table>
+ </fieldset
+ </aside>
-</head>
-<body>
-</body>
-</html>
+
+ </body>
+ <script type="module" src="index.js"></script>
+
+<html>
diff --git a/index.js b/index.js
index 4110aec9189d82d7ae7588fe7678772c39fc63c9..5de6b22701401c0c14d3927ee634854c45663b91 100644
--- a/index.js
+++ b/index.js
@@ -43,4 +43,3 @@ document.getElementById("cashOutButton").onclick = function(){Player.cashOut();}
document.getElementById("reloadButton").onclick = function(){Basic.reloadGame();}
//UnitTest.runUnitTest();
-
diff --git a/monopoly/code/index.html b/monopoly/code/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/monopoly/code/test.js b/monopoly/code/test.js
index 6223225d660bac57640489c9315f20cc5dfda17e..37c70f371f02f04b1d7f42fcac1288d9fcf0ca3e 100644
--- a/monopoly/code/test.js
+++ b/monopoly/code/test.js
@@ -1,2 +1,2 @@
-var test = false;
+var test = true;
module.exports = test;
diff --git a/server.js b/server.js
index ce2cee4364c3dd9fc08e97e46fa6f739ab15d419..187c89107f826a2f3b64137130702094fc99c659 100644
--- a/server.js
+++ b/server.js
@@ -3,5 +3,3 @@ var app = express();
app.use(express.static(__dirname)); //__dir and not _dir
var port = 3000; // you can use any port
app.listen(port);
-
-