From bedd742c9325ec59256b4e9c3f86ca25af15eb6c Mon Sep 17 00:00:00 2001
From: Alistair McIntyre <ajm412@uclive.ac.nz>
Date: Mon, 14 Aug 2017 13:26:51 +1200
Subject: [PATCH 01/15] Started on Request/Response packets for the Boat
 customization to begin the boat customization process.

tags: #story[1142]
---
 .../server/messages/ChatterMessage.java       |  4 +--
 .../messages/CustomizeRequestMessage.java     | 19 +++++++++++
 .../server/messages/CustomizeRequestType.java | 31 +++++++++++++++++
 .../messages/CustomizeResponseType.java       | 34 +++++++++++++++++++
 4 files changed, 85 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java
 create mode 100644 src/main/java/seng302/gameServer/server/messages/CustomizeRequestType.java
 create mode 100644 src/main/java/seng302/gameServer/server/messages/CustomizeResponseType.java

diff --git a/src/main/java/seng302/gameServer/server/messages/ChatterMessage.java b/src/main/java/seng302/gameServer/server/messages/ChatterMessage.java
index 1295b725..08cce58f 100644
--- a/src/main/java/seng302/gameServer/server/messages/ChatterMessage.java
+++ b/src/main/java/seng302/gameServer/server/messages/ChatterMessage.java
@@ -1,8 +1,6 @@
 package seng302.gameServer.server.messages;
 
