From 4780354452039465dd9114e005ac1c247f88158b Mon Sep 17 00:00:00 2001
From: hba56 <hba56@uclive.ac.nz>
Date: Fri, 8 Sep 2017 16:35:36 +1200
Subject: [PATCH] Errors in this commit: mock threads get interrupted
 #story[#1188]

---
 dedicatedServer/pom.xml                       |   3 +
 .../Controllers/HostController.java           |   2 +-
 .../Controllers/InGameLobbyController.java    | 135 ++++++++-----
 .../Controllers/LobbyController.java          |   2 +-
 .../Controllers/MainController.java           |  19 +-
 .../java/visualiser/layout/Subject3D.java     |  68 +++++++
 .../main/java/visualiser/layout/View3D.java   | 161 ++++++++++++++++
 .../java/visualiser/model/BoatDisplay3D.java  |  18 --
 .../main/java/visualiser/model/View3D.java    |  49 -----
 .../visualiser/scenes/gameLobby.fxml          |  98 ++++++++++
 .../resources/visualiser/scenes/hostgame.fxml |  82 ++++----
 .../visualiser/scenes/inGameLobby.fxml        | 182 ------------------
 .../resources/visualiser/scenes/main.fxml     |   3 +-
 13 files changed, 480 insertions(+), 342 deletions(-)
 create mode 100644 racevisionGame/src/main/java/visualiser/layout/Subject3D.java
 create mode 100644 racevisionGame/src/main/java/visualiser/layout/View3D.java
 delete mode 100644 racevisionGame/src/main/java/visualiser/model/BoatDisplay3D.java
 delete mode 100644 racevisionGame/src/main/java/visualiser/model/View3D.java
 create mode 100644 racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
 delete mode 100644 racevisionGame/src/main/resources/visualiser/scenes/inGameLobby.fxml

diff --git a/dedicatedServer/pom.xml b/dedicatedServer/pom.xml
index 8702f4f9..c7a7d668 100644
--- a/dedicatedServer/pom.xml
+++ b/dedicatedServer/pom.xml
@@ -106,6 +106,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
                 <version>2.8.1</version>
+                <configuration>
+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                </configuration>
             </plugin>
         </plugins>
     </reporting>
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
index bd469643..a8d62974 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
@@ -78,7 +78,7 @@ public class HostController extends Controller {
         try{
             Socket socket = new Socket(address, port);
             hostWrapper.setVisible(false);
-            parent.enterLobby(socket, true);
+            parent.enterGameLobby(socket, true);
         } catch (IOException e) { /* Never reached */ }
     }
 
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java b/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
index 7bff7325..9f152728 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
@@ -2,40 +2,37 @@ package visualiser.Controllers;
 
 import javafx.animation.AnimationTimer;
 import javafx.application.Platform;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
+import javafx.geometry.Insets;
 import javafx.scene.control.*;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.GridPane;
-import javafx.scene.layout.Pane;
+import javafx.scene.shape.Box;
 import mock.app.Event;
 import network.Messages.Enums.RaceStatusEnum;
 import network.Messages.Enums.RequestToJoinEnum;
 import visualiser.gameController.ControllerClient;
-import visualiser.model.View3D;
+import visualiser.layout.Subject3D;
+import visualiser.layout.View3D;
+import visualiser.model.VisualiserBoat;
 import visualiser.model.VisualiserRaceEvent;
 import visualiser.model.VisualiserRaceState;
 
 import java.io.IOException;
 import java.net.Socket;
 import java.net.URL;
-import java.util.Optional;
-import java.util.ResourceBundle;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
  * Controller for Hosting a game.
  */