-/**
- * Created by kre39 on 20/07/17.
- */
+
 public class ChatterMessage extends Message {
 
     private final long MESSAGE_VERSION_NUMBER = 1;
diff --git a/src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java b/src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java
new file mode 100644
index 00000000..943da0ba
--- /dev/null
+++ b/src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java
@@ -0,0 +1,19 @@
+package seng302.gameServer.server.messages;
+
+
+public class CustomizeRequestMessage extends Message {
+
+    CustomizeRequestType customizeType;
+    private static int MESSAGE_LENGTH = 2;
+
+    private Double sourceID;
+
+    public CustomizeRequestMessage(CustomizeRequestType customizeType, Double sourceID,)
+
+    @Override
+    public int getSize() {
+        return 1; // placeholder
+    }
+
+
+}
diff --git a/src/main/java/seng302/gameServer/server/messages/CustomizeRequestType.java b/src/main/java/seng302/gameServer/server/messages/CustomizeRequestType.java
new file mode 100644
index 00000000..86aae5a5
--- /dev/null
+++ b/src/main/java/seng302/gameServer/server/messages/CustomizeRequestType.java
@@ -0,0 +1,31 @@
+package seng302.gameServer.server.messages;
+
+// TODO: 14/08/17 ajm412: this may eventually need adjusting due to conforming to the agreed spec.
+public enum CustomizeRequestType {
+    NAME(0x00),
+    COLOR(0x01),
+    SHAPE(0x02);
+
+    private int type;
+
+    CustomizeRequestType(int type) {
+        this.type = type;
+    }
+
+    int getType() {
+        return this.type;
+    }
+
+    public static CustomizeRequestType getRequestType(int typeCode) {
+        switch (typeCode) {
+            case 0x00:
+                return NAME;
+            case 0x01:
+                return COLOR;
+            case 0x02:
+                return SHAPE;
+            default:
+                return null;
+        }
+    }
+}
diff --git a/src/main/java/seng302/gameServer/server/messages/CustomizeResponseType.java b/src/main/java/seng302/gameServer/server/messages/CustomizeResponseType.java
new file mode 100644
index 00000000..b26780b9
--- /dev/null
+++ b/src/main/java/seng302/gameServer/server/messages/CustomizeResponseType.java
@@ -0,0 +1,34 @@
+package seng302.gameServer.server.messages;
+
+// TODO: 14/08/17 ajm412: this may eventually need adjusting due to conforming to the agreed spec.
+public enum CustomizeResponseType {
+    SUCCESS(0x00),
+    FAILURE(0x01),
+    FAILURE_MALFORMED_DATA(0x02),
+    FAILURE_INCOMPATIBLE(0x03);
+
+    private int type;
+
+    CustomizeResponseType(int type) {
+        this.type = type;
+    }
+
+    int getType() {
+        return this.type;
+    }
+
+    public static CustomizeResponseType getResponseType(int typeCode) {
+        switch (typeCode) {
+            case 0x00:
+                return SUCCESS;
+            case 0x01:
+                return FAILURE;
+            case 0x02:
+                return FAILURE_MALFORMED_DATA;
+            case 0x03:
+                return FAILURE_INCOMPATIBLE;
+            default:
+                return null;
+        }
+    }
+}

From 9420717b442630ce0581f030d6cc2cc1e0f0b2d0 Mon Sep 17 00:00:00 2001
From: Alistair McIntyre <ajm412@uclive.ac.nz>
Date: Mon, 14 Aug 2017 13:38:41 +1200
Subject: [PATCH 02/15] Added Messages to MessageType, continued working on
 request.

tags: #story[1142]
---
 .../server/messages/CustomizeRequestMessage.java   | 14 ++++++++++++--
 .../gameServer/server/messages/MessageType.java    |  5 ++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java b/src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java
index 943da0ba..1f5bd126 100644
--- a/src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java
+++ b/src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java
@@ -3,12 +3,22 @@ package seng302.gameServer.server.messages;
 
 public class CustomizeRequestMessage extends Message {
 
-    CustomizeRequestType customizeType;
+
     private static int MESSAGE_LENGTH = 2;
 
+    //Message fields
     private Double sourceID;
+    private CustomizeRequestType customizeType;
 
-    public CustomizeRequestMessage(CustomizeRequestType customizeType, Double sourceID,)
+    public CustomizeRequestMessage(CustomizeRequestType customizeType, Double sourceID) {
+        setHeader(
+            new Header(MessageType.CUSTOMIZATION_REQUEST, sourceID.intValue(), (short) getSize()));
+
+        allocateBuffer();
+        writeHeaderToBuffer();
+
+
+    }
 
     @Override
     public int getSize() {
diff --git a/src/main/java/seng302/gameServer/server/messages/MessageType.java b/src/main/java/seng302/gameServer/server/messages/MessageType.java
index 4552d781..6b32fd65 100644
--- a/src/main/java/seng302/gameServer/server/messages/MessageType.java
+++ b/src/main/java/seng302/gameServer/server/messages/MessageType.java
@@ -19,7 +19,10 @@ public enum MessageType {
     AVERAGE_WIND(47),
     BOAT_ACTION(100),
     REGISTRATION_REQUEST(101),
-    REGISTRATION_RESPONSE(102);
+    REGISTRATION_RESPONSE(102),
+    CUSTOMIZATION_REQUEST(103),
+    CUSTOMIZATION_RESPONSE(104);
+
 
     private int code;
 

From 3754b71f4dd21ac4e8ab29062c031ca99e2b5dcf Mon Sep 17 00:00:00 2001
From: Alistair McIntyre <ajm412@uclive.ac.nz>
Date: Mon, 14 Aug 2017 14:31:02 +1200
Subject: [PATCH 03/15] Merged updated develop into branch. tags: #story[1142]

---
 .../gameServer/server/messages/CustomizeRequestMessage.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java b/src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java
index 1f5bd126..e08d6e61 100644
--- a/src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java
+++ b/src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java
@@ -1,6 +1,6 @@
 package seng302.gameServer.server.messages;
 
-
+// TODO: 14/08/17 ajm412: this may eventually need adjusting due to conforming to the agreed spec.
 public class CustomizeRequestMessage extends Message {
 
 
@@ -22,7 +22,7 @@ public class CustomizeRequestMessage extends Message {
 
     @Override
     public int getSize() {
-        return 1; // placeholder
+        return MESSAGE_LENGTH; // placeholder
     }
 
 

From 1f09005147184c54c04c9828dfbc3bd9c75f3dfe Mon Sep 17 00:00:00 2001
From: Alistair McIntyre <ajm412@uclive.ac.nz>
Date: Mon, 14 Aug 2017 15:30:42 +1200
Subject: [PATCH 04/15] Message types for Request and Response created, and
 Messages for them also created. tags: #story[1142]

---
 .../messages/CustomizeRequestMessage.java     | 18 ++++++++----
 .../messages/CustomizeResponseMessage.java    | 28 +++++++++++++++++++
 2 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/seng302/gameServer/server/messages/CustomizeResponseMessage.java

diff --git a/src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java b/src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java
index e08d6e61..8c2eb5a4 100644
--- a/src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java
+++ b/src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java
@@ -4,25 +4,31 @@ package seng302.gameServer.server.messages;
 public class CustomizeRequestMessage extends Message {
 
 
-    private static int MESSAGE_LENGTH = 2;
+    private static int MESSAGE_LENGTH = 6;
 
     //Message fields
-    private Double sourceID;
     private CustomizeRequestType customizeType;
+    private Integer payloadLength;
 
-    public CustomizeRequestMessage(CustomizeRequestType customizeType, Double sourceID) {
-        setHeader(
-            new Header(MessageType.CUSTOMIZATION_REQUEST, sourceID.intValue(), (short) getSize()));
+    public CustomizeRequestMessage(CustomizeRequestType customizeType, double sourceID,
+        byte[] payload) {
+        setHeader(new Header(MessageType.CUSTOMIZATION_REQUEST, 1, (short) getSize()));
 
         allocateBuffer();
         writeHeaderToBuffer();
 
+        payloadLength = payload.length;
+        putInt((int) sourceID, 4);
+        putInt((int) customizeType.getType(), 2);
+        putBytes(payload);
 
+        writeCRC();
+        rewind();
     }
 
     @Override
     public int getSize() {
-        return MESSAGE_LENGTH; // placeholder
+        return MESSAGE_LENGTH + payloadLength; // placeholder
     }
 
 
diff --git a/src/main/java/seng302/gameServer/server/messages/CustomizeResponseMessage.java b/src/main/java/seng302/gameServer/server/messages/CustomizeResponseMessage.java
new file mode 100644
index 00000000..d3380ea8
--- /dev/null
+++ b/src/main/java/seng302/gameServer/server/messages/CustomizeResponseMessage.java
@@ -0,0 +1,28 @@
+package seng302.gameServer.server.messages;
+
+/**
+ * Created by ajm412 on 14/08/17.
+ */
+public class CustomizeResponseMessage extends Message {
+
+    private static int MESSAGE_LENGTH = 2;
+
+    public CustomizeResponseMessage(CustomizeResponseType responseType) {
+        setHeader(new Header(MessageType.CUSTOMIZATION_RESPONSE, 1, (short) getSize()));
+
+        allocateBuffer();
+        writeHeaderToBuffer();
+
+        putInt(responseType.getType(), 2);
+
+        writeCRC();
+        rewind();
+    }
+
+    @Override
+    public int getSize() {
+        return MESSAGE_LENGTH; // placeholder
+    }
+
+
+}

From 9cb5956f3c3a991f5bd50651d1383da00ecaea3b Mon Sep 17 00:00:00 2001
From: Alistair McIntyre <ajm412@uclive.ac.nz>
Date: Tue, 15 Aug 2017 16:48:23 +1200
Subject: [PATCH 05/15] Updated lobby controller to pass the player ID through,
 and the lobby view to have a customize button.

tags: #story[1142]
---
 src/main/java/seng302/visualiser/GameClient.java   |  8 +++++---
 .../visualiser/controllers/LobbyController.java    | 14 ++++++++++++++
 src/main/resources/views/LobbyView.fxml            |  4 +++-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/main/java/seng302/visualiser/GameClient.java b/src/main/java/seng302/visualiser/GameClient.java
index 028ea1e3..2a2ce3d4 100644
--- a/src/main/java/seng302/visualiser/GameClient.java
+++ b/src/main/java/seng302/visualiser/GameClient.java
@@ -72,7 +72,6 @@ public class GameClient {
 
         socketThread.addStreamObserver(this::parsePackets);
         LobbyController lobbyController = loadLobby();
-        lobbyController.setPlayerListSource(clientLobbyList);
         lobbyController.disableReadyButton();
         lobbyController.setTitle("Connected to host - IP : " + ipAddress + " Port : " + portNumber);
         lobbyController.addCloseListener((exitCause) -> this.loadStartScreen());
@@ -93,7 +92,6 @@ public class GameClient {
         }
         socketThread.addStreamObserver(this::parsePackets);
         LobbyController lobbyController = loadLobby();
-        lobbyController.setPlayerListSource(clientLobbyList);
         lobbyController.setTitle("Hosting Lobby - IP : " + ipAddress + " Port : " + portNumber);
         lobbyController.addCloseListener(exitCause -> {
             if (exitCause == CloseStatus.READY) {
@@ -133,7 +131,11 @@ public class GameClient {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        return fxmlLoader.getController();
+        LobbyController lobbyController = fxmlLoader.getController();
+        lobbyController.setPlayerListSource(clientLobbyList);
+        lobbyController.setPlayerID(socketThread.getClientId());
+
+        return lobbyController;
     }
 
     private void loadRaceView() {
diff --git a/src/main/java/seng302/visualiser/controllers/LobbyController.java b/src/main/java/seng302/visualiser/controllers/LobbyController.java
index 809bd3b5..113ae70e 100644
--- a/src/main/java/seng302/visualiser/controllers/LobbyController.java
+++ b/src/main/java/seng302/visualiser/controllers/LobbyController.java
@@ -14,6 +14,7 @@ import javafx.scene.image.ImageView;
 import javafx.scene.text.Text;
 import seng302.gameServer.GameStages;
 import seng302.gameServer.GameState;
+import seng302.visualiser.GameView;
 
 /**
  * A class describing the actions of the lobby screen
@@ -72,6 +73,7 @@ public class LobbyController {
     private List<TextArea> listViews = new ArrayList<>();
 
     private int MAX_NUM_PLAYERS = 8;
+    private Integer playerID;
 
     private List<LobbyCloseListener> lobbyListeners = new ArrayList<>();
     private ObservableList<String> players;
@@ -98,6 +100,9 @@ public class LobbyController {
         //Update players if one added.
         for (int i = 0; i < players.size(); i++) {
             listViews.get(i).setText(players.get(i));
+            if (playerID == (i + 1)) {
+                listViews.get(i).setText(listViews.get(i).getText() + " (YOU)");
+            }
             imageViews.get(i).setVisible(true);
         }
         //Update empty text fields if player left.
@@ -122,6 +127,11 @@ public class LobbyController {
         }
     }
 
+    @FXML
+    public void customize() {
+        System.out.println(playerID);
+    }
+
     @FXML
     public void leaveLobbyButtonPressed() {
         // TODO: 10/07/17 wmu16 - Finish function!
@@ -154,6 +164,10 @@ public class LobbyController {
         Platform.runLater(this::updatePlayers);
     }
 
+    public void setPlayerID(Integer id) {
+        playerID = id;
+    }
+
     public void disableReadyButton () {
         readyButton.setDisable(true);
         readyButton.setVisible(false);
diff --git a/src/main/resources/views/LobbyView.fxml b/src/main/resources/views/LobbyView.fxml
index 2ef91fd5..1280fb1c 100644
--- a/src/main/resources/views/LobbyView.fxml
+++ b/src/main/resources/views/LobbyView.fxml
@@ -35,6 +35,7 @@
       <GridPane prefHeight="166.0" prefWidth="1530.0" GridPane.rowIndex="2">
         <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>
@@ -42,7 +43,8 @@
         </rowConstraints>
          <children>
             <Button fx:id="readyButton" focusTraversable="false" mnemonicParsing="false" onAction="#readyButtonPressed" prefWidth="101.0" text="Ready" GridPane.halignment="CENTER" />
-            <Button focusTraversable="false" mnemonicParsing="false" onAction="#leaveLobbyButtonPressed" text="Leave Lobby" GridPane.columnIndex="1" GridPane.halignment="CENTER" />
+            <Button focusTraversable="false" mnemonicParsing="false" onAction="#leaveLobbyButtonPressed" text="Leave Lobby" GridPane.columnIndex="2" GridPane.halignment="CENTER" />
+            <Button focusTraversable="false" mnemonicParsing="false" onAction="#customize" text="Customization" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
          </children>
       </GridPane>
       <GridPane GridPane.rowIndex="1">

From 1db75a8ae464cb8c30bed00df56333b6acf657af Mon Sep 17 00:00:00 2001
From: Alistair McIntyre <ajm412@uclive.ac.nz>
Date: Wed, 16 Aug 2017 14:54:50 +1200
Subject: [PATCH 06/15] Request Messages now sending to server, need to update
 game and send response packet.

tags: #story[1142]
---
 .../gameServer/ServerToClientThread.java      |  3 ++
 .../messages/CustomizeRequestMessage.java     |  4 +-
 .../model/stream/packets/PacketType.java      | 11 ++++--
 .../visualiser/ClientToServerThread.java      | 11 ++++++
 .../java/seng302/visualiser/GameClient.java   |  1 +
 .../controllers/CustomizationController.java  | 39 +++++++++++++++++++
 .../controllers/LobbyController.java          | 28 ++++++++++++-
 src/main/resources/views/customizeView.fxml   | 25 ++++++++++++
 8 files changed, 115 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/seng302/visualiser/controllers/CustomizationController.java
 create mode 100644 src/main/resources/views/customizeView.fxml

diff --git a/src/main/java/seng302/gameServer/ServerToClientThread.java b/src/main/java/seng302/gameServer/ServerToClientThread.java
index bae4216c..9b773ac1 100644
--- a/src/main/java/seng302/gameServer/ServerToClientThread.java
+++ b/src/main/java/seng302/gameServer/ServerToClientThread.java
@@ -203,6 +203,9 @@ public class ServerToClientThread implements Runnable, Observer {
 
                                 completeRegistration(requestedType);
                                 break;
+
+                            case RACE_CUSTOMIZATION_REQUEST:
+                                System.out.println("CUSTOMIZATION RECEIVED");
                         }
                     } else {
                         logger.warn("Packet has been dropped", 1);
diff --git a/src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java b/src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java
index 8c2eb5a4..9407603b 100644
--- a/src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java
+++ b/src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java
@@ -12,12 +12,12 @@ public class CustomizeRequestMessage extends Message {
 
     public CustomizeRequestMessage(CustomizeRequestType customizeType, double sourceID,
         byte[] payload) {
+        payloadLength = payload.length;
         setHeader(new Header(MessageType.CUSTOMIZATION_REQUEST, 1, (short) getSize()));
-
         allocateBuffer();
         writeHeaderToBuffer();
 
-        payloadLength = payload.length;
+
         putInt((int) sourceID, 4);
         putInt((int) customizeType.getType(), 2);
         putBytes(payload);
diff --git a/src/main/java/seng302/model/stream/packets/PacketType.java b/src/main/java/seng302/model/stream/packets/PacketType.java
index 1a38ae14..baf2ff42 100644
--- a/src/main/java/seng302/model/stream/packets/PacketType.java
+++ b/src/main/java/seng302/model/stream/packets/PacketType.java
@@ -1,8 +1,5 @@
 package seng302.model.stream.packets;
 
-/**
- * Created by Kusal on 4/24/2017.
- */
 public enum PacketType {
     HEARTBEAT,
     RACE_STATUS,
@@ -21,7 +18,9 @@ public enum PacketType {
     BOAT_ACTION,
     OTHER,
     RACE_REGISTRATION_REQUEST,
-    RACE_REGISTRATION_RESPONSE;
+    RACE_REGISTRATION_RESPONSE,
+    RACE_CUSTOMIZATION_REQUEST,
+    RACE_CUSTOMIZATION_RESPONSE;
 
     public static PacketType assignPacketType(int packetType, byte[] payload){
         switch(packetType){
@@ -62,6 +61,10 @@ public enum PacketType {
                 return RACE_REGISTRATION_REQUEST;
             case 102:
                 return RACE_REGISTRATION_RESPONSE;
+            case 103:
+                return RACE_CUSTOMIZATION_REQUEST;
+            case 104:
+                return RACE_CUSTOMIZATION_RESPONSE;
             default:
         }
         return OTHER;
diff --git a/src/main/java/seng302/visualiser/ClientToServerThread.java b/src/main/java/seng302/visualiser/ClientToServerThread.java
index 9f76d37c..a37e2703 100644
--- a/src/main/java/seng302/visualiser/ClientToServerThread.java
+++ b/src/main/java/seng302/visualiser/ClientToServerThread.java
@@ -24,6 +24,8 @@ import org.slf4j.LoggerFactory;
 import seng302.gameServer.server.messages.BoatAction;
 import seng302.gameServer.server.messages.BoatActionMessage;
 import seng302.gameServer.server.messages.ClientType;
+import seng302.gameServer.server.messages.CustomizeRequestMessage;
+import seng302.gameServer.server.messages.CustomizeRequestType;
 import seng302.gameServer.server.messages.Message;
 import seng302.gameServer.server.messages.RegistrationRequestMessage;
 import seng302.gameServer.server.messages.RegistrationResponseStatus;
@@ -173,6 +175,15 @@ public class ClientToServerThread implements Runnable {
         clientLog("Closed connection to Server", 0);
     }
 
+    public void sendCustomizationRequest(CustomizeRequestType reqType, byte[] payload) {
+        CustomizeRequestMessage requestMessage = new CustomizeRequestMessage(reqType, this.clientId, payload);
+        try {
+            os.write(requestMessage.getBuffer());
+        } catch (IOException e) {
+            logger.error("Could not send customization request");
+        }
+
+    }
 
     /**
      * Sends a request to the server asking for a source ID
diff --git a/src/main/java/seng302/visualiser/GameClient.java b/src/main/java/seng302/visualiser/GameClient.java
index 15328eab..1d4522b8 100644
--- a/src/main/java/seng302/visualiser/GameClient.java
+++ b/src/main/java/seng302/visualiser/GameClient.java
@@ -136,6 +136,7 @@ public class GameClient {
             e.printStackTrace();
         }
         LobbyController lobbyController = fxmlLoader.getController();
+        lobbyController.setSocketThread(socketThread);
         lobbyController.setPlayerListSource(clientLobbyList);
         lobbyController.setPlayerID(socketThread.getClientId());
 
diff --git a/src/main/java/seng302/visualiser/controllers/CustomizationController.java b/src/main/java/seng302/visualiser/controllers/CustomizationController.java
new file mode 100644
index 00000000..be70db7c
--- /dev/null
+++ b/src/main/java/seng302/visualiser/controllers/CustomizationController.java
@@ -0,0 +1,39 @@
+package seng302.visualiser.controllers;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ColorPicker;
+import javafx.scene.control.TextField;
+import seng302.gameServer.server.messages.CustomizeRequestType;
+import seng302.visualiser.ClientToServerThread;
+
+public class CustomizationController {
+
+    @FXML
+    private TextField nameField;
+
+    @FXML
+    private ColorPicker boatColorPicker;
+
+    @FXML
+    private Button customizeSubmit;
+
+    private ClientToServerThread socketThread;
+
+    public void initialize() {
+
+    }
+
+    public void setServerThread(ClientToServerThread ctsThread) {
+        this.socketThread = ctsThread;
+    }
+
+    @FXML
+    public void submitCustomization() {
+        System.out.println("Attempting to send");
+        socketThread.sendCustomizationRequest(CustomizeRequestType.NAME, nameField.getText().getBytes());
+    }
+
+
+
+}
diff --git a/src/main/java/seng302/visualiser/controllers/LobbyController.java b/src/main/java/seng302/visualiser/controllers/LobbyController.java
index 113ae70e..4af72b25 100644
--- a/src/main/java/seng302/visualiser/controllers/LobbyController.java
+++ b/src/main/java/seng302/visualiser/controllers/LobbyController.java
@@ -1,5 +1,8 @@
 package seng302.visualiser.controllers;
 
+import com.sun.deploy.util.SessionState.Client;
+import com.sun.media.jfxmedia.logging.Logger;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -7,13 +10,18 @@ import javafx.application.Platform;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.TextArea;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.text.Text;
+import javafx.stage.Stage;
 import seng302.gameServer.GameStages;
 import seng302.gameServer.GameState;
+import seng302.visualiser.ClientToServerThread;
 import seng302.visualiser.GameView;
 
 /**
@@ -72,6 +80,8 @@ public class LobbyController {
     private List<ImageView> imageViews = new ArrayList<>();
     private List<TextArea> listViews = new ArrayList<>();
 
+    private ClientToServerThread socketThread;
+
     private int MAX_NUM_PLAYERS = 8;
     private Integer playerID;
 
@@ -129,7 +139,23 @@ public class LobbyController {
 
     @FXML
     public void customize() {
-        System.out.println(playerID);
+        Parent root;
+        try {
+            FXMLLoader fxmlLoader = new FXMLLoader(LobbyController.class.getResource("/views/customizeView.fxml"));
+            root = fxmlLoader.load();
+            Stage customizeStage = new Stage();
+            CustomizationController cc = fxmlLoader.getController();
+            cc.setServerThread(this.socketThread);
+            customizeStage.setTitle("Customize Boat");
+            customizeStage.setScene(new Scene(root, 700, 450));
+            customizeStage.show();
+        } catch (IOException e) {
+            Logger.logMsg(4, "Failed to load Customization View from resources.");
+        }
+    }
+
+    public void setSocketThread(ClientToServerThread thread) {
+        this.socketThread = thread;
     }
 
     @FXML
diff --git a/src/main/resources/views/customizeView.fxml b/src/main/resources/views/customizeView.fxml
new file mode 100644
index 00000000..f70205d3
--- /dev/null
+++ b/src/main/resources/views/customizeView.fxml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.text.*?>
+<?import javafx.scene.control.*?>
+<?import java.lang.*?>
+<?import javafx.scene.layout.*?>
+
+<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.visualiser.controllers.CustomizationController">
+  <columnConstraints>
+    <ColumnConstraints fillWidth="false" halignment="CENTER" 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>
+      <TextField fx:id="nameField" GridPane.columnIndex="1" />
+      <ColorPicker fx:id="boatColorPicker" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
+      <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Player Name" />
+      <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Boat Color" GridPane.rowIndex="1" />
+      <Button fx:id="customizeSubmit" mnemonicParsing="false" onAction="#submitCustomization" text="Submit" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="CENTER" />
+   </children>
+</GridPane>

From 4fc00f8a3c58f5b6faca02ecd37f213ef6867e07 Mon Sep 17 00:00:00 2001
From: Alistair McIntyre <ajm412@uclive.ac.nz>
Date: Wed, 16 Aug 2017 17:57:22 +1200
Subject: [PATCH 07/15] Boat names now change, just the issue of the lobby not
 updating unless another person joins/leaves to try and fix.

tags: #story[1142]
---
 .../java/seng302/gameServer/GameState.java    | 13 ++++++++
 .../gameServer/ServerPacketParser.java        | 10 ++++--
 .../gameServer/ServerToClientThread.java      | 32 +++++++++++--------
 src/main/java/seng302/model/ServerYacht.java  |  4 +++
 .../controllers/CustomizationController.java  |  3 ++
 5 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java
index a6716807..764f0f66 100644
--- a/src/main/java/seng302/gameServer/GameState.java
+++ b/src/main/java/seng302/gameServer/GameState.java
@@ -10,6 +10,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import seng302.gameServer.server.messages.BoatAction;
 import seng302.gameServer.server.messages.BoatStatus;
+import seng302.gameServer.server.messages.CustomizeRequestType;
 import seng302.gameServer.server.messages.MarkRoundingMessage;
 import seng302.gameServer.server.messages.MarkType;
 import seng302.gameServer.server.messages.Message;
@@ -509,6 +510,18 @@ public class GameState implements Runnable {
         return false;
     }
 
+    public static void customizePlayer(long playerID, CustomizeRequestType requestType,
+        byte[] customizeData) {
+        System.out.println(playerID + " " + requestType.toString());
+        ServerYacht playerYacht = yachts.get((int) playerID);
+
+        if (requestType.equals(CustomizeRequestType.NAME)) {
+            String name = new String(customizeData);
+            System.out.println(playerYacht.getBoatName());
+            playerYacht.setBoatName(name);
+            System.out.println(playerYacht.getBoatName());
+        }
+    }
 
     private static Mark markCollidedWith(ServerYacht yacht) {
         Set<Mark> marksInRace = GameState.getMarks();
diff --git a/src/main/java/seng302/gameServer/ServerPacketParser.java b/src/main/java/seng302/gameServer/ServerPacketParser.java
index 84f8fd17..4b62c933 100644
--- a/src/main/java/seng302/gameServer/ServerPacketParser.java
+++ b/src/main/java/seng302/gameServer/ServerPacketParser.java
@@ -1,11 +1,11 @@
 package seng302.gameServer;
 
 import java.util.Arrays;
-
+import seng302.gameServer.server.messages.BoatAction;
 import seng302.gameServer.server.messages.ClientType;
+import seng302.gameServer.server.messages.CustomizeRequestType;
 import seng302.gameServer.server.messages.Message;
 import seng302.model.stream.packets.StreamPacket;
-import seng302.gameServer.server.messages.BoatAction;
 
 
 public class ServerPacketParser {
@@ -22,5 +22,11 @@ public class ServerPacketParser {
         long value = Message.bytesToLong(Arrays.copyOfRange(payload, 0, 1));
         return ClientType.getClientType((int) value);
     }
+
+    public static CustomizeRequestType extractCustomizationType(StreamPacket packet) {
+        byte[] payload = packet.getPayload();
+        long type = Message.bytesToLong(Arrays.copyOfRange(payload, 4, 5));
+        return CustomizeRequestType.getRequestType((int) type);
+    }
 }
 
diff --git a/src/main/java/seng302/gameServer/ServerToClientThread.java b/src/main/java/seng302/gameServer/ServerToClientThread.java
index 9b773ac1..2f26b67e 100644
--- a/src/main/java/seng302/gameServer/ServerToClientThread.java
+++ b/src/main/java/seng302/gameServer/ServerToClientThread.java
@@ -10,6 +10,7 @@ import java.io.OutputStream;
 import java.net.Socket;
 import java.net.SocketException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Observable;
 import java.util.Observer;
@@ -19,26 +20,23 @@ import java.util.zip.CRC32;
 import java.util.zip.Checksum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import seng302.gameServer.server.messages.BoatAction;
+import seng302.gameServer.server.messages.BoatLocationMessage;
+import seng302.gameServer.server.messages.ClientType;
+import seng302.gameServer.server.messages.CustomizeRequestType;
+import seng302.gameServer.server.messages.Message;
+import seng302.gameServer.server.messages.RegistrationResponseMessage;
+import seng302.gameServer.server.messages.RegistrationResponseStatus;
+import seng302.gameServer.server.messages.XMLMessage;
+import seng302.gameServer.server.messages.XMLMessageSubType;
 import seng302.gameServer.server.messages.YachtEventCodeMessage;
 import seng302.model.Player;
+import seng302.model.ServerYacht;
 import seng302.model.stream.packets.PacketType;
 import seng302.model.stream.packets.StreamPacket;
 import seng302.model.stream.xml.generator.Race;
 import seng302.model.stream.xml.generator.Regatta;
 import seng302.utilities.XMLGenerator;
-import seng302.gameServer.server.messages.BoatAction;
-import seng302.gameServer.server.messages.BoatLocationMessage;
-import seng302.gameServer.server.messages.BoatSubMessage;
-import seng302.gameServer.server.messages.ClientType;
-import seng302.gameServer.server.messages.Message;
-import seng302.gameServer.server.messages.RaceStatus;
-import seng302.gameServer.server.messages.RaceStatusMessage;
-import seng302.gameServer.server.messages.RaceType;
-import seng302.gameServer.server.messages.RegistrationResponseMessage;
-import seng302.gameServer.server.messages.RegistrationResponseStatus;
-import seng302.gameServer.server.messages.XMLMessage;
-import seng302.gameServer.server.messages.XMLMessageSubType;
-import seng302.model.ServerYacht;
 
 /**
  * A class describing a single connection to a Client for the purposes of sending and receiving on
@@ -206,6 +204,14 @@ public class ServerToClientThread implements Runnable, Observer {
 
                             case RACE_CUSTOMIZATION_REQUEST:
                                 System.out.println("CUSTOMIZATION RECEIVED");
+                                Long sourceID = Message
+                                    .bytesToLong(Arrays.copyOfRange(payload, 0, 3));
+                                CustomizeRequestType requestType = ServerPacketParser
+                                    .extractCustomizationType(
+                                        new StreamPacket(type, payloadLength, timeStamp, payload));
+                                GameState.customizePlayer(sourceID, requestType,
+                                    Arrays.copyOfRange(payload, 6, payload.length));
+                                break;
                         }
                     } else {
                         logger.warn("Packet has been dropped", 1);
diff --git a/src/main/java/seng302/model/ServerYacht.java b/src/main/java/seng302/model/ServerYacht.java
index 2f10929c..9abbd520 100644
--- a/src/main/java/seng302/model/ServerYacht.java
+++ b/src/main/java/seng302/model/ServerYacht.java
@@ -298,6 +298,10 @@ public class ServerYacht extends Observable {
         return country;
     }
 
+    public void setBoatName(String name) {
+        boatName = name;
+        shortName = name.split(" ")[0];
+    }
 
     public GeoPoint getLocation() {
         return location;
diff --git a/src/main/java/seng302/visualiser/controllers/CustomizationController.java b/src/main/java/seng302/visualiser/controllers/CustomizationController.java
index be70db7c..08e1c9d0 100644
--- a/src/main/java/seng302/visualiser/controllers/CustomizationController.java
+++ b/src/main/java/seng302/visualiser/controllers/CustomizationController.java
@@ -32,6 +32,9 @@ public class CustomizationController {
     public void submitCustomization() {
         System.out.println("Attempting to send");
         socketThread.sendCustomizationRequest(CustomizeRequestType.NAME, nameField.getText().getBytes());
+        // TODO: 16/08/17 ajm412: Turn colors into byte array.
+        socketThread.sendCustomizationRequest(CustomizeRequestType.COLOR,
+            boatColorPicker.getValue().toString().getBytes());
     }
 
 

From 02a7b804c1abf36a573db9d3d984e34babe5cc67 Mon Sep 17 00:00:00 2001
From: Alistair McIntyre <ajm412@uclive.ac.nz>
Date: Wed, 16 Aug 2017 19:31:27 +1200
Subject: [PATCH 08/15] Boat Names Change. Colors Change too. Updates clients
 during lobby when a change is made.

tags: #story[1142]
---
 .../java/seng302/gameServer/GameState.java    | 10 ++++++--
 .../seng302/gameServer/MainServerThread.java  | 18 ++++++++++++---
 .../gameServer/ServerToClientThread.java      |  1 +
 src/main/java/seng302/model/ServerYacht.java  | 11 +++++++++
 .../java/seng302/utilities/XMLParser.java     |  2 ++
 .../java/seng302/visualiser/GameView.java     |  5 ++--
 .../controllers/CustomizationController.java  | 23 +++++++++++++++++--
 .../controllers/LobbyController.java          | 10 ++++----
 .../server_config/xml_templates/boats.ftlh    |  2 +-
 9 files changed, 67 insertions(+), 15 deletions(-)

diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java
index e67d6d71..6a150fc9 100644
--- a/src/main/java/seng302/gameServer/GameState.java
+++ b/src/main/java/seng302/gameServer/GameState.java
@@ -6,6 +6,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import javafx.scene.paint.Color;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.slf4j.Logger;
@@ -578,9 +579,14 @@ public class GameState implements Runnable {
 
         if (requestType.equals(CustomizeRequestType.NAME)) {
             String name = new String(customizeData);
-            System.out.println(playerYacht.getBoatName());
             playerYacht.setBoatName(name);
-            System.out.println(playerYacht.getBoatName());
+        } else if (requestType.equals(CustomizeRequestType.COLOR)) {
+            System.out.println(customizeData.length);
+            int red = customizeData[0] & 0xFF;
+            int green = customizeData[1] & 0xFF;
+            int blue = customizeData[2] & 0xFF;
+            Color yachtColor = Color.rgb(red, green, blue);
+            playerYacht.setBoatColor(yachtColor);
         }
     }
 
diff --git a/src/main/java/seng302/gameServer/MainServerThread.java b/src/main/java/seng302/gameServer/MainServerThread.java
index fe0d9017..cce67458 100644
--- a/src/main/java/seng302/gameServer/MainServerThread.java
+++ b/src/main/java/seng302/gameServer/MainServerThread.java
@@ -1,6 +1,5 @@
 package seng302.gameServer;
 
-import gherkin.lexer.Fi;
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.time.LocalDateTime;
@@ -8,8 +7,13 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
-
-import seng302.gameServer.server.messages.*;
+import seng302.gameServer.server.messages.BoatSubMessage;
+import seng302.gameServer.server.messages.Message;
+import seng302.gameServer.server.messages.RaceStartNotificationType;
+import seng302.gameServer.server.messages.RaceStartStatusMessage;
+import seng302.gameServer.server.messages.RaceStatus;
+import seng302.gameServer.server.messages.RaceStatusMessage;
+import seng302.gameServer.server.messages.RaceType;
 import seng302.model.GeoPoint;
 import seng302.model.Player;
 import seng302.model.PolarTable;
@@ -73,6 +77,14 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
                 serverLog("Interrupted exception in Main Server Thread thread sleep", 1);
             }
 
+            if (GameState.getCurrentStage() == GameStages.LOBBYING) {
+                // TODO: 16/08/17 ajm412: This can probably be done in a nicer way via those fancy functional interfaces.
+                for (ServerToClientThread thread : serverToClientThreads) {
+                    thread.sendSetupMessages();
+                }
+
+            }
+
             if (GameState.getCurrentStage() == GameStages.PRE_RACE) {
                 updateClients();
             }
diff --git a/src/main/java/seng302/gameServer/ServerToClientThread.java b/src/main/java/seng302/gameServer/ServerToClientThread.java
index c9ece2b4..4d215716 100644
--- a/src/main/java/seng302/gameServer/ServerToClientThread.java
+++ b/src/main/java/seng302/gameServer/ServerToClientThread.java
@@ -211,6 +211,7 @@ public class ServerToClientThread implements Runnable, Observer {
                                         new StreamPacket(type, payloadLength, timeStamp, payload));
                                 GameState.customizePlayer(sourceID, requestType,
                                     Arrays.copyOfRange(payload, 6, payload.length));
+                                sendSetupMessages();
                                 break;
                         }
                     } else {
diff --git a/src/main/java/seng302/model/ServerYacht.java b/src/main/java/seng302/model/ServerYacht.java
index 28397a64..e8b2b1e7 100644
--- a/src/main/java/seng302/model/ServerYacht.java
+++ b/src/main/java/seng302/model/ServerYacht.java
@@ -3,6 +3,7 @@ package seng302.model;
 import java.util.HashMap;
 import java.util.Observable;
 import java.util.Observer;
+import javafx.scene.paint.Color;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import seng302.gameServer.GameState;
@@ -30,6 +31,8 @@ public class ServerYacht extends Observable {
     private String country;
     private BoatStatus boatStatus;
 
+    private Color boatColor;
+
 
     //Location
     private Double lastHeading;
@@ -65,6 +68,7 @@ public class ServerYacht extends Observable {
         this.heading = 120.0;   //In degrees
         this.currentVelocity = 0d;     //in mms-1
         this.currentMarkSeqID = 0;
+        this.boatColor = Color.rgb(0, 0, 0);
 
         this.hasEnteredRoundingZone = false;
         this.hasPassedLine = false;
@@ -385,5 +389,12 @@ public class ServerYacht extends Observable {
         return hasPassedLine;
     }
 
+    public void setBoatColor(Color color) {
+        this.boatColor = color;
+    }
+
+    public Color getBoatColor() {
+        return boatColor;
+    }
 
 }
diff --git a/src/main/java/seng302/utilities/XMLParser.java b/src/main/java/seng302/utilities/XMLParser.java
index a08a0769..d7556234 100644
--- a/src/main/java/seng302/utilities/XMLParser.java
+++ b/src/main/java/seng302/utilities/XMLParser.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javafx.scene.paint.Color;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -142,6 +143,7 @@ public class XMLParser {
                     XMLParser.getNodeAttributeString(currentBoat, "ShortName"),
                     XMLParser.getNodeAttributeString(currentBoat, "BoatName"),
                     XMLParser.getNodeAttributeString(currentBoat, "Country"));
+                yacht.setColour(Color.web(getNodeAttributeString(currentBoat, "Color")));
                 if (yacht.getBoatType().equals("Yacht")) {
                     competingBoats.put(yacht.getSourceId(), yacht);
                 }
diff --git a/src/main/java/seng302/visualiser/GameView.java b/src/main/java/seng302/visualiser/GameView.java
index cf8ecd95..45ba0fc4 100644
--- a/src/main/java/seng302/visualiser/GameView.java
+++ b/src/main/java/seng302/visualiser/GameView.java
@@ -23,9 +23,8 @@ import javafx.scene.paint.Paint;
 import javafx.scene.shape.Circle;
 import javafx.scene.shape.Polygon;
 import javafx.scene.text.Text;
-import seng302.model.ClientYacht;
 import javafx.util.Duration;
-import seng302.model.Colors;
+import seng302.model.ClientYacht;
 import seng302.model.GeoPoint;
 import seng302.model.Limit;
 import seng302.model.mark.CompoundMark;
@@ -351,7 +350,7 @@ public class GameView extends Pane {
         BoatObject newBoat;
         final List<Group> wakes = new ArrayList<>();
         for (ClientYacht clientYacht : clientYachts) {
-            Paint colour = Colors.getColor();
+            Paint colour = clientYacht.getColour();
             newBoat = new BoatObject();
             newBoat.setFill(colour);
             boatObjects.put(clientYacht, newBoat);
diff --git a/src/main/java/seng302/visualiser/controllers/CustomizationController.java b/src/main/java/seng302/visualiser/controllers/CustomizationController.java
index 08e1c9d0..6d3ad262 100644
--- a/src/main/java/seng302/visualiser/controllers/CustomizationController.java
+++ b/src/main/java/seng302/visualiser/controllers/CustomizationController.java
@@ -4,6 +4,8 @@ import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ColorPicker;
 import javafx.scene.control.TextField;
+import javafx.scene.paint.Color;
+import javafx.stage.Stage;
 import seng302.gameServer.server.messages.CustomizeRequestType;
 import seng302.visualiser.ClientToServerThread;
 
@@ -19,6 +21,7 @@ public class CustomizationController {
     private Button customizeSubmit;
 
     private ClientToServerThread socketThread;
+    private Stage windowStage;
 
     public void initialize() {
 
@@ -33,8 +36,24 @@ public class CustomizationController {
         System.out.println("Attempting to send");
         socketThread.sendCustomizationRequest(CustomizeRequestType.NAME, nameField.getText().getBytes());
         // TODO: 16/08/17 ajm412: Turn colors into byte array.
-        socketThread.sendCustomizationRequest(CustomizeRequestType.COLOR,
-            boatColorPicker.getValue().toString().getBytes());
+        Color color = boatColorPicker.getValue();
+
+        short red = (short) (color.getRed() * 255);
+        short green = (short) (color.getGreen() * 255);
+        short blue = (short) (color.getBlue() * 255);
+
+        byte[] colorArray = new byte[3];
+
+        colorArray[0] = (byte) red;
+        colorArray[1] = (byte) green;
+        colorArray[2] = (byte) blue;
+
+        socketThread.sendCustomizationRequest(CustomizeRequestType.COLOR, colorArray);
+        windowStage.close();
+    }
+
+    public void setStage(Stage stage) {
+        this.windowStage = stage;
     }
 
 
diff --git a/src/main/java/seng302/visualiser/controllers/LobbyController.java b/src/main/java/seng302/visualiser/controllers/LobbyController.java
index 86df9287..3630289b 100644
--- a/src/main/java/seng302/visualiser/controllers/LobbyController.java
+++ b/src/main/java/seng302/visualiser/controllers/LobbyController.java
@@ -1,7 +1,10 @@
 package seng302.visualiser.controllers;
 
-import java.util.*;
-
+import com.sun.media.jfxmedia.logging.Logger;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import javafx.application.Platform;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
@@ -18,9 +21,7 @@ import javafx.stage.Stage;
 import seng302.gameServer.GameStages;
 import seng302.gameServer.GameState;
 import seng302.model.RaceState;
-import seng302.visualiser.GameClient;
 import seng302.visualiser.ClientToServerThread;
-import seng302.visualiser.GameView;
 
 /**
  * A class describing the actions of the lobby screen
@@ -153,6 +154,7 @@ public class LobbyController {
             cc.setServerThread(this.socketThread);
             customizeStage.setTitle("Customize Boat");
             customizeStage.setScene(new Scene(root, 700, 450));
+            cc.setStage(customizeStage); // pass the stage through so it can be closed later.
             customizeStage.show();
         } catch (IOException e) {
             Logger.logMsg(4, "Failed to load Customization View from resources.");
diff --git a/src/main/resources/server_config/xml_templates/boats.ftlh b/src/main/resources/server_config/xml_templates/boats.ftlh
index f9a1e2d0..8186e000 100644
--- a/src/main/resources/server_config/xml_templates/boats.ftlh
+++ b/src/main/resources/server_config/xml_templates/boats.ftlh
@@ -13,7 +13,7 @@
     <Boats>
         <#list boats as boat>
             <Boat Type="Yacht" SourceID="${boat.sourceId}" ShapeID="4" HullNum="${boat.hullID}" StoweName="${boat.shortName}" ShortName="${boat.shortName}"
-                  BoatName="${boat.boatName}" Country="${boat.country}">
+                  BoatName="${boat.boatName}" Country="${boat.country}" Color="${boat.boatColor}">
                 <GPSposition Z="0" Y="3.7" X="0" />
                 <MastTop Z="0" Y="6.2" X="0" />
             </Boat>

From 67f0c213c219a8027d5a1a4417d39f22a9d57706 Mon Sep 17 00:00:00 2001
From: Alistair McIntyre <ajm412@uclive.ac.nz>
Date: Wed, 16 Aug 2017 20:38:11 +1200
Subject: [PATCH 09/15] Everything works. Needs a bit of polish, and possibly
 look at boat shapes next.

tags: #story[1142]
---
 .../java/seng302/gameServer/GameState.java    | 15 ++++++
 .../seng302/gameServer/MainServerThread.java  |  6 +--
 .../gameServer/ServerToClientThread.java      |  2 +-
 .../java/seng302/visualiser/GameClient.java   |  2 +-
 .../controllers/CustomizationController.java  |  5 ++
 .../controllers/LobbyController.java          |  2 +
 src/main/resources/views/customizeView.fxml   | 47 ++++++++++++++-----
 7 files changed, 61 insertions(+), 18 deletions(-)

diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java
index 6a150fc9..6256c428 100644
--- a/src/main/java/seng302/gameServer/GameState.java
+++ b/src/main/java/seng302/gameServer/GameState.java
@@ -60,6 +60,8 @@ public class GameState implements Runnable {
     public static Double windDirection;
     private static Double windSpeed;
 
+    private static Boolean customizationFlag;
+
     private static String hostIpAddress;
     private static List<Player> players;
     private static Map<Integer, ServerYacht> yachts;
@@ -91,6 +93,7 @@ public class GameState implements Runnable {
         yachts = new HashMap<>();
         players = new ArrayList<>();
         GameState.hostIpAddress = hostIpAddress;
+        customizationFlag = false;
 
         currentStage = GameStages.LOBBYING;
         isRaceStarted = false;
@@ -668,4 +671,16 @@ public class GameState implements Runnable {
     public static void addMarkPassListener(NewMessageListener listener) {
         markListeners.add(listener);
     }
+
+    public static void setCustomizationFlag() {
+        customizationFlag = true;
+    }
+
+    public static Boolean getCustomizationFlag() {
+        return customizationFlag;
+    }
+
+    public static void resetCustomizationFlag() {
+        customizationFlag = false;
+    }
 }
diff --git a/src/main/java/seng302/gameServer/MainServerThread.java b/src/main/java/seng302/gameServer/MainServerThread.java
index cce67458..800e715a 100644
--- a/src/main/java/seng302/gameServer/MainServerThread.java
+++ b/src/main/java/seng302/gameServer/MainServerThread.java
@@ -76,13 +76,13 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
             } catch (InterruptedException e) {
                 serverLog("Interrupted exception in Main Server Thread thread sleep", 1);
             }
-
-            if (GameState.getCurrentStage() == GameStages.LOBBYING) {
+            if (GameState.getCurrentStage() == GameStages.LOBBYING && GameState
+                .getCustomizationFlag()) {
                 // TODO: 16/08/17 ajm412: This can probably be done in a nicer way via those fancy functional interfaces.
                 for (ServerToClientThread thread : serverToClientThreads) {
                     thread.sendSetupMessages();
                 }
-
+                GameState.resetCustomizationFlag();
             }
 
             if (GameState.getCurrentStage() == GameStages.PRE_RACE) {
diff --git a/src/main/java/seng302/gameServer/ServerToClientThread.java b/src/main/java/seng302/gameServer/ServerToClientThread.java
index 4d215716..6686a767 100644
--- a/src/main/java/seng302/gameServer/ServerToClientThread.java
+++ b/src/main/java/seng302/gameServer/ServerToClientThread.java
@@ -211,7 +211,7 @@ public class ServerToClientThread implements Runnable, Observer {
                                         new StreamPacket(type, payloadLength, timeStamp, payload));
                                 GameState.customizePlayer(sourceID, requestType,
                                     Arrays.copyOfRange(payload, 6, payload.length));
-                                sendSetupMessages();
+                                GameState.setCustomizationFlag();
                                 break;
                         }
                     } else {
diff --git a/src/main/java/seng302/visualiser/GameClient.java b/src/main/java/seng302/visualiser/GameClient.java
index 4222653d..2898faa8 100644
--- a/src/main/java/seng302/visualiser/GameClient.java
+++ b/src/main/java/seng302/visualiser/GameClient.java
@@ -241,7 +241,7 @@ public class GameClient {
                     );
                     clientLobbyList.clear();
                     allBoatsMap.forEach((id, boat) ->
-                        clientLobbyList.add(id + " " + boat.getBoatName())
+                        clientLobbyList.add(boat.getBoatName())
                     );
                     break;
 
diff --git a/src/main/java/seng302/visualiser/controllers/CustomizationController.java b/src/main/java/seng302/visualiser/controllers/CustomizationController.java
index 6d3ad262..fc00f2a0 100644
--- a/src/main/java/seng302/visualiser/controllers/CustomizationController.java
+++ b/src/main/java/seng302/visualiser/controllers/CustomizationController.java
@@ -25,6 +25,8 @@ public class CustomizationController {
 
     public void initialize() {
 
+        boatColorPicker.setValue(new Color(0.0, 0.0, 0.0, 1.0));
+
     }
 
     public void setServerThread(ClientToServerThread ctsThread) {
@@ -56,6 +58,9 @@ public class CustomizationController {
         this.windowStage = stage;
     }
 
+    public void setPlayerName(String name) {
+        this.nameField.setText(name);
+    }
 
 
 }
diff --git a/src/main/java/seng302/visualiser/controllers/LobbyController.java b/src/main/java/seng302/visualiser/controllers/LobbyController.java
index 3630289b..fd3e272a 100644
--- a/src/main/java/seng302/visualiser/controllers/LobbyController.java
+++ b/src/main/java/seng302/visualiser/controllers/LobbyController.java
@@ -149,9 +149,11 @@ public class LobbyController {
         try {
             FXMLLoader fxmlLoader = new FXMLLoader(LobbyController.class.getResource("/views/customizeView.fxml"));
             root = fxmlLoader.load();
+            root.getStylesheets().add("/css/master.css");
             Stage customizeStage = new Stage();
             CustomizationController cc = fxmlLoader.getController();
             cc.setServerThread(this.socketThread);
+            cc.setPlayerName(this.players.get(playerID - 1));
             customizeStage.setTitle("Customize Boat");
             customizeStage.setScene(new Scene(root, 700, 450));
             cc.setStage(customizeStage); // pass the stage through so it can be closed later.
diff --git a/src/main/resources/views/customizeView.fxml b/src/main/resources/views/customizeView.fxml
index f70205d3..9e97ba1b 100644
--- a/src/main/resources/views/customizeView.fxml
+++ b/src/main/resources/views/customizeView.fxml
@@ -1,25 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.text.*?>
-<?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.layout.*?>
-
-<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.visualiser.controllers.CustomizationController">
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ColorPicker?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.text.Text?>
+<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
+  prefHeight="400.0" prefWidth="600.0" style="-fx-background-color: #2C2c36;"
+  xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
+  fx:controller="seng302.visualiser.controllers.CustomizationController">
   <columnConstraints>
-    <ColumnConstraints fillWidth="false" halignment="CENTER" hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+      <ColumnConstraints fillWidth="false" halignment="CENTER" hgrow="SOMETIMES"
+        maxWidth="1.7976931348623157E308" minWidth="1.0" percentWidth="10.0" prefWidth="1.0"/>
+      <ColumnConstraints fillWidth="false" halignment="CENTER" hgrow="SOMETIMES" maxWidth="299.0"
+        minWidth="10.0" percentWidth="30.0" prefWidth="299.0"/>
+      <ColumnConstraints hgrow="SOMETIMES" maxWidth="299.0" minWidth="10.0" percentWidth="50.0"
+        prefWidth="154.0"/>
+      <ColumnConstraints hgrow="SOMETIMES" maxWidth="123.0" minWidth="0.0" percentWidth="10.0"
+        prefWidth="122.0"/>
   </columnConstraints>
   <rowConstraints>
+      <RowConstraints minHeight="10.0" percentHeight="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 minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+      <RowConstraints minHeight="10.0" percentHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
   </rowConstraints>
    <children>
-      <TextField fx:id="nameField" GridPane.columnIndex="1" />
-      <ColorPicker fx:id="boatColorPicker" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
-      <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Player Name" />
-      <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Boat Color" GridPane.rowIndex="1" />
-      <Button fx:id="customizeSubmit" mnemonicParsing="false" onAction="#submitCustomization" text="Submit" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="CENTER" />
+       <TextField fx:id="nameField" maxWidth="200.0" minWidth="200.0" prefWidth="200.0"
+         GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="1"
+         GridPane.valignment="CENTER"/>
+       <ColorPicker fx:id="boatColorPicker" prefWidth="200.0" style="-fx-background-color: eeeeee;"
+         GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="2"
+         GridPane.valignment="CENTER"/>
+       <Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="Player Name"
+         GridPane.columnIndex="1" GridPane.rowIndex="1"/>
+       <Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="Boat Color"
+         GridPane.columnIndex="1" GridPane.rowIndex="2"/>
+       <Button fx:id="customizeSubmit" mnemonicParsing="false" onAction="#submitCustomization"
+         text="Submit" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="3"
+         GridPane.valignment="CENTER"/>
    </children>
 </GridPane>

From 6e02d3e5334cd1adf5d904cfc534b2beaa19c871 Mon Sep 17 00:00:00 2001
From: alistairjmcintyre <alistairjmcintyre@gmail.com>
Date: Thu, 17 Aug 2017 01:20:16 +1200
Subject: [PATCH 10/15] Added some general UI improvements such as autofilling
 the color field of the form, and looked at how best to deal with response
 packets, as it should be part of the spec.

tags: #story[1142]
---
 .../seng302/gameServer/ServerToClientThread.java |  3 +--
 src/main/java/seng302/model/ClientYacht.java     |  1 +
 src/main/java/seng302/model/Colors.java          |  9 ++-------
 src/main/java/seng302/model/ServerYacht.java     |  2 +-
 .../controllers/CustomizationController.java     | 12 ++++++++++--
 .../visualiser/controllers/LobbyController.java  | 16 ++++++++++++++++
 src/test/java/seng302/ColorsTest.java            |  2 +-
 7 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/main/java/seng302/gameServer/ServerToClientThread.java b/src/main/java/seng302/gameServer/ServerToClientThread.java
index 6686a767..5896b6b9 100644
--- a/src/main/java/seng302/gameServer/ServerToClientThread.java
+++ b/src/main/java/seng302/gameServer/ServerToClientThread.java
@@ -186,7 +186,6 @@ public class ServerToClientThread implements Runnable, Observer {
                     long computedCrc = checksum.getValue();
                     long packetCrc = Message.bytesToLong(getBytes(4));
                     if (computedCrc == packetCrc) {
-                        //System.out.println("RECEIVED A PACKET");
                         switch (PacketType.assignPacketType(type, payload)) {
                             case BOAT_ACTION:
                                 BoatAction actionType = ServerPacketParser
@@ -203,7 +202,6 @@ public class ServerToClientThread implements Runnable, Observer {
                                 break;
 
                             case RACE_CUSTOMIZATION_REQUEST:
-                                System.out.println("CUSTOMIZATION RECEIVED");
                                 Long sourceID = Message
                                     .bytesToLong(Arrays.copyOfRange(payload, 0, 3));
                                 CustomizeRequestType requestType = ServerPacketParser
@@ -212,6 +210,7 @@ public class ServerToClientThread implements Runnable, Observer {
                                 GameState.customizePlayer(sourceID, requestType,
                                     Arrays.copyOfRange(payload, 6, payload.length));
                                 GameState.setCustomizationFlag();
+                                //// TODO: 17/08/2017 ajm412: Send a response packet here. 
                                 break;
                         }
                     } else {
diff --git a/src/main/java/seng302/model/ClientYacht.java b/src/main/java/seng302/model/ClientYacht.java
index 564754b0..709345bb 100644
--- a/src/main/java/seng302/model/ClientYacht.java
+++ b/src/main/java/seng302/model/ClientYacht.java
@@ -71,6 +71,7 @@ public class ClientYacht extends Observable {
         this.heading = 120.0;   //In degrees
         this.currentVelocity = 0d;
         this.boatStatus = 1;
+        this.colour = Color.rgb(0, 0, 0, 1.0);
     }
 
     /**
diff --git a/src/main/java/seng302/model/Colors.java b/src/main/java/seng302/model/Colors.java
index 81829262..c3afef90 100644
--- a/src/main/java/seng302/model/Colors.java
+++ b/src/main/java/seng302/model/Colors.java
@@ -8,12 +8,7 @@ import javafx.scene.paint.Color;
 public enum Colors {
     RED, PERU, GOLD, GREEN, BLUE, PURPLE, DEEPPINK, GRAY;
 
-    static Integer index = 0;
-
-    public static Color getColor() {
-        if (index == 8) {
-            index = 0;
-        }
-        return Color.valueOf(values()[index++].toString());
+    public static Color getColor(Integer index) {
+        return Color.valueOf(values()[index].toString());
     }
 }
diff --git a/src/main/java/seng302/model/ServerYacht.java b/src/main/java/seng302/model/ServerYacht.java
index e8b2b1e7..755f9946 100644
--- a/src/main/java/seng302/model/ServerYacht.java
+++ b/src/main/java/seng302/model/ServerYacht.java
@@ -68,7 +68,7 @@ public class ServerYacht extends Observable {
         this.heading = 120.0;   //In degrees
         this.currentVelocity = 0d;     //in mms-1
         this.currentMarkSeqID = 0;
-        this.boatColor = Color.rgb(0, 0, 0);
+        this.boatColor = Colors.getColor(sourceId - 1);
 
         this.hasEnteredRoundingZone = false;
         this.hasPassedLine = false;
diff --git a/src/main/java/seng302/visualiser/controllers/CustomizationController.java b/src/main/java/seng302/visualiser/controllers/CustomizationController.java
index fc00f2a0..ea8db318 100644
--- a/src/main/java/seng302/visualiser/controllers/CustomizationController.java
+++ b/src/main/java/seng302/visualiser/controllers/CustomizationController.java
@@ -20,13 +20,12 @@ public class CustomizationController {
     @FXML
     private Button customizeSubmit;
 
+    private LobbyController lc;
     private ClientToServerThread socketThread;
     private Stage windowStage;
 
     public void initialize() {
 
-        boatColorPicker.setValue(new Color(0.0, 0.0, 0.0, 1.0));
-
     }
 
     public void setServerThread(ClientToServerThread ctsThread) {
@@ -51,9 +50,14 @@ public class CustomizationController {
         colorArray[2] = (byte) blue;
 
         socketThread.sendCustomizationRequest(CustomizeRequestType.COLOR, colorArray);
+        lc.setPlayersColor(color);
         windowStage.close();
     }
 
+    public void setLobbyController(LobbyController lc) {
+        this.lc = lc;
+    }
+
     public void setStage(Stage stage) {
         this.windowStage = stage;
     }
@@ -62,5 +66,9 @@ public class CustomizationController {
         this.nameField.setText(name);
     }
 
+    public void setPlayerColor(Color playerColor) {
+        this.boatColorPicker.setValue(playerColor);
+    }
+
 
 }
diff --git a/src/main/java/seng302/visualiser/controllers/LobbyController.java b/src/main/java/seng302/visualiser/controllers/LobbyController.java
index fd3e272a..88d29062 100644
--- a/src/main/java/seng302/visualiser/controllers/LobbyController.java
+++ b/src/main/java/seng302/visualiser/controllers/LobbyController.java
@@ -16,10 +16,12 @@ import javafx.scene.control.Button;
 import javafx.scene.control.TextArea;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
+import javafx.scene.paint.Color;
 import javafx.scene.text.Text;
 import javafx.stage.Stage;
 import seng302.gameServer.GameStages;
 import seng302.gameServer.GameState;
+import seng302.model.Colors;
 import seng302.model.RaceState;
 import seng302.visualiser.ClientToServerThread;
 
@@ -86,6 +88,8 @@ public class LobbyController {
 
     private ClientToServerThread socketThread;
 
+    private Color playersColor;
+
     private int MAX_NUM_PLAYERS = 8;
     private Integer playerID;
 
@@ -154,9 +158,16 @@ public class LobbyController {
             CustomizationController cc = fxmlLoader.getController();
             cc.setServerThread(this.socketThread);
             cc.setPlayerName(this.players.get(playerID - 1));
+
+            if (this.playersColor == null) {
+                this.playersColor = Colors.getColor(playerID - 1);
+            }
+
+            cc.setPlayerColor(this.playersColor);
             customizeStage.setTitle("Customize Boat");
             customizeStage.setScene(new Scene(root, 700, 450));
             cc.setStage(customizeStage); // pass the stage through so it can be closed later.
+            cc.setLobbyController(this);
             customizeStage.show();
         } catch (IOException e) {
             Logger.logMsg(4, "Failed to load Customization View from resources.");
@@ -218,4 +229,9 @@ public class LobbyController {
         readyButton.setDisable(true);
         readyButton.setVisible(false);
     }
+
+    public void setPlayersColor(Color playerColor) {
+        this.playersColor = playerColor;
+    }
+
 }
diff --git a/src/test/java/seng302/ColorsTest.java b/src/test/java/seng302/ColorsTest.java
index 0b4b4238..389d3ede 100644
--- a/src/test/java/seng302/ColorsTest.java
+++ b/src/test/java/seng302/ColorsTest.java
@@ -12,7 +12,7 @@ public class ColorsTest {
         Color expectedColors[] = {Color.RED, Color.PERU, Color.GOLD, Color.GREEN, Color.BLUE,
             Color.PURPLE, Color.DEEPPINK, Color.GRAY};
         for (int i = 0; i < 8; i++) {
-            Assert.assertEquals(expectedColors[i], Colors.getColor());
+            Assert.assertEquals(expectedColors[i], Colors.getColor(i));
         }
     }
 }

From d73e4f8ec5f212de4a9cbb6708fb38941196ae3e Mon Sep 17 00:00:00 2001
From: alistairjmcintyre <alistairjmcintyre@gmail.com>
Date: Thu, 17 Aug 2017 01:23:34 +1200
Subject: [PATCH 11/15] Fixed a build error.

tags: #story[1142]
---
 src/test/java/seng302/models/YachtTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/seng302/models/YachtTest.java b/src/test/java/seng302/models/YachtTest.java
index 788ae1dc..98cba53b 100644
--- a/src/test/java/seng302/models/YachtTest.java
+++ b/src/test/java/seng302/models/YachtTest.java
@@ -21,7 +21,7 @@ public class YachtTest {
 
     @BeforeClass
     public static void setUp() {
-        y1 = new ServerYacht("Yacht", 101, "Y1", "Y1", "Yacht 1", "C1");
+        y1 = new ServerYacht("Yacht", 1, "Y1", "Y1", "Yacht 1", "C1");
         gs = new GameState("localhost");
     }
 

From ac279583df4881e6ae452f51345154fb380d43f5 Mon Sep 17 00:00:00 2001
From: Alistair McIntyre <ajm412@uclive.ac.nz>
Date: Thu, 17 Aug 2017 12:31:15 +1200
Subject: [PATCH 12/15] Small documentation changes.

tags: #story[1142]
---
 src/main/java/seng302/gameServer/GameState.java       | 11 ++++++++---
 .../java/seng302/gameServer/ServerToClientThread.java |  2 +-
 src/main/resources/css/master.css                     |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java
index 6256c428..9ac1d61d 100644
--- a/src/main/java/seng302/gameServer/GameState.java
+++ b/src/main/java/seng302/gameServer/GameState.java
@@ -60,7 +60,7 @@ public class GameState implements Runnable {
     public static Double windDirection;
     private static Double windSpeed;
 
-    private static Boolean customizationFlag;
+    private static Boolean customizationFlag; // dirty flag to tell if a player has customized their boat.
 
     private static String hostIpAddress;
     private static List<Player> players;
@@ -575,16 +575,21 @@ public class GameState implements Runnable {
         return false;
     }
 
+    /**
+     * Handles player customization.
+     *
+     * @param playerID The ID of the player being modified.
+     * @param requestType the type of player customization the player wants
+     * @param customizeData the data related to the customization (color, name, shape)
+     */
     public static void customizePlayer(long playerID, CustomizeRequestType requestType,
         byte[] customizeData) {
-        System.out.println(playerID + " " + requestType.toString());
         ServerYacht playerYacht = yachts.get((int) playerID);
 
         if (requestType.equals(CustomizeRequestType.NAME)) {
             String name = new String(customizeData);
             playerYacht.setBoatName(name);
         } else if (requestType.equals(CustomizeRequestType.COLOR)) {
-            System.out.println(customizeData.length);
             int red = customizeData[0] & 0xFF;
             int green = customizeData[1] & 0xFF;
             int blue = customizeData[2] & 0xFF;
diff --git a/src/main/java/seng302/gameServer/ServerToClientThread.java b/src/main/java/seng302/gameServer/ServerToClientThread.java
index 5896b6b9..4062adf8 100644
--- a/src/main/java/seng302/gameServer/ServerToClientThread.java
+++ b/src/main/java/seng302/gameServer/ServerToClientThread.java
@@ -210,7 +210,7 @@ public class ServerToClientThread implements Runnable, Observer {
                                 GameState.customizePlayer(sourceID, requestType,
                                     Arrays.copyOfRange(payload, 6, payload.length));
                                 GameState.setCustomizationFlag();
-                                //// TODO: 17/08/2017 ajm412: Send a response packet here. 
+                                // TODO: 17/08/2017 ajm412: Send a response packet here, not really necessary until we do shapes.
                                 break;
                         }
                     } else {
diff --git a/src/main/resources/css/master.css b/src/main/resources/css/master.css
index 7620d831..f79f79f3 100644
--- a/src/main/resources/css/master.css
+++ b/src/main/resources/css/master.css
@@ -99,6 +99,7 @@ Table
     -fx-text-fill: black;
 }
 
+server thread
 .ui-table .column-header {
     -fx-background-color: transparent;
 }

From faf4600f5177b6b05af1bd3b004dff9dc9b0f409 Mon Sep 17 00:00:00 2001
From: Alistair McIntyre <ajm412@uclive.ac.nz>
Date: Thu, 17 Aug 2017 13:13:07 +1200
Subject: [PATCH 13/15] Fixed some weird bug with the messages package, trying
 to add some small QoL changes with potential interaction bugs with the
 customization/lobby menu. tags : #story[1142]

---
 .../java/seng302/gameServer/GameState.java    | 16 ++---
 .../seng302/gameServer/HeartbeatThread.java   |  4 +-
 .../seng302/gameServer/MainServerThread.java  | 14 ++---
 .../gameServer/ServerPacketParser.java        |  8 +--
 .../gameServer/ServerToClientThread.java      | 20 +++----
 .../{server => }/messages/BoatAction.java     |  2 +-
 .../messages/BoatActionMessage.java           |  2 +-
 .../messages/BoatLocationMessage.java         |  2 +-
 .../{server => }/messages/BoatStatus.java     |  2 +-
 .../{server => }/messages/BoatSubMessage.java |  2 +-
 .../{server => }/messages/ChatterMessage.java |  2 +-
 .../{server => }/messages/ClientType.java     |  2 +-
 .../messages/CustomizeRequestMessage.java     |  2 +-
 .../messages/CustomizeRequestType.java        |  2 +-
 .../messages/CustomizeResponseMessage.java    |  2 +-
 .../messages/CustomizeResponseType.java       |  2 +-
 .../{server => }/messages/DeviceType.java     |  2 +-
 .../{server => }/messages/Header.java         |  2 +-
 .../{server => }/messages/Heartbeat.java      |  2 +-
 .../{server => }/messages/MarkType.java       |  2 +-
 .../{server => }/messages/Message.java        |  2 +-
 .../{server => }/messages/MessageType.java    |  2 +-
 .../messages/RaceStartNotificationType.java   |  2 +-
 .../messages/RaceStartStatusMessage.java      |  2 +-
 .../{server => }/messages/RaceStatus.java     |  2 +-
 .../messages/RaceStatusMessage.java           |  2 +-
 .../{server => }/messages/RaceType.java       |  2 +-
 .../messages/RegistrationRequestMessage.java  |  2 +-
 .../messages/RegistrationResponseMessage.java |  2 +-
 .../messages/RegistrationResponseStatus.java  |  2 +-
 .../messages/RoundingBoatStatus.java          |  2 +-
 .../{server => }/messages/RoundingSide.java   |  2 +-
 .../{server => }/messages/XMLMessage.java     |  2 +-
 .../messages/XMLMessageSubType.java           |  2 +-
 .../messages/YachtEventCodeMessage.java       |  2 +-
 .../server/messages/MarkRoundingMessage.java  | 60 -------------------
 src/main/java/seng302/model/ServerYacht.java  |  2 +-
 .../java/seng302/model/mark/CompoundMark.java |  2 +-
 src/main/java/seng302/model/mark/Mark.java    |  2 +-
 .../java/seng302/model/mark/MarkOrder.java    |  2 +-
 .../java/seng302/utilities/XMLGenerator.java  |  2 +-
 .../visualiser/ClientToServerThread.java      | 16 ++---
 .../java/seng302/visualiser/GameClient.java   |  2 +-
 .../controllers/CustomizationController.java  |  2 +-
 .../controllers/LobbyController.java          | 17 +++++-
 src/main/resources/css/master.css             |  2 +-
 src/main/resources/views/LobbyView.fxml       |  2 +-
 .../gameServer/server/TestConversions.java    |  2 +-
 .../seng302/gameServer/server/TestHeader.java |  4 +-
 .../gameServer/server/TestMessage.java        |  6 +-
 src/test/java/steps/ToggleSailSteps.java      |  2 +-
 51 files changed, 99 insertions(+), 148 deletions(-)
 rename src/main/java/seng302/gameServer/{server => }/messages/BoatAction.java (94%)
 rename src/main/java/seng302/gameServer/{server => }/messages/BoatActionMessage.java (94%)
 rename src/main/java/seng302/gameServer/{server => }/messages/BoatLocationMessage.java (99%)
 rename src/main/java/seng302/gameServer/{server => }/messages/BoatStatus.java (87%)
 rename src/main/java/seng302/gameServer/{server => }/messages/BoatSubMessage.java (98%)
 rename src/main/java/seng302/gameServer/{server => }/messages/ChatterMessage.java (95%)
 rename src/main/java/seng302/gameServer/{server => }/messages/ClientType.java (93%)
 rename src/main/java/seng302/gameServer/{server => }/messages/CustomizeRequestMessage.java (95%)
 rename src/main/java/seng302/gameServer/{server => }/messages/CustomizeRequestType.java (93%)
 rename src/main/java/seng302/gameServer/{server => }/messages/CustomizeResponseMessage.java (92%)
 rename src/main/java/seng302/gameServer/{server => }/messages/CustomizeResponseType.java (94%)
 rename src/main/java/seng302/gameServer/{server => }/messages/DeviceType.java (82%)
 rename src/main/java/seng302/gameServer/{server => }/messages/Header.java (98%)
 rename src/main/java/seng302/gameServer/{server => }/messages/Heartbeat.java (92%)
 rename src/main/java/seng302/gameServer/{server => }/messages/MarkType.java (85%)
 rename src/main/java/seng302/gameServer/{server => }/messages/Message.java (99%)
 rename src/main/java/seng302/gameServer/{server => }/messages/MessageType.java (94%)
 rename src/main/java/seng302/gameServer/{server => }/messages/RaceStartNotificationType.java (88%)
 rename src/main/java/seng302/gameServer/{server => }/messages/RaceStartStatusMessage.java (97%)
 rename src/main/java/seng302/gameServer/{server => }/messages/RaceStatus.java (91%)
 rename src/main/java/seng302/gameServer/{server => }/messages/RaceStatusMessage.java (98%)
 rename src/main/java/seng302/gameServer/{server => }/messages/RaceType.java (85%)
 rename src/main/java/seng302/gameServer/{server => }/messages/RegistrationRequestMessage.java (91%)
 rename src/main/java/seng302/gameServer/{server => }/messages/RegistrationResponseMessage.java (91%)
 rename src/main/java/seng302/gameServer/{server => }/messages/RegistrationResponseStatus.java (95%)
 rename src/main/java/seng302/gameServer/{server => }/messages/RoundingBoatStatus.java (86%)
 rename src/main/java/seng302/gameServer/{server => }/messages/RoundingSide.java (96%)
 rename src/main/java/seng302/gameServer/{server => }/messages/XMLMessage.java (97%)
 rename src/main/java/seng302/gameServer/{server => }/messages/XMLMessageSubType.java (86%)
 rename src/main/java/seng302/gameServer/{server => }/messages/YachtEventCodeMessage.java (96%)
 delete mode 100644 src/main/java/seng302/gameServer/server/messages/MarkRoundingMessage.java

diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java
index 9ac1d61d..ab513b81 100644
--- a/src/main/java/seng302/gameServer/GameState.java
+++ b/src/main/java/seng302/gameServer/GameState.java
@@ -13,14 +13,14 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
-import seng302.gameServer.server.messages.BoatAction;
-import seng302.gameServer.server.messages.BoatStatus;
-import seng302.gameServer.server.messages.CustomizeRequestType;
-import seng302.gameServer.server.messages.MarkRoundingMessage;
-import seng302.gameServer.server.messages.MarkType;
-import seng302.gameServer.server.messages.Message;
-import seng302.gameServer.server.messages.RoundingBoatStatus;
-import seng302.gameServer.server.messages.YachtEventCodeMessage;
+import seng302.gameServer.messages.BoatAction;
+import seng302.gameServer.messages.BoatStatus;
+import seng302.gameServer.messages.CustomizeRequestType;
+import seng302.gameServer.messages.MarkRoundingMessage;
+import seng302.gameServer.messages.MarkType;
+import seng302.gameServer.messages.Message;
+import seng302.gameServer.messages.RoundingBoatStatus;
+import seng302.gameServer.messages.YachtEventCodeMessage;
 import seng302.model.GeoPoint;
 import seng302.model.Limit;
 import seng302.model.Player;
diff --git a/src/main/java/seng302/gameServer/HeartbeatThread.java b/src/main/java/seng302/gameServer/HeartbeatThread.java
index b168a197..8b9cd288 100644
--- a/src/main/java/seng302/gameServer/HeartbeatThread.java
+++ b/src/main/java/seng302/gameServer/HeartbeatThread.java
@@ -5,8 +5,8 @@ import java.util.Stack;
 import java.util.Timer;
 import java.util.TimerTask;
 import seng302.model.Player;
-import seng302.gameServer.server.messages.Heartbeat;
-import seng302.gameServer.server.messages.Message;
+import seng302.gameServer.messages.Heartbeat;
+import seng302.gameServer.messages.Message;
 
 /**
  * Send Heartbeat messages to connected player at a specified interval
diff --git a/src/main/java/seng302/gameServer/MainServerThread.java b/src/main/java/seng302/gameServer/MainServerThread.java
index 800e715a..5f8b000a 100644
--- a/src/main/java/seng302/gameServer/MainServerThread.java
+++ b/src/main/java/seng302/gameServer/MainServerThread.java
@@ -7,13 +7,13 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
-import seng302.gameServer.server.messages.BoatSubMessage;
-import seng302.gameServer.server.messages.Message;
-import seng302.gameServer.server.messages.RaceStartNotificationType;
-import seng302.gameServer.server.messages.RaceStartStatusMessage;
-import seng302.gameServer.server.messages.RaceStatus;
-import seng302.gameServer.server.messages.RaceStatusMessage;
-import seng302.gameServer.server.messages.RaceType;
+import seng302.gameServer.messages.BoatSubMessage;
+import seng302.gameServer.messages.Message;
+import seng302.gameServer.messages.RaceStartNotificationType;
+import seng302.gameServer.messages.RaceStartStatusMessage;
+import seng302.gameServer.messages.RaceStatus;
+import seng302.gameServer.messages.RaceStatusMessage;
+import seng302.gameServer.messages.RaceType;
 import seng302.model.GeoPoint;
 import seng302.model.Player;
 import seng302.model.PolarTable;
diff --git a/src/main/java/seng302/gameServer/ServerPacketParser.java b/src/main/java/seng302/gameServer/ServerPacketParser.java
index 4b62c933..62d971ea 100644
--- a/src/main/java/seng302/gameServer/ServerPacketParser.java
+++ b/src/main/java/seng302/gameServer/ServerPacketParser.java
@@ -1,10 +1,10 @@
 package seng302.gameServer;
 
 import java.util.Arrays;
-import seng302.gameServer.server.messages.BoatAction;
-import seng302.gameServer.server.messages.ClientType;
-import seng302.gameServer.server.messages.CustomizeRequestType;
-import seng302.gameServer.server.messages.Message;
+import seng302.gameServer.messages.BoatAction;
+import seng302.gameServer.messages.ClientType;
+import seng302.gameServer.messages.CustomizeRequestType;
+import seng302.gameServer.messages.Message;
 import seng302.model.stream.packets.StreamPacket;
 
 
diff --git a/src/main/java/seng302/gameServer/ServerToClientThread.java b/src/main/java/seng302/gameServer/ServerToClientThread.java
index 4062adf8..0ddfef21 100644
--- a/src/main/java/seng302/gameServer/ServerToClientThread.java
+++ b/src/main/java/seng302/gameServer/ServerToClientThread.java
@@ -20,16 +20,16 @@ import java.util.zip.CRC32;
 import java.util.zip.Checksum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import seng302.gameServer.server.messages.BoatAction;
-import seng302.gameServer.server.messages.BoatLocationMessage;
-import seng302.gameServer.server.messages.ClientType;
-import seng302.gameServer.server.messages.CustomizeRequestType;
-import seng302.gameServer.server.messages.Message;
-import seng302.gameServer.server.messages.RegistrationResponseMessage;
-import seng302.gameServer.server.messages.RegistrationResponseStatus;
-import seng302.gameServer.server.messages.XMLMessage;
-import seng302.gameServer.server.messages.XMLMessageSubType;
-import seng302.gameServer.server.messages.YachtEventCodeMessage;
+import seng302.gameServer.messages.BoatAction;
+import seng302.gameServer.messages.BoatLocationMessage;
+import seng302.gameServer.messages.ClientType;
+import seng302.gameServer.messages.CustomizeRequestType;
+import seng302.gameServer.messages.Message;
+import seng302.gameServer.messages.RegistrationResponseMessage;
+import seng302.gameServer.messages.RegistrationResponseStatus;
+import seng302.gameServer.messages.XMLMessage;
+import seng302.gameServer.messages.XMLMessageSubType;
+import seng302.gameServer.messages.YachtEventCodeMessage;
 import seng302.model.Player;
 import seng302.model.ServerYacht;
 import seng302.model.stream.packets.PacketType;
diff --git a/src/main/java/seng302/gameServer/server/messages/BoatAction.java b/src/main/java/seng302/gameServer/messages/BoatAction.java
similarity index 94%
rename from src/main/java/seng302/gameServer/server/messages/BoatAction.java
rename to src/main/java/seng302/gameServer/messages/BoatAction.java
index cc53668c..9003958a 100644
--- a/src/main/java/seng302/gameServer/server/messages/BoatAction.java
+++ b/src/main/java/seng302/gameServer/messages/BoatAction.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/seng302/gameServer/server/messages/BoatActionMessage.java b/src/main/java/seng302/gameServer/messages/BoatActionMessage.java
similarity index 94%
rename from src/main/java/seng302/gameServer/server/messages/BoatActionMessage.java
rename to src/main/java/seng302/gameServer/messages/BoatActionMessage.java
index 2fc084e5..419bf72e 100644
--- a/src/main/java/seng302/gameServer/server/messages/BoatActionMessage.java
+++ b/src/main/java/seng302/gameServer/messages/BoatActionMessage.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 /**
  * Created by kre39 on 12/07/17.
diff --git a/src/main/java/seng302/gameServer/server/messages/BoatLocationMessage.java b/src/main/java/seng302/gameServer/messages/BoatLocationMessage.java
similarity index 99%
rename from src/main/java/seng302/gameServer/server/messages/BoatLocationMessage.java
rename to src/main/java/seng302/gameServer/messages/BoatLocationMessage.java
index 72548c12..faf344ff 100644
--- a/src/main/java/seng302/gameServer/server/messages/BoatLocationMessage.java
+++ b/src/main/java/seng302/gameServer/messages/BoatLocationMessage.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 public class BoatLocationMessage extends Message {
 
diff --git a/src/main/java/seng302/gameServer/server/messages/BoatStatus.java b/src/main/java/seng302/gameServer/messages/BoatStatus.java
similarity index 87%
rename from src/main/java/seng302/gameServer/server/messages/BoatStatus.java
rename to src/main/java/seng302/gameServer/messages/BoatStatus.java
index 2f09dd4f..7837994b 100644
--- a/src/main/java/seng302/gameServer/server/messages/BoatStatus.java
+++ b/src/main/java/seng302/gameServer/messages/BoatStatus.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 /**
  * The current status of a boat
diff --git a/src/main/java/seng302/gameServer/server/messages/BoatSubMessage.java b/src/main/java/seng302/gameServer/messages/BoatSubMessage.java
similarity index 98%
rename from src/main/java/seng302/gameServer/server/messages/BoatSubMessage.java
rename to src/main/java/seng302/gameServer/messages/BoatSubMessage.java
index d0d57888..f6b78422 100644
--- a/src/main/java/seng302/gameServer/server/messages/BoatSubMessage.java
+++ b/src/main/java/seng302/gameServer/messages/BoatSubMessage.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/main/java/seng302/gameServer/server/messages/ChatterMessage.java b/src/main/java/seng302/gameServer/messages/ChatterMessage.java
similarity index 95%
rename from src/main/java/seng302/gameServer/server/messages/ChatterMessage.java
rename to src/main/java/seng302/gameServer/messages/ChatterMessage.java
index 08cce58f..0ac18413 100644
--- a/src/main/java/seng302/gameServer/server/messages/ChatterMessage.java
+++ b/src/main/java/seng302/gameServer/messages/ChatterMessage.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 
 public class ChatterMessage extends Message {
diff --git a/src/main/java/seng302/gameServer/server/messages/ClientType.java b/src/main/java/seng302/gameServer/messages/ClientType.java
similarity index 93%
rename from src/main/java/seng302/gameServer/server/messages/ClientType.java
rename to src/main/java/seng302/gameServer/messages/ClientType.java
index b96ca5c7..13be441e 100644
--- a/src/main/java/seng302/gameServer/server/messages/ClientType.java
+++ b/src/main/java/seng302/gameServer/messages/ClientType.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 public enum ClientType {
     SPECTATOR(0x00),
diff --git a/src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java b/src/main/java/seng302/gameServer/messages/CustomizeRequestMessage.java
similarity index 95%
rename from src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java
rename to src/main/java/seng302/gameServer/messages/CustomizeRequestMessage.java
index 9407603b..324196f6 100644
--- a/src/main/java/seng302/gameServer/server/messages/CustomizeRequestMessage.java
+++ b/src/main/java/seng302/gameServer/messages/CustomizeRequestMessage.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 // TODO: 14/08/17 ajm412: this may eventually need adjusting due to conforming to the agreed spec.
 public class CustomizeRequestMessage extends Message {
diff --git a/src/main/java/seng302/gameServer/server/messages/CustomizeRequestType.java b/src/main/java/seng302/gameServer/messages/CustomizeRequestType.java
similarity index 93%
rename from src/main/java/seng302/gameServer/server/messages/CustomizeRequestType.java
rename to src/main/java/seng302/gameServer/messages/CustomizeRequestType.java
index 86aae5a5..8077c657 100644
--- a/src/main/java/seng302/gameServer/server/messages/CustomizeRequestType.java
+++ b/src/main/java/seng302/gameServer/messages/CustomizeRequestType.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 // TODO: 14/08/17 ajm412: this may eventually need adjusting due to conforming to the agreed spec.
 public enum CustomizeRequestType {
diff --git a/src/main/java/seng302/gameServer/server/messages/CustomizeResponseMessage.java b/src/main/java/seng302/gameServer/messages/CustomizeResponseMessage.java
similarity index 92%
rename from src/main/java/seng302/gameServer/server/messages/CustomizeResponseMessage.java
rename to src/main/java/seng302/gameServer/messages/CustomizeResponseMessage.java
index d3380ea8..e1723623 100644
--- a/src/main/java/seng302/gameServer/server/messages/CustomizeResponseMessage.java
+++ b/src/main/java/seng302/gameServer/messages/CustomizeResponseMessage.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 /**
  * Created by ajm412 on 14/08/17.
diff --git a/src/main/java/seng302/gameServer/server/messages/CustomizeResponseType.java b/src/main/java/seng302/gameServer/messages/CustomizeResponseType.java
similarity index 94%
rename from src/main/java/seng302/gameServer/server/messages/CustomizeResponseType.java
rename to src/main/java/seng302/gameServer/messages/CustomizeResponseType.java
index b26780b9..a935dc80 100644
--- a/src/main/java/seng302/gameServer/server/messages/CustomizeResponseType.java
+++ b/src/main/java/seng302/gameServer/messages/CustomizeResponseType.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 // TODO: 14/08/17 ajm412: this may eventually need adjusting due to conforming to the agreed spec.
 public enum CustomizeResponseType {
diff --git a/src/main/java/seng302/gameServer/server/messages/DeviceType.java b/src/main/java/seng302/gameServer/messages/DeviceType.java
similarity index 82%
rename from src/main/java/seng302/gameServer/server/messages/DeviceType.java
rename to src/main/java/seng302/gameServer/messages/DeviceType.java
index 4f6d7b80..54925b6d 100644
--- a/src/main/java/seng302/gameServer/server/messages/DeviceType.java
+++ b/src/main/java/seng302/gameServer/messages/DeviceType.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 public enum DeviceType {
     UNKNOWN(0),
diff --git a/src/main/java/seng302/gameServer/server/messages/Header.java b/src/main/java/seng302/gameServer/messages/Header.java
similarity index 98%
rename from src/main/java/seng302/gameServer/server/messages/Header.java
rename to src/main/java/seng302/gameServer/messages/Header.java
index 074a8ab0..1e388b0d 100644
--- a/src/main/java/seng302/gameServer/server/messages/Header.java
+++ b/src/main/java/seng302/gameServer/messages/Header.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/main/java/seng302/gameServer/server/messages/Heartbeat.java b/src/main/java/seng302/gameServer/messages/Heartbeat.java
similarity index 92%
rename from src/main/java/seng302/gameServer/server/messages/Heartbeat.java
rename to src/main/java/seng302/gameServer/messages/Heartbeat.java
index 688aaf40..0a81ceec 100644
--- a/src/main/java/seng302/gameServer/server/messages/Heartbeat.java
+++ b/src/main/java/seng302/gameServer/messages/Heartbeat.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 public class Heartbeat extends Message {
     private final int MESSAGE_SIZE = 4;
diff --git a/src/main/java/seng302/gameServer/server/messages/MarkType.java b/src/main/java/seng302/gameServer/messages/MarkType.java
similarity index 85%
rename from src/main/java/seng302/gameServer/server/messages/MarkType.java
rename to src/main/java/seng302/gameServer/messages/MarkType.java
index 6e6ae116..e67a9509 100644
--- a/src/main/java/seng302/gameServer/server/messages/MarkType.java
+++ b/src/main/java/seng302/gameServer/messages/MarkType.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 /**
  * Types of marks boats can round
diff --git a/src/main/java/seng302/gameServer/server/messages/Message.java b/src/main/java/seng302/gameServer/messages/Message.java
similarity index 99%
rename from src/main/java/seng302/gameServer/server/messages/Message.java
rename to src/main/java/seng302/gameServer/messages/Message.java
index cabba2b3..691bb022 100644
--- a/src/main/java/seng302/gameServer/server/messages/Message.java
+++ b/src/main/java/seng302/gameServer/messages/Message.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/src/main/java/seng302/gameServer/server/messages/MessageType.java b/src/main/java/seng302/gameServer/messages/MessageType.java
similarity index 94%
rename from src/main/java/seng302/gameServer/server/messages/MessageType.java
rename to src/main/java/seng302/gameServer/messages/MessageType.java
index 6b32fd65..9f0ddd4c 100644
--- a/src/main/java/seng302/gameServer/server/messages/MessageType.java
+++ b/src/main/java/seng302/gameServer/messages/MessageType.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 /**
  * Enum containing the types of messages
diff --git a/src/main/java/seng302/gameServer/server/messages/RaceStartNotificationType.java b/src/main/java/seng302/gameServer/messages/RaceStartNotificationType.java
similarity index 88%
rename from src/main/java/seng302/gameServer/server/messages/RaceStartNotificationType.java
rename to src/main/java/seng302/gameServer/messages/RaceStartNotificationType.java
index 7f9543ff..4824e349 100644
--- a/src/main/java/seng302/gameServer/server/messages/RaceStartNotificationType.java
+++ b/src/main/java/seng302/gameServer/messages/RaceStartNotificationType.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 /**
  * The types of race start status messages
diff --git a/src/main/java/seng302/gameServer/server/messages/RaceStartStatusMessage.java b/src/main/java/seng302/gameServer/messages/RaceStartStatusMessage.java
similarity index 97%
rename from src/main/java/seng302/gameServer/server/messages/RaceStartStatusMessage.java
rename to src/main/java/seng302/gameServer/messages/RaceStartStatusMessage.java
index ddb960c0..9de0a7b2 100644
--- a/src/main/java/seng302/gameServer/server/messages/RaceStartStatusMessage.java
+++ b/src/main/java/seng302/gameServer/messages/RaceStartStatusMessage.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 public class RaceStartStatusMessage extends Message {
     private final int MESSAGE_SIZE = 20;
diff --git a/src/main/java/seng302/gameServer/server/messages/RaceStatus.java b/src/main/java/seng302/gameServer/messages/RaceStatus.java
similarity index 91%
rename from src/main/java/seng302/gameServer/server/messages/RaceStatus.java
rename to src/main/java/seng302/gameServer/messages/RaceStatus.java
index 6880ab06..82adfb5b 100644
--- a/src/main/java/seng302/gameServer/server/messages/RaceStatus.java
+++ b/src/main/java/seng302/gameServer/messages/RaceStatus.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 /**
  * The current status of the race
diff --git a/src/main/java/seng302/gameServer/server/messages/RaceStatusMessage.java b/src/main/java/seng302/gameServer/messages/RaceStatusMessage.java
similarity index 98%
rename from src/main/java/seng302/gameServer/server/messages/RaceStatusMessage.java
rename to src/main/java/seng302/gameServer/messages/RaceStatusMessage.java
index 5cddf0bf..f1ede439 100644
--- a/src/main/java/seng302/gameServer/server/messages/RaceStatusMessage.java
+++ b/src/main/java/seng302/gameServer/messages/RaceStatusMessage.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 import java.util.List;
 import java.util.zip.CRC32;
diff --git a/src/main/java/seng302/gameServer/server/messages/RaceType.java b/src/main/java/seng302/gameServer/messages/RaceType.java
similarity index 85%
rename from src/main/java/seng302/gameServer/server/messages/RaceType.java
rename to src/main/java/seng302/gameServer/messages/RaceType.java
index 5d601083..52e0d628 100644
--- a/src/main/java/seng302/gameServer/server/messages/RaceType.java
+++ b/src/main/java/seng302/gameServer/messages/RaceType.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 /**
  * Enum containing the types of races
diff --git a/src/main/java/seng302/gameServer/server/messages/RegistrationRequestMessage.java b/src/main/java/seng302/gameServer/messages/RegistrationRequestMessage.java
similarity index 91%
rename from src/main/java/seng302/gameServer/server/messages/RegistrationRequestMessage.java
rename to src/main/java/seng302/gameServer/messages/RegistrationRequestMessage.java
index 59757a18..c7b2a1db 100644
--- a/src/main/java/seng302/gameServer/server/messages/RegistrationRequestMessage.java
+++ b/src/main/java/seng302/gameServer/messages/RegistrationRequestMessage.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 
 public class RegistrationRequestMessage extends Message {
diff --git a/src/main/java/seng302/gameServer/server/messages/RegistrationResponseMessage.java b/src/main/java/seng302/gameServer/messages/RegistrationResponseMessage.java
similarity index 91%
rename from src/main/java/seng302/gameServer/server/messages/RegistrationResponseMessage.java
rename to src/main/java/seng302/gameServer/messages/RegistrationResponseMessage.java
index e2174da4..28700210 100644
--- a/src/main/java/seng302/gameServer/server/messages/RegistrationResponseMessage.java
+++ b/src/main/java/seng302/gameServer/messages/RegistrationResponseMessage.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 public class RegistrationResponseMessage extends Message{
 
diff --git a/src/main/java/seng302/gameServer/server/messages/RegistrationResponseStatus.java b/src/main/java/seng302/gameServer/messages/RegistrationResponseStatus.java
similarity index 95%
rename from src/main/java/seng302/gameServer/server/messages/RegistrationResponseStatus.java
rename to src/main/java/seng302/gameServer/messages/RegistrationResponseStatus.java
index 2ae47a92..90e579bf 100644
--- a/src/main/java/seng302/gameServer/server/messages/RegistrationResponseStatus.java
+++ b/src/main/java/seng302/gameServer/messages/RegistrationResponseStatus.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 public enum RegistrationResponseStatus {
     SUCCESS_SPECTATING(0x00),
diff --git a/src/main/java/seng302/gameServer/server/messages/RoundingBoatStatus.java b/src/main/java/seng302/gameServer/messages/RoundingBoatStatus.java
similarity index 86%
rename from src/main/java/seng302/gameServer/server/messages/RoundingBoatStatus.java
rename to src/main/java/seng302/gameServer/messages/RoundingBoatStatus.java
index 3b0a6d09..324c03e3 100644
--- a/src/main/java/seng302/gameServer/server/messages/RoundingBoatStatus.java
+++ b/src/main/java/seng302/gameServer/messages/RoundingBoatStatus.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 /**
  * The status of a boat rounding a mark
diff --git a/src/main/java/seng302/gameServer/server/messages/RoundingSide.java b/src/main/java/seng302/gameServer/messages/RoundingSide.java
similarity index 96%
rename from src/main/java/seng302/gameServer/server/messages/RoundingSide.java
rename to src/main/java/seng302/gameServer/messages/RoundingSide.java
index efb4c929..ffcc7f6c 100644
--- a/src/main/java/seng302/gameServer/server/messages/RoundingSide.java
+++ b/src/main/java/seng302/gameServer/messages/RoundingSide.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 /**
  * The side the boat rounded the mark
diff --git a/src/main/java/seng302/gameServer/server/messages/XMLMessage.java b/src/main/java/seng302/gameServer/messages/XMLMessage.java
similarity index 97%
rename from src/main/java/seng302/gameServer/server/messages/XMLMessage.java
rename to src/main/java/seng302/gameServer/messages/XMLMessage.java
index 6bcd42ca..361bac0e 100644
--- a/src/main/java/seng302/gameServer/server/messages/XMLMessage.java
+++ b/src/main/java/seng302/gameServer/messages/XMLMessage.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 public class XMLMessage extends Message{
     private final MessageType MESSAGE_TYPE = MessageType.XML_MESSAGE;
diff --git a/src/main/java/seng302/gameServer/server/messages/XMLMessageSubType.java b/src/main/java/seng302/gameServer/messages/XMLMessageSubType.java
similarity index 86%
rename from src/main/java/seng302/gameServer/server/messages/XMLMessageSubType.java
rename to src/main/java/seng302/gameServer/messages/XMLMessageSubType.java
index 3b4bdc91..64757c5d 100644
--- a/src/main/java/seng302/gameServer/server/messages/XMLMessageSubType.java
+++ b/src/main/java/seng302/gameServer/messages/XMLMessageSubType.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 /**
  * Enum containing the types of XML messages
diff --git a/src/main/java/seng302/gameServer/server/messages/YachtEventCodeMessage.java b/src/main/java/seng302/gameServer/messages/YachtEventCodeMessage.java
similarity index 96%
rename from src/main/java/seng302/gameServer/server/messages/YachtEventCodeMessage.java
rename to src/main/java/seng302/gameServer/messages/YachtEventCodeMessage.java
index 08db575a..eb9f557e 100644
--- a/src/main/java/seng302/gameServer/server/messages/YachtEventCodeMessage.java
+++ b/src/main/java/seng302/gameServer/messages/YachtEventCodeMessage.java
@@ -1,4 +1,4 @@
-package seng302.gameServer.server.messages;
+package seng302.gameServer.messages;
 
 /**
  * Created by zyt10 on 10/08/17.
diff --git a/src/main/java/seng302/gameServer/server/messages/MarkRoundingMessage.java b/src/main/java/seng302/gameServer/server/messages/MarkRoundingMessage.java
deleted file mode 100644
index f0d68e15..00000000
--- a/src/main/java/seng302/gameServer/server/messages/MarkRoundingMessage.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package seng302.gameServer.server.messages;
-
-import seng302.gameServer.GameState;
-
-public class MarkRoundingMessage extends Message{
-    private final long MESSAGE_VERSION_NUMBER = 1;
-    private final int MESSAGE_SIZE = 21;
-
-    private long time;
-    private long ackNumber;
-    private long raceId;
-    private long sourceId;
-    private RoundingBoatStatus boatStatus;
-    private RoundingSide roundingSide;
-    private long markId;
-
-
-    /**
-     * This message is sent when a boat passes a mark, start line, or finish line
-     * The purpose of this is to record the time when yachts cross marks
-     * @param ackNumber ackNumber
-     * @param raceId raceId
-     * @param sourceId boatSourceId
-     * @param roundingBoatStatus roundingBoatStatus
-     * @param roundingSide roundingSide
-     * @param markId markId
-     */
-    public MarkRoundingMessage(int ackNumber, int raceId, int sourceId, RoundingBoatStatus roundingBoatStatus,
-        RoundingSide roundingSide, MarkType markType, int markId) {
-        this.time = System.currentTimeMillis();
-        this.ackNumber = ackNumber;
-        this.raceId = raceId;
-        this.sourceId = sourceId;
-        this.boatStatus = roundingBoatStatus;
-        this.roundingSide = roundingSide;
-        this.markId = markId;
-
-        setHeader(new Header(MessageType.MARK_ROUNDING, 1, (short) getSize()));
-        allocateBuffer();
-        writeHeaderToBuffer();
-
-        putByte((byte) MESSAGE_VERSION_NUMBER);
-        putInt((int) time, 6);
-        putInt((int) ackNumber, 2);
-        putInt((int) raceId, 4);
-        putInt((int) sourceId, 4);
-        putByte((byte) boatStatus.getCode());
-        putByte((byte) roundingSide.getCode());
-        putByte((byte) markType.getCode());
-        putByte((byte) markId);
-
-        writeCRC();
-        rewind();
-    }
-
-    @Override
-    public int getSize() {
-        return MESSAGE_SIZE;
-    }
-}
diff --git a/src/main/java/seng302/model/ServerYacht.java b/src/main/java/seng302/model/ServerYacht.java
index 755f9946..61053a19 100644
--- a/src/main/java/seng302/model/ServerYacht.java
+++ b/src/main/java/seng302/model/ServerYacht.java
@@ -7,7 +7,7 @@ import javafx.scene.paint.Color;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import seng302.gameServer.GameState;
-import seng302.gameServer.server.messages.BoatStatus;
+import seng302.gameServer.messages.BoatStatus;
 import seng302.model.mark.Mark;
 import seng302.utilities.GeoUtility;
 
diff --git a/src/main/java/seng302/model/mark/CompoundMark.java b/src/main/java/seng302/model/mark/CompoundMark.java
index 70cd114f..13dfa50e 100644
--- a/src/main/java/seng302/model/mark/CompoundMark.java
+++ b/src/main/java/seng302/model/mark/CompoundMark.java
@@ -2,7 +2,7 @@ package seng302.model.mark;
 
 import java.util.ArrayList;
 import java.util.List;
-import seng302.gameServer.server.messages.RoundingSide;
+import seng302.gameServer.messages.RoundingSide;
 import seng302.model.GeoPoint;
 import seng302.utilities.GeoUtility;
 
diff --git a/src/main/java/seng302/model/mark/Mark.java b/src/main/java/seng302/model/mark/Mark.java
index de66166c..b5b65e7e 100644
--- a/src/main/java/seng302/model/mark/Mark.java
+++ b/src/main/java/seng302/model/mark/Mark.java
@@ -2,7 +2,7 @@ package seng302.model.mark;
 
 import java.util.ArrayList;
 import java.util.List;
-import seng302.gameServer.server.messages.RoundingSide;
+import seng302.gameServer.messages.RoundingSide;
 import seng302.model.GeoPoint;
 
 /**
diff --git a/src/main/java/seng302/model/mark/MarkOrder.java b/src/main/java/seng302/model/mark/MarkOrder.java
index aa75b494..c093e967 100644
--- a/src/main/java/seng302/model/mark/MarkOrder.java
+++ b/src/main/java/seng302/model/mark/MarkOrder.java
@@ -10,7 +10,7 @@ import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
-import seng302.gameServer.server.messages.RoundingSide;
+import seng302.gameServer.messages.RoundingSide;
 import seng302.model.stream.xml.generator.Race;
 import seng302.model.stream.xml.parser.RaceXMLData;
 import seng302.utilities.XMLGenerator;
diff --git a/src/main/java/seng302/utilities/XMLGenerator.java b/src/main/java/seng302/utilities/XMLGenerator.java
index 3dc99694..7fcc8efd 100644
--- a/src/main/java/seng302/utilities/XMLGenerator.java
+++ b/src/main/java/seng302/utilities/XMLGenerator.java
@@ -9,7 +9,7 @@ import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
 import seng302.model.stream.xml.generator.Race;
 import seng302.model.stream.xml.generator.Regatta;
-import seng302.gameServer.server.messages.XMLMessageSubType;
+import seng302.gameServer.messages.XMLMessageSubType;
 
 /**
  * An XML generator to generate the Race, Boat, and Regatta XML dynamically
diff --git a/src/main/java/seng302/visualiser/ClientToServerThread.java b/src/main/java/seng302/visualiser/ClientToServerThread.java
index a37e2703..dad3d740 100644
--- a/src/main/java/seng302/visualiser/ClientToServerThread.java
+++ b/src/main/java/seng302/visualiser/ClientToServerThread.java
@@ -21,14 +21,14 @@ import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.ButtonType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import seng302.gameServer.server.messages.BoatAction;
-import seng302.gameServer.server.messages.BoatActionMessage;
-import seng302.gameServer.server.messages.ClientType;
-import seng302.gameServer.server.messages.CustomizeRequestMessage;
-import seng302.gameServer.server.messages.CustomizeRequestType;
-import seng302.gameServer.server.messages.Message;
-import seng302.gameServer.server.messages.RegistrationRequestMessage;
-import seng302.gameServer.server.messages.RegistrationResponseStatus;
+import seng302.gameServer.messages.BoatAction;
+import seng302.gameServer.messages.BoatActionMessage;
+import seng302.gameServer.messages.ClientType;
+import seng302.gameServer.messages.CustomizeRequestMessage;
+import seng302.gameServer.messages.CustomizeRequestType;
+import seng302.gameServer.messages.Message;
+import seng302.gameServer.messages.RegistrationRequestMessage;
+import seng302.gameServer.messages.RegistrationResponseStatus;
 import seng302.model.stream.packets.PacketType;
 import seng302.model.stream.packets.StreamPacket;
 
diff --git a/src/main/java/seng302/visualiser/GameClient.java b/src/main/java/seng302/visualiser/GameClient.java
index 2898faa8..b8d15ab5 100644
--- a/src/main/java/seng302/visualiser/GameClient.java
+++ b/src/main/java/seng302/visualiser/GameClient.java
@@ -14,7 +14,7 @@ import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.Pane;
 import seng302.gameServer.GameState;
 import seng302.gameServer.MainServerThread;
-import seng302.gameServer.server.messages.BoatAction;
+import seng302.gameServer.messages.BoatAction;
 import seng302.model.ClientYacht;
 import seng302.model.RaceState;
 import seng302.model.stream.packets.StreamPacket;
diff --git a/src/main/java/seng302/visualiser/controllers/CustomizationController.java b/src/main/java/seng302/visualiser/controllers/CustomizationController.java
index ea8db318..1a5b5e4d 100644
--- a/src/main/java/seng302/visualiser/controllers/CustomizationController.java
+++ b/src/main/java/seng302/visualiser/controllers/CustomizationController.java
@@ -6,7 +6,7 @@ import javafx.scene.control.ColorPicker;
 import javafx.scene.control.TextField;
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
-import seng302.gameServer.server.messages.CustomizeRequestType;
+import seng302.gameServer.messages.CustomizeRequestType;
 import seng302.visualiser.ClientToServerThread;
 
 public class CustomizationController {
diff --git a/src/main/java/seng302/visualiser/controllers/LobbyController.java b/src/main/java/seng302/visualiser/controllers/LobbyController.java
index 88d29062..4dc5293f 100644
--- a/src/main/java/seng302/visualiser/controllers/LobbyController.java
+++ b/src/main/java/seng302/visualiser/controllers/LobbyController.java
@@ -46,6 +46,8 @@ public class LobbyController {
     @FXML
     private Button readyButton;
     @FXML
+    private Button customizeButton;
+    @FXML
     private TextArea playerOneTxt;
     @FXML
     private TextArea playerTwoTxt;
@@ -88,6 +90,8 @@ public class LobbyController {
 
     private ClientToServerThread socketThread;
 
+    private Stage customizeStage;
+
     private Color playersColor;
 
     private int MAX_NUM_PLAYERS = 8;
@@ -154,7 +158,9 @@ public class LobbyController {
             FXMLLoader fxmlLoader = new FXMLLoader(LobbyController.class.getResource("/views/customizeView.fxml"));
             root = fxmlLoader.load();
             root.getStylesheets().add("/css/master.css");
-            Stage customizeStage = new Stage();
+            customizeStage = new Stage();
+            customizeStage.setTitle("Customize Boat");
+            customizeStage.setScene(new Scene(root, 700, 450));
             CustomizationController cc = fxmlLoader.getController();
             cc.setServerThread(this.socketThread);
             cc.setPlayerName(this.players.get(playerID - 1));
@@ -164,8 +170,6 @@ public class LobbyController {
             }
 
             cc.setPlayerColor(this.playersColor);
-            customizeStage.setTitle("Customize Boat");
-            customizeStage.setScene(new Scene(root, 700, 450));
             cc.setStage(customizeStage); // pass the stage through so it can be closed later.
             cc.setLobbyController(this);
             customizeStage.show();
@@ -194,6 +198,7 @@ public class LobbyController {
 
         for (LobbyCloseListener readyListener : lobbyListeners)
             readyListener.notify(CloseStatus.READY);
+        customizeButton.setDisable(true);
     }
 
     public void setTitle (String title) {
@@ -222,6 +227,12 @@ public class LobbyController {
 
     public void updateRaceState(RaceState raceState){
         this.raceState = raceState;
+        /*if (this.customizeStage != null) {
+            this.customizeStage.close();
+        }*/ // TODO: 17/08/17 ajm412: close the customization window if the host starts the game while customizing 
+        if (!customizeButton.isDisabled()) {
+            customizeButton.setDisable(true);
+        }
         timeUntilStart.setText("Starting in: " + raceState.getRaceTimeStr());
     }
 
diff --git a/src/main/resources/css/master.css b/src/main/resources/css/master.css
index f79f79f3..f274eda1 100644
--- a/src/main/resources/css/master.css
+++ b/src/main/resources/css/master.css
@@ -99,7 +99,7 @@ Table
     -fx-text-fill: black;
 }
 
-server thread
+/*server thread */
 .ui-table .column-header {
     -fx-background-color: transparent;
 }
diff --git a/src/main/resources/views/LobbyView.fxml b/src/main/resources/views/LobbyView.fxml
index 23e0b55b..1d325055 100644
--- a/src/main/resources/views/LobbyView.fxml
+++ b/src/main/resources/views/LobbyView.fxml
@@ -39,7 +39,7 @@
          <children>
             <Button fx:id="readyButton" focusTraversable="false" mnemonicParsing="false" onAction="#readyButtonPressed" prefWidth="101.0" text="Ready" GridPane.halignment="CENTER" />
             <Button focusTraversable="false" mnemonicParsing="false" onAction="#leaveLobbyButtonPressed" text="Leave Lobby" GridPane.columnIndex="2" GridPane.halignment="CENTER" />
-            <Button focusTraversable="false" mnemonicParsing="false" onAction="#customize" text="Customization" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
+            <Button fx:id="customizeButton" focusTraversable="false" mnemonicParsing="false" onAction="#customize" text="Customization" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
          </children>
       </GridPane>
       <GridPane GridPane.rowIndex="1">
diff --git a/src/test/java/seng302/gameServer/server/TestConversions.java b/src/test/java/seng302/gameServer/server/TestConversions.java
index b341def1..f8f16e20 100644
--- a/src/test/java/seng302/gameServer/server/TestConversions.java
+++ b/src/test/java/seng302/gameServer/server/TestConversions.java
@@ -3,7 +3,7 @@ package seng302.gameServer.server;
 import static junit.framework.TestCase.assertEquals;
 
 import org.junit.Test;
-import seng302.gameServer.server.messages.BoatLocationMessage;
+import seng302.gameServer.messages.BoatLocationMessage;
 
 /**
  * Test conversions used by the boat location messages
diff --git a/src/test/java/seng302/gameServer/server/TestHeader.java b/src/test/java/seng302/gameServer/server/TestHeader.java
index 3441e3bc..7d7221b3 100644
--- a/src/test/java/seng302/gameServer/server/TestHeader.java
+++ b/src/test/java/seng302/gameServer/server/TestHeader.java
@@ -3,8 +3,8 @@ package seng302.gameServer.server;
 import static junit.framework.TestCase.assertTrue;
 
 import org.junit.Test;
-import seng302.gameServer.server.messages.Header;
-import seng302.gameServer.server.messages.MessageType;
+import seng302.gameServer.messages.Header;
+import seng302.gameServer.messages.MessageType;
 
 /**
  * Tests message header
diff --git a/src/test/java/seng302/gameServer/server/TestMessage.java b/src/test/java/seng302/gameServer/server/TestMessage.java
index 337202ec..86fe96f2 100644
--- a/src/test/java/seng302/gameServer/server/TestMessage.java
+++ b/src/test/java/seng302/gameServer/server/TestMessage.java
@@ -4,9 +4,9 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertTrue;
 
 import org.junit.Test;
-import seng302.gameServer.server.messages.Message;
-import seng302.gameServer.server.messages.XMLMessage;
-import seng302.gameServer.server.messages.XMLMessageSubType;
+import seng302.gameServer.messages.Message;
+import seng302.gameServer.messages.XMLMessage;
+import seng302.gameServer.messages.XMLMessageSubType;
 
 public class TestMessage {
     private static int XML_MESSAGE_LEN = 14;
diff --git a/src/test/java/steps/ToggleSailSteps.java b/src/test/java/steps/ToggleSailSteps.java
index f74b05be..e4c6abed 100644
--- a/src/test/java/steps/ToggleSailSteps.java
+++ b/src/test/java/steps/ToggleSailSteps.java
@@ -8,7 +8,7 @@ import org.junit.Assert;
 import seng302.gameServer.GameStages;
 import seng302.gameServer.GameState;
 import seng302.gameServer.MainServerThread;
-import seng302.gameServer.server.messages.BoatAction;
+import seng302.gameServer.messages.BoatAction;
 import seng302.model.ServerYacht;
 import seng302.visualiser.ClientToServerThread;
 

From 5fc744235962129179f878adc2ce0192156ff812 Mon Sep 17 00:00:00 2001
From: Alistair McIntyre <ajm412@uclive.ac.nz>
Date: Thu, 17 Aug 2017 13:40:00 +1200
Subject: [PATCH 14/15] Merged Develop into branch. tags : #story[1142]

---
 src/main/java/seng302/visualiser/GameClient.java | 4 ++--
 src/main/java/seng302/visualiser/GameView.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/seng302/visualiser/GameClient.java b/src/main/java/seng302/visualiser/GameClient.java
index eac8624f..9b386cb4 100644
--- a/src/main/java/seng302/visualiser/GameClient.java
+++ b/src/main/java/seng302/visualiser/GameClient.java
@@ -95,7 +95,7 @@ public class GameClient {
 
     /**
      * Connect to a game as the host at the given address and starts the visualiser.
-     * @param ipAddress IP to connect to.
+     * @param ipAdclientYachtsdress IP to connect to.
      * @param portNumber Port to connect to.
      */
     public void runAsHost(String ipAddress, Integer portNumber) {
@@ -130,7 +130,7 @@ public class GameClient {
         });
 
         this.lobbyController = lobbyController;
-        server.setGameClient(this);
+        //server.setGameClient(this);
     }
 
     private void loadStartScreen() {
diff --git a/src/main/java/seng302/visualiser/GameView.java b/src/main/java/seng302/visualiser/GameView.java
index 53467dde..10ef749e 100644
--- a/src/main/java/seng302/visualiser/GameView.java
+++ b/src/main/java/seng302/visualiser/GameView.java
@@ -474,7 +474,7 @@ public class GameView extends Pane {
     public void setBoats(List<ClientYacht> yachts) {
         BoatObject newBoat;
         final List<Group> wakes = new ArrayList<>();
-        for (ClientYacht clientYacht : clientYachts) {
+        for (ClientYacht clientYacht : yachts) {
             Paint colour = clientYacht.getColour();
             newBoat = new BoatObject();
             newBoat.addSelectedBoatListener(this::setSelectedBoat);

From af3a400841ac8988893b306ed82b8fc1ce8727d7 Mon Sep 17 00:00:00 2001
From: Alistair McIntyre <ajm412@uclive.ac.nz>
Date: Thu, 17 Aug 2017 13:44:34 +1200
Subject: [PATCH 15/15] Fixed build bug. tags : #story[1142]

---
 src/main/java/seng302/visualiser/GameClient.java           | 2 +-
 src/main/java/seng302/visualiser/fxObjects/BoatObject.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/seng302/visualiser/GameClient.java b/src/main/java/seng302/visualiser/GameClient.java
index 9b386cb4..6dd0d98b 100644
--- a/src/main/java/seng302/visualiser/GameClient.java
+++ b/src/main/java/seng302/visualiser/GameClient.java
@@ -95,7 +95,7 @@ public class GameClient {
 
     /**
      * Connect to a game as the host at the given address and starts the visualiser.
-     * @param ipAdclientYachtsdress IP to connect to.
+     * @param ipAddress IP to connect to.
      * @param portNumber Port to connect to.
      */
     public void runAsHost(String ipAddress, Integer portNumber) {
diff --git a/src/main/java/seng302/visualiser/fxObjects/BoatObject.java b/src/main/java/seng302/visualiser/fxObjects/BoatObject.java
index 09be438f..a86a3ac8 100644
--- a/src/main/java/seng302/visualiser/fxObjects/BoatObject.java
+++ b/src/main/java/seng302/visualiser/fxObjects/BoatObject.java
@@ -129,7 +129,7 @@ public class BoatObject extends Group {
      * @param y The Y coordinate to move the boat to
      * @param rotation The rotation by which the boat moves
      * @param velocity The velocity the boat is moving
-     * @param sailIn
+     * @param sailIn Boolean to toggle sail state.
      */
     public void moveTo(double x, double y, double rotation, double velocity, Boolean sailIn, double windDir) {
         Double dx = Math.abs(boatPoly.getLayoutX() - x);