-public class InGameLobby extends Controller {
-
-
-//    @FXML
-//    TextField gameNameField;
-//
-//    @FXML
-//    TextField hostNameField;
-
+public class InGameLobbyController extends Controller {
     @FXML
     private ImageView imageView;
 
@@ -43,32 +40,33 @@ public class InGameLobby extends Controller {
     AnchorPane gameLobbyWrapper;
 
     @FXML
-    AnchorPane imagePane;
+    GridPane playerContainer;
+
 
     @FXML
-    SplitPane splitPane;
+    private Label playerLabel;
 
     @FXML
-    AnchorPane specPane;
+    private Label playerLabel2;
 
     @FXML
-    GridPane playerContainer;
+    private Label playerLabel3;
 
     @FXML
-    private Pane playerPane;
+    private Label playerLabel4;
 
     @FXML
-    private Pane playerPane4;
+    private Label playerLabel5;
 
     @FXML
-    private Button startButton;
+    private Label playerLabel6;
 
     @FXML
-    private Label countdownLable;
+    private Label countdownLabel;
 
     private Event game;
 
-    private View3D fancyStuff;
+    private View3D playerBoat;
 
     private VisualiserRaceEvent visualiserRaceEvent;
 
@@ -76,28 +74,82 @@ public class InGameLobby extends Controller {
 
     private ControllerClient controllerClient;
 
+    private ArrayList<Label> allPlayerLabels;
+
+    private ObservableList<Subject3D> subjects = FXCollections.observableArrayList();
+
     @Override
     public void initialize(URL location, ResourceBundle resources) {
-        fancyStuff = new View3D();
-        playerPane4.getChildren().add(fancyStuff);
-
-        //centering the 3d object
-        fancyStuff.layoutXProperty().bind(playerPane4.widthProperty().subtract(fancyStuff.widthProperty()).divide(2));
-        fancyStuff.layoutYProperty().bind(playerPane4.heightProperty().subtract(fancyStuff.heightProperty()).divide(2));
-        //playerContainer.add(fancyStuff, 0,0);
+        allPlayerLabels = new ArrayList(Arrays.asList(playerLabel, playerLabel2,
+                playerLabel3,
+                playerLabel4,
+                playerLabel5,
+                playerLabel6));
+    }
 
-        fancyStuff.spinBox();
+    private void populatePlayers(ListChangeListener.Change change){
+        Platform.runLater(
+                () -> {
+                    while (change.next()){
+                        if (change.wasAdded()){
+                            try{
+                                int count = 0;
+                                int row = 0;
+                                for (VisualiserBoat boat :this.visualiserRaceEvent.getVisualiserRaceState().getBoats()) {
+                                    View3D playerBoatToSet = new View3D();
+                                    playerBoatToSet.setItems(subjects);
+                                    playerContainer.add(playerBoatToSet, (count % 3) , row);
+                                    playerContainer.setMargin(playerBoatToSet, new Insets(10, 10, 10, 10));
+
+                                    Subject3D subject = new Subject3D(new Box());
+                                    subjects.add(subject);
+
+                                    playerBoatToSet.setDistance(50);
+                                    playerBoatToSet.setYaw(45);
+                                    playerBoatToSet.setPitch(20);
+
+
+
+                                    AnimationTimer rotate = new AnimationTimer() {
+                                        @Override
+                                        public void handle(long now) {
+                                            subject.setHeading(subject.getHeading() + 0.1);
+                                        }
+                                    };
+                                    rotate.start();
+
+                                    allPlayerLabels.get(count).setText("Player: " + boat.getSourceID());
+                                    allPlayerLabels.get(count).toFront();
+                                    count += 1;
+                                    if (count > 2){
+                                        row = 1;
+                                    }
+                                }
+                            }
+                            catch(ConcurrentModificationException e){
+                            }
+                        }
+                    }
+                }
+        );
     }
 
     /**
      * Starts the race.
      */
     private void startRace() {
+         //Initialises the race clock.
         initialiseRaceClock(this.visualiserRaceEvent.getVisualiserRaceState());
+
+
         //Starts the race countdown timer.
         countdownTimer();
     }
 
+    public AnchorPane gameLobbyWrapper(){
+        return gameLobbyWrapper;
+    }
+
     /**
      * Initialises the race clock/timer labels for the start time, current time, and remaining time.
      * @param visualiserRace The race to get data from.
@@ -117,7 +169,7 @@ public class InGameLobby extends Controller {
 
         visualiserRace.getRaceClock().durationProperty().addListener((observable, oldValue, newValue) -> {
             Platform.runLater(() -> {
-                countdownLable.setText(newValue);
+                countdownLabel.setText(newValue);
             });
         });
 
@@ -153,23 +205,20 @@ public class InGameLobby extends Controller {
      * Hosts a game.
      */
     public void enterGameLobby(Socket socket, boolean isHost){
-        splitPane.setResizableWithParent(specPane, false);
-        splitPane.lookupAll(".split-pane-divider").stream().forEach(div -> div.setMouseTransparent(true));
-        imageView.fitWidthProperty().bind(imagePane.widthProperty());
-        imageView.fitHeightProperty().bind(imagePane.heightProperty());
-        this.isHost = isHost;
-        this.controllerClient = visualiserRaceEvent.getControllerClient();
-
-        if (!isHost){
-            startButton.setVisible(false);
-        }
-
         try {
 
             this.visualiserRaceEvent = new VisualiserRaceEvent(socket, RequestToJoinEnum.PARTICIPANT);
+            this.isHost = isHost;
+            this.controllerClient = visualiserRaceEvent.getControllerClient();
+
+
+            this.visualiserRaceEvent.getVisualiserRaceState().getBoats().addListener((ListChangeListener<? super VisualiserBoat>) c ->{
+                populatePlayers(c);
+            });
+
+
             gameLobbyWrapper.setVisible(true);
             startRace();
-
         } catch (IOException e) {
             //TODO should probably let this propagate, so that we only enter this scene if everything works
             Logger.getGlobal().log(Level.WARNING, "Could not connect to server.", e);
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java b/racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
index a820e226..afbaa422 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
@@ -103,7 +103,7 @@ public class LobbyController extends Controller {
             RaceConnection connection = lobbyTable.getSelectionModel().getSelectedItem();
             Socket socket = new Socket(connection.getHostname(), connection.getPort());
             lobbyWrapper.setVisible(false);
-            parent.enterLobby(socket, false);
+            parent.enterGameLobby(socket, false);
         } catch (IOException e) { /* Never reached */
             e.printStackTrace();
         }
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/MainController.java b/racevisionGame/src/main/java/visualiser/Controllers/MainController.java
index 5a5b772c..dee2cd54 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/MainController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/MainController.java
@@ -27,6 +27,7 @@ public class MainController extends Controller {
     @FXML private TitleController titleController;
     @FXML private HostController hostController;
     @FXML private LobbyController lobbyController;
+    @FXML private InGameLobbyController inGameLobbyController;
 
     private MatchBrowserInterface matchBrowserInterface;
     private DatagramSocket udpSocket;
@@ -57,6 +58,15 @@ public class MainController extends Controller {
 
     public void endEvent() throws IOException { hostController.endEvent(); }
 
+    /**
+     * Transitions from the server selection screen to the pre-race lobby for a given server.
+     * @param socket The server to read data from.
+     * @param isHost is connection a host
+     */
+    public void enterGameLobby(Socket socket, Boolean isHost) {
+        inGameLobbyController.enterGameLobby(socket, isHost);
+    }
+
     /**
      * Transitions from the server selection screen to the pre-race lobby for a given server.
      * @param socket The server to read data from.
@@ -112,12 +122,13 @@ public class MainController extends Controller {
         titleController.setParent(this);
         hostController.setParent(this);
         lobbyController.setParent(this);
+        inGameLobbyController.setParent(this);
 
 
-        AnchorPane.setTopAnchor(startController.startWrapper(), 0.0);
-        AnchorPane.setBottomAnchor(startController.startWrapper(), 0.0);
-        AnchorPane.setLeftAnchor(startController.startWrapper(), 0.0);
-        AnchorPane.setRightAnchor(startController.startWrapper(), 0.0);
+        AnchorPane.setTopAnchor(inGameLobbyController.gameLobbyWrapper(), 0.0);
+        AnchorPane.setBottomAnchor(inGameLobbyController.gameLobbyWrapper(), 0.0);
+        AnchorPane.setLeftAnchor(inGameLobbyController.gameLobbyWrapper(), 0.0);
+        AnchorPane.setRightAnchor(inGameLobbyController.gameLobbyWrapper(), 0.0);
 
         AnchorPane.setTopAnchor(lobbyController.startWrapper(), 0.0);
         AnchorPane.setBottomAnchor(lobbyController.startWrapper(), 0.0);
diff --git a/racevisionGame/src/main/java/visualiser/layout/Subject3D.java b/racevisionGame/src/main/java/visualiser/layout/Subject3D.java
new file mode 100644
index 00000000..e3b1fc3e
--- /dev/null
+++ b/racevisionGame/src/main/java/visualiser/layout/Subject3D.java
@@ -0,0 +1,68 @@
+package visualiser.layout;
+
+import javafx.scene.shape.Shape3D;
+import javafx.scene.transform.Rotate;
+import javafx.scene.transform.Translate;
+
+/**
+ * Wrapper for controlling the position and heading of rendered 3D models.
+ */
+public class Subject3D {
+    /**
+     * Rendered mesh
+     */
+    private Shape3D mesh;
+
+    /**
+     * Position translation updated by state listeners
+     */
+    private Translate position;
+
+    /**
+     * Heading rotation updated by state listeners
+     */
+    private Rotate heading;
+
+    /**
+     * Constructor for view subject wrapper
+     * @param mesh to be rendered
+     */
+    public Subject3D(Shape3D mesh) {
+        this.mesh = mesh;
+        this.position = new Translate();
+        this.heading = new Rotate(0, Rotate.Y_AXIS);
+
+        this.mesh.getTransforms().addAll(position, heading, new Rotate(90, Rotate.X_AXIS), new Rotate(180, Rotate.Y_AXIS));
+        this.position.xProperty().addListener(((observable, oldValue, newValue) -> System.out.println("Boat x: " + newValue)));
+        this.position.yProperty().addListener(((observable, oldValue, newValue) -> System.out.println("Boat y: " + newValue)));
+        this.position.zProperty().addListener(((observable, oldValue, newValue) -> System.out.println("Boat z: " + newValue)));
+    }
+
+    public Shape3D getMesh() {
+        return mesh;
+    }
+
+    public Translate getPosition() {
+        return this.position;
+    }
+
+    public void setX(double x) {
+        position.setX(x);
+    }
+
+    public void setY(double y) {
+        position.setY(y);
+    }
+
+    public void setZ(double z) {
+        position.setZ(z);
+    }
+
+    public double getHeading() {
+        return heading.getAngle();
+    }
+
+    public void setHeading(double angle) {
+        heading.setAngle(angle);
+    }
+}
\ No newline at end of file
diff --git a/racevisionGame/src/main/java/visualiser/layout/View3D.java b/racevisionGame/src/main/java/visualiser/layout/View3D.java
new file mode 100644
index 00000000..d7f94df5
--- /dev/null
+++ b/racevisionGame/src/main/java/visualiser/layout/View3D.java
@@ -0,0 +1,161 @@
+package visualiser.layout;
+
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.geometry.Point3D;
+import javafx.scene.Group;
+import javafx.scene.PerspectiveCamera;
+import javafx.scene.SubScene;
+import javafx.scene.layout.Pane;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Shape3D;
+import javafx.scene.transform.Rotate;
+import javafx.scene.transform.Translate;
+
+/**
+ * Control for rendering 3D objects visible through a PerspectiveCamera. Implements Adapter Pattern to
+ * interface with camera, and allows clients to add shapes to the scene. All scenes contain sea plane and
+ * sky box, whose textures are set with special methods.
+ */
+public class View3D extends Pane {
+    /**
+     * Observable list of renderable items
+     */
+    private ObservableList<Subject3D> items;
+    /**
+     * Rendering container for shapes
+     */
+    private Group world;
+    /**
+     * Near limit of view frustum
+     */
+    private double nearClip;
+    /**
+     * Far limit of view frustum
+     */
+    private double farClip;
+    /**
+     * Camera origin
+     */
+    private Translate pivot;
+    /**
+     * Distance of camera from pivot point
+     */
+    private Translate distance;
+    /**
+     * Angle along ground between z-axis and camera
+     */
+    private Rotate yaw;
+    /**
+     * Angle between ground plane and camera direction
+     */
+    private Rotate pitch;
+
+    private PerspectiveCamera camera;
+
+    /**
+     * Default constructor for View3D. Sets up Scene and PerspectiveCamera.
+     */
+    public View3D() {
+        world = new Group();
+
+        SubScene scene = new SubScene(world, 300, 300);
+        scene.widthProperty().bind(this.widthProperty());
+        scene.heightProperty().bind(this.heightProperty());
+        scene.setFill(new Color(0.2, 0.6, 1, 1));
+
+        scene.setCamera(buildCamera());
+
+        this.getChildren().add(scene);
+    }
+
+    /**
+     * Sets up camera view frustum and binds transformations
+     * @return perspective camera
+     */
+    private PerspectiveCamera buildCamera() {
+        PerspectiveCamera camera = new PerspectiveCamera(true);
+
+        // Set up view frustum
+        nearClip = 0.1;
+        farClip = 3000.0;
+        camera.setNearClip(nearClip);
+        camera.setFarClip(farClip);
+
+        // Set up transformations
+        pivot = new Translate();
+        distance = new Translate();
+        yaw = new Rotate(0, Rotate.Y_AXIS);
+        pitch = new Rotate(0, Rotate.X_AXIS);
+        camera.getTransforms().addAll(pivot, yaw, pitch, distance);
+        centerCamera();
+
+        this.camera = camera;
+        return camera;
+    }
+
+    public void setItems(ObservableList<Subject3D> items) {
+        this.items = items;
+        this.items.addListener((ListChangeListener<? super Subject3D>) c -> {
+            while(c.next()) {
+                if (c.wasRemoved() || c.wasAdded()) {
+                    for (Subject3D shape : c.getRemoved()) world.getChildren().remove(shape.getMesh());
+                    for (Subject3D shape : c.getAddedSubList()) world.getChildren().add(shape.getMesh());
+                }
+            }
+        });
+    }
+
+    public void setNearClip(double nearClip) {
+        this.nearClip = nearClip;
+    }
+
+    public void setFarClip(double farClip) {
+        this.farClip = farClip;
+    }
+
+    public void updatePivot(Translate pivot) {
+        this.pivot.setX(pivot.getX());
+        this.pivot.setY(pivot.getY());
+        this.pivot.setZ(pivot.getZ());
+    }
+
+    public void updatePosition(double x, double y, double z) {
+        this.distance.setX(x);
+        this.distance.setY(y);
+        this.distance.setZ(z);
+    }
+
+    /**
+     * Set distance of camera from pivot
+     * @param distance in units
+     */
+    public void setDistance(double distance) {
+        this.distance.setZ(-distance);
+    }
+
+    /**
+     * Set angle of camera from z-axis along ground
+     * @param yaw in degrees
+     */
+    public void setYaw(double yaw) {
+        this.yaw.setAngle(yaw);
+    }
+
+    /**
+     * Set elevation of camera
+     * @param pitch in degrees
+     */
+    public void setPitch(double pitch) {
+        this.pitch.setAngle(-pitch);
+    }
+
+    public void centerCamera(){
+    }
+
+    public void rotateCamera(double angle, double x, double y, double z){
+        camera.setRotationAxis(new Point3D(x, y, z));
+        camera.setRotate(-90);
+    }
+
+}
\ No newline at end of file
diff --git a/racevisionGame/src/main/java/visualiser/model/BoatDisplay3D.java b/racevisionGame/src/main/java/visualiser/model/BoatDisplay3D.java
deleted file mode 100644
index 9314f5cd..00000000
--- a/racevisionGame/src/main/java/visualiser/model/BoatDisplay3D.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package visualiser.model;
-
-import com.interactivemesh.jfx.importer.Importer;
-import javafx.scene.layout.Pane;
-
-/**
- * Created by fwy13 on 29/08/17.
- */
-public class BoatDisplay3D extends Pane {
-
-
-    public BoatDisplay3D(String filePath){
-        super();
-//        Shape3D
-//        this.getChildren().add();
-    }
-
-}
diff --git a/racevisionGame/src/main/java/visualiser/model/View3D.java b/racevisionGame/src/main/java/visualiser/model/View3D.java
deleted file mode 100644
index f6937755..00000000
--- a/racevisionGame/src/main/java/visualiser/model/View3D.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package visualiser.model;
-
-import javafx.animation.AnimationTimer;
-import javafx.scene.Group;
-import javafx.scene.PerspectiveCamera;
-import javafx.scene.SubScene;
-import javafx.scene.layout.Pane;
-import javafx.scene.shape.Box;
-import javafx.scene.shape.CullFace;
-import javafx.scene.transform.Rotate;
-
-/**
- * Created by connortaylorbrown on 30/08/17.
- */
-public class View3D extends Pane {
-    SubScene scene;
-    PerspectiveCamera camera;
-    Box box;
-
-    public View3D() {
-        scene = new SubScene(this, 500, 500);
-        camera = new PerspectiveCamera();
-        scene.setCamera(camera);
-    }
-
-    public void spinBox() {
-        camera.getTransforms().add(new Rotate(-20, Rotate.X_AXIS));
-
-        box = new Box(50,50,50);
-        box.setTranslateX(100);
-        box.setTranslateY(100);
-        box.setCullFace(CullFace.BACK);
-
-        Rotate ry = new Rotate(0, 0,0,0, Rotate.Y_AXIS);
-        box.getTransforms().add(ry);
-
-        this.getChildren().add(camera);
-        this.getChildren().add(box);
-
-        AnimationTimer rotation = new AnimationTimer() {
-            @Override
-            public void handle(long now) {
-                ry.setAngle(ry.getAngle() + 0.1);
-            }
-        };
-
-        rotation.start();
-    }
-}
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml b/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
new file mode 100644
index 00000000..49b1bce3
--- /dev/null
+++ b/racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.SplitPane?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.text.Font?>
+
+<AnchorPane fx:id="gameLobbyWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" visible="false" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.InGameLobbyController">
+    <children>
+      <GridPane style="-fx-background-color: rgba(0, 0, 0, 0.5);" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <children>
+            <Button mnemonicParsing="false" onAction="#menuBtnPressed" text="Quit" GridPane.rowIndex="2">
+               <GridPane.margin>
+                  <Insets left="20.0" />
+               </GridPane.margin>
+            </Button>
+            <Label fx:id="countdownLabel" alignment="CENTER" contentDisplay="CENTER" textFill="WHITE" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2">
+               <font>
+                  <Font size="16.0" />
+               </font>
+            </Label>
+            <GridPane fx:id="playerContainer" GridPane.columnSpan="3" GridPane.rowIndex="1">
+               <columnConstraints>
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+               </columnConstraints>
+               <rowConstraints>
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+               </rowConstraints>
+               <children>
+                  <Label fx:id="playerLabel" text="No Player" GridPane.halignment="CENTER" GridPane.valignment="BOTTOM">
+                     <GridPane.margin>
+                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+                     </GridPane.margin>
+                  </Label>
+                  <Label fx:id="playerLabel4" text="No Player" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="BOTTOM">
+                     <GridPane.margin>
+                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+                     </GridPane.margin>
+                  </Label>
+                  <Label fx:id="playerLabel2" text="No Player" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="BOTTOM">
+                     <GridPane.margin>
+                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+                     </GridPane.margin>
+                  </Label>
+                  <Label fx:id="playerLabel3" text="No Player" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.valignment="BOTTOM">
+                     <GridPane.margin>
+                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+                     </GridPane.margin>
+                  </Label>
+                  <Label fx:id="playerLabel5" text="No Player" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="BOTTOM">
+                     <GridPane.margin>
+                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+                     </GridPane.margin>
+                  </Label>
+                  <Label fx:id="playerLabel6" text="No Player" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="BOTTOM">
+                     <GridPane.margin>
+                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+                     </GridPane.margin>
+                  </Label>
+               </children>
+            </GridPane>
+            <Label text="Get Ready For The Next Race" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
+               <font>
+                  <Font name="Cabin-Bold" size="17.0" />
+               </font>
+            </Label>
+         </children>
+         <columnConstraints>
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+         </columnConstraints>
+         <rowConstraints>
+            <RowConstraints maxHeight="80.0" minHeight="80.0" prefHeight="80.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="1.7976931348623157E308" minHeight="250.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="80.0" minHeight="80.0" prefHeight="80.0" vgrow="SOMETIMES" />
+         </rowConstraints>
+      </GridPane>
+    </children>
+</AnchorPane>
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml b/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
index ab14abaf..901cd255 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
@@ -1,44 +1,40 @@
-<!--<?xml version="1.0" encoding="UTF-8"?>-->
+<?xml version="1.0" encoding="UTF-8"?>
 
-<!--<?import java.lang.*?>-->
-<!--<?import javafx.scene.control.*?>-->
-<!--<?import javafx.scene.text.*?>-->
-<!--<?import javafx.scene.control.Button?>-->
-<!--<?import javafx.scene.control.Label?>-->
-<!--<?import javafx.scene.layout.*?>-->
-<!--<?import javafx.scene.text.Font?>-->
-
-<!--<AnchorPane fx:id="hostWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" visible="false" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">-->
-   <!--<children>-->
-      <!--<GridPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">-->
-        <!--<columnConstraints>-->
-            <!--<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />-->
-          <!--<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />-->
-          <!--<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />-->
-        <!--</columnConstraints>-->
-        <!--<rowConstraints>-->
-          <!--<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />-->
-          <!--<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />-->
-          <!--<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />-->
-        <!--</rowConstraints>-->
-         <!--<children>-->
-            <!--<Button fx:id="hostGameBtn" mnemonicParsing="false" onAction="#hostGamePressed" text="Start Game" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2">-->
-               <!--<font>-->
-                  <!--<Font size="20.0" />-->
-               <!--</font>-->
-            <!--</Button>-->
-            <!--<Label text="Address: 127.0.0.1" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="TOP">-->
-               <!--<font>-->
-                  <!--<Font size="17.0" />-->
-               <!--</font>-->
-            <!--</Label>-->
-            <!--<Label text="Port: 4942" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1">-->
-               <!--<font>-->
-                  <!--<Font size="17.0" />-->
-               <!--</font>-->
-            <!--</Label>-->
-            <!--<Button mnemonicParsing="false" onAction="#menuBtnPressed" text="Main Menu" GridPane.halignment="CENTER" />-->
-         <!--</children>-->
-      <!--</GridPane>-->
-   <!--</children>-->
-<!--</AnchorPane>-->
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.Font?>
+<AnchorPane fx:id="hostWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" visible="false" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.HostController">
+    <children>
+        <GridPane AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+            <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            </columnConstraints>
+            <rowConstraints>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+            </rowConstraints>
+            <children>
+                <Button fx:id="hostGameBtn" mnemonicParsing="false" onAction="#hostGamePressed" text="Start Game" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2">
+                    <font>
+                        <Font size="20.0" />
+                    </font>
+                </Button>
+                <Label text="Address: 127.0.0.1" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="TOP">
+                    <font>
+                        <Font size="17.0" />
+                    </font>
+                </Label>
+                <Label text="Port: 4942" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1">
+                    <font>
+                        <Font size="17.0" />
+                    </font>
+                </Label>
+                <Button mnemonicParsing="false" onAction="#menuBtnPressed" text="Main Menu" GridPane.halignment="CENTER" />
+            </children>
+        </GridPane>
+    </children>
+</AnchorPane>
\ No newline at end of file
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/inGameLobby.fxml b/racevisionGame/src/main/resources/visualiser/scenes/inGameLobby.fxml
deleted file mode 100644
index bc41218d..00000000
--- a/racevisionGame/src/main/resources/visualiser/scenes/inGameLobby.fxml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.image.*?>
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.SplitPane?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.text.Font?>
-
-<AnchorPane fx:id="hostWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.InGameLobby">
-   <children>
-      <SplitPane fx:id="splitPane" dividerPositions="0.7724935732647815" layoutX="580.0" layoutY="129.0" prefHeight="160.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-        <items>
-          <AnchorPane fx:id="imagePane" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
-               <children>
-                  <ImageView fx:id="imageView" fitHeight="376.0" fitWidth="597.0" nodeOrientation="INHERIT" pickOnBounds="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                     <image>
-                        <Image url="@../images/lobby.gif" />
-                     </image></ImageView>
-                  <GridPane style="-fx-background-color: rgba(0, 0, 0, 0.5);" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                    <columnConstraints>
-                      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                    </columnConstraints>
-                    <rowConstraints>
-                        <RowConstraints maxHeight="50.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                      <RowConstraints maxHeight="1.7976931348623157E308" minHeight="10.0" prefHeight="173.0" vgrow="SOMETIMES" />
-                        <RowConstraints maxHeight="50.0" minHeight="10.0" prefHeight="50.0" vgrow="SOMETIMES" />
-                      <RowConstraints maxHeight="1.7976931348623157E308" minHeight="10.0" prefHeight="173.0" vgrow="SOMETIMES" />
-                      <RowConstraints maxHeight="50.0" minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                    </rowConstraints>
-                     <children>
-                        <AnchorPane GridPane.rowIndex="1">
-                           <children>
-                              <Pane fx:id="playerPane" layoutX="22.0" layoutY="28.0" onMouseClicked="#joinRacePressed" prefHeight="150.0" prefWidth="156.0" style="-fx-border-color: black; -fx-background-color: rgba(100, 100, 100, 0.8);" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="0.0" GridPane.rowIndex="1">
-                                 <GridPane.margin>
-                                    <Insets left="20.0" right="20.0" />
-                                 </GridPane.margin>
-                                 <padding>
-                                    <Insets left="20.0" right="20.0" />
-                                 </padding>
-                                 <opaqueInsets>
-                                    <Insets />
-                                 </opaqueInsets>
-                              </Pane>
-                              <Label alignment="CENTER" contentDisplay="CENTER" text="No Player" AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
-                           </children>
-                        </AnchorPane>
-                        <AnchorPane layoutX="10.0" layoutY="78.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
-                           <children>
-                              <Pane layoutX="22.0" layoutY="28.0" onMouseClicked="#joinRacePressed" prefHeight="150.0" prefWidth="156.0" style="-fx-border-color: black; -fx-background-color: rgba(100, 100, 100, 0.8);" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="0.0" GridPane.rowIndex="1">
-                                 <opaqueInsets>
-                                    <Insets />
-                                 </opaqueInsets>
-                                 <padding>
-                                    <Insets left="20.0" right="20.0" />
-                                 </padding>
-                                 <GridPane.margin>
-                                    <Insets left="20.0" right="20.0" />
-                                 </GridPane.margin>
-                              </Pane>
-                              <Label alignment="CENTER" contentDisplay="CENTER" text="No Player" AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
-                           </children>
-                        </AnchorPane>
-                        <AnchorPane layoutX="209.0" layoutY="78.0" GridPane.columnIndex="2" GridPane.rowIndex="1">
-                           <children>
-                              <Pane layoutX="22.0" layoutY="28.0" onMouseClicked="#joinRacePressed" prefHeight="150.0" prefWidth="156.0" style="-fx-border-color: black; -fx-background-color: rgba(100, 100, 100, 0.8);" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="0.0" GridPane.rowIndex="1">
-                                 <opaqueInsets>
-                                    <Insets />
-                                 </opaqueInsets>
-                                 <padding>
-                                    <Insets left="20.0" right="20.0" />
-                                 </padding>
-                                 <GridPane.margin>
-                                    <Insets left="20.0" right="20.0" />
-                                 </GridPane.margin>
-                              </Pane>
-                              <Label alignment="CENTER" contentDisplay="CENTER" text="No Player" AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
-                           </children>
-                        </AnchorPane>
-                        <AnchorPane layoutX="408.0" layoutY="78.0" GridPane.rowIndex="3">
-                           <children>
-                              <Pane fx:id="playerPane4" layoutX="22.0" layoutY="28.0" onMouseClicked="#joinRacePressed" prefHeight="150.0" prefWidth="156.0" style="-fx-border-color: black; -fx-background-color: rgba(100, 100, 100, 0.8);" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="0.0" GridPane.rowIndex="1">
-                                 <opaqueInsets>
-                                    <Insets />
-                                 </opaqueInsets>
-                                 <padding>
-                                    <Insets left="20.0" right="20.0" />
-                                 </padding>
-                                 <GridPane.margin>
-                                    <Insets left="20.0" right="20.0" />
-                                 </GridPane.margin>
-                              </Pane>
-                              <Label alignment="CENTER" contentDisplay="CENTER" text="No Player" AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
-                           </children>
-                        </AnchorPane>
-                        <AnchorPane layoutX="10.0" layoutY="334.0" GridPane.columnIndex="1" GridPane.rowIndex="3">
-                           <children>
-                              <Pane layoutX="22.0" layoutY="28.0" onMouseClicked="#joinRacePressed" prefHeight="150.0" prefWidth="156.0" style="-fx-border-color: black; -fx-background-color: rgba(100, 100, 100, 0.8);" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="0.0" GridPane.rowIndex="1">
-                                 <opaqueInsets>
-                                    <Insets />
-                                 </opaqueInsets>
-                                 <padding>
-                                    <Insets left="20.0" right="20.0" />
-                                 </padding>
-                                 <GridPane.margin>
-                                    <Insets left="20.0" right="20.0" />
-                                 </GridPane.margin>
-                              </Pane>
-                              <Label alignment="CENTER" contentDisplay="CENTER" text="No Player" AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
-                           </children>
-                        </AnchorPane>
-                        <AnchorPane layoutX="209.0" layoutY="334.0" GridPane.columnIndex="2" GridPane.rowIndex="3">
-                           <children>
-                              <Pane layoutX="22.0" layoutY="28.0" onMouseClicked="#joinRacePressed" prefHeight="150.0" prefWidth="156.0" style="-fx-border-color: black; -fx-background-color: rgba(100, 100, 100, 0.8);" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="0.0" GridPane.rowIndex="1">
-                                 <opaqueInsets>
-                                    <Insets />
-                                 </opaqueInsets>
-                                 <padding>
-                                    <Insets left="20.0" right="20.0" />
-                                 </padding>
-                                 <GridPane.margin>
-                                    <Insets left="20.0" right="20.0" />
-                                 </GridPane.margin>
-                              </Pane>
-                              <Label alignment="CENTER" contentDisplay="CENTER" text="No Player" AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" />
-                           </children>
-                        </AnchorPane>
-                        <Button mnemonicParsing="false" onAction="#menuBtnPressed" text="Quit" GridPane.rowIndex="4">
-                           <GridPane.margin>
-                              <Insets left="20.0" />
-                           </GridPane.margin>
-                        </Button>
-                        <Button alignment="CENTER_RIGHT" contentDisplay="RIGHT" mnemonicParsing="false" onAction="#startBtnPressed" text="Start Game" GridPane.columnIndex="2" GridPane.halignment="RIGHT" GridPane.rowIndex="4">
-                           <GridPane.margin>
-                              <Insets right="20.0" />
-                           </GridPane.margin>
-                        </Button>
-                        <Label alignment="CENTER" contentDisplay="CENTER" text="Map: MapNameHere" textFill="WHITE" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2">
-                           <font>
-                              <Font size="16.0" />
-                           </font>
-                        </Label>
-                     </children>
-                  </GridPane>
-                  <Label alignment="TOP_CENTER" text="Get Ready For The Next Race" textFill="#fffdfd" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="20.0">
-                     <font>
-                        <Font size="22.0" />
-                     </font>
-                  </Label>
-               </children>
-            </AnchorPane>
-          <AnchorPane fx:id="specPane" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
-               <children>
-                  <TableView onMouseClicked="#joinSpecPressed" prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: rgba(60, 60, 60, 1);" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                    <columns>
-                      <TableColumn prefWidth="173.0" text="Spectators" />
-                    </columns>
-                     <columnResizePolicy>
-                        <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-                     </columnResizePolicy>
-                  </TableView>
-               </children>
-            </AnchorPane>
-        </items>
-      </SplitPane>
-   </children>
-</AnchorPane>
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/main.fxml b/racevisionGame/src/main/resources/visualiser/scenes/main.fxml
index 7aff44c0..f6ebbab4 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/main.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/main.fxml
@@ -7,8 +7,9 @@
         <fx:include fx:id="start" source="start.fxml" />
         <fx:include fx:id="connection" source="connect.fxml" />
         <fx:include fx:id="finish" source="finish.fxml" />
-        <fx:include fx:id="host" source="hostlobby.fxml" />
+        <fx:include fx:id="host" source="hostgame.fxml" />
         <fx:include fx:id="title" source="titleScreen.fxml" />
         <fx:include fx:id="lobby" source="lobby.fxml" />
+        <fx:include fx:id="inGameLobby" source="gameLobby.fxml" />
     </children>
 </AnchorPane>