- Initial commit to attempt to smooth turning.

tags : #issue[78]

.codeclimate.yml

@@ -0,0 +1,17 @@
+engines:
+  pmd:
+    enabled: true
+    channel: "beta"
+
+  fixme:
+    enabled: true
+    config:
+      strings:
+      - FIXME
+      - TODO
+      - BUG
+      - FIX
+
+ratings:
+  paths:
+  - "**.java"

.gitignore

@@ -7,7 +7,6 @@
 .mtj.tmp/
 
 # Package Files #
-*.jar
 *.war
 *.ear
 
@@ -180,3 +179,7 @@ local.properties
 .recommenders/
 
 Makefile
+
+infer-out/
+infer.txt
+log.log

.mailmap

@@ -17,3 +17,11 @@
 # http://stacktoheap.com/blog/2013/01/06/using-mailmap-to-fix-authors-list-in-git/
 
 Michael Rausch <mra106@uclive.ac.nz> <me@michaelrausch.nz>
+Michael Rausch <mra106@uclive.ac.nz> <michael@michaelrausch.net>
+Kusal Ekanayake <kre39@uclive.ac.nz> kre39 <kre39@uclive.ac.nz>
+Haoming Yin <hyi25@uclive.ac.nz> <haoming.y@icloud.com>
+Peter Galloway <ptg19@uclive.ac.nz> Peter <ptg19@uclive.ac.nz>
+Zhi You Tan <zyt10@uclive.ac.nz> zyt10 <zyt10@uclive.ac.nz>
+Zhi You Tan <zyt10@uclive.ac.nz> Ryan Tan <ryan_zhiyou@hotmail.com>
+Alistair McIntyre <ajm412@uclive.ac.nz> <alistairjmcintyre@gmail.com>
+Calum <cir27@uclive.ac.nz> cir27 <cir27@uclive.ac.nz>

doc/design_decisions.md

@@ -9,7 +9,7 @@ prints out event details, including time, involved boats and legs.
 
 - Configuration file
 
-We decided to store the team information including team names and boat velocity, as well as race configuration setting in external file.
+We decided to store the team information including team names and boat currentVelocity, as well as race configuration setting in external file.
 
 To read external files, "Json-simple" library has been used to parse information. 
 By using this library, we did not have to write our json parser and benefited from the flexibility of json files.

doc/user_manual.md

@@ -8,7 +8,7 @@ You can specify a config file using the using the -f flag, for example 'java -ja
 
 ## The config file
 
-The teams/boats are specified in the config file under 'teams', each team requires a team name, and a velocity (in meters per second).
+The teams/boats are specified in the config file under 'teams', each team requires a team name, and a currentVelocity (in meters per second).
 
 The 'time-scale' option lets you change how long the race takes to complete. A time-scale of 1.0 is normal speed, 2.0 is 2x etc.
 

lib/com/interactivemesh/jimColModelImporter/0.7/jimColModelImporter-0.7.jar.md5

@@ -0,0 +1 @@
+bc00cae65d030845973151123fd0f2b1

lib/com/interactivemesh/jimColModelImporter/0.7/jimColModelImporter-0.7.jar.sha1

@@ -0,0 +1 @@
+de6c72cb03b2216bbe03ac7b882f0c146fb76bc8

lib/com/interactivemesh/jimColModelImporter/0.7/jimColModelImporter-0.7.pom

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>lib.com.interactivemesh</groupId>
+  <artifactId>jimColModelImporter</artifactId>
+  <version>0.7</version>
+</project>

lib/com/interactivemesh/jimColModelImporter/0.7/jimColModelImporter-0.7.pom.md5

@@ -0,0 +1 @@
+8fc884a64856917671745720acc6048c

lib/com/interactivemesh/jimColModelImporter/0.7/jimColModelImporter-0.7.pom.sha1

@@ -0,0 +1 @@
+4b35131587917ed1a16acb1eff8cd7a213a26edc

lib/com/interactivemesh/jimColModelImporter/maven-metadata.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>lib.com.interactivemesh</groupId>
+  <artifactId>jimColModelImporter</artifactId>
+  <versioning>
+    <release>0.7</release>
+    <versions>
+      <version>0.7</version>
+    </versions>
+    <lastUpdated>20170912024010</lastUpdated>
+  </versioning>
+</metadata>

lib/com/interactivemesh/jimColModelImporter/maven-metadata.xml.md5

@@ -0,0 +1 @@
+3132c3f88de1a942ac37930b8cdaa764

lib/com/interactivemesh/jimColModelImporter/maven-metadata.xml.sha1

@@ -0,0 +1 @@
+20847be06b0d11b70f1fbfb1527c5efee4e9f49e

lib/com/interactivemesh/jimStlMeshImporter/0.7/jimStlMeshImporter-0.7.jar.md5

@@ -0,0 +1 @@
+deec04fc74e1115465598d342810df18

lib/com/interactivemesh/jimStlMeshImporter/0.7/jimStlMeshImporter-0.7.jar.sha1

@@ -0,0 +1 @@
+ea31eabe6384ae965cd8180920f7ba0248717313

lib/com/interactivemesh/jimStlMeshImporter/0.7/jimStlMeshImporter-0.7.pom

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>lib.com.interactivemesh</groupId>
+  <artifactId>jimStlMeshImporter</artifactId>
+  <version>0.7</version>
+</project>

lib/com/interactivemesh/jimStlMeshImporter/0.7/jimStlMeshImporter-0.7.pom.md5

@@ -0,0 +1 @@
+82a485ac9a76d6587b1b23b7fbd8f5a0

lib/com/interactivemesh/jimStlMeshImporter/0.7/jimStlMeshImporter-0.7.pom.sha1

@@ -0,0 +1 @@
+2bac29a6598a88b2f115b72433181c13fc6201d2

lib/com/interactivemesh/jimStlMeshImporter/maven-metadata.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>lib.com.interactivemesh</groupId>
+  <artifactId>jimStlMeshImporter</artifactId>
+  <versioning>
+    <release>0.7</release>
+    <versions>
+      <version>0.7</version>
+    </versions>
+    <lastUpdated>20170912024122</lastUpdated>
+  </versioning>
+</metadata>

lib/com/interactivemesh/jimStlMeshImporter/maven-metadata.xml.md5

@@ -0,0 +1 @@
+cad88c5c501f771bc8d1fc085decb3c4

lib/com/interactivemesh/jimStlMeshImporter/maven-metadata.xml.sha1

@@ -0,0 +1 @@
+c6cd4fae002dbbe4246c8eac4b35de07d921fd51

pom.xml

@@ -11,6 +11,7 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <dependencies>
@@ -20,6 +21,11 @@
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.3.2</version>
+        </dependency>
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>
             <artifactId>json-simple</artifactId>
@@ -31,6 +37,84 @@
             <version>2.7.13</version>
             <scope>test</scope>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.freemarker/freemarker -->
+        <dependency>
+            <groupId>info.cukes</groupId>
+            <artifactId>cucumber-junit</artifactId>
+            <version>1.2.5</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/info.cukes/cucumber-java -->
+        <dependency>
+            <groupId>info.cukes</groupId>
+            <artifactId>cucumber-java</artifactId>
+            <version>1.2.5</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.freemarker/freemarker -->
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>2.3.26-incubating</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-slf4j-impl -->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.1.7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>1.4</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.lwjgl/lwjgl -->
+        <dependency>
+            <groupId>org.lwjgl</groupId>
+            <artifactId>lwjgl</artifactId>
+            <version>3.1.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>de.javagl</groupId>
+            <artifactId>obj</artifactId>
+            <version>0.2.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.interactivemesh</groupId>
+            <artifactId>jimStlMeshImporter</artifactId>
+            <version>0.7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.interactivemesh</groupId>
+            <artifactId>jimColModelImporter</artifactId>
+            <version>0.7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.jfoenix</groupId>
+            <artifactId>jfoenix</artifactId>
+            <version>1.8.0</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/javax.jmdns/jmdns -->
+        <dependency>
+            <groupId>javax.jmdns</groupId>
+            <artifactId>jmdns</artifactId>
+            <version>3.4.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.fxyz3d</groupId>
+            <artifactId>fxyz3d</artifactId>
+            <version>0.1.1</version>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -113,4 +197,18 @@
             </plugin>
         </plugins>
     </reporting>
+
+    <repositories>
+        <repository>
+            <id>lib</id>
+            <name>third party libraries</name>
+            <url>file://${basedir}/lib</url>
+        </repository>
+
+        <repository>
+            <id>Homer-Core</id>
+            <name>Homer-core-repo</name>
+            <url>https://nexus.arcsmed.at/content/repositories/homer.core</url>
+        </repository>
+    </repositories>
 </project>

src/main/java/seng302/App.java

@@ -1,24 +1,109 @@
 package seng302;
 
+import ch.qos.logback.classic.Level;
 import javafx.application.Application;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
 import javafx.stage.Stage;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import seng302.discoveryServer.DiscoveryServer;
+import seng302.visualiser.controllers.ViewManager;
 
-public class App extends Application
-{
-    @Override
-    public void start(Stage primaryStage) throws Exception {
-        Parent root = FXMLLoader.load(getClass().getResource("/views/MainView.fxml"));
-        primaryStage.setTitle("RaceVision");
-        primaryStage.setScene(new Scene(root));
+public class App extends Application {
 
-        primaryStage.show();
+    private static Logger logger = LoggerFactory.getLogger(App.class);
+    private static boolean isRunningAsCache = false;
+
+    public static void parseArgs(String[] args) throws ParseException {
+        Options options = new Options();
+        CommandLineParser parser = new DefaultParser();
+        CommandLine cmd;
+
+        ch.qos.logback.classic.Logger rootLogger = (ch.qos.logback.classic.Logger) LoggerFactory
+            .getLogger(Logger.ROOT_LOGGER_NAME);
+
+        options.addOption("debugLevel", true, "Set the application debug level");
+        options.addOption("runAsDiscoveryServer", false, "Run as a discovery server");
+        options.addOption("discoveryDevMode", false, "Use a local discovery server");
+
+        cmd = parser.parse(options, args);
+
+        if (cmd.hasOption("runAsDiscoveryServer")){
+            isRunningAsCache = true;
+            rootLogger.setLevel(Level.ALL);
+            return;
+        }
+
+        if (cmd.hasOption("discoveryDevMode")) {
+            DiscoveryServer.DISCOVERY_SERVER = "localhost";
+        }
+
+        if (cmd.hasOption("debugLevel")) {
+
+        switch (cmd.getOptionValue("debugLevel")) {
+            case "DEBUG":
+                rootLogger.setLevel(Level.DEBUG);
+                break;
+
+            case "ALL":
+                rootLogger.setLevel(Level.ALL);
+                break;
+
+            case "WARNING":
+                rootLogger.setLevel(Level.WARN);
+                break;
+
+            case "ERROR":
+                rootLogger.setLevel(Level.ERROR);
+                break;
+
+            case "INFO":
+                rootLogger.setLevel(Level.INFO);
+
+            case "TRACE":
+                rootLogger.setLevel(Level.TRACE);
+
+            default:
+                rootLogger.setLevel(Level.ALL);
+        }
+    } else {
+        rootLogger.setLevel(Level.WARN);
+    }
     }
 
-    public static void main(String[] args) {
-        launch(args);
+    @Override
+    public void start(Stage primaryStage) throws Exception {
+        ViewManager.getInstance().initialiseSplashScreen(primaryStage);
+    }
+
+    private static void runDiscoveryServer() throws Exception {
+        while (true){
+            try {
+                new DiscoveryServer();
+            }
+            catch (Exception ignored){
+                ;
+            }
+        }
+    }
+
+    public static void main(String[] args) throws Exception {
+        try {
+            parseArgs(args);
+        } catch (ParseException e) {
+            logger.error("Could not parse command line arguments");
+        }
+
+        if (!isRunningAsCache){
+            launch(args);
+        }
+        else{
+            runDiscoveryServer();
+        }
     }
 }
 

src/main/java/seng302/controllers/CanvasController.java

@@ -1,283 +0,0 @@
-package seng302.controllers;
-
-import javafx.animation.*;
-import javafx.fxml.FXML;
-import javafx.scene.canvas.Canvas;
-import javafx.scene.canvas.GraphicsContext;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.paint.Color;
-import javafx.scene.text.Font;
-import seng302.models.Boat;
-import seng302.models.TimelineInfo;
-import seng302.models.mark.GateMark;
-import seng302.models.mark.Mark;
-import seng302.models.mark.MarkType;
-import seng302.models.mark.SingleMark;
-
-import java.util.*;
-
-/**
- * Created by ptg19 on 15/03/17.
- * Modified by Haoming Yin (hyi25) on 20/3/2017.
- */
-public class CanvasController {
-
-    @FXML
-    private AnchorPane canvasPane;
-
-    private RaceViewController raceViewController;
-    private ResizableCanvas canvas;
-    private GraphicsContext gc;
-
-    private final double ORIGIN_LAT = 32.321504;
-    private final double ORIGIN_LON = -64.857063;
-    private final int SCALE = 16000;
-
-    public void setup(RaceViewController raceViewController){
-        this.raceViewController = raceViewController;
-    }
-
-    public void initialize() {
-        canvas = new ResizableCanvas();
-        canvasPane.getChildren().add(canvas);
-        // Bind canvas size to stack pane size.
-        canvas.widthProperty().bind(canvasPane.widthProperty());
-        canvas.heightProperty().bind(canvasPane.heightProperty());
-        gc = canvas.getGraphicsContext2D();
-
-
-        // overriding the handle so that it can clean canvas and redraw boats and course marks
-        AnimationTimer timer = new AnimationTimer() {
-            private long lastUpdate = 0;
-            private long lastFpsUpdate = 0;
-            private int lastFpsCount = 0;
-            private int fpsCount = 0;
-
-            @Override
-            public void handle(long now) {
-                if (true){ //if statement for limiting refresh rate if needed
-                    gc.clearRect(0, 0, canvas.getWidth(),canvas.getHeight());
-                    gc.setFill(Color.SKYBLUE);
-                    gc.fillRect(0,0,canvas.getWidth(),canvas.getHeight());
-                    drawCourse();
-                    drawBoats();
-                    drawFps(lastFpsCount);
-
-                    // If race has started, draw the boats and play the timeline
-                    if (raceViewController.getRace().getRaceTime() > 1){
-                        raceViewController.playTimelines();
-                    }
-                    // Race has not started, pause the timelines
-                    else {
-                        raceViewController.pauseTimelines();
-                    }
-                    lastUpdate = now;
-                    fpsCount ++;
-                    if (now - lastFpsUpdate >= 1000000000){
-                        lastFpsCount = fpsCount;
-                        fpsCount = 0;
-                        lastFpsUpdate = now;
-                    }
-                }
-            }
-        };
-        timer.start();
-    }
-
-    class ResizableCanvas extends Canvas {
-
-        public ResizableCanvas() {
-            // Redraw canvas when size changes.
-            widthProperty().addListener(evt -> draw());
-            heightProperty().addListener(evt -> draw());
-        }
-
-        private void draw() {
-            double width = getWidth();
-            double height = getHeight();
-
-            GraphicsContext gc = getGraphicsContext2D();
-            gc.clearRect(0, 0, width, height);
-        }
-
-        @Override
-        public boolean isResizable() {
-            return true;
-        }
-
-        @Override
-        public double prefWidth(double height) {
-            return getWidth();
-        }
-
-        @Override
-        public double prefHeight(double width) {
-            return getHeight();
-        }
-    }
-
-    private void drawFps(int fps){
-        if (raceViewController.isDisplayFps()){
-            gc.setFill(Color.BLACK);
-            gc.setFont(new Font(14));
-            gc.setLineWidth(3);
-            gc.fillText(fps + " FPS", 5, 20);
-        }
-    }
-
-    /**
-     * Draws all the boats.
-     */
-    private void drawBoats() {
-        Map<Boat, TimelineInfo> timelineInfos = raceViewController.getTimelineInfos();
-        for (Boat boat : timelineInfos.keySet()) {
-            TimelineInfo timelineInfo = timelineInfos.get(boat);
-
-            boat.setLocation(timelineInfo.getY().doubleValue(), timelineInfo.getX().doubleValue());
-
-            drawBoat(boat.getLongitude(), boat.getLatitude(), boat.getColor(), boat.getShortName(), boat.getSpeedInKnots(), boat.getHeading());
-        }
-    }
-
-    /**
-     * Draw the wake line behind a boat
-     * @param gc The graphics context used for drawing the wake
-     * @param x the x position of the boat
-     * @param y the y position of the boat
-     * @param speed the speed of the boat
-     * @param color the color of the wake line
-     * @param heading the heading of the boat
-     */
-    private void drawWake(GraphicsContext gc, double x, double y, double speed, Color color, double heading){
-        double angle = Math.toRadians(heading);
-        speed = speed * 10;
-        Point newP = new Point(0, speed);
-        newP.rotate(angle);
-
-        gc.setStroke(color);
-        gc.setLineWidth(1.0);
-        gc.strokeLine(x, y, newP.x + x, newP.y + y);
-    }
-
-    /**
-     * Draws a boat with given (x, y) position in the given color
-     *
-     * @param lat
-     * @param lon
-     * @param color
-     * @param name
-     * @param speed
-     */
-    private void drawBoat(double lat, double lon, Color color, String name, double speed, double heading) {
-        // Latitude
-        double x = (lon - ORIGIN_LON) * SCALE;
-        double y = (ORIGIN_LAT - lat) * SCALE;
-
-        gc.setFill(color);
-
-        if (raceViewController.isDisplayAnnotations()) {
-            // Set boat text
-            gc.setFont(new Font(14));
-            gc.setLineWidth(3);
-            gc.fillText(name + ", " + speed + " knots", x + 15, y + 15);
-        }
-//        double diameter = 9;
-//        gc.fillOval(x, y, diameter, diameter);
-        double angle = Math.toRadians(heading);
-
-        Point p1 = new Point(0, -15); // apex point
-        Point p2 = new Point(7, 4); // base point
-        Point p3 = new Point(-7, 4); // base point
-        p1.rotate(angle);
-        p2.rotate(angle);
-        p3.rotate(angle);
-        double[] xx = new double[] {p1.x + x, p2.x + x, x, p3.x + x};
-        double[] yy = new double[] {p1.y + y, p2.y + y, y, p3.y + y};
-        gc.fillPolygon(xx, yy, 4);
-
-        if (raceViewController.isDisplayAnnotations()){
-            drawWake(gc, x, y, speed, color, heading);
-        }
-    }
-
-    /**
-     * Inner class for creating point so that you can rotate it around origin point.
-     */
-    class Point {
-
-        double x, y;
-
-        Point (double x, double y) {
-            this.x = x;
-            this.y = y;
-        }
-
-        void rotate(double angle) {
-            double oldX = x;
-            double oldY = y;
-            this.x = oldX * Math.cos(angle) - oldY * Math.sin(angle);
-            this.y = oldX * Math.sin(angle) + oldY * Math.cos(angle);
-
-        }
-    }
-
-    /**
-     * Draws the course.
-     */
-    private void drawCourse() {
-        for (Mark mark : raceViewController.getRace().getCourse()) {
-            if (mark.getMarkType() == MarkType.SINGLE_MARK) {
-                drawSingleMark((SingleMark) mark, Color.BLACK);
-            } else if (mark.getMarkType() == MarkType.GATE_MARK) {
-                drawGateMark((GateMark) mark);
-            }
-        }
-    }
-
-    /**
-     * Draw a given mark on canvas
-     *
-     * @param singleMark
-     */
-    private void drawSingleMark(SingleMark singleMark, Color color) {
-        double x = (singleMark.getLongitude() - ORIGIN_LON) * SCALE;
-        double y = (ORIGIN_LAT - singleMark.getLatitude()) * SCALE;
-
-        gc.setFill(color);
-        gc.fillRect(x,y,5.5,5.5);
-    }
-
-    /**
-     * Draw a gate mark which contains two single marks
-     *
-     * @param gateMark
-     */
-    private void drawGateMark(GateMark gateMark) {
-        Color color = Color.BLUE;
-
-        if (gateMark.getName().equals("Start")){
-            color = Color.RED;
-        }
-
-        if (gateMark.getName().equals("Finish")){
-            color = Color.GREEN;
-        }
-
-        drawSingleMark(gateMark.getSingleMark1(), color);
-        drawSingleMark(gateMark.getSingleMark2(), color);
-
-        GraphicsContext gc = canvas.getGraphicsContext2D();
-
-        gc.setStroke(color);
-
-        // Convert lat/lon to x,y
-        double x1 = (gateMark.getSingleMark1().getLongitude()- ORIGIN_LON) * SCALE;
-        double y1 = (ORIGIN_LAT - gateMark.getSingleMark1().getLatitude()) * SCALE;
-
-        double x2 = (gateMark.getSingleMark2().getLongitude() - ORIGIN_LON) * SCALE;
-        double y2 = (ORIGIN_LAT - gateMark.getSingleMark2().getLatitude()) * SCALE;
-
-        gc.setLineWidth(1);
-        gc.strokeLine(x1, y1, x2, y2);
-    }
-}

src/main/java/seng302/controllers/Controller.java

@@ -1,38 +0,0 @@
-package seng302.controllers;
-
-import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.fxml.Initializable;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.Pane;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.ResourceBundle;
-
-/**
- * Created by michaelrausch on 21/03/17.
- */
-public class Controller implements Initializable {
-    @FXML
-    private AnchorPane contentPane;
-
-    private void setContentPane(String jfxUrl){
-        try{
-            contentPane.getChildren().removeAll();
-            contentPane.getChildren().clear();
-            contentPane.getChildren().addAll((Pane) FXMLLoader.load(getClass().getResource(jfxUrl)));
-        }
-        catch(javafx.fxml.LoadException e){
-            System.err.println(e.getCause());
-        }
-        catch(IOException e){
-            System.err.println(e);
-        }
-    }
-
-    @Override
-    public void initialize(URL location, ResourceBundle resources) {
-        setContentPane("/views/RaceView.fxml");
-    }
-}

src/main/java/seng302/controllers/RaceController.java

@@ -1,80 +0,0 @@
-package seng302.controllers;
-
-import seng302.models.Boat;
-import seng302.models.Race;
-import seng302.models.parsers.ConfigParser;
-import seng302.models.parsers.CourseParser;
-import seng302.models.parsers.TeamsParser;
-
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Random;
-
-/**
- * Created by zyt10 on 17/03/17.
- * run before CanvasController to initialize race events
- * the CanvasController then uses the event data to make the animations
- */
-public class RaceController {
-    Race race = null;
-
-    public void initializeRace() {
-        String raceConfigFile = "/config/config.xml";
-        String teamsConfigFile = "/config/teams.xml";
-
-        try {
-            race = createRace(raceConfigFile, teamsConfigFile);
-        } catch (Exception e) {
-            System.out.println("There was an error creating the race.");
-        }
-
-        if (race != null) {
-            race.startRace();
-        } else {
-            System.out.println("There was an error creating the race. Exiting.");
-        }
-    }
-
-    public Race createRace(String configFile, String teamsConfigFile) throws Exception {
-        Race race = new Race();
-
-        // Read team names from file
-        TeamsParser tp = new TeamsParser(teamsConfigFile);
-
-        // Read course from file
-        ConfigParser config = new ConfigParser(configFile);
-
-        ArrayList<String> boatNames = new ArrayList<>();
-        ArrayList<Boat> teams = tp.getBoats();
-
-        //get race size
-        int numberOfBoats = teams.size();
-
-        //get time scale
-        double timeScale = config.getTimeScale();
-        race.setTimeScale(timeScale);
-
-        for (Boat boat : teams) {
-            boatNames.add(boat.getTeamName());
-            race.addBoat(boat);
-        }
-
-        // Shuffle team names
-        long seed = System.nanoTime();
-        Collections.shuffle(boatNames, new Random(seed));
-
-        if (numberOfBoats > Array.getLength(boatNames.toArray())) {
-            return null;
-        }
-
-        CourseParser course = new CourseParser("/config/course.xml");
-        race.addCourse(course.getCourse());
-
-        return race;
-    }
-
-    public Race getRace() {
-        return race;
-    }
-}

src/main/java/seng302/controllers/RaceResultController.java

@@ -1,37 +0,0 @@
-package seng302.controllers;
-
-import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.VBox;
-import javafx.scene.text.Text;
-import seng302.models.Race;
-
-import java.net.URL;
-import java.util.ResourceBundle;
-
-/**
- * Created by ptg19 on 20/03/17.
- */
-public class RaceResultController implements Initializable{
-    @FXML private AnchorPane window;
-    @FXML private VBox resultsVBox;
-    private Race race;
-
-    RaceResultController(Race race){
-        this.race = race;
-    }
-
-    @Override
-    public void initialize(URL location, ResourceBundle resources) {
-        int boatPosition = this.race.getFinishedBoats().length;
-
-        for (int i = this.race.getFinishedBoats().length - 1; i >= 0; i--){
-            resultsVBox.getChildren().add(0, new Text(boatPosition + ": " + this.race.getFinishedBoats()[i].getTeamName()));
-            boatPosition--;
-        }
-
-
-
-    }
-}

src/main/java/seng302/controllers/RaceViewController.java

@@ -1,280 +0,0 @@
-package seng302.controllers;
-
-import javafx.animation.Animation;
-import javafx.animation.KeyFrame;
-import javafx.animation.KeyValue;
-import javafx.animation.Timeline;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.SimpleDoubleProperty;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.control.CheckBox;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.VBox;
-import javafx.scene.text.Text;
-import javafx.util.Duration;
-import seng302.models.Boat;
-import seng302.models.Event;
-import seng302.models.Race;
-import seng302.models.TimelineInfo;
-import seng302.models.parsers.ConfigParser;
-
-import java.io.IOException;
-import java.util.*;
-
-/**
- * Created by ptg19 on 29/03/17.
- */
-public class RaceViewController {
-    @FXML
-    private VBox positionVbox;
-    @FXML
-    private CheckBox toggleAnnotation, toggleFps;
-    @FXML
-    private Text timerLabel;
-    @FXML
-    private AnchorPane contentAnchorPane;
-    @FXML
-    private Text windArrowText, windDirectionText;
-    @FXML
-    private CanvasController includedCanvasController;
-
-    private boolean displayAnnotations;
-    private boolean displayFps;
-    private Timeline timerTimeline;
-    private Map<Boat, TimelineInfo> timelineInfos = new HashMap<>();
-    private ArrayList<Boat> boatOrder = new ArrayList<>();
-    private Race race;
-
-    public void initialize() {
-        includedCanvasController.setup(this);
-        RaceController raceController = new RaceController();
-        raceController.initializeRace();
-        race = raceController.getRace();
-
-        initializeTimer();
-        initializeSettings();
-        try{
-            initializeTimelines();
-        }
-        catch (Exception e){
-            e.printStackTrace();
-        }
-
-        //set wind direction!!!!!!! can't find another place to put my code --haoming
-        double windDirection = new ConfigParser("/config/config.xml").getWindDirection();
-        windDirectionText.setText(String.format("%.1f°", windDirection));
-        windArrowText.setRotate(windDirection);
-    }
-
-    private void initializeSettings(){
-        displayAnnotations = true;
-        displayFps = true;
-
-        toggleAnnotation.selectedProperty().addListener(new ChangeListener<Boolean>() {
-            @Override
-            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
-                displayAnnotations = !displayAnnotations;
-            }
-        });
-        toggleFps.selectedProperty().addListener(new ChangeListener<Boolean>() {
-            @Override
-            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
-                displayFps = !displayFps;
-            }
-        });
-    }
-
-    private void initializeTimer(){
-        timerTimeline = new Timeline();
-        timerTimeline.setCycleCount(Timeline.INDEFINITE);
-        // Run timer update every second
-        timerTimeline.getKeyFrames().add(
-                new KeyFrame(Duration.seconds(1),
-                        event -> {
-                            // Stop timer if race is finished
-                            if (this.race.isRaceFinished()) {
-                                this.timerTimeline.stop();
-                            } else {
-                                timerLabel.setText(convertTimeToMinutesSeconds(race.getRaceTime()));
-                                this.race.incrementRaceTime();
-                            }
-                        })
-        );
-
-        // Start the timer
-        timerTimeline.playFromStart();
-    }
-
-    /**
-     * Generates time line for each boat, and stores time time into timelineInfos hash map
-     */
-    private void initializeTimelines() {
-        HashMap<Boat, List> boat_events = race.getEvents();
-
-        for (Boat boat : boat_events.keySet()) {
-            // x, y are the real time coordinates
-            DoubleProperty x = new SimpleDoubleProperty();
-            DoubleProperty y = new SimpleDoubleProperty();
-
-            List<KeyFrame> keyFrames = new ArrayList<>();
-            List<Event> events = boat_events.get(boat);
-
-            // iterates all events and convert each event to keyFrame, then add them into a list
-            for (Event event : events) {
-                if (event.getIsFinishingEvent()) {
-                    keyFrames.add(
-                            new KeyFrame(Duration.seconds(event.getTime() / 60 / 60 / 5),
-                                    onFinished -> {race.setBoatFinished(boat); handleEvent(event);},
-                                    new KeyValue(x, event.getThisMark().getLatitude()),
-                                    new KeyValue(y, event.getThisMark().getLongitude())
-                            )
-                    );
-                } else {
-                    keyFrames.add(
-                            new KeyFrame(Duration.seconds(event.getTime() / 60 / 60 / 5),
-                                    onFinished ->{
-                                        handleEvent(event);
-                                        boat.setHeading(event.getBoatHeading());
-                                    },
-                                    new KeyValue(x, event.getThisMark().getLatitude()),
-                                    new KeyValue(y, event.getThisMark().getLongitude())
-                            )
-                    );
-                }
-            }
-            timelineInfos.put(boat, new TimelineInfo(new Timeline(keyFrames.toArray(new KeyFrame[keyFrames.size()])), x, y));
-        }
-        setRaceDuration();
-    }
-
-    private void setRaceDuration(){
-        Double maxDuration = 0.0;
-        Timeline maxTimeline = null;
-
-        for (TimelineInfo timelineInfo : timelineInfos.values()) {
-
-            Timeline timeline = timelineInfo.getTimeline();
-            if (timeline.getTotalDuration().toMillis() >= maxDuration) {
-                maxDuration = timeline.getTotalDuration().toMillis();
-                maxTimeline = timeline;
-            }
-
-            // Timelines are paused by default
-            timeline.play();
-            timeline.pause();
-        }
-
-        maxTimeline.setOnFinished(event -> {
-            race.setRaceFinished();
-            loadRaceResultView();
-        });
-    }
-
-    /**
-     * Play each boats timerTimeline
-     */
-    public void playTimelines(){
-        for (TimelineInfo timelineInfo : timelineInfos.values()){
-            Timeline timeline = timelineInfo.getTimeline();
-
-            if (timeline.getStatus() == Animation.Status.PAUSED){
-                timeline.play();
-            }
-        }
-    }
-
-    /**
-     * Pause each boats timerTimeline
-     */
-    public void pauseTimelines(){
-        for (TimelineInfo timelineInfo : timelineInfos.values()){
-            Timeline timeline = timelineInfo.getTimeline();
-
-            if (timeline.getStatus() == Animation.Status.RUNNING){
-                timeline.pause();
-            }
-        }
-    }
-
-    /**
-     * Display the list of boats in the order they finished the race
-     */
-    private void loadRaceResultView() {
-        FXMLLoader loader = new FXMLLoader(getClass().getResource("/views/FinishView.fxml"));
-        loader.setController(new RaceResultController(race));
-
-        try {
-            contentAnchorPane.getChildren().removeAll();
-            contentAnchorPane.getChildren().clear();
-            contentAnchorPane.getChildren().addAll((Pane) loader.load());
-
-        } catch (javafx.fxml.LoadException e) {
-            System.err.println(e.getCause());
-        } catch (IOException e) {
-            System.err.println(e);
-        }
-    }
-
-    public void handleEvent(Event event) {
-        Boat boat = event.getBoat();
-        boatOrder.remove(boat);
-        boat.setMarkLastPast(event.getMarkPosInRace());
-        boatOrder.add(boat);
-        boatOrder.sort(new Comparator<Boat>() {
-            @Override
-            public int compare(Boat b1, Boat b2) {
-                return b2.getMarkLastPast() - b1.getMarkLastPast();
-            }
-        });
-        showOrder();
-    }
-
-    private void showOrder() {
-        positionVbox.getChildren().clear();
-        positionVbox.getChildren().removeAll();
-
-        for (Boat boat : boatOrder) {
-            positionVbox.getChildren().add(new Text(boat.getShortName() + " " + boat.getSpeedInKnots() + " Knots"));
-        }
-    }
-
-    /**
-     * Convert seconds to a string of the format mm:ss
-     *
-     * @param time the time in seconds
-     * @return a formatted string
-     */
-    public String convertTimeToMinutesSeconds(int time) {
-        if (time < 0) {
-            return String.format("-%02d:%02d", (time * -1) / 60, (time * -1) % 60);
-        }
-        return String.format("%02d:%02d", time / 60, time % 60);
-    }
-
-    public void stopTimer() {
-        timerTimeline.stop();
-    }
-    public void startTimer() {
-        timerTimeline.play();
-    }
-
-    public boolean isDisplayFps() {
-        return displayFps;
-    }
-
-    public boolean isDisplayAnnotations() {
-        return displayAnnotations;
-    }
-
-    public Race getRace() {
-        return race;
-    }
-
-    public Map<Boat, TimelineInfo> getTimelineInfos() {
-        return timelineInfos;
-    }
-}

src/main/java/seng302/discoveryServer/DiscoveryServer.java

@@ -0,0 +1,170 @@
+package seng302.discoveryServer;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import seng302.gameServer.messages.Message;
+import seng302.gameServer.messages.RoomCodeRequest;
+import seng302.gameServer.messages.ServerRegistrationMessage;
+import seng302.model.stream.packets.PacketType;
+import seng302.discoveryServer.util.ServerListing;
+import seng302.discoveryServer.util.ServerRepoStreamParser;
+import seng302.discoveryServer.util.ServerTable;
+import seng302.visualiser.ServerListener;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+import java.util.Timer;
+
+public class DiscoveryServer {
+    public static final String ANSI_GREEN = "\u001B[32m";
+    public static final String ANSI_YELLOW = "\u001B[33m";
+    public static final String ANSI_BLUE = "\u001B[34m";
+    public static final String ANSI_RESET = "\u001B[0m";
+    private static final int MAX_SERVER_TRIES = 10;
+    public static String DISCOVERY_SERVER = "party.sydney.srv.michaelrausch.nz";
+
+    private ServerTable serverTable;
+    public static final Integer PORT_NUMBER = 9969;
+    private ServerSocket serverSocket;
+
+    private final Logger logger = LoggerFactory.getLogger(DiscoveryServer.class);
+
+    private void displayHeader(){
+        String selectedColor = Arrays.asList(ANSI_BLUE, ANSI_GREEN, ANSI_YELLOW).get(new Random().nextInt(2));
+        System.out.println(selectedColor);
+        System.out.println("                              .ccccc.             \n" +
+                "                         .cc;'coooxkl;.           \n" +
+                "                     .:c:::c:,,,,,;c;;,.'.        \n" +
+                "                   .clc,',:,..:xxocc;'..c;        \n" +
+                "                  .c:,';:ox:..:c,,,,,,...cd,      \n" +
+                "                .c:'.,oxxxxl::l:.,loll;..;ol.     \n" +
+                "                ;Oc..:xxxxxxxxx:.,llll,....oc     \n" +
+                "             .,;,',:loxxxxxxxxx:.,llll;.,,.'ld,   \n" +
+                "            .lo;..:xxxxxxxxxxxx:.'cllc,.:l:'cO;   \n" +
+                "           .:;...'cxxxxxxxxxxxxoc;,::,..cdl;;l'   \n" +
+                "         .cl;':,'';oxxxxxxdxxxxxx:....,cooc,cO;   \n" +
+                "     .,,,::;,lxoc:,,:lxxxxxxxxxxxo:,,;lxxl;'oNc   \n" +
+                "   .cdxo;':lxxxxxxc'';cccccoxxxxxxxxxxxxo,.;lc.  " + ANSI_YELLOW + "Party-Parrots-At-Sea Discovery Server v0.1 " + selectedColor +"\n" +
+                "  .loc'.'lxxxxxxxxocc;''''';ccoxxxxxxxxx:..oc     \n" +
+                "olc,..',:cccccccccccc:;;;;;;;;:ccccccccc,.'c,     \n" +
+                "Ol;......................................;l'  ");
+        System.out.println(ANSI_RESET);
+    }
+
+    public DiscoveryServer() throws Exception {
+        displayHeader();
+        serverTable = new ServerTable();
+
+        try{
+            serverSocket = new ServerSocket(PORT_NUMBER);
+        }
+        catch(java.net.BindException e){
+            logger.error("FATAL - Could not bind socket, are you sure there isn't already an instance running?");
+            System.exit(1);
+            return;
+        }
+
+        logger.info("Started successfully - Now accepting connections");
+
+        try{
+            while (true){
+                Socket clientSocket = serverSocket.accept();
+
+                parseRequest(clientSocket);
+
+                clientSocket.close();
+            }
+        }
+        catch (Exception e){
+            close();
+        }
+    }
+
+
+    private void parseRequest(Socket clientSocket) throws Exception {
+        ServerRepoStreamParser parser = new ServerRepoStreamParser(clientSocket.getInputStream());
+
+        if (clientSocket.isConnected() && !clientSocket.isClosed()){
+            PacketType parsePacketResult = parser.parse();
+
+            switch (parsePacketResult){
+                case SERVER_REGISTRATION:
+                    ServerListing listing = parser.getServerListing();
+
+                    if (!serverTable.getAllServers().contains(listing)){
+                        listing.setRoomCode(serverTable.getNextRoomCode().toString());
+                    }
+
+                    serverTable.addServer(listing);
+
+                    Message serverRegMessage = new RoomCodeRequest(listing.getRoomCode());
+                    clientSocket.getOutputStream().write(serverRegMessage.getBuffer());
+                    break;
+
+                case ROOM_CODE_REQUEST:
+                    String desiredRoomCode = parser.getRoomCode();
+                    ServerListing serverListing;
+
+                    if (desiredRoomCode.equals("0000")){
+                        serverListing = getRandomFreeServer();
+                    }
+                    else {
+                        serverListing = serverTable.getServerByRoomCode(desiredRoomCode);
+                    }
+
+                    Message response;
+
+                    if (serverListing != null){
+                        response = new ServerRegistrationMessage(serverListing.getServerName(), serverListing.getMapName(), serverListing.getAddress(), serverListing.getPortNumber(), 0, 0, desiredRoomCode);
+                    }
+                    else{
+                        response = ServerRegistrationMessage.getEmptyRegistration();
+                    }
+
+                    clientSocket.getOutputStream().write(response.getBuffer());
+                    break;
+            }
+        }
+    }
+
+    public ServerListing getRandomFreeServer() {
+        ServerListing serverToJoin;
+
+        List<ServerListing> servers = serverTable.getAllServers();
+
+        if (servers.size() <= 0){
+            return null;
+        }
+
+        if (servers.size() == 1){
+            return servers.get(0);
+        }
+
+        serverToJoin = servers.get(new Random().nextInt(servers.size()));
+
+        int tries = 0;
+
+        while (serverToJoin != null && serverToJoin.isMaxPlayersReached() && tries < MAX_SERVER_TRIES){
+            serverToJoin = servers.get(new Random().nextInt(servers.size()));
+            tries++;
+        }
+
+        if (serverToJoin != null && serverToJoin.isMaxPlayersReached()){
+            return null;
+        }
+
+        return serverToJoin;
+    }
+
+    public void close(){
+        try {
+            serverSocket.close();
+        } catch (IOException ignored) {
+            ;
+        }
+    }
+}

src/main/java/seng302/discoveryServer/DiscoveryServerClient.java

@@ -0,0 +1,195 @@
+package seng302.discoveryServer;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import seng302.discoveryServer.util.ServerListing;
+import seng302.discoveryServer.util.ServerRepoStreamParser;
+import seng302.gameServer.messages.Message;
+import seng302.gameServer.messages.RoomCodeRequest;
+import seng302.gameServer.messages.ServerRegistrationMessage;
+import seng302.model.stream.packets.PacketType;
+import seng302.visualiser.controllers.ViewManager;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.Socket;
+import java.net.URL;
+import java.util.Timer;
+import java.util.TimerTask;
+
+public class DiscoveryServerClient {
+    private final Integer UPDATE_INTERVAL_MS = 5000;
+
+    private static String roomCode = null;
+    private Timer serverListingUpdateTimer;
+    private Logger logger = LoggerFactory.getLogger(DiscoveryServerClient.class);
+    private String ip = "";
+    private Boolean isInInvalidState = false;
+
+    public DiscoveryServerClient() {
+        try {
+            ip = getInetIpAddr();
+        } catch (Exception e) {
+            failError();
+        }
+    }
+
+    public String getInetIp(){
+        return ip;
+    }
+
+    private void failError() {
+        isInInvalidState = true;
+        ViewManager.getInstance().showErrorSnackBar("You do not appear to be able to connect to the internet. Matchmaking will be unavailable.");
+    }
+
+    public boolean didFail(){
+        return isInInvalidState;
+    }
+
+    /**
+     * Register the server with the discovery server
+     * @param serverListing The listing to register
+     */
+    public void register(ServerListing serverListing){
+        if (isInInvalidState) return;
+
+        if (serverListingUpdateTimer != null){
+            serverListingUpdateTimer.cancel();
+            serverListingUpdateTimer = null;
+        }
+
+        serverListingUpdateTimer = new Timer();
+
+        serverListingUpdateTimer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                try {
+                    sendRegistrationUpdate(serverListing);
+                } catch (Exception e) {
+                    logger.debug("Could not update server listing");
+                }
+            }
+        }, 0, UPDATE_INTERVAL_MS);
+    }
+
+    /**
+     * Stop updating the server registration updates
+     */
+    public void unregister(){
+        if (serverListingUpdateTimer != null)
+            serverListingUpdateTimer.cancel();
+    }
+
+    /**
+     * Gets the connection information for a server given a room code
+     *
+     * @param roomCode The room code to search for
+     * @return The ServerListing, or null if there was an error
+     * @throws Exception .
+     */
+    public ServerListing getServerForRoomCode(String roomCode) throws Exception {
+        Socket socket = new Socket(DiscoveryServer.DISCOVERY_SERVER, DiscoveryServer.PORT_NUMBER);
+        ServerRepoStreamParser parser = new ServerRepoStreamParser(socket.getInputStream());
+
+        Message request = new RoomCodeRequest(roomCode); //roomCode);
+        socket.getOutputStream().write(request.getBuffer());
+
+        PacketType packetType = parser.parse();
+
+        if (packetType != PacketType.SERVER_REGISTRATION){
+            logger.debug("Wrong packet received in response to a room code request");
+            return null;
+        }
+
+        socket.close();
+
+        return parser.getServerListing();
+    }
+
+    public ServerListing getRandomServer() throws Exception {
+        Socket socket = new Socket(DiscoveryServer.DISCOVERY_SERVER, DiscoveryServer.PORT_NUMBER);
+        ServerRepoStreamParser parser = new ServerRepoStreamParser(socket.getInputStream());
+
+        Message request = new RoomCodeRequest("0000");
+        socket.getOutputStream().write(request.getBuffer());
+
+        PacketType packetType = parser.parse();
+
+        if (packetType != PacketType.SERVER_REGISTRATION){
+            logger.error("Incorrect packet type received");
+            return null;
+        }
+
+        socket.close();
+
+        ServerListing serverListing = parser.getServerListing();
+
+        if (serverListing == null || serverListing.equals(ServerRegistrationMessage.getEmptyRegistration())){
+            return null;
+        }
+
+        return serverListing;
+    }
+
+    /**
+     * Sends a registration update to the discovery server.
+     *
+     * @param serverListing The server listing to send
+     * @throws Exception IF there was an error sending the update
+     */
+    private void sendRegistrationUpdate(ServerListing serverListing) throws Exception {
+        Socket socket = new Socket(DiscoveryServer.DISCOVERY_SERVER, DiscoveryServer.PORT_NUMBER);
+        ServerRepoStreamParser parser = new ServerRepoStreamParser(socket.getInputStream());
+
+        Message req = new ServerRegistrationMessage(serverListing);
+
+        socket.getOutputStream().write(req.getBuffer());
+
+        PacketType packetType = parser.parse();
+
+        if (packetType != PacketType.ROOM_CODE_REQUEST){
+            socket.close();
+            return;
+        }
+
+        String roomCode = parser.getRoomCode();
+
+        if (roomCode.length() != 0){
+            DiscoveryServerClient.roomCode = roomCode;
+        }
+
+        socket.close();
+    }
+
+    /**
+     * @return The last room code received by the client
+     */
+    public static String getRoomCode(){
+        return roomCode;
+    }
+
+    public static String getInetIpAddr() throws Exception {
+        URL myIp = new URL("http://checkip.amazonaws.com");
+        BufferedReader in = null;
+        try {
+            in = new BufferedReader(new InputStreamReader(
+                    myIp.openStream()));
+            String ip = in.readLine();
+            return ip;
+        } finally {
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+
+
+}
+

src/main/java/seng302/discoveryServer/util/ReadableByteInputStream.java

@@ -0,0 +1,50 @@
+package seng302.discoveryServer.util;
+
+import java.io.InputStream;
+
+public class ReadableByteInputStream {
+    private InputStream is;
+
+    public ReadableByteInputStream(InputStream is){
+        this.is = is;
+    }
+
+    /**
+     * Get n bytes from the input stream
+     * @param n number of bytes
+     * @return the bytes read
+     * @throws Exception .
+     */
+    public byte[] getBytes(int n) throws Exception {
+        byte[] bytes = new byte[n];
+        for (int i = 0; i < n; i++) {
+            bytes[i] = (byte) readByte();
+        }
+        return bytes;
+    }
+
+    /**
+     * Skip n bytes
+     * @param n number of bytes to skip
+     * @throws Exception
+     */
+    public void skipBytes(long n) throws Exception {
+        for (int i = 0; i < n; i++) {
+            readByte();
+        }
+    }
+
+    /**
+     * Read the next byte from the stream
+     * @return The byte that was read
+     * @throws Exception .
+     */
+    public int readByte() throws Exception {
+        int currentByte = is.read();
+
+        if (currentByte == -1) {
+            throw new Exception();
+        }
+        return currentByte;
+    }
+}

src/main/java/seng302/discoveryServer/util/ServerListing.java

@@ -0,0 +1,117 @@
+package seng302.discoveryServer.util;
+
+public class ServerListing {
+    public final static int SERVER_TTL_DEFAULT = 10;
+
+    private String serverName = "";
+    private String mapName = "";
+    private String address = "";
+    private int portNumber = 0;
+    private int capacity = 0;
+    private int players = 0;
+    private String roomCode = "";
+    private int ttl = SERVER_TTL_DEFAULT;
+
+
+    public ServerListing(String serverName, String mapName, String address, int portNumber, int capacity){
+        this.serverName = serverName;
+        this.mapName = mapName;
+        this.address = address;
+        this.portNumber = portNumber;
+        this.capacity = capacity;
+    }
+
+    public ServerListing setNumberOfPlayers(int players){
+        this.players = players;
+        return this;
+    }
+
+    public ServerListing setRoomCode(String roomCode){
+        this.roomCode = roomCode;
+        return this;
+    }
+
+    public void refreshTtl(){
+        ttl = SERVER_TTL_DEFAULT;
+    }
+
+    public void decrementTtl(){
+        ttl--;
+    }
+
+    public boolean hasTtlExpired(){
+        return ttl < 0;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (!ServerListing.class.isAssignableFrom(obj.getClass())) {
+            return false;
+        }
+
+        final ServerListing other = (ServerListing) obj;
+
+        if (this.getPortNumber() != other.getPortNumber()){
+            return false;
+        }
+
+        if (!this.getMapName().equals(other.getMapName())){
+            return false;
+        }
+
+        if (!this.getServerName().equals(other.getServerName())){
+            return false;
+        }
+
+        if (this.getCapacity() != other.getCapacity()){
+            return false;
+        }
+
+        if (!this.getAddress().equals(other.getAddress())){
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return this.getServerName().hashCode() +
+                this.getAddress().hashCode() + this.getMapName().hashCode();
+    }
+
+    public String getRoomCode() {
+        return roomCode;
+    }
+
+    public int getPortNumber() {
+        return portNumber;
+    }
+
+    public String getMapName() {
+        return mapName;
+    }
+
+    public String getServerName() {
+        return serverName;
+    }
+
+    public int getCapacity() {
+        return capacity;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setTtl(Integer ttl){
+        this.ttl = ttl;
+    }
+
+    public boolean isMaxPlayersReached() {
+        return players >= capacity;
+    }
+}

src/main/java/seng302/discoveryServer/util/ServerRepoStreamParser.java

@@ -0,0 +1,109 @@
+package seng302.discoveryServer.util;
+
+
+import seng302.gameServer.messages.Message;
+import seng302.model.stream.packets.PacketType;
+
+import java.io.InputStream;
+import java.util.Arrays;
+
+public class ServerRepoStreamParser {
+    private ReadableByteInputStream inputStream;
+
+    private String roomCode;
+    private String mapName;
+    private ServerListing serverListing;
+
+    public ServerRepoStreamParser(InputStream is){
+        inputStream = new ReadableByteInputStream(is);
+    }
+
+    public PacketType parse() throws Exception {
+        int sync1 = inputStream.readByte();
+        int sync2 = inputStream.readByte();
+
+        PacketType packetType = null;
+
+        if (sync1 == 0x47 && sync2 == 0x83) {
+            int type = inputStream.readByte();
+            inputStream.skipBytes(10);
+            long payloadLength = Message.bytesToLong(inputStream.getBytes(2));
+            byte[] payload = inputStream.getBytes((int) payloadLength);
+            inputStream.skipBytes(4);
+
+            packetType = PacketType.assignPacketType(type, payload);
+
+            switch (packetType) {
+                case ROOM_CODE_REQUEST:
+                    roomCode = parseRoomCodeRequest(payload);
+                    break;
+
+                case LOBBY_REQUEST:
+                    mapName = parseLobbyRequest(payload);
+
+                case SERVER_REGISTRATION:
+                    serverListing = parseServerRegistration(payload);
+                    break;
+            }
+
+        }
+
+        return packetType;
+    }
+    private String parseLobbyRequest(byte[] payload) {
+        int mapNameLength = (int) Message.bytesToLong(Arrays.copyOfRange(payload, 0 ,4));
+
+        return new String(Arrays.copyOfRange(payload, 4, 4+mapNameLength));
+    }
+
+    private String parseRoomCodeRequest(byte[] payload) {
+        int roomCodeLength = (int) Message.bytesToLong(Arrays.copyOfRange(payload, 0 ,6));
+
+        return new String(Arrays.copyOfRange(payload, 6, 6+roomCodeLength));
+    }
+
+    public static ServerListing parseServerRegistration(byte[] payload) {
+        int nameLength = (int) Message.bytesToLong(Arrays.copyOfRange(payload, 0, 6));
+        int mapNameLength = (int) Message.bytesToLong(Arrays.copyOfRange(payload, 6, 12));
+        int addressLength = (int) Message.bytesToLong(Arrays.copyOfRange(payload, 12, 18));
+        int roomCodeLength = (int) Message.bytesToLong(Arrays.copyOfRange(payload, 18, 24));
+
+        int portNumber = (int) Message.bytesToLong(Arrays.copyOfRange(payload, 24, 28));
+        int players = (int) Message.bytesToLong(Arrays.copyOfRange(payload, 28, 32));
+        int capacity = (int) Message.bytesToLong(Arrays.copyOfRange(payload, 32, 36));
+
+        int currentPos = 36;
+        int nextPos = currentPos + nameLength;
+        String serverName = new String(Arrays.copyOfRange(payload, currentPos, nextPos));
+
+        currentPos = nextPos;
+        nextPos = currentPos + mapNameLength;
+        String mapName = new String(Arrays.copyOfRange(payload, currentPos, nextPos));
+
+        currentPos = nextPos;
+        nextPos = currentPos + addressLength;
+        String address = new String(Arrays.copyOfRange(payload, currentPos, nextPos));
+
+        currentPos = nextPos;
+        nextPos = currentPos + roomCodeLength;
+        String roomCode = new String(Arrays.copyOfRange(payload, currentPos, nextPos));
+
+        ServerListing serverListing = new ServerListing(serverName, mapName, address, portNumber, capacity);
+        serverListing.setNumberOfPlayers(players);
+        serverListing.setRoomCode(roomCode);
+
+        return serverListing;
+    }
+
+    public String getRoomCode() {
+        return roomCode;
+    }
+
+    public String getMapName() {
+        return mapName;
+    }
+
+    public ServerListing getServerListing() {
+        return serverListing;
+    }
+}

src/main/java/seng302/discoveryServer/util/ServerTable.java

@@ -0,0 +1,97 @@
+package seng302.discoveryServer.util;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
+
+public class ServerTable {
+    private List<ServerListing> servers;
+    private int lastRoomCode = 4020;
+    private Logger logger = LoggerFactory.getLogger(ServerTable.class);
+
+    public ServerTable(){
+        servers = new ArrayList<>();
+
+        new Timer().schedule(new TimerTask() {
+            @Override
+            public void run() {
+                updateServers();
+            }
+        }, 0, 1000);
+    }
+
+    /**
+     * Update the servers TTL values, and then remove expired servers
+     */
+    private void updateServers() {
+        List<ServerListing> serversToRemove = new ArrayList<>();
+
+        for (ServerListing server : servers){
+            server.decrementTtl();
+
+            if (server.hasTtlExpired()){
+                logger.debug("Removed expired server - " + server.getServerName());
+                serversToRemove.add(server);
+            }
+        }
+
+        servers.removeAll(serversToRemove);
+    }
+
+    /**
+     * Add a server to the table
+     * @param server The server to add
+     */
+    public void addServer(ServerListing server){
+        if (servers.contains(server)){
+           updateTtlForServer(server);
+           return;
+        }
+        logger.debug("Added new server - " + server.getServerName() + " at address: " + server.getAddress() + ":" + server.getPortNumber());
+        servers.add(server);
+    }
+
+    /**
+     * Update the TTL for a given server to the default TTL value
+     * @param server The server to update
+     */
+    private void updateTtlForServer(ServerListing server) {
+        for (ServerListing serverListing : servers){
+            if (server.equals(serverListing)){
+                serverListing.refreshTtl();
+            }
+        }
+    }
+
+    /**
+     * @return All the servers in the table
+     */
+    public List<ServerListing> getAllServers(){
+        return Collections.unmodifiableList(servers);
+    }
+
+    /**
+     * Get a server from the table given its room code
+     * @param roomCode The room code to search for
+     * @return The ServerListing of the found server, or null
+     *         the server wasn't found
+     */
+    public ServerListing getServerByRoomCode(String roomCode){
+        for (ServerListing serverListing : servers){
+            if (serverListing.getRoomCode().equals(roomCode)){
+                return serverListing;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @return The next available room code
+     */
+    public Integer getNextRoomCode(){
+        lastRoomCode += 1;
+        return lastRoomCode;
+    }
+}

src/main/java/seng302/gameServer/ClientConnectionDelegate.java

@@ -0,0 +1,17 @@
+package seng302.gameServer;
+
+import seng302.model.Player;
+
+public interface ClientConnectionDelegate {
+    /**
+     * A player has connected to the server
+     * @param serverToClientThread The player that has connected
+     */
+    void clientConnected(ServerToClientThread serverToClientThread);
+
+    /**
+     * A player has disconnected from the server
+     * @param player The player that has disconnected
+     */
+    void clientDisconnected(Player player);
+}

src/main/java/seng302/gameServer/GameStages.java

@@ -0,0 +1,24 @@
+package seng302.gameServer;
+
+/**
+ * An enum describing the states of the game
+ * Created by wmu16 on 11/07/17.
+ */
+public enum GameStages {
+
+    LOBBYING(0),
+    PRE_RACE(1),
+    RACING(2),
+    FINISHED(3),
+    CANCELLED(4);
+
+    private long code;
+
+    GameStages(long code) {
+        this.code = code;
+    }
+
+    public long getCode(){
+        return code;
+    }
+}

src/main/java/seng302/gameServer/HeartbeatThread.java

@@ -0,0 +1,90 @@
+package seng302.gameServer;
+
+import java.io.IOException;
+import java.util.Stack;
+import java.util.Timer;
+import java.util.TimerTask;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import seng302.model.Player;
+import seng302.gameServer.messages.Heartbeat;
+import seng302.gameServer.messages.Message;
+
+/**
+ * Send Heartbeat messages to connected player at a specified interval
+ * Will call .clientDisconnected on the delegate when a heartbeat message
+ * cannot be sent to a player
+ */
+public class HeartbeatThread implements Runnable {
+
+    private Logger logger = LoggerFactory.getLogger(HeartbeatThread.class);
+
+    private final int HEARTBEAT_PERIOD = 200;
+    private ClientConnectionDelegate delegate;
+    private Integer seqNum;
+    private Stack<Player> disconnectedPlayers;
+
+    public HeartbeatThread(ClientConnectionDelegate delegate){
+        this.delegate =  delegate;
+        seqNum = 0;
+        disconnectedPlayers = new Stack<>();
+
+        Thread thread = new Thread(this, "HeartBeat");
+        thread.start();
+    }
+
+    /**
+     * A player has lost connection to the server
+     * The player is added to a stack so that the delegate
+     * can be notified
+     *
+     * @param player The player that has disconnected
+     */
+    private void playerLostConnection(Player player){
+        disconnectedPlayers.push(player);
+    }
+
+    /**
+     * Sends a heartbeat message to each connected player
+     * The delegate is notified if a player has disconnected
+     */
+    private void sendHeartbeatToAllPlayers(){
+        try {
+            Message heartbeat = new Heartbeat(seqNum);
+            for (Player player : GameState.getPlayers()) {
+                if (!player.getSocket().isConnected()) {
+                    playerLostConnection(player);
+                }
+                try {
+                    player.getSocket().getOutputStream().write(heartbeat.getBuffer());
+                } catch (IOException e) {
+                    playerLostConnection(player);
+                }
+            }
+            updateDelegate();
+            seqNum++;
+        } catch (NullPointerException ne) {
+            logger.debug("Socket closed between checking for connection and sending heartbeat");
+        }
+    }
+
+    /**
+     * Notifies the delegate about
+     * each disconnected player
+     */
+    private void updateDelegate() {
+        while (!disconnectedPlayers.empty()){
+            delegate.clientDisconnected(disconnectedPlayers.pop());
+        }
+    }
+
+    public void run(){
+        Timer t = new Timer();
+        t.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                sendHeartbeatToAllPlayers();
+            }
+        }, 0, HEARTBEAT_PERIOD);
+    }
+}

src/main/java/seng302/gameServer/MainServerThread.java

@@ -0,0 +1,462 @@
+package seng302.gameServer;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+import java.util.Timer;
+import java.util.TimerTask;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import seng302.gameServer.messages.Message;
+import seng302.model.GeoPoint;
+import seng302.model.Player;
+import seng302.model.PolarTable;
+import seng302.model.ServerYacht;
+import seng302.model.stream.xml.parser.RaceXMLData;
+import seng302.model.stream.xml.parser.RegattaXMLData;
+import seng302.utilities.GeoUtility;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.util.ArrayList;
+import java.util.Random;
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * A class describing the overall server, which creates and collects server threads for each client
+ * Created by wmu16 on 13/07/17.
+ */
+public class MainServerThread implements Runnable, ClientConnectionDelegate {
+
+    private Logger logger = LoggerFactory.getLogger(MainServerThread.class);
+
+    private static final int PORT = 4942;
+    private static final Integer CLIENT_UPDATES_PER_SECOND = 60;
+
+    private boolean terminated;
+
+    private Thread thread;
+    private boolean hasStarted = false;
+
+    private ServerSocket serverSocket = null;
+    private ArrayList<ServerToClientThread> serverToClientThreads = new ArrayList<>();
+    private static Integer capacity;
+    private RaceXMLData raceXMLData;
+    private RegattaXMLData regattaXMLData;
+    private boolean serverStarted = false;
+
+    private void startAdvertisingServer() {
+        Integer capacity = GameState.getCapacity();
+        Integer numPlayers = GameState.getNumberOfPlayers();
+        Integer spacesLeft = capacity - numPlayers;
+
+        // No spaces left on server
+        if (spacesLeft < 1) {
+            return;
+        }
+
+        // Start advertising server
+        try {
+            ServerAdvertiser.getInstance()
+                .setMapName(regattaXMLData.getCourseName())
+                .setCapacity(capacity)
+                .setNumberOfPlayers(numPlayers - 1)
+                .registerGame(PORT, regattaXMLData.getRegattaName());
+        } catch (IOException e) {
+            logger.warn("Could not register server");
+        }
+    }
+
+    public MainServerThread() {
+        new GameState();
+        try {
+            serverSocket = new ServerSocket(PORT);
+        } catch (IOException e) {
+            logger.trace("IO error in server thread handler upon trying to make new server socket",
+                0);
+        }
+        terminated = false;
+        thread = new Thread(this, "MainServer");
+        thread.start();
+    }
+
+    private void startServer() {
+        PolarTable.parsePolarFile(getClass().getResourceAsStream("/server_config/acc_polars.csv"));
+        MessageFactory.updateXMLGenerator(raceXMLData, regattaXMLData);
+        GameState.setRace(raceXMLData);
+        MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
+        startAdvertisingServer();
+        GameState.addMessageEventListener(this::broadcastMessage);
+        sendSetupMessages();
+    }
+
+    public void run() {
+
+        new HeartbeatThread(this);
+        new ServerListenThread(serverSocket, this);
+
+        hasStarted = true;
+
+        //You should handle interrupts in some way, so that the thread won't keep on forever if you exit the app.
+        while (!terminated) {
+            if (GameState.getPlayerHasLeftFlag()) {
+                for (ServerToClientThread stc : serverToClientThreads) {
+                    if (!stc.isSocketOpen()) {
+                        GameState.getYachts().remove(stc.getSourceId());
+                        sendSetupMessages();
+                        try {
+                            stc.getSocket().close();
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+                GameState.setPlayerHasLeftFlag(false);
+            }
+            try {
+                Thread.sleep(1000 / CLIENT_UPDATES_PER_SECOND);
+            } catch (InterruptedException e) {
+                logger.trace("Interrupted exception in Main Server Thread thread sleep", 1);
+            }
+            if (GameState.getCurrentStage() == GameStages.LOBBYING && GameState.getCustomizationFlag()) {
+                MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
+                sendSetupMessages();
+                GameState.resetCustomizationFlag();
+            }
+
+            if (GameState.getCurrentStage() == GameStages.PRE_RACE) {
+                sendBoatLocations();
+            }
+
+            //RACING
+            if (GameState.getCurrentStage() == GameStages.RACING) {
+                sendBoatLocations();
+            }
+
+            //FINISHED
+            else if (GameState.getCurrentStage() == GameStages.FINISHED) {
+                broadcastMessage(MessageFactory.getRaceStatusMessage());
+                try {
+                    Thread.sleep(1000); //Hackish fix to make sure all threads have sent closing RaceStatus
+                    terminate();
+                } catch (InterruptedException ie) {
+                    logger.trace("Thread interrupted while waiting to terminate clients", 1);
+                }
+            }
+        }
+        try {
+            synchronized (this){
+                for (ServerToClientThread serverToClientThread : serverToClientThreads) {
+                    serverToClientThread.terminate();
+                }
+            }
+            serverSocket.close();
+        } catch (IOException e) {
+            System.out.println("IO error in server thread handler upon closing socket");
+        }
+    }
+
+    private void sendBoatLocations() {
+        for (ServerYacht serverYacht : GameState.getYachts().values()) {
+            broadcastMessage(MessageFactory.getBoatLocationMessage(serverYacht));
+        }
+    }
+
+    private void sendSetupMessages() {
+        MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
+        broadcastMessage(MessageFactory.getRaceXML());
+        broadcastMessage(MessageFactory.getRegattaXML());
+        broadcastMessage(MessageFactory.getBoatXML());
+    }
+
+    private void broadcastMessage(Message message) {
+        for (ServerToClientThread serverToClientThread : serverToClientThreads) {
+            serverToClientThread.sendMessage(message);
+        }
+    }
+
+    /**
+     * A client has tried to connect to the server
+     *
+     * @param serverToClientThread The player that connected
+     */
+    @Override
+    public void clientConnected(ServerToClientThread serverToClientThread) {
+        logger.debug("Player Connected From " + serverToClientThread.getThread().getName(), 0);
+        if (serverToClientThreads.size() == 0) { //Sets first client as host.
+            serverToClientThread.setAsHost();
+            serverToClientThread.raceXMLProperty().addListener((obs, oldVal, race) -> {
+                if (race != null) {
+                    raceXMLData = race;
+                }
+                if (regattaXMLData != null) {
+                    startServer();
+                }
+            });
+            serverToClientThread.regattaXMLProperty().addListener((obs, oldVal, regatta) -> {
+                if (regatta != null) {
+                    regattaXMLData = regatta;
+                }
+                if (raceXMLData != null) {
+                    startServer();
+                }
+            });
+        } else {
+            //serverToClientThread.addConnectionListener(this::sendSetupMessages);
+        }
+        serverToClientThreads.add(serverToClientThread);
+
+        try {
+            ServerAdvertiser.getInstance().setNumberOfPlayers(GameState.getNumberOfPlayers());
+        } catch (IOException e) {
+            logger.warn("Couldn't update advertisement");
+        }
+
+        while (regattaXMLData == null && raceXMLData == null){
+            try {
+                Thread.sleep(50);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+
+        }
+        serverToClientThread.addConnectionListener(this::sendSetupMessages);
+        serverToClientThread.addDisconnectListener(this::clientDisconnected);
+    }
+
+    /**
+     * A player has left the game, remove the player from the GameState
+     *
+     * @param player The player that left
+     */
+    @Override
+    public void clientDisconnected(Player player) {
+        logger.debug("Player " + player.getYacht().getSourceId() + "'s socket disconnected", 0);
+        GameState.removeYacht(player.getYacht().getSourceId());
+        GameState.removePlayer(player);
+        ServerToClientThread closedConnection = null;
+        for (ServerToClientThread serverToClientThread : serverToClientThreads) {
+            if (serverToClientThread.getSocket() == player.getSocket()) {
+                closedConnection = serverToClientThread;
+            } else if (GameState.getCurrentStage() != GameStages.RACING){
+                serverToClientThread.sendSetupMessages();
+            }
+        }
+
+        serverToClientThreads.remove(closedConnection);
+
+        try {
+            ServerAdvertiser.getInstance().setNumberOfPlayers(GameState.getNumberOfPlayers());
+        } catch (IOException e) {
+            logger.warn("Couldn't update advertisement");
+        }
+
+        closedConnection.terminate();
+    }
+
+    public void startGame() {
+        try {
+            ServerAdvertiser.getInstance().unregister();
+        } catch (IOException e) {
+            logger.warn("Error unregistering server");
+        }
+
+        initialiseBoatPositions();
+        Timer t = new Timer();
+
+        t.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                broadcastMessage(MessageFactory.getRaceStatusMessage());
+                if (GameState.getCurrentStage() == GameStages.PRE_RACE
+                        || GameState.getCurrentStage() == GameStages.LOBBYING) {
+                    broadcastMessage(MessageFactory.getRaceStartStatusMessage());
+                }
+            }
+        }, 0, 500);
+
+
+//        if (GameState.getCurrentStage() == GameStages.LOBBYING) {
+//            sendSetupMessages();
+//        }
+    }
+
+    public void terminate() {
+        terminated = true;
+    }
+
+    /**
+     * Initialise boats to specific spaced out geopoints behind starting line.
+     */
+    private void initialiseBoatPositions() {
+//        CompoundMark cm = GameState.getMarkOrder().getMarkOrder().get(0);
+//        GeoPoint startMark1 = cm.getSubMark(1);
+//        GeoPoint startMark2 = cm.getSubMark(2);
+//
+//        // Calculating midpoint
+//        Double perpendicularAngle = GeoUtility.getBearing(startMark1, startMark2);
+//        Double length = GeoUtility.getDistance(startMark1, startMark2);
+//        GeoPoint midpoint = GeoUtility.getGeoCoordinate(startMark1, perpendicularAngle, length / 2);
+//
+//        // Setting each boats position side by side
+//        final double SEPARATION = 50.0;  // distance apart in meters
+//
+//        int boatIndex = 0;
+//        for (ServerYacht yacht : GameState.getYachts().values()) {
+//            int distanceApart = boatIndex / 2;
+//
+//            if (boatIndex % 2 == 1 && boatIndex != 0) {
+//                distanceApart++;
+//                distanceApart *= -1;
+//            }
+//
+//            GeoPoint spawnMark = GeoUtility
+//                .getGeoCoordinate(midpoint, perpendicularAngle, distanceApart * SEPARATION);
+//
+//            if (yacht.getHeading() < perpendicularAngle) {
+//                spawnMark = GeoUtility
+//                    .getGeoCoordinate(spawnMark, perpendicularAngle + 90, SEPARATION);
+//            } else {
+//                spawnMark = GeoUtility
+//                    .getGeoCoordinate(spawnMark, perpendicularAngle + 270, SEPARATION);
+//            }
+//
+//            yacht.setLocation(spawnMark);
+//            boatIndex++;
+//        }
+
+//        final double SEPARATION = 50.0;  // distance apart in meters
+//
+//        //Reverse of the angle from start to first mark
+//        double angleToFirstMark = 360 - GeoUtility.getBearing(
+//            GameState.getMarkOrder().getMarkOrder().get(0).getMidPoint(),
+//            GameState.getMarkOrder().getMarkOrder().get(1).getMidPoint()
+//        );
+//
+//        //Length of start line
+//        double startLineLength = GeoUtility.getDistance(
+//            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(1),
+//            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(2)
+//        );
+//
+//        //Angle of start line
+//        double startMarkToMarkAngle = GeoUtility.getBearing(
+//            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(1),
+//            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(2)
+//        );
+//
+//        //How many yachts can fit along the start line
+//        int spacesAlongLine = (int) Math.round(startLineLength / SEPARATION);
+//        //The free space left by the boats.
+//        double buffer = (startLineLength % SEPARATION) / 2;
+//
+//        //Randomize starting order.
+//        List<ServerYacht> serverYachtList = new ArrayList<>(GameState.getYachts().values());
+//        Collections.shuffle(serverYachtList);
+//
+//        //set the starting point away from start line.
+//        GeoPoint startingPoint = GeoUtility.getGeoCoordinate(
+//            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(1),
+//            angleToFirstMark, SEPARATION
+//        );
+//
+//        //Move it along the start line
+//        startingPoint = GeoUtility.getGeoCoordinate(
+//            startingPoint, startMarkToMarkAngle, buffer
+//        );
+//
+//        int yachtCount = 0;
+//        int repeats = 0;
+//
+//        GeoPoint yachtLocation;
+//
+//        for (ServerYacht serverYacht : serverYachtList) {
+//
+//            //Move away from start line
+//            yachtLocation = GeoUtility.getGeoCoordinate(
+//                startingPoint, angleToFirstMark,repeats * SEPARATION
+//            );
+//            //Move along start line
+//            yachtLocation = GeoUtility.getGeoCoordinate(
+//                yachtLocation, startMarkToMarkAngle, yachtCount * SEPARATION
+//            );
+//            serverYacht.setLocation(yachtLocation);
+//            serverYacht.setHeading(GeoUtility.getBearing(
+//                yachtLocation, GameState.getMarkOrder().getMarkOrder().get(1).getMidPoint()
+//            ));
+//            //Set location for next yacht
+//            yachtCount++;
+//            if (yachtCount > spacesAlongLine) {
+//                yachtCount = 0;
+//                repeats++;
+//            }
+//        }
+
+        final double DISTANCE_TO_START = 75d;
+        final double YACHT_SEPARATION = 20d;
+
+        //Length of start line
+        double startLineLength = GeoUtility.getDistance(
+            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(1),
+            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(2)
+        );
+
+        //How many yachts can fit along the start line
+        int spacesAlongLine = (int) Math.round(startLineLength / YACHT_SEPARATION);
+
+        //Angle of start line
+        double startMarkToMarkAngle = GeoUtility.getBearing(
+            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(1),
+            GameState.getMarkOrder().getMarkOrder().get(0).getSubMark(2)
+        );
+
+        //angle from first mark to the start
+        double angleToStart = GeoUtility.getBearing(
+            GameState.getMarkOrder().getMarkOrder().get(1).getMidPoint(),
+            GameState.getMarkOrder().getMarkOrder().get(0).getMidPoint()
+        );
+
+        double angleFromStart = GeoUtility.getBearing(
+            GameState.getMarkOrder().getMarkOrder().get(0).getMidPoint(),
+            GameState.getMarkOrder().getMarkOrder().get(1).getMidPoint()
+        );
+
+        GeoPoint startingPoint = GeoUtility.getGeoCoordinate(
+            GameState.getMarkOrder().getMarkOrder().get(0).getMidPoint(),
+            angleToStart, DISTANCE_TO_START
+        );
+
+        List<ServerYacht> randomisedYachts = new ArrayList<>(GameState.getYachts().values());
+        Collections.shuffle(randomisedYachts);
+        while (randomisedYachts.size() > 0) {
+
+            int numYachtsInLine = spacesAlongLine > randomisedYachts.size() ? randomisedYachts.size() : spacesAlongLine;
+            double yachtSpace = numYachtsInLine * YACHT_SEPARATION / 2;
+
+            GeoPoint firstYachtPoint = GeoUtility.getGeoCoordinate(
+                startingPoint, startMarkToMarkAngle + 180, yachtSpace
+            );
+
+            for (int i=0; i<numYachtsInLine; i++){
+                randomisedYachts.get(0).setHeading(angleFromStart);
+                randomisedYachts.get(0).setLocation(firstYachtPoint);
+                firstYachtPoint = GeoUtility.getGeoCoordinate(
+                    firstYachtPoint, startMarkToMarkAngle, yachtSpace
+                );
+                randomisedYachts.remove(0);
+            }
+
+            startingPoint = GeoUtility.getGeoCoordinate(
+                startingPoint, angleToStart, DISTANCE_TO_START
+            );
+        }
+    }
+
+    public boolean hasStarted() {
+        return hasStarted;
+    }
+}

src/main/java/seng302/gameServer/MessageFactory.java

@@ -0,0 +1,232 @@
+package seng302.gameServer;
+
+import seng302.gameServer.messages.*;
+import java.util.ArrayList;
+import java.util.List;
+import seng302.gameServer.messages.BoatLocationMessage;
+import seng302.gameServer.messages.BoatSubMessage;
+import seng302.gameServer.messages.ChatterMessage;
+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.gameServer.messages.XMLMessage;
+import seng302.gameServer.messages.XMLMessageSubType;
+import seng302.gameServer.messages.YachtEventCodeMessage;
+import seng302.gameServer.messages.YachtEventType;
+import seng302.model.Player;
+import seng302.model.ServerYacht;
+import seng302.model.stream.xml.generator.RaceXMLTemplate;
+import seng302.model.stream.xml.generator.RegattaXMLTemplate;
+import seng302.model.stream.xml.parser.RaceXMLData;
+import seng302.model.stream.xml.parser.RegattaXMLData;
+import seng302.model.token.Token;
+import seng302.model.token.TokenType;
+import seng302.utilities.XMLGenerator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A Class for interfacing between the data we have in the GameState to the messages we need to send
+ * through the MainServerThread.
+ *
+ * WARNING DO NOT USE THIS CLASS IF GAMESTATE HAS NOT BEEN INSTANTIATED. (Main Server has not started)
+ * // TODO: 29/08/17 wmu16 - Make GameState non static to fix this ¯\_(ツ)_/¯
+ * Created by wmu16 on 29/08/17.
+ */
+
+/*
+Ideally this class would be created with an instance of the GameState (I tried implementing this for
+ a bit) but it was too difficult to properly make GameState non static without doing some proper
+ re working. To do later.
+ */
+public class MessageFactory {
+
+    private static XMLGenerator xmlGenerator = new XMLGenerator();
+    private static XMLMessage race;
+    private static XMLMessage regatta;
+    private static XMLMessage boats;
+
+    public static void updateXMLGenerator(RaceXMLData race, RegattaXMLData regatta) {
+        xmlGenerator.setRegattaTemplate(
+            new RegattaXMLTemplate(
+                regatta.getRegattaName(),
+                regatta.getCourseName(),
+                regatta.getCentralLat(),
+                regatta.getCentralLng()
+            )
+        );
+        xmlGenerator.setRaceTemplate(
+            new RaceXMLTemplate(
+                new ArrayList<>(),
+                new ArrayList<>(),
+                race.getMarkSequence(),
+                race.getCourseLimit(),
+                new ArrayList<>(race.getCompoundMarks().values()),
+                GameState.getCapacity(), true
+            )
+        );
+        String xmlStr = xmlGenerator.getRaceAsXml();
+        MessageFactory.race = new XMLMessage(xmlStr, XMLMessageSubType.RACE, xmlStr.length());
+        xmlStr = xmlGenerator.getRegattaAsXml();
+        MessageFactory.regatta = new XMLMessage(xmlStr, XMLMessageSubType.REGATTA, xmlStr.length());
+        xmlStr = xmlGenerator.getBoatsAsXml();
+        MessageFactory.boats = new XMLMessage(xmlStr, XMLMessageSubType.BOAT, xmlStr.length());
+    }
+
+    public static void updateBoats(List<ServerYacht> yachts) {
+//        for (ServerYacht serverYacht : yachts) {
+//            System.out.println(serverYacht);
+//        }
+        xmlGenerator.getRace().setBoats(yachts);
+        String xmlStr = xmlGenerator.getBoatsAsXml();
+        MessageFactory.boats = new XMLMessage(xmlStr, XMLMessageSubType.BOAT, xmlStr.length());
+    }
+
+    public static void updateTokens(List<Token> tokens) {
+        xmlGenerator.getRace().setTokens(tokens);
+        String xmlStr = xmlGenerator.getRaceAsXml();
+        MessageFactory.race = new XMLMessage(xmlStr, XMLMessageSubType.RACE, xmlStr.length());
+    }
+
+
+    public static RaceStartStatusMessage getRaceStartStatusMessage() {
+        return new RaceStartStatusMessage(
+            1,
+            GameState.getStartTime(),
+            1,
+            RaceStartNotificationType.SET_RACE_START_TIME);
+    }
+
+    public static RaceStatusMessage getRaceStatusMessage() {
+        // variables taken from GameServerThread
+
+        List<BoatSubMessage> boatSubMessages = new ArrayList<>();
+        RaceStatus raceStatus;
+
+        for (Player player : GameState.getPlayers()) {
+            ServerYacht y = player.getYacht();
+            BoatSubMessage m = new BoatSubMessage(y.getSourceId(), y.getBoatStatus(),
+                y.getLegNumber(),
+                0, 0, 1234L,
+                1234L);
+            boatSubMessages.add(m);
+        }
+
+        long timeTillStart = System.currentTimeMillis() - GameState.getStartTime();
+
+        if (GameState.getCurrentStage() == GameStages.LOBBYING) {
+            raceStatus = RaceStatus.PRESTART;
+        } else if (GameState.getCurrentStage() == GameStages.PRE_RACE) {
+            raceStatus = RaceStatus.PRESTART;
+
+            if (timeTillStart > GameState.WARNING_TIME) {
+                raceStatus = RaceStatus.WARNING;
+            }
+
+            if (timeTillStart > GameState.PREPATORY_TIME) {
+                raceStatus = RaceStatus.PREPARATORY;
+            }
+        } else {
+            raceStatus = RaceStatus.STARTED;
+        }
+
+        return new RaceStatusMessage(1, raceStatus, GameState.getStartTime(),
+            GameState.getWindDirection(),
+            GameState.getWindSpeedMMS().longValue(), GameState.getPlayers().size(),
+            RaceType.MATCH_RACE, 1, boatSubMessages);
+    }
+
+    public static BoatLocationMessage getBoatLocationMessage(ServerYacht yacht) {
+        return new BoatLocationMessage(
+            yacht.getSourceId(),
+            0,  // TODO: 29/08/17 wmu16 - Work out what to do with seqNo. Currently not used
+            yacht.getLocation().getLat(),
+            yacht.getLocation().getLng(),
+            yacht.getHeading(),
+            yacht.getCurrentVelocity().longValue());
+    }
+
+    public static XMLMessage getRaceXML() {
+        return race;
+    }
+
+    public static XMLMessage getRegattaXML() {
+       return regatta;
+    }
+
+    public static XMLMessage getBoatXML() {
+        return boats;
+    }
+
+    public static YachtEventCodeMessage makeCollisionMessage(ServerYacht serverYacht) {
+        return new YachtEventCodeMessage(serverYacht.getSourceId(), YachtEventType.COLLISION);
+    }
+
+
+    /**
+     * Constructs a message to be sent out whenever a yacht picks up a boost
+     *
+     * @param serverYacht The yacht that has picked up a power up
+     * @param token The token which they picked up
+     * @return The corresponding YachtEventCodeMessage
+     */
+    public static YachtEventCodeMessage makePickupMessage(ServerYacht serverYacht, Token token) {
+        YachtEventType yachtEventType = null;
+        switch (token.getTokenType()) {
+            case BOOST:
+                yachtEventType = YachtEventType.TOKEN_VELOCITY;
+                break;
+            case HANDLING:
+                yachtEventType = YachtEventType.TOKEN_HANDLING;
+                break;
+            case WIND_WALKER:
+                yachtEventType = YachtEventType.TOKEN_WIND_WALKER;
+                break;
+            case BUMPER:
+                yachtEventType = YachtEventType.TOKEN_BUMPER;
+                break;
+            case RANDOM:
+                yachtEventType = YachtEventType.TOKEN_RANDOM;
+                break;
+        }
+        return new YachtEventCodeMessage(serverYacht.getSourceId(), yachtEventType);
+    }
+
+    /**
+     * Constructs a message representing a certain buff / debuff for a given yacht. For now this is
+     * just for the bumper debuff so the affected boat is aware that it has been crashed. This could
+     * however be extended to render affects for all boats given a certain debuff.
+     *
+     * @param yacht The yacht affected by some status
+     * @param token The token indicating what status they have
+     * @return A YachtEventCodeMessage
+     */
+    public static YachtEventCodeMessage makeStatusEffectMessage(ServerYacht yacht,
+        TokenType token) {
+        YachtEventType yachtEventType = null;
+        switch (token) {
+            case BUMPER:
+                yachtEventType = YachtEventType.BUMPER_CRASH;
+                break;
+        }
+        return new YachtEventCodeMessage(yacht.getSourceId(), yachtEventType);
+    }
+
+
+    /**
+     * Constructs a message to be sent out when a given yacht powers down (From a boost of any type)
+     *
+     * @param yacht The yacht that is powering down
+     * @return A YachtEventCodeMessage representing this action
+     */
+    public static YachtEventCodeMessage makePowerDownMessage(ServerYacht yacht) {
+        return new YachtEventCodeMessage(yacht.getSourceId(), YachtEventType.POWER_DOWN);
+    }
+
+    public static ChatterMessage makeChatterMessage(Integer messageType, String message) {
+        return new ChatterMessage(messageType, "SERVER: " + message);
+    }
+}

src/main/java/seng302/gameServer/ServerAdvertiser.java

@@ -0,0 +1,185 @@
+package seng302.gameServer;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import seng302.discoveryServer.DiscoveryServerClient;
+import seng302.discoveryServer.util.ServerListing;
+
+import javax.jmdns.JmDNS;
+import javax.jmdns.ServiceInfo;
+import java.io.IOException;
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+/**
+ * Advertises the game server on the local network
+ */
+public class ServerAdvertiser {
+    /*
+    Our service name & protocol
+
+    This must be in the format _Service._Proto.Name as per http://www.ietf.org/rfc/rfc2782.txt
+    Where Service is unique on the network, and protocol is usually _tcp.
+
+    The pseudo-domain 'local.' must end in a full-stop. This is used to indicate that
+    the lookup should be performed using an IP multicast query on the local IP network.
+
+    Read this before changing any of the following values
+    https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/NetServices/Articles/domainnames.html#//apple_ref/doc/uid/TP40002460-SW1
+     */
+    private static String SERVICE = "_partyatsea";
+    private static String PROTOCOL = "_tcp";
+    public static String SERVICE_TYPE = SERVICE + "." + PROTOCOL + ".local.";
+
+    private static ServerAdvertiser instance = null;
+    private static JmDNS jmdnsInstance = null;
+    private ServiceInfo serviceInfo; // Note: Whenever this is changed, our service will be re-registered on the network.
+    private DiscoveryServerClient repositoryClient;
+
+    private Hashtable<String ,String> props;
+    private Logger logger = LoggerFactory.getLogger(ServerAdvertiser.class);
+
+    private ServerAdvertiser() throws IOException{
+        jmdnsInstance = JmDNS.create(InetAddress.getByName(getLocalHostIp()));
+
+        repositoryClient = new DiscoveryServerClient();
+
+        props = new Hashtable<>();
+        props.put("map", "");
+        props.put("spacesLeft", "0");
+        props.put("capacity", "0");
+        props.put("players", "0");
+    }
+
+    /**
+     * Get an instance of the ServerAdvertiser, create an instance if there isn't already one
+     * @return A ServerAdvertiser Instance
+     * @throws IOException If there was an exception creating the instance
+     */
+    public static ServerAdvertiser getInstance() throws IOException {
+        if (instance == null){
+            instance = new ServerAdvertiser();
+        }
+
+        return instance;
+    }
+
+    /**
+     * Set the map name and broadcast an update on the network
+     * @param mapName The new map name
+     * @return The current ServerAdvertiser instance
+     */
+    public ServerAdvertiser setMapName(String mapName){
+        props.replace("map", mapName);
+
+        if (serviceInfo != null){
+            serviceInfo.setText(props);
+        }
+
+        return instance;
+    }
+
+    /**
+     * Set the number of players on the server and broadcast an update on the network
+     * @param numPlayers The number of players on the server
+     * @return The current ServerAdvertiser instance
+     */
+    public ServerAdvertiser setNumberOfPlayers(Integer numPlayers){
+        props.replace("players", numPlayers.toString());
+
+        if (serviceInfo != null){
+            serviceInfo.setText(props);
+        }
+
+        return instance;
+    }
+
+    /**
+     * Set the max capacity of the server and broadcast an update on the network
+     * @param capacity The maximum capacity of the server
+     * @return The current ServerAdvertiser instance
+     */
+    public ServerAdvertiser setCapacity(Integer capacity){
+        props.replace("capacity", capacity.toString());
+
+        if (serviceInfo != null){
+            serviceInfo.setText(props);
+        }
+
+        return instance;
+    }
+
+    /**
+     * Register this service on the network
+     *
+     * Note: other parameters (map name/spaces left etc) are set after the
+     * service has been registered
+     * @param portNo The servers port number
+     * @param serverName The servers name
+     */
+    public void registerGame(Integer portNo, String serverName) {
+
+        serviceInfo = ServiceInfo.create(SERVICE_TYPE, serverName, portNo, 0, 0, props);
+
+        new java.util.Timer().schedule(
+            new java.util.TimerTask() {
+                @Override
+                public void run() {
+                    try {
+                        jmdnsInstance.registerService(serviceInfo);
+                    } catch (IOException e) {
+                        logger.warn("Failed to register service info");
+                    }
+                }
+            }, 0);
+
+        ServerListing serverListing = new ServerListing(serverName, props.get("map"), new DiscoveryServerClient().getInetIp(), portNo, Integer.parseInt(props.get("capacity")));
+        repositoryClient.register(serverListing);
+    }
+
+    /**
+     * Unregister the service
+     */
+    public void unregister(){
+        if (serviceInfo != null)
+            jmdnsInstance.unregisterService(serviceInfo);
+    }
+
+    /**
+     * Gets the local host ip address.
+     *
+     * @return the localhost ip address
+     */
+    public static String getLocalHostIp() {
+        String ipAddress = null;
+        try {
+            Enumeration<NetworkInterface> e = NetworkInterface.getNetworkInterfaces();
+            while (e.hasMoreElements()) {
+                NetworkInterface ni = e.nextElement();
+                if (ni.isLoopback())
+                    continue;
+                if(ni.isPointToPoint())
+                    continue;
+                if(ni.isVirtual())
+                    continue;
+
+                Enumeration<InetAddress> addresses = ni.getInetAddresses();
+                while(addresses.hasMoreElements()) {
+                    InetAddress address = addresses.nextElement();
+                    if(address instanceof Inet4Address) {    // skip all ipv6
+                        ipAddress = address.getHostAddress();
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (ipAddress == null) {
+            System.out.println("[HOST] Cannot obtain local host ip address.");
+        }
+        return ipAddress;
+    }
+}

src/main/java/seng302/gameServer/ServerDescription.java

@@ -0,0 +1,101 @@
+package seng302.gameServer;
+
+public class ServerDescription {
+    private Integer capacity;
+    private String address;
+    private Integer portNum;
+    private String serverName;
+    private String mapName;
+    private Integer numPlayers;
+    private Long lastUpdated;
+    private Long lastRefreshed;
+
+    private static Long EXPIRY_INTERVAL = 5000L;
+
+    public ServerDescription(String serverName, String mapName, Integer numPlayers, Integer capacity, String address, Integer portNum){
+        this.serverName = serverName;
+        this.mapName = mapName;
+        this.numPlayers = numPlayers;
+        this.address = address;
+        this.portNum = portNum;
+        this.capacity = capacity;
+        lastUpdated = System.currentTimeMillis();
+    }
+
+
+    public String getName() {
+        return serverName;
+    }
+
+    public String getMapName() {
+        return mapName;
+    }
+
+    public Integer portNumber() {
+        return portNum;
+    }
+
+    public String getAddress(){
+        return address;
+    }
+
+    public Integer getNumPlayers() {
+        return numPlayers;
+    }
+
+    public Integer getCapacity(){
+        return capacity;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (!ServerDescription.class.isAssignableFrom(obj.getClass())) {
+            return false;
+        }
+        final ServerDescription other = (ServerDescription) obj;
+
+        if (!this.getAddress().equals(other.getAddress()) ) {
+            return false;
+        }
+
+        if (!this.portNumber().equals(other.portNumber())){
+            return false;
+        }
+
+        if (!this.getMapName().equals(other.getMapName())){
+            return false;
+        }
+
+        if (!this.getName().equals(other.getName())){
+            return false;
+        }
+
+        if (!this.getCapacity().equals(other.getCapacity())){
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return this.getName().hashCode() + this.getAddress().hashCode() +
+                this.portNumber().hashCode() + this.getMapName().hashCode();
+    }
+
+    public Boolean hasExpired(){
+        return System.currentTimeMillis() - lastUpdated > EXPIRY_INTERVAL;
+    }
+
+    public Boolean serverShouldBeRemoved() {
+        if (lastRefreshed == null) return false;
+        return System.currentTimeMillis() - lastRefreshed > EXPIRY_INTERVAL;
+    }
+
+    public void hasBeenRefreshed(){
+        lastRefreshed = System.currentTimeMillis();
+    }
+}

src/main/java/seng302/gameServer/ServerListenThread.java

@@ -0,0 +1,45 @@
+package seng302.gameServer;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+/**
+ * A class for a thread to listen to connections
+ * Created by wmu16 on 11/07/17.
+ */
+public class ServerListenThread implements Runnable {
+    private ServerSocket serverSocket;
+    private ClientConnectionDelegate delegate;
+
+    public ServerListenThread(ServerSocket serverSocket, ClientConnectionDelegate delegate){
+        this.serverSocket = serverSocket;
+        this.delegate = delegate;
+
+        Thread thread = new Thread(this, "ServerListen");
+        thread.start();
+    }
+
+    /**
+     * Listens for a connection and upon finding one, creates a Player object and adds it to the universal GameState
+     */
+    private void acceptConnection() {
+        try {
+            Socket thisClient = serverSocket.accept();
+            if (thisClient != null && GameState.getCurrentStage().equals(GameStages.LOBBYING)) {
+                ServerToClientThread thisConnection = new ServerToClientThread(thisClient);
+                delegate.clientConnected(thisConnection);
+            } else {
+                thisClient.close();
+            }
+        } catch (IOException e) {
+            e.getMessage();
+        }
+    }
+
+    public void run(){
+        while (serverSocket != null && !serverSocket.isClosed()){
+            acceptConnection();
+        }
+    }
+}

src/main/java/seng302/gameServer/ServerPacketParser.java

@@ -0,0 +1,46 @@
+package seng302.gameServer;
+
+import java.util.Arrays;
+import seng302.gameServer.messages.BoatAction;
+import seng302.gameServer.messages.ChatterMessage;
+import seng302.gameServer.messages.ClientType;
+import seng302.gameServer.messages.CustomizeRequestType;
+import seng302.gameServer.messages.Message;
+import seng302.model.stream.packets.StreamPacket;
+
+
+public class ServerPacketParser {
+
+    public static BoatAction extractBoatAction(StreamPacket packet) {
+        byte[] payload = packet.getPayload();
+        int messageVersionNo = payload[0];
+        long actionTypeValue = Message.bytesToLong(Arrays.copyOfRange(payload, 0, 1));
+        return BoatAction.getType((int) actionTypeValue);
+    }
+
+    public static ClientType extractClientType(StreamPacket packet){
+        byte[] payload = packet.getPayload();
+        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);
+    }
+
+    public static ChatterMessage extractChatterText(byte[] payload) {
+        return new ChatterMessage(
+            payload[1], new String(Arrays.copyOfRange(payload, 3, payload.length))
+        );
+    }
+
+    public static ChatterMessage extractChatterText(StreamPacket packet) {
+        byte[] payload = packet.getPayload();
+        return new ChatterMessage(
+            payload[1], new String(Arrays.copyOfRange(payload, 3, payload.length))
+        );
+    }
+}
+

src/main/java/seng302/gameServer/ServerToClientThread.java

@@ -0,0 +1,334 @@
+package seng302.gameServer;
+
+
+import javafx.beans.property.SimpleObjectProperty;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import seng302.gameServer.messages.*;
+import org.w3c.dom.Document;
+import seng302.gameServer.messages.BoatAction;
+import seng302.gameServer.messages.ChatterMessage;
+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.model.Player;
+import seng302.model.ServerYacht;
+import seng302.model.stream.packets.PacketType;
+import seng302.model.stream.packets.StreamPacket;
+import seng302.model.stream.xml.parser.RaceXMLData;
+import seng302.model.stream.xml.parser.RegattaXMLData;
+import seng302.utilities.StreamParser;
+import seng302.utilities.XMLGenerator;
+import seng302.utilities.XMLParser;
+import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+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.zip.CRC32;
+import java.util.zip.Checksum;
+
+/**
+ * A class describing a single connection to a Client for the purposes of sending and receiving on
+ * its own thread. All server threads created and owned by the server thread handler which can
+ * trigger client updates on its threads Created by wmu16 on 13/07/17.
+ */
+public class ServerToClientThread implements Runnable {
+
+    /**
+     * Called to notify listeners when this thread receives a connection correctly.
+     */
+    @FunctionalInterface
+    interface ConnectionListener {
+        void notifyConnection ();
+    }
+
+    // TODO: 17/08/17 this is only temporary disconnects should be handled consistently
+    @FunctionalInterface
+    interface DisconnectListener {
+        void notifyDisconnect (Player player);
+    }
+
+    private Logger logger = LoggerFactory.getLogger(ServerToClientThread.class);
+
+    private Thread thread;
+
+    private InputStream is;
+    private OutputStream os;
+    private Socket socket;
+
+    private ByteArrayOutputStream crcBuffer;
+
+    private Integer seqNo;
+    private Integer sourceId;
+
+    private ClientType clientType;
+    private Boolean isRegistered = false;
+    private Boolean isHost = false;
+
+    private XMLGenerator xmlGenerator;
+
+    private List<ConnectionListener> connectionListeners = new ArrayList<>();
+    private DisconnectListener disconnectListener;
+
+    private Player player;
+
+    private SimpleObjectProperty<RaceXMLData> raceXMLProperty = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<RegattaXMLData> regattaXMLProperty = new SimpleObjectProperty<>();
+
+    public ServerToClientThread(Socket socket) {
+        this.socket = socket;
+        seqNo = 0;
+
+        try{
+            is = socket.getInputStream();
+            os = socket.getOutputStream();
+        } catch (IOException e) {
+            return;
+        }
+
+        thread = new Thread(this, "ServerToClient");
+        thread.start();
+    }
+
+    public Integer getSourceId() {
+        return sourceId;
+    }
+
+    private void setUpPlayer(){
+        String shortName = "P" + sourceId;
+        String longName = "Player " + sourceId;
+
+        ServerYacht yacht = new ServerYacht(
+            BoatMeshType.DINGHY, sourceId, sourceId.toString(), shortName, longName, "NZ");
+
+        player = new Player(socket, yacht);
+        GameState.addYacht(sourceId, yacht);
+        GameState.addPlayer(player);
+    }
+
+    private void completeRegistration(ClientType clientType) throws IOException {
+        // Fail if not a player
+        if (!clientType.equals(ClientType.PLAYER)){
+            RegistrationResponseMessage responseMessage = new RegistrationResponseMessage(0, RegistrationResponseStatus.FAILURE_GENERAL);
+            os.write(responseMessage.getBuffer());
+            return;
+        }
+
+        if (GameState.getPlayers().size() >= GameState.getCapacity()){
+            RegistrationResponseMessage responseMessage = new RegistrationResponseMessage(0, RegistrationResponseStatus.FAILURE_FULL);
+            os.write(responseMessage.getBuffer());
+            return;
+        }
+
+        Integer sourceId = GameState.getUniquePlayerID();
+        RegistrationResponseMessage responseMessage = new RegistrationResponseMessage(sourceId, RegistrationResponseStatus.SUCCESS_PLAYING);
+
+        this.clientType = clientType;
+        this.sourceId = sourceId;
+        isRegistered = true;
+        os.write(responseMessage.getBuffer());
+
+        setUpPlayer();
+
+        for (ConnectionListener listener : connectionListeners) {
+            listener.notifyConnection();
+        }
+    }
+
+    public void run() {
+        int sync1;
+        int sync2;
+        // TODO: 14/07/17 wmu16 - Work out how to fix this while loop
+
+        while (socket.isConnected() && !socket.isClosed()) {
+            try {
+                crcBuffer = new ByteArrayOutputStream();
+                sync1 = readByte();
+                sync2 = readByte();
+                //checking if it is the start of the packet
+                if (sync1 == 0x47 && sync2 == 0x83) {
+                    int type = readByte();
+                    //No. of milliseconds since Jan 1st 1970
+                    long timeStamp = Message.bytesToLong(getBytes(6));
+                    skipBytes(4);
+                    long payloadLength = Message.bytesToLong(getBytes(2));
+                    byte[] payload = getBytes((int) payloadLength);
+                    Checksum checksum = new CRC32();
+                    checksum.update(crcBuffer.toByteArray(), 0, crcBuffer.size());
+                    long computedCrc = checksum.getValue();
+                    long packetCrc = Message.bytesToLong(getBytes(4));
+                    if (computedCrc == packetCrc) {
+                        StreamPacket packet = new StreamPacket(type, payloadLength, timeStamp, payload);
+                        switch (PacketType.assignPacketType(type, payload)) {
+                            case BOAT_ACTION:
+                                BoatAction actionType = ServerPacketParser.extractBoatAction(packet);
+                                GameState.updateBoat(sourceId, actionType);
+                                break;
+
+                            case RACE_REGISTRATION_REQUEST:
+                                ClientType requestedType = ServerPacketParser
+                                    .extractClientType(packet);
+                                completeRegistration(requestedType);
+                                break;
+                            case CHATTER_TEXT:
+                                ChatterMessage chatterMessage = ServerPacketParser
+                                    .extractChatterText(packet);
+                                GameState.processChatter(chatterMessage, isHost);
+                                break;
+                            case RACE_CUSTOMIZATION_REQUEST:
+                                Long sourceID = Message.bytesToLong(
+                                    Arrays.copyOfRange(payload, 0, 3)
+                                );
+                                CustomizeRequestType requestType = ServerPacketParser
+                                    .extractCustomizationType(packet);
+
+                                GameState.customizePlayer(sourceID, requestType,
+                                    Arrays.copyOfRange(payload, 6, payload.length)
+                                );
+                                GameState.setCustomizationFlag();
+                                // TODO: 17/08/2017 ajm412: Send a response packet here, not really necessary until we do shapes.
+                                break;
+                            case RACE_XML:
+                                Document document = StreamParser.extractXmlMessage(packet);
+                                raceXMLProperty.set(
+                                    XMLParser.parseRace(document)
+                                );
+                                GameState.setMaxPlayers(XMLParser.getMaxPlayers(document));
+                                GameState.setTokensEnabled(XMLParser.tokensEnabled(document));
+                                break;
+                            case REGATTA_XML:
+                                regattaXMLProperty.set(
+                                    XMLParser.parseRegatta(
+                                        StreamParser.extractXmlMessage(packet)
+                                    )
+                                );
+                                break;
+
+                        }
+                    } else {
+                        logger.warn("Packet has been dropped", 1);
+                    }
+                }
+            } catch (Exception e) {
+                closeSocket();
+                GameState.setPlayerHasLeftFlag(true);
+                return;
+            }
+        }
+        GameState.setPlayerHasLeftFlag(true);
+        logger.warn("Closed serverToClientThread" + thread, 1);
+    }
+
+    public void sendSetupMessages() {
+        sendMessage(MessageFactory.getRegattaXML());
+        sendMessage(MessageFactory.getBoatXML());
+        sendMessage(MessageFactory.getRaceXML());
+    }
+
+    private void closeSocket() {
+        try {
+            socket.close();
+        } catch (IOException e) {
+            System.out.println("IO error in server thread upon trying to close socket");
+        }
+    }
+
+    public Boolean isSocketOpen() {
+        return !socket.isClosed();
+    }
+
+    private int readByte() throws Exception {
+        int currentByte = -1;
+        try {
+            currentByte = is.read();
+            crcBuffer.write(currentByte);
+        } catch (SocketException se) {
+            disconnectListener.notifyDisconnect(this.player);
+        } catch (IOException e) {
+            disconnectListener.notifyDisconnect(this.player);
+            logger.warn("Socket read failed", 1);
+        }
+        if (currentByte == -1) {
+            throw new Exception();
+        }
+        return currentByte;
+    }
+
+    private byte[] getBytes(int n) throws Exception {
+        byte[] bytes = new byte[n];
+        for (int i = 0; i < n; i++) {
+            bytes[i] = (byte) readByte();
+        }
+        return bytes;
+    }
+
+    private void skipBytes(long n) throws Exception {
+        for (int i = 0; i < n; i++) {
+            readByte();
+        }
+    }
+
+    public void sendMessage(Message message) {
+        try {
+            os.write(message.getBuffer());
+        } catch (SocketException e) {
+            logger.warn("Player " + sourceId + " side socket disconnected", 1);
+        } catch (IOException e) {
+            logger.warn("Message send failed", 1);
+        }
+    }
+
+    private int getSeqNo() {
+        seqNo++;
+        return seqNo;
+    }
+
+    public Thread getThread() {
+        return thread;
+    }
+
+    public Socket getSocket() {
+        return socket;
+    }
+
+    public void addConnectionListener(ConnectionListener listener) {
+        connectionListeners.add(listener);
+    }
+
+    public void removeConnectionListener(ConnectionListener listener) {
+        connectionListeners.remove(listener);
+    }
+
+    public void terminate () {
+        try {
+            socket.close();
+        } catch (IOException ioe) {
+            logger.warn("IOException attempting to terminate serverToClientThread " + this.thread);
+        }
+    }
+
+    public void addDisconnectListener(DisconnectListener disconnectListener) {
+        this.disconnectListener = disconnectListener;
+    }
+
+    public void setAsHost() {
+        isHost = true;
+    }
+
+    public SimpleObjectProperty<RaceXMLData> raceXMLProperty() {
+        return raceXMLProperty;
+    }
+
+    public SimpleObjectProperty<RegattaXMLData> regattaXMLProperty() {
+        return regattaXMLProperty;
+    }
+}

src/main/java/seng302/gameServer/messages/BoatAction.java

@@ -0,0 +1,41 @@
+package seng302.gameServer.messages;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by kre39 on 12/07/17.
+ */
+public enum BoatAction {
+
+    VMG(1),
+    SAILS_IN(2),
+    SAILS_OUT(3),
+    TACK_GYBE(4),
+    UPWIND(5),
+    DOWNWIND(6),
+    MAINTAIN_HEADING(7),
+    CONTINUOUSLY_TURNING(8),
+    DEFAULT_TURNING(9);
+
+    private final int type;
+    private static final Map<Integer, BoatAction> intToTypeMap = new HashMap<>();
+
+    static {
+        for (BoatAction type : BoatAction.values()) {
+            intToTypeMap.put(type.getValue(), type);
+        }
+    }
+
+    BoatAction(int type){
+        this.type = type;
+    }
+
+    public static BoatAction getType(int value) {
+        return intToTypeMap.get(value);
+    }
+
+    public int getValue() {
+        return this.type;
+    }
+}

src/main/java/seng302/gameServer/messages/BoatActionMessage.java

@@ -0,0 +1,29 @@
+package seng302.gameServer.messages;
+
+/**
+ * Created by kre39 on 12/07/17.
+ */
+public class BoatActionMessage extends Message{
+    private final MessageType MESSAGE_TYPE = MessageType.BOAT_ACTION;
+    private final int MESSAGE_SIZE = 5;
+    private BoatAction actionType;
+
+    public BoatActionMessage(BoatAction actionType, int sourceId) {
+        this.actionType = actionType;
+        setHeader(new Header(MessageType.BOAT_ACTION, sourceId, (short) MESSAGE_SIZE)); // the second variable is the source id
+        allocateBuffer();
+        writeHeaderToBuffer();
+        // Write message fields
+        putInt(actionType.getValue(), 1);
+        putInt(sourceId, 4);
+        writeCRC();
+        rewind();
+    }
+
+    @Override
+    public int getSize() {
+        return MESSAGE_SIZE;
+    }
+
+
+}

src/main/java/seng302/gameServer/messages/BoatLocationMessage.java

@@ -0,0 +1,162 @@
+package seng302.gameServer.messages;
+
+public class BoatLocationMessage extends Message {
+
+    private final int MESSAGE_SIZE = 56;
+
+    private long messageVersionNumber;
+    private long time;
+    private long sourceId;
+    private long sequenceNum;
+    private DeviceType deviceType;
+    private double latitude;
+    private double longitude;
+    private long altitude;
+    private Double heading;
+    private long pitch;
+    private long roll;
+    private long boatSpeed;
+    private long COG;
+    private long SOG;
+    private long apparentWindSpeed;
+    private long apparentWindAngle;
+    private long trueWindSpeed;
+    private long trueWindDirection;
+    private long trueWindAngle;
+    private long currentDrift;
+    private long currentSet;
+    private long rudderAngle;
+
+    /**
+     * Describes the location, altitude and sensor data from the boat.
+     *
+     * @param sourceId ID of the boat
+     * @param sequenceNum Sequence number of the message
+     * @param latitude The boats latitude
+     * @param longitude The boats longitude
+     * @param heading The boats heading
+     * @param boatSpeed The boats speed
+     */
+    public BoatLocationMessage(int sourceId, int sequenceNum, double latitude, double longitude,
+        double heading, long boatSpeed) {
+        messageVersionNumber = 1;
+        time = System.currentTimeMillis();
+        this.sourceId = sourceId;
+        this.sequenceNum = sequenceNum;
+        this.deviceType = DeviceType.RACING_YACHT;
+        this.latitude = latitude;
+        this.longitude = longitude;
+        this.altitude = 0;
+        this.heading = heading;
+        this.pitch = 0;
+        this.roll = 0;
+        this.boatSpeed = boatSpeed;
+        this.COG = 2;
+        this.SOG = boatSpeed;
+        this.apparentWindSpeed = 0;
+        this.apparentWindAngle = 0;
+        this.trueWindSpeed = 0;
+        this.trueWindDirection = 0;
+        this.trueWindAngle = 0;
+        this.currentDrift = 0;
+        this.currentSet = 0;
+        this.rudderAngle = 0;
+
+        setHeader(new Header(MessageType.BOAT_LOCATION, 1, (short) getSize()));
+        allocateBuffer();
+        writeHeaderToBuffer();
+
+        long headingToSend = (long) ((heading / 360.0) * 65535.0);
+
+        putByte((byte) messageVersionNumber);
+        putInt(time, 6);
+        putInt((int) sourceId, 4);
+        putUnsignedInt((int) sequenceNum, 4);
+        putByte((byte) deviceType.getCode());
+        putInt((int) latLonToBinaryPackedLong(latitude), 4);
+        putInt((int) latLonToBinaryPackedLong(longitude), 4);
+        putInt((int) altitude, 4);
+        putInt(headingToSend, 2);
+        putInt((int) pitch, 2);
+        putInt((int) roll, 2);
+        putInt((int) boatSpeed, 2);
+        putUnsignedInt((int) COG, 2);
+        putUnsignedInt((int) SOG, 2);
+        putUnsignedInt((int) apparentWindSpeed, 2);
+        putInt((int) apparentWindAngle, 2);
+        putUnsignedInt((int) trueWindSpeed, 2);
+        putUnsignedInt((int) trueWindDirection, 2);
+        putInt((int) trueWindAngle, 2);
+        putUnsignedInt((int) currentDrift, 2);
+        putUnsignedInt((int) currentSet, 2);
+        putInt((int) rudderAngle, 2);
+
+        writeCRC();
+        rewind();
+    }
+
+    /**
+     * Convert binary latitude or longitude to floating point number
+     *
+     * @param binaryPackedLatLon Binary packed lat OR lon
+     * @return Floating point lat/lon
+     */
+    public static double binaryPackedToLatLon(long binaryPackedLatLon) {
+        return (double) binaryPackedLatLon * 180.0 / 2147483648.0;
+    }
+
+    /**
+     * Convert binary packed heading to floating point number
+     *
+     * @param binaryPackedHeading Binary packed heading
+     * @return heading as a decimal
+     */
+    public static double binaryPackedHeadingToDouble(long binaryPackedHeading) {
+        return (double) binaryPackedHeading * 360.0 / 65536.0;
+    }
+
+    /**
+     * Convert binary packed wind angle to floating point number
+     *
+     * @param binaryPackedWindAngle Binary packed wind angle
+     * @return wind angle as a decimal
+     */
+    public static double binaryPackedWindAngleToDouble(long binaryPackedWindAngle) {
+        return (double) binaryPackedWindAngle * 180.0 / 32768.0;
+    }
+
+    /**
+     * Convert a latitude or longitude to a binary packed long
+     *
+     * @param latLon A floating point latitude/longitude
+     * @return A binary packed lat/lon
+     */
+    public static long latLonToBinaryPackedLong(double latLon) {
+        return (long) ((536870912 * latLon) / 45);
+    }
+
+    /**
+     * Convert a heading to a binary packed long
+     *
+     * @param heading A floating point heading
+     * @return A binary packed heading
+     */
+    public static long headingToBinaryPackedLong(double heading) {
+        return (long) ((8192 * heading) / 45);
+    }
+
+    /**
+     * Convert a wind angle to a binary packed long
+     *
+     * @param windAngle Floating point wind angle
+     * @return A binary packed wind angle
+     */
+    public static long windAngleToBinaryPackedLong(double windAngle) {
+        return (long) ((8192 * windAngle) / 45);
+    }
+
+    @Override
+    public int getSize() {
+        return MESSAGE_SIZE;
+    }
+}

src/main/java/seng302/gameServer/messages/BoatStatus.java

@@ -0,0 +1,25 @@
+package seng302.gameServer.messages;
+
+/**
+ * The current status of a boat
+ */
+public enum BoatStatus {
+    UNDEFINED(0),
+    PRESTART(1),
+    RACING(2),
+    FINISHED(3),
+    DNS(4),
+    DNF(5),
+    DSQ(6),
+    CS(7);
+
+    private long code;
+
+    BoatStatus(long code) {
+        this.code = code;
+    }
+
+    public long getCode(){
+        return code;
+    }
+}

src/main/java/seng302/gameServer/messages/BoatSubMessage.java

@@ -0,0 +1,85 @@
+package seng302.gameServer.messages;
+
+import java.nio.ByteBuffer;
+
+/**
+ * The status of each boat, sent within a race status message
+ */
+public class BoatSubMessage{
+    private final int MESSAGE_SIZE = 20;
+
+    private long sourceId;
+    private BoatStatus boatStatus;
+    private long legNumber;
+    private long numberPenaltiesAwarded;
+    private long numberPenaltiesServed;
+    private long estimatedTimeAtNextMark;
+    private long estimatedTimeAtFinish;
+    private ByteBuffer buff = ByteBuffer.allocate(getSize());
+    private int buffPos = 0;
+
+    /**
+     * Boat Sub message from section 4.2 of the AC35 streaming data interface spec
+     * @param sourceId The source ID of the boat
+     * @param boatStatus The boats status
+     * @param legNumber The leg the boat is on (0= prestart, 1=start to first mark etc)
+     * @param numberPenaltiesAwarded The number of penalties awarded to the boat
+     * @param numberPenaltiesServed The number of penalties served to the boat
+     * @param estimatedTimeAtFinish The estimated time (UTC) the boat will finish the race
+     * @param estimatedTimeAtNextMark The estimated time (UTC) the boat will arrive at the next mark
+     */
+    public BoatSubMessage(long sourceId, BoatStatus boatStatus, long legNumber, long numberPenaltiesAwarded, long numberPenaltiesServed,
+                   long estimatedTimeAtFinish, long estimatedTimeAtNextMark){
+        this.sourceId = sourceId;
+        this.boatStatus = boatStatus;
+        this.legNumber = legNumber;
+        this.numberPenaltiesAwarded = numberPenaltiesAwarded;
+        this.numberPenaltiesServed = numberPenaltiesServed;
+        this.estimatedTimeAtFinish = estimatedTimeAtFinish;
+        this.estimatedTimeAtNextMark = estimatedTimeAtNextMark;
+    }
+
+    /**
+     * @return The size of this message in bytes
+     */
+    public int getSize(){
+        return MESSAGE_SIZE;
+    }
+
+    private void putInBuffer(byte[] bytes, long val){
+        byte[] tmp = bytes.clone();
+        Message.reverse(tmp);
+
+        buff.put(tmp);
+        buffPos += tmp.length;
+        buff.position(buffPos);
+    }
+
+    /**
+     * @return a ByteBuffer containing this boat status message
+     */
+    public ByteBuffer getByteBuffer(){
+        // Source ID, 4 bytes
+        putInBuffer(Message.intToByteArray(sourceId, 4), 4);
+
+        // Boat Status, 1 byte
+        putInBuffer(ByteBuffer.allocate(1).put((byte) (boatStatus.getCode() & 0xff)).array(), 1);
+
+        // Leg number, 1 byte
+        putInBuffer(ByteBuffer.allocate(1).put((byte) (legNumber & 0xff)).array(), 1);
+
+        // Number of penalties awarded, 1 byte
+        putInBuffer(ByteBuffer.allocate(1).put((byte) (numberPenaltiesAwarded & 0xff)).array(), 1);
+
+        // Number of penalties served, 1 byte
+        putInBuffer(ByteBuffer.allocate(1).put((byte) (numberPenaltiesServed & 0xff)).array(), 1);
+
+        // Estimated time at next mark, 6 bytes
+        putInBuffer(Message.intToByteArray((int) estimatedTimeAtNextMark, 6),6);
+
+        // Estimated time at finish, 6 bytes
+        putInBuffer(Message.intToByteArray((int) estimatedTimeAtFinish, 6), 6);
+
+        return buff;
+    }
+}

src/main/java/seng302/gameServer/messages/ChatterMessage.java

@@ -0,0 +1,46 @@
+package seng302.gameServer.messages;
+
+/**
+ * Created by kre39 on 20/07/17.
+ */
+public class ChatterMessage extends Message {
+
+    private final long MESSAGE_VERSION_NUMBER = 1;
+    private final int MESSAGE_SIZE = 3;
+    private int message_type;
+    private int message_size = 21;
+    private String message;
+
+    public ChatterMessage(int message_type, String message) {
+        byte[] byteMessage = message.getBytes();
+
+        this.message_type = message_type;
+        this.message_size = byteMessage.length;
+        this.message = message;
+
+        setHeader(new Header(MessageType.CHATTER_TEXT, 1, (short) getSize()));
+        allocateBuffer();
+        writeHeaderToBuffer();
+
+        putByte((byte) MESSAGE_VERSION_NUMBER);
+        putInt(message_type, 1);
+        putInt(message_size, 1);
+        putBytes(byteMessage);
+
+        writeCRC();
+        rewind();
+    }
+
+    @Override
+    public int getSize() {
+        return MESSAGE_SIZE + message_size;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public int getMessageType() {
+        return message_type;
+    }
+}

src/main/java/seng302/gameServer/messages/ClientType.java

@@ -0,0 +1,33 @@
+package seng302.gameServer.messages;
+
+public enum ClientType {
+    SPECTATOR(0x00),
+    PLAYER(0x01),
+    CONTROL_TUTORIAL(0x02),
+    GHOST_MODE(0x03);
+
+    private int type;
+
+    ClientType(int type){
+        this.type = type;
+    }
+
+    public int getCode(){
+        return type;
+    }
+
+    public static ClientType getClientType(int typeCode){
+        switch (typeCode){
+            case 0x00:
+                return SPECTATOR;
+            case 0x01:
+                return PLAYER;
+            case 0x02:
+                return CONTROL_TUTORIAL;
+            case 0x03:
+                return GHOST_MODE;
+            default:
+                return PLAYER;
+        }
+    }
+}

src/main/java/seng302/gameServer/messages/CustomizeRequestMessage.java

@@ -0,0 +1,35 @@
+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 {
+
+
+    private static int MESSAGE_LENGTH = 6;
+
+    //Message fields
+    private CustomizeRequestType customizeType;
+    private Integer payloadLength;
+
+    public CustomizeRequestMessage(CustomizeRequestType customizeType, double sourceID,
+        byte[] payload) {
+        payloadLength = payload.length;
+        setHeader(new Header(MessageType.CUSTOMIZATION_REQUEST, 1, (short) getSize()));
+        allocateBuffer();
+        writeHeaderToBuffer();
+
+
+        putInt((int) sourceID, 4);
+        putInt((int) customizeType.getType(), 2);
+        putBytes(payload);
+
+        writeCRC();
+        rewind();
+    }
+
+    @Override
+    public int getSize() {
+        return MESSAGE_LENGTH + payloadLength; // placeholder
+    }
+
+
+}

src/main/java/seng302/gameServer/messages/CustomizeRequestType.java

@@ -0,0 +1,31 @@
+package seng302.gameServer.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;
+        }
+    }
+}

src/main/java/seng302/gameServer/messages/CustomizeResponseMessage.java

@@ -0,0 +1,28 @@
+package seng302.gameServer.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
+    }
+
+
+}

src/main/java/seng302/gameServer/messages/CustomizeResponseType.java

@@ -0,0 +1,34 @@
+package seng302.gameServer.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;
+        }
+    }
+}

src/main/java/seng302/gameServer/messages/DeviceType.java

@@ -0,0 +1,16 @@
+package seng302.gameServer.messages;
+
+public enum DeviceType {
+    UNKNOWN(0),
+    RACING_YACHT(1);
+
+    private long code;
+
+    DeviceType(long code) {
+        this.code = code;
+    }
+
+    public long getCode(){
+        return code;
+    }
+}

src/main/java/seng302/gameServer/messages/Header.java

@@ -0,0 +1,80 @@
+package seng302.gameServer.messages;
+
+import java.nio.ByteBuffer;
+
+public class Header {
+    // From API spec
+    private final int syncByte1 = 0x47;
+    private final int syncByte2 = 0x83;
+
+    private MessageType messageType;
+    private int timeStamp;
+    private int sourceId;
+    private short messageLength;
+    private static final int MESSAGE_LEN = 15;
+    private ByteBuffer buff;
+    private int buffPos;
+
+    /**
+     * Message Header from section 3.2 of the AC35 Streaming
+     * Data spec
+     * @param messageType The type of the message following this header
+     * @param sourceId The message source (as defined in the spec)
+     * @param messageLength The length of the message following this header
+     */
+    public Header(MessageType messageType, int sourceId, Short messageLength){
+        this.messageType = messageType;
+        this.sourceId = sourceId;
+        this.messageLength = messageLength;
+        timeStamp = (int) (System.currentTimeMillis() / 1000L);
+        buff = ByteBuffer.allocate(MESSAGE_LEN);
+        buffPos = 0;
+    }
+
+    private void putInBuffer(byte[] bytes, long val){
+        byte[] tmp = bytes.clone();
+        Message.reverse(tmp);
+
+        buff.put(tmp);
+        buffPos += tmp.length;
+        buff.position(buffPos);
+    }
+
+    /**
+     * Reset the buffer
+     */
+    public void reset(){
+        buffPos = 0;
+        buff.clear();
+        buff.position(buffPos);
+    }
+
+    /**
+     * @return a ByteBuffer containing the message header
+     */
+    public ByteBuffer getByteBuffer(){
+        reset();
+
+        putInBuffer(ByteBuffer.allocate(1).put((byte)syncByte1).array(), syncByte1);
+
+        putInBuffer(ByteBuffer.allocate(1).put((byte)syncByte2).array(), syncByte2);
+
+        putInBuffer(ByteBuffer.allocate(1).put((byte)messageType.getCode()).array(), messageType.getCode());
+
+        putInBuffer(Message.intToByteArray(timeStamp, 6), timeStamp);
+
+        putInBuffer(Message.intToByteArray(sourceId, 4), sourceId);
+
+        putInBuffer(Message.intToByteArray(messageLength, 2), messageLength);
+
+        return buff;
+    }
+
+    /**
+     * Returns the size of this message
+     * @return the size of the message
+     */
+    public static Integer getSize(){
+        return MESSAGE_LEN;
+    }
+}

src/main/java/seng302/gameServer/messages/Heartbeat.java

@@ -0,0 +1,27 @@
+package seng302.gameServer.messages;
+
+public class Heartbeat extends Message {
+    private final int MESSAGE_SIZE = 4;
+
+    /**
+     * Heartbeat from the AC35 Streaming data spec
+     * @param seqNo Increment every time a message is sent
+     */
+    public Heartbeat(int seqNo){
+        setHeader(new Header(MessageType.HEARTBEAT, 0x01, (short) getSize()));
+
+        allocateBuffer();
+        writeHeaderToBuffer();
+
+        putUnsignedInt(seqNo, 4);
+
+        writeCRC();
+        rewind();
+    }
+
+    @Override
+    public int getSize() {
+        return MESSAGE_SIZE;
+    }
+
+}

src/main/java/seng302/gameServer/messages/MarkRoundingMessage.java

@@ -0,0 +1,59 @@
+package seng302.gameServer.messages;
+
+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
+     * @param markType .
+     */
+    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;
+    }
+}

src/main/java/seng302/gameServer/messages/MarkType.java

@@ -0,0 +1,20 @@
+package seng302.gameServer.messages;
+
+/**
+ * Types of marks boats can round
+ */
+public enum MarkType {
+    UNKNOWN(0),
+    ROUNDING_MARK(1),
+    GATE(2);
+
+    private long code;
+
+    MarkType(long code) {
+        this.code = code;
+    }
+
+    public long getCode(){
+        return code;
+    }
+}

src/main/java/seng302/gameServer/messages/Message.java

@@ -0,0 +1,221 @@
+package seng302.gameServer.messages;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Arrays;
+import java.util.zip.CRC32;
+
+public abstract class Message {
+    private final int CRC_SIZE = 4;
+    private Header header;
+    private ByteBuffer buffer;
+    private int bufferPosition;
+    private CRC32 crc;
+
+    /**
+     * @param header Set the header for this message
+     */
+    void setHeader(Header header){
+        this.header = header;
+    }
+
+    /**
+     * @return the header specified for this message
+     */
+    Header getHeader(){
+        return header;
+    }
+
+    /**
+     * @return the size of the message
+     */
+    public abstract int getSize();
+
+    /**
+     * Allocate byte buffer to correct size
+     */
+    void allocateBuffer(){
+        buffer = ByteBuffer.allocate(Header.getSize() + getSize() + CRC_SIZE);
+        buffer.order(ByteOrder.LITTLE_ENDIAN);
+        bufferPosition = 0;
+        buffer.position(bufferPosition);
+    }
+
+    /**
+     * Write the set header to the byte buffer
+     */
+    void writeHeaderToBuffer(){
+        buffer.put(getHeader().getByteBuffer().array());
+        bufferPosition += Header.getSize();
+        buffer.position(bufferPosition);
+    }
+
+    /**
+     * Move the buffer position by n bytes
+     * @param size Number of bytes to move the buffer by
+     */
+    private void moveBufferPositionBy(int size){
+        bufferPosition += size;
+        buffer.position(bufferPosition);
+    }
+
+    /**
+     * Put an unsigned byte in the buffer
+     */
+    void putUnsignedByte(byte b){
+        buffer.put(ByteBuffer.allocate(1).put((byte) (b & 0xff)).array());
+        moveBufferPositionBy(1);
+    }
+
+    /**
+     * Put an signed byte in the buffer
+     */
+    void putByte(byte b){
+        buffer.put(ByteBuffer.allocate(1).put(b).array());
+        moveBufferPositionBy(1);
+    }
+
+    /**
+     * Place an unsigned integer of the specified length in the buffer
+     * @param val The integer value to add (Note: This must be long due to java not supporting unsigned integers)
+     * @param size The size of the int to be added to the buffer
+     */
+    void putUnsignedInt(long val, int size){
+        if (size <= 1){
+            putUnsignedByte((byte) val);
+
+        }
+        else if (size < 4){
+            // Use short
+            byte[] tmp =  Message.intToByteArray(val, size); //ByteBuffer.allocate(size).putShort((short) (val & 0xffff)).array();
+            reverse(tmp);
+            buffer.put(tmp);
+            moveBufferPositionBy(size);
+        }
+        else{
+            // Use int
+            byte[] tmp = Message.intToByteArray(val, size);
+            reverse(tmp);
+            moveBufferPositionBy(size);
+        }
+    }
+
+    /**
+     * Put a signed int of a specified length in the buffer
+     * @param val The integer value to add
+     * @param size The size of the integer to be added to the buffer
+     */
+    void putInt(long val, int size){
+        if (size < 4){
+            byte[] tmp = Message.intToByteArray(val, size);
+            reverse(tmp);
+            buffer.put(tmp);
+        }
+        else{
+            byte[] tmp = Message.intToByteArray(val, size);
+            reverse(tmp);
+            buffer.put(tmp);
+        }
+        moveBufferPositionBy(size);
+    }
+
+    /**
+     * Write an array of bytes to the buffer
+     * @param bytes to write
+     */
+    void putBytes(byte[] bytes){
+        buffer.put(bytes);
+        moveBufferPositionBy(bytes.length);
+    }
+
+    /**
+     * Write a ByteBuffer of bytes to the buffer
+     * @param bytes to write
+     * @param size number of bytes
+     */
+    void putBytes(ByteBuffer bytes, int size){
+        buffer.put(bytes.array());
+        moveBufferPositionBy(size);
+    }
+
+
+    /**
+     * Calculate the CRC of the buffer and append it to the end of the buffer
+     */
+    void writeCRC(){
+        crc = new CRC32();
+
+        buffer.position(0);
+
+        byte[] data = Arrays.copyOfRange(buffer.array(), 0, buffer.array().length-CRC_SIZE);
+        crc.update(data);
+        buffer.position(bufferPosition);
+
+        putInt((int) crc.getValue(), CRC_SIZE);
+    }
+
+    /**
+     * @return The current buffer as a byte array
+     */
+    public byte[] getBuffer(){
+        return buffer.array();
+    }
+
+    /**
+     * Rewind the buffer to the beginning
+     */
+    void rewind(){
+        buffer.flip();
+    }
+
+    /**
+     * Convert an integer to an array of bytes
+     * @param val The value to add
+     * @param len The width of the integer in the buffer
+     * @return A byte array to be sent
+     */
+    public static byte[] intToByteArray(long val, int len){
+        int index = 0;
+        byte[] data = new byte[len];
+
+        for (int i = 0; i < len; i++){
+            data[len - index - 1] = (byte) (val & 0xFF);
+            val >>>= 8;
+            index++;
+        }
+
+        return data;
+    }
+
+    /**
+     * takes an array of up to 7 bytes in little endian format and
+     * returns a positive long constructed from the input bytes
+     *
+     * @param bytes the bytes to be converted to long
+     * @return a positive long if there is less than 8 bytes -1 otherwise
+     */
+    public static long bytesToLong(byte[] bytes){
+        long partialLong = 0;
+        int index = 0;
+        for (byte b: bytes){
+            if (index > 6){
+                return -1;
+            }
+            partialLong = partialLong | (b & 0xFFL) << (index * 8);
+            index++;
+        }
+        return partialLong;
+    }
+
+    /**
+     * Reverse an array of bytes
+     * @param data The byte[] to reverse
+     */
+    public static void reverse(byte[] data) {
+        for (int left = 0, right = data.length - 1; left < right; left++, right--) {
+            byte temp = (byte) (data[left] & 0xff);
+            data[left]  = (byte) (data[right] & 0xff);
+            data[right] = (byte) (temp & 0xff);
+        }
+    }
+}

src/main/java/seng302/gameServer/messages/MessageType.java

@@ -0,0 +1,45 @@
+package seng302.gameServer.messages;
+
+/**
+ * Enum containing the types of messages
+ * sent by the server
+ */
+public enum MessageType {
+    HEARTBEAT(1),
+    RACE_STATUS(12),
+    DISPLAY_TEXT_MESSAGE(20),
+    XML_MESSAGE(26),
+    RACE_START_STATUS(27),
+    YACHT_EVENT_CODE(29),
+    YACHT_ACTION_CODE(31),
+    CHATTER_TEXT(36),
+    BOAT_LOCATION(37),
+    MARK_ROUNDING(38),
+    COURSE_WIND(44),
+    AVERAGE_WIND(47),
+    BOAT_ACTION(100),
+    REGISTRATION_REQUEST(101),
+    REGISTRATION_RESPONSE(102),
+    CUSTOMIZATION_REQUEST(103),
+    CUSTOMIZATION_RESPONSE(104),
+    REPO_REGISTRATION_REQUEST(201),
+    ROOM_CODE_REQUEST(202),
+    LOBBY_REQUEST(203);
+
+
+    private int code;
+
+    MessageType(int code){
+        this.code = code;
+    }
+
+    /**
+     * Get the message code (From the API Spec)
+     * @return the message code
+     */
+    int getCode(){
+        return this.code;
+    }
+
+
+}

src/main/java/seng302/gameServer/messages/RaceStartNotificationType.java

@@ -0,0 +1,21 @@
+package seng302.gameServer.messages;
+
+/**
+ * The types of race start status messages
+ */
+public enum RaceStartNotificationType {
+    SET_RACE_START_TIME(1),
+    RACE_POSTPONED(2),
+    RACE_ABANDONED(3),
+    RACE_TERMINATED(4);
+
+    private final long type;
+
+    RaceStartNotificationType(long type) {
+        this.type = type;
+    }
+
+    long getType(){
+        return type;
+    }
+}

src/main/java/seng302/gameServer/messages/RaceStartStatusMessage.java

@@ -0,0 +1,48 @@
+package seng302.gameServer.messages;
+
+public class RaceStartStatusMessage extends Message {
+    private final int MESSAGE_SIZE = 20;
+
+    private long version;
+    private long timeStamp;
+    private long ackNumber;
+    private long raceStartTime;
+    private long raceId;
+    private RaceStartNotificationType notificationType;
+
+    /**
+     * Message sent to clients with the expected start time of the race
+     * @param ackNumber  Sequence number of message.
+     * @param raceStartTime Expected race start time
+     * @param raceId Race ID#
+     * @param notificationType Type of this notification
+     */
+    public RaceStartStatusMessage(long ackNumber, long raceStartTime, long raceId, RaceStartNotificationType notificationType){
+        this.version = 1;
+        this.timeStamp = System.currentTimeMillis() / 1000L;
+        this.ackNumber = ackNumber;
+        this.raceStartTime = raceStartTime;
+        this.notificationType = notificationType;
+        this.raceId = raceId;
+
+        setHeader(new Header(MessageType.RACE_START_STATUS, 1, (short) getSize()));
+        allocateBuffer();
+        writeHeaderToBuffer();
+
+        putUnsignedByte((byte) version);
+        putInt((int) timeStamp, 6);
+        putInt((int) ackNumber, 2);
+        putInt((int) raceStartTime, 6);
+        putInt((int) raceId, 4);
+        putUnsignedByte((byte) notificationType.getType());
+
+        writeCRC();
+        rewind();
+    }
+
+    @Override
+    public int getSize() {
+        return MESSAGE_SIZE;
+    }
+
+}

src/main/java/seng302/gameServer/messages/RaceStatus.java

@@ -0,0 +1,26 @@
+package seng302.gameServer.messages;
+
+/**
+ * The current status of the race
+ */
+public enum RaceStatus {
+    NOTACTIVE(0),
+    WARNING(1), // Between 3:00 and 1:00 before start
+    PREPARATORY(2), // Less than 1:00 before start
+    STARTED(3),
+    ABANDONED(6),
+    POSTPONED(7),
+    TERMINATED(8),
+    RACE_START_TIME_NOT_SET(9),
+    PRESTART(10); // More than 3:00 before start
+
+    private int code;
+
+    RaceStatus(int code){
+        this.code = code;
+    }
+
+    public int getCode(){
+        return this.code;
+    }
+}

src/main/java/seng302/gameServer/messages/RaceStatusMessage.java

@@ -0,0 +1,79 @@
+package seng302.gameServer.messages;
+
+import java.util.List;
+import java.util.zip.CRC32;
+
+public class RaceStatusMessage extends Message{
+    private final MessageType MESSAGE_TYPE = MessageType.RACE_STATUS;
+    private final int MESSAGE_VERSION = 2; //Always set to 1
+    private final int MESSAGE_BASE_SIZE = 24;
+    private final double windDirFactor = 0x4000 / 90;
+
+
+    private long currentTime;
+    private long raceId;
+    private RaceStatus raceStatus;
+    private long expectedStartTime;
+    private double raceWindDirection;
+    private long windSpeed;
+    private long numBoatsInRace;
+    private RaceType raceType;
+    private List<BoatSubMessage> boats;
+    private CRC32 crc;
+
+    /**
+     * A message containing the current status of the race
+     * @param raceId The ID of the current race
+     * @param raceStatus The status of the race
+     * @param expectedStartTime The expected start time
+     * @param raceWindDirection The wind direction (north, east, south)
+     * @param windSpeed The wind speed in mm/sec
+     * @param numBoatsInRace The number of boats in the race
+     * @param raceType The race type (Match/fleet)
+     * @param sourceId The source of this message
+     * @param boats A list of boat status sub messages
+     */
+    public RaceStatusMessage(long raceId, RaceStatus raceStatus, long expectedStartTime, double raceWindDirection,
+                             long windSpeed, long numBoatsInRace, RaceType raceType, long sourceId, List<BoatSubMessage> boats){
+        currentTime = System.currentTimeMillis();
+        this.raceId = raceId;
+        this.raceStatus = raceStatus;
+        this.expectedStartTime = expectedStartTime;
+        this.raceWindDirection = raceWindDirection * windDirFactor+100.0;
+        this.windSpeed = windSpeed;
+        this.numBoatsInRace = numBoatsInRace;
+        this.raceType = raceType;
+        this.boats = boats;
+        crc = new CRC32();
+
+        setHeader(new Header(MESSAGE_TYPE, (int) sourceId, (short) getSize()));
+        allocateBuffer();
+        writeHeaderToBuffer();
+
+        putByte((byte) MESSAGE_VERSION);
+        putInt(currentTime, 6);
+        putInt((int) raceId, 4);
+        putByte((byte) raceStatus.getCode());
+        putInt(expectedStartTime, 6);
+        putInt((int) this.raceWindDirection, 2);
+        putInt((int) windSpeed, 2);
+        putByte((byte) numBoatsInRace);
+        putByte((byte) raceType.getCode());
+
+        for (BoatSubMessage boatSubMessage : boats){
+            putBytes(boatSubMessage.getByteBuffer(), boatSubMessage.getSize());
+        }
+
+        writeCRC();
+        rewind();
+    }
+
+    /**
+     * @return the size of this message in bytes
+     */
+    @Override
+    public int getSize() {
+        return MESSAGE_BASE_SIZE + (20 * ((int) numBoatsInRace));
+    }
+
+}

src/main/java/seng302/gameServer/messages/RaceType.java

@@ -0,0 +1,20 @@
+package seng302.gameServer.messages;
+
+/**
+ * Enum containing the types of races
+ * sent by the server
+ */
+public enum RaceType {
+    MATCH_RACE(1),
+    FLEET_RACE(2);
+
+    private long code;
+
+    RaceType(long code){
+        this.code = code;
+    }
+
+    public long getCode(){
+        return code;
+    }
+}

src/main/java/seng302/gameServer/messages/RegistrationRequestMessage.java

@@ -0,0 +1,22 @@
+package seng302.gameServer.messages;
+
+
+public class RegistrationRequestMessage extends Message {
+    private static int MESSAGE_LENGTH = 2;
+
+    public RegistrationRequestMessage(ClientType type, int clientID){
+        setHeader(new Header(MessageType.REGISTRATION_REQUEST, clientID, (short) getSize()));
+
+        allocateBuffer();
+        writeHeaderToBuffer();
+
+        putInt(type.getCode(), 2);
+
+        writeCRC();
+    }
+
+    @Override
+    public int getSize() {
+        return MESSAGE_LENGTH;
+    }
+}

src/main/java/seng302/gameServer/messages/RegistrationResponseMessage.java

@@ -0,0 +1,20 @@
+package seng302.gameServer.messages;
+
+public class RegistrationResponseMessage extends Message{
+
+    public RegistrationResponseMessage(int clientSourceID, RegistrationResponseStatus status){
+        setHeader(new Header(MessageType.REGISTRATION_RESPONSE, 1, (short) getSize()));
+        allocateBuffer();
+        writeHeaderToBuffer();
+
+        putInt(clientSourceID, 4);
+        putInt(status.getCode(), 1);
+
+        writeCRC();
+    }
+
+    @Override
+    public int getSize() {
+        return 5;
+    }
+}

src/main/java/seng302/gameServer/messages/RegistrationResponseStatus.java

@@ -0,0 +1,44 @@
+package seng302.gameServer.messages;
+
+public enum RegistrationResponseStatus {
+    SUCCESS_SPECTATING(0x00),
+    SUCCESS_PLAYING(0x01),
+    SUCCESS_TUTORIAL(0x02),
+    SUCCESS_GHOSTING(0x03),
+
+    FAILURE_GENERAL(0x10),
+    FAILURE_FULL(0x11);
+
+    private int code;
+
+    RegistrationResponseStatus(int code){
+        this.code = code;
+    }
+
+    /**
+     * Get the message code (From the API Spec)
+     * @return the message code
+     */
+    int getCode(){
+        return this.code;
+    }
+
+    public static RegistrationResponseStatus getResponseStatus(int typeCode){
+        switch (typeCode){
+            case 0x00:
+                return SUCCESS_SPECTATING;
+            case 0x01:
+                return SUCCESS_PLAYING;
+            case 0x02:
+                return SUCCESS_TUTORIAL;
+            case 0x03:
+                return SUCCESS_GHOSTING;
+            case 0x10:
+                return FAILURE_GENERAL;
+            case 0x11:
+                return FAILURE_FULL;
+            default:
+                return FAILURE_GENERAL;
+        }
+    }
+}

src/main/java/seng302/gameServer/messages/RoomCodeRequest.java

@@ -0,0 +1,24 @@
+package seng302.gameServer.messages;
+
+public class RoomCodeRequest extends Message{
+    private int size = 0;
+
+    @Override
+    public int getSize() {
+        return size;
+    }
+
+    public RoomCodeRequest(String roomCode){
+        size = roomCode.length() + 6;
+
+        setHeader(new Header(MessageType.ROOM_CODE_REQUEST, 0x01, (short)getSize()));
+        allocateBuffer();
+        writeHeaderToBuffer();
+
+        putInt(roomCode.length(), 6);
+        putBytes(roomCode.getBytes());
+
+        writeCRC();
+        rewind();
+    }
+}

src/main/java/seng302/gameServer/messages/RoundingBoatStatus.java

@@ -0,0 +1,21 @@
+package seng302.gameServer.messages;
+
+/**
+ * The status of a boat rounding a mark
+ */
+public enum RoundingBoatStatus {
+    UNKNOWN(0),
+    RACING(1),
+    DSQ(2),
+    WITHDRAWN(3);
+
+    private long code;
+
+    RoundingBoatStatus(long code) {
+        this.code = code;
+    }
+
+    public long getCode(){
+        return code;
+    }
+}

src/main/java/seng302/gameServer/messages/RoundingSide.java

@@ -0,0 +1,52 @@
+package seng302.gameServer.messages;
+
+/**
+ * The side the boat rounded the mark
+ */
+public enum RoundingSide {
+    UNKNOWN(0, "Unknown"),
+    PORT(1, "Port"),
+    STARBOARD(2, "Stbd"),
+    SP(3, "SP"),
+    PS(4, "PS");
+
+
+    private long code;
+    private String name;
+
+    RoundingSide(long code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+    public long getCode(){
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public static RoundingSide getRoundingSide(String identifier) {
+        RoundingSide roundingSide = UNKNOWN;
+        switch (identifier) {
+            case "Unknown":
+                roundingSide = UNKNOWN;
+                break;
+            case "Port":
+                roundingSide = PORT;
+                break;
+            case "Stbd":
+                roundingSide = STARBOARD;
+                break;
+            case "SP":
+                roundingSide = SP;
+                break;
+            case "PS":
+                roundingSide = PS;
+                break;
+        }
+
+        return roundingSide;
+    }
+}

src/main/java/seng302/gameServer/messages/ServerRegistrationMessage.java

@@ -0,0 +1,64 @@
+package seng302.gameServer.messages;
+
+import seng302.discoveryServer.util.ServerListing;
+
+public class ServerRegistrationMessage extends Message {
+    private int size;
+
+    public ServerRegistrationMessage(ServerListing serverListing) {
+        String serverName = serverListing.getServerName();
+        String mapName = serverListing.getMapName();
+        String address = serverListing.getAddress();
+        int port = serverListing.getPortNumber();
+        int players = serverListing.getPortNumber();
+        int capacity = serverListing.getCapacity();
+        String roomCode = serverListing.getRoomCode();
+
+        createMessage(serverName, mapName, address, port, players, capacity, roomCode);
+    }
+
+    public static ServerRegistrationMessage getEmptyRegistration() {
+        return new ServerRegistrationMessage("","","",0,0,0,"");
+    }
+
+    @Override
+    public int getSize() {
+        return size;
+    }
+
+    public ServerRegistrationMessage(String serverName, String mapName, String address, int port, int players, int capacity, String roomCode){
+        createMessage(serverName, mapName, address, port, players, capacity, roomCode);
+    }
+
+    private void createMessage(String serverName, String mapName, String address, int port, int players, int capacity, String roomCode){
+        size = serverName.getBytes().length + mapName.length() + address.length() + roomCode.length() + 36;
+
+        setHeader(new Header(MessageType.REPO_REGISTRATION_REQUEST, 0x01, (short) getSize()));
+        allocateBuffer();
+        writeHeaderToBuffer();
+
+        int nameLength = serverName.length();
+        int mapNameLength = mapName.length();
+        int addressLength = address.length();
+        int roomCodeLength = roomCode.length();
+
+        // Put fields here
+        putInt(nameLength, 6);
+        putInt(mapNameLength, 6);
+        putInt(addressLength, 6);
+        putInt(roomCodeLength, 6);
+
+        putInt(port, 4);
+        putInt(players, 4);
+        putInt(capacity, 4);
+
+        putBytes(serverName.getBytes());
+        putBytes(mapName.getBytes());
+        putBytes(address.getBytes());
+        putBytes(roomCode.getBytes());
+
+        writeCRC();
+        rewind();
+    }
+
+}

src/main/java/seng302/gameServer/messages/XMLMessage.java

@@ -0,0 +1,53 @@
+package seng302.gameServer.messages;
+
+public class XMLMessage extends Message{
+    private final MessageType MESSAGE_TYPE = MessageType.XML_MESSAGE;
+    private final int MESSAGE_VERSION = 1; //Always set to 1
+    private final int MESSAGE_SIZE = 14;
+
+    // Message fields
+    private long timeStamp;
+    private long ack = 0x00; //Unused
+    private XMLMessageSubType xmlMessageSubType;
+    private long length;
+    private long sequence;
+    private String content;
+
+    /**
+     * XML Message from the AC35 Streaming data spec
+     * @param content The XML content
+     * @param type The XML Message Sub Type
+     * @param sequenceNum sequenceNum
+     */
+    public XMLMessage(String content, XMLMessageSubType type, long sequenceNum){
+        this.content = content;
+        this.xmlMessageSubType = type;
+        timeStamp = System.currentTimeMillis() / 1000L;
+        ack = 0;
+        length = this.content.length();
+        sequence = sequenceNum;
+
+        setHeader(new Header(MESSAGE_TYPE, 0x01, (short) getSize()));
+        allocateBuffer();
+        writeHeaderToBuffer();
+
+        // Write message fields
+        putUnsignedByte((byte) MESSAGE_VERSION);
+        putInt((int) ack, 2);
+        putInt((int) timeStamp, 6);
+        putByte((byte)xmlMessageSubType.getType());
+        putInt((int) sequence, 2);
+        putInt((int) length, 2);
+        putBytes(content.getBytes());
+
+        writeCRC();
+        rewind();
+    }
+
+    /**
+     * @return The length of this message
+     */
+    public int getSize(){
+        return MESSAGE_SIZE + content.length();
+    }
+}

src/main/java/seng302/gameServer/messages/XMLMessageSubType.java

@@ -0,0 +1,20 @@
+package seng302.gameServer.messages;
+
+/**
+ * Enum containing the types of XML messages
+ */
+public enum XMLMessageSubType {
+    REGATTA(5),
+    RACE(6),
+    BOAT(7);
+
+    private int type;
+
+    XMLMessageSubType(int type){
+        this.type = type;
+    }
+
+    public int getType(){
+        return this.type;
+    }
+}

src/main/java/seng302/gameServer/messages/YachtEventCodeMessage.java

@@ -0,0 +1,52 @@
+package seng302.gameServer.messages;
+
+/**
+ * Created by zyt10 on 10/08/17.
+ */
+public class YachtEventCodeMessage extends Message {
+
+    private final MessageType MESSAGE_TYPE = MessageType.YACHT_EVENT_CODE;
+    private final int MESSAGE_VERSION = 1; //Always set to 1
+    private final int MESSAGE_SIZE = 22;
+
+    // Message fields
+    private long timeStamp;
+    private long ack = 0x00; //Unused
+    private int raceId;
+    private int destSourceId;
+    private int incidentId;
+    private int eventId;
+
+
+    public YachtEventCodeMessage(Integer subjectId, YachtEventType yachtEventType) {
+        timeStamp = System.currentTimeMillis() / 1000L;
+        ack = 0;
+        raceId = 1;
+        destSourceId = subjectId;  // collision boat source id
+        incidentId = 0;
+        eventId = yachtEventType.getCode();
+
+        setHeader(new Header(MESSAGE_TYPE, 0x01, (short) getSize()));
+        allocateBuffer();
+        writeHeaderToBuffer();
+
+        // Write message fields
+        putUnsignedByte((byte) MESSAGE_VERSION);
+        putInt((int) timeStamp, 6);
+        putInt((int) ack, 2);
+        putInt((int) raceId, 4);
+        putInt((int) destSourceId, 4);
+        putInt((int) incidentId, 4);
+        putInt((int) eventId, 1);
+
+        writeCRC();
+        rewind();
+    }
+
+    /**
+     * @return The length of this message
+     */
+    public int getSize() {
+        return MESSAGE_SIZE;
+    }
+}

src/main/java/seng302/gameServer/messages/YachtEventType.java

@@ -0,0 +1,26 @@
+package seng302.gameServer.messages;
+
+/**
+ * Enum for different event types for the yacht
+ */
+public enum YachtEventType {
+    COLLISION(33),
+    TOKEN_VELOCITY(34),
+    TOKEN_BUMPER(35),
+    TOKEN_HANDLING(36),
+    TOKEN_WIND_WALKER(37),
+    TOKEN_RANDOM(38),
+    POWER_DOWN(39),
+    BUMPER_CRASH(40);
+
+
+    private int code;
+
+    YachtEventType(int code) {
+        this.code = code;
+    }
+
+    public int getCode() {
+        return code;
+    }
+}

src/main/java/seng302/model/ClientYacht.java

@@ -0,0 +1,389 @@
+package seng302.model;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Observable;
+import java.util.Observer;
+import java.util.Timer;
+import javafx.beans.property.ReadOnlyDoubleProperty;
+import javafx.beans.property.ReadOnlyDoubleWrapper;
+import javafx.beans.property.ReadOnlyIntegerProperty;
+import javafx.beans.property.ReadOnlyIntegerWrapper;
+import javafx.beans.property.ReadOnlyLongProperty;
+import javafx.beans.property.ReadOnlyLongWrapper;
+import javafx.beans.value.ObservableObjectValue;
+import javafx.collections.FXCollections;
+import javafx.scene.paint.Color;
+import jdk.nashorn.internal.objects.annotations.Function;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import seng302.model.token.TokenType;
+import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
+import seng302.model.token.TokenType;
+import seng302.visualiser.fxObjects.assets_3D.BoatObject;
+
+/**
+ * Yacht class for the racing boat. <p> Class created to store more variables (eg. boat statuses)
+ * compared to the XMLParser boat class, also done outside Boat class because some old variables are
+ * not used anymore.
+ */
+public class ClientYacht extends Observable {
+
+    @FunctionalInterface
+    public interface YachtLocationListener {
+        void notifyLocation(ClientYacht clientYacht, double lat, double lon, double heading,
+            Boolean sailsIn, double velocity);
+    }
+
+    @FunctionalInterface
+    public interface MarkRoundingListener {
+        void notifyRounding(ClientYacht yacht, int legNumber);
+    }
+
+    @FunctionalInterface
+    public interface ColorChangeListener {
+
+        void notifyColorChange(ClientYacht yacht);
+    }
+
+    //This notifies RaceViewController so it can display icon - wmu16
+    @FunctionalInterface
+    public interface PowerUpListener {
+        void notifyPowerUp(ClientYacht yacht, TokenType tokenType);
+    }
+
+    //This notifies RaceViewController so it can remove token icon - wmu16
+    @FunctionalInterface
+    public interface PowerDownListener {
+        void notifyPowerDown(ClientYacht yacht);
+    }
+
+
+
+    private Logger logger = LoggerFactory.getLogger(ClientYacht.class);
+
+
+    private BoatMeshType boatType;
+    private Integer sourceId;
+    private String hullID; //matches HullNum in the XML spec.
+    private String shortName;
+    private String boatName;
+    private String country;
+    private Integer position;
+    private TokenType powerUp;
+
+    private Long estimateTimeAtFinish;
+    private Boolean sailIn = true;
+    private Integer currentMarkSeqID = 0;
+    private Long markRoundTime;
+    private Long timeTillNext;
+    private Double heading;
+    private Integer legNumber = 0;
+    private GeoPoint location;
+    private Integer boatStatus;
+    private Double currentVelocity;
+
+    Timer t;
+
+    private BoatObject boatObject;
+
+    private List<YachtLocationListener> locationListeners = new ArrayList<>();
+    private List<MarkRoundingListener> markRoundingListeners = new ArrayList<>();
+    private List<PowerUpListener> powerUpListeners = new ArrayList<>();
+    private List<PowerDownListener> powerDownListeners = new ArrayList<>();
+    private List<ColorChangeListener> colorChangeListeners = new ArrayList<>();
+
+    private ReadOnlyDoubleWrapper velocityProperty = new ReadOnlyDoubleWrapper();
+    private ReadOnlyLongWrapper timeTillNextProperty = new ReadOnlyLongWrapper();
+    private ReadOnlyLongWrapper timeSinceLastMarkProperty = new ReadOnlyLongWrapper();
+    private ReadOnlyIntegerWrapper placingProperty = new ReadOnlyIntegerWrapper();
+    private ReadOnlyDoubleWrapper headingProperty = new ReadOnlyDoubleWrapper();
+    private Color colour;
+
+    public ClientYacht(BoatMeshType boatType, Integer sourceId, String hullID, String shortName,
+        String boatName, String country) {
+        this.boatType = boatType;
+        this.sourceId = sourceId;
+        this.hullID = hullID;
+        this.shortName = shortName;
+        this.boatName = boatName;
+        this.country = country;
+        this.location = new GeoPoint(57.670341, 11.826856);
+        this.heading = 120.0;   //In degrees
+        this.headingProperty.set(this.heading);
+        this.currentVelocity = 0d;
+        this.boatStatus = 1;
+        this.colour = Color.rgb(0, 0, 0, 1.0);
+    }
+
+    /**
+     * Add ServerToClientThread as the observer, this observer pattern mainly server for the boat
+     * rounding package.
+     */
+    @Override
+    public void addObserver(Observer o) {
+        super.addObserver(o);
+    }
+
+    public BoatMeshType getBoatType() {
+        return boatType;
+    }
+
+    public Integer getSourceId() {
+        //@TODO Remove and merge with Creating Game Loop
+        if (sourceId == null) {
+            return 0;
+        }
+        return sourceId;
+    }
+
+    public String getHullID() {
+        if (hullID == null) {
+            return "";
+        }
+        return hullID;
+    }
+
+    public String getShortName() {
+        return shortName;
+    }
+
+    public String getBoatName() {
+        return boatName;
+    }
+
+    public String getCountry() {
+        if (country == null) {
+            return "";
+        }
+        return country;
+    }
+
+    public Integer getBoatStatus() {
+        return boatStatus;
+    }
+
+    public void setBoatStatus(Integer boatStatus) {
+        this.boatStatus = boatStatus;
+    }
+
+    public Integer getLegNumber() {
+        return legNumber;
+    }
+
+    public void setLegNumber(Integer legNumber) {
+        this.legNumber = legNumber;
+    }
+
+    public void setEstimateTimeTillNextMark(Long estimateTimeTillNextMark) {
+        timeTillNext = estimateTimeTillNextMark;
+    }
+
+    public String getEstimateTimeAtFinish() {
+        DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
+        return format.format(estimateTimeAtFinish);
+    }
+
+    public void setEstimateTimeAtFinish(Long estimateTimeAtFinish) {
+        this.estimateTimeAtFinish = estimateTimeAtFinish;
+    }
+
+    public Integer getPlacing() {
+        return placingProperty.get();
+    }
+
+    public void setPlacing(Integer position) {
+        placingProperty.set(position);
+    }
+
+    public ReadOnlyIntegerProperty placingProperty() {
+        return placingProperty.getReadOnlyProperty();
+    }
+
+    public void updateVelocityProperty(double velocity) {
+        this.velocityProperty.set(velocity);
+    }
+
+    public void setMarkRoundingTime(Long markRoundingTime) {
+        this.markRoundTime = markRoundingTime;
+    }
+
+    public ReadOnlyDoubleProperty getVelocityProperty() {
+        return velocityProperty.getReadOnlyProperty();
+    }
+
+    public ReadOnlyLongProperty timeTillNextProperty() {
+        return timeTillNextProperty.getReadOnlyProperty();
+    }
+
+    public Long getTimeTillNext() {
+        return timeTillNext;
+    }
+
+    public Long getMarkRoundTime() {
+        return markRoundTime;
+    }
+
+    public GeoPoint getLocation() {
+        return location;
+    }
+
+    public Integer getPosition() {
+        return position;
+    }
+
+    public void setPosition(Integer position) {
+        this.position = position;
+    }
+
+    /**
+     * Powers down the boat and notifies the raceViewController to display
+     */
+    public void powerDown() {
+        this.powerUp = null;
+        for (PowerDownListener listener : powerDownListeners) {
+            listener.notifyPowerDown(this);
+        }
+    }
+
+    /**
+     * powers up the boat and notifies the raceViewController to display
+     *
+     * @param tokenType The type of token that this boat is being powered up with
+     */
+    public void setPowerUp(TokenType tokenType) {
+        this.powerUp = tokenType;
+        for (PowerUpListener listener : powerUpListeners) {
+            listener.notifyPowerUp(this, tokenType);
+        }
+    }
+
+    public TokenType getPowerUp() {
+        return powerUp;
+    }
+
+    public void toggleSail() {
+        sailIn = !sailIn;
+    }
+    //// TODO: 15/08/17 asd
+
+    /**
+     * Sets the current location of the boat in lat and long whilst preserving the last location
+     *
+     * @param lat Latitude
+     * @param lng Longitude
+     */
+    public void setLocation(Double lat, Double lng) {
+        location.setLat(lat);
+        location.setLng(lng);
+    }
+
+    public Double getHeading() {
+        return heading;
+    }
+
+    public void setHeading(Double heading) {
+        this.heading = heading;
+        setHeadingProperty();
+    }
+
+    @Override
+    public String toString() {
+        return boatName;
+    }
+
+    public void updateTimeSinceLastMarkProperty(long timeSinceLastMark) {
+        this.timeSinceLastMarkProperty.set(timeSinceLastMark);
+    }
+
+    public ReadOnlyLongProperty timeSinceLastMarkProperty() {
+        return timeSinceLastMarkProperty.getReadOnlyProperty();
+    }
+
+    public void setTimeTillNext(Long timeTillNext) {
+        this.timeTillNext = timeTillNext;
+    }
+
+
+    public Color getColour() {
+        return colour;
+    }
+
+    public void setColour(Color colour) {
+        this.colour = colour;
+        for (ColorChangeListener listener : colorChangeListeners) {
+            listener.notifyColorChange(this);
+        }
+    }
+
+    public void updateLocation(double lat, double lng, double heading, double velocity) {
+        setLocation(lat, lng);
+        this.heading = heading;
+        setHeadingProperty();
+        this.currentVelocity = velocity;
+        updateVelocityProperty(velocity);
+        for (YachtLocationListener yll : locationListeners) {
+            yll.notifyLocation(this, lat, lng, heading, sailIn, velocity);
+        }
+    }
+
+    private void setHeadingProperty() {
+        headingProperty.set(heading);
+    }
+
+    public void addLocationListener(YachtLocationListener listener) {
+        locationListeners.add(listener);
+    }
+
+    public void addMarkRoundingListener(MarkRoundingListener listener) {
+        markRoundingListeners.add(listener);
+    }
+
+    public void addPowerUpListener(PowerUpListener listener) {
+        powerUpListeners.add(listener);
+    }
+
+    public void addPowerDownListener(PowerDownListener listener) {
+        powerDownListeners.add(listener);
+    }
+
+    public void addColorChangeListener(ColorChangeListener listener) {
+        colorChangeListeners.add(listener);
+    }
+
+    public void removeMarkRoundingListener(MarkRoundingListener listener) {
+        markRoundingListeners.remove(listener);
+    }
+
+    public boolean getSailIn () {
+        return sailIn;
+    }
+
+    public void roundMark(long markRoundTime, long timeSinceLastMark) {
+        this.markRoundTime = markRoundTime;
+        timeSinceLastMarkProperty.set(timeSinceLastMark);
+        legNumber++;
+        for (MarkRoundingListener listener : markRoundingListeners) {
+            listener.notifyRounding(this, legNumber);
+        }
+    }
+
+    public Double getCurrentVelocity() {
+        return currentVelocity;
+    }
+
+    public void setBoatObject(BoatObject newBoatObject) {
+        this.boatObject = newBoatObject;
+    }
+
+    public BoatObject getBoatObject() {
+        return this.boatObject;
+    }
+
+    public ReadOnlyDoubleWrapper getHeadingProperty() {
+        return headingProperty;
+    }
+
+}

src/main/java/seng302/model/Colors.java

@@ -0,0 +1,14 @@
+package seng302.model;
+
+import javafx.scene.paint.Color;
+
+/**
+ * Enum for generating colours.
+ */
+public enum Colors {
+    RED, PERU, GOLD, GREEN, BLUE, PURPLE, DEEPPINK, GRAY;
+
+    public static Color getColor(Integer index) {
+        return Color.valueOf(values()[index].toString());
+    }
+}

src/main/java/seng302/model/GameKeyBind.java

@@ -0,0 +1,87 @@
+package seng302.model;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import javafx.scene.input.KeyCode;
+
+public class GameKeyBind {
+
+    private static GameKeyBind instance;
+    private Map<KeyCode, KeyAction> keyToActionMap;
+    private Map<KeyAction, KeyCode> actionToKeyMap;
+    private Boolean continuouslyTurning;
+
+
+    private GameKeyBind() {
+        setToDefault();
+    }
+
+    public void setToDefault() {
+        actionToKeyMap = new HashMap<>();
+        keyToActionMap = new HashMap<>();
+        continuouslyTurning = false;
+        // default key bindings
+        ArrayList<KeyCode> keys = new ArrayList<>();
+        keys.add(KeyCode.Z);
+        keys.add(KeyCode.X);
+        keys.add(KeyCode.SPACE);
+        keys.add(KeyCode.SHIFT);
+        keys.add(KeyCode.ENTER);
+        keys.add(KeyCode.PAGE_UP);
+        keys.add(KeyCode.PAGE_DOWN);
+        keys.add(KeyCode.F1);
+        keys.add(KeyCode.D);
+        keys.add(KeyCode.A);
+        keys.add(KeyCode.W);
+        keys.add(KeyCode.S);
+        for (int i = 0; i < 12; i++) {
+            actionToKeyMap.put(KeyAction.getType(i + 1), keys.get(i));
+            keyToActionMap.put(keys.get(i), KeyAction.getType(i + 1));
+        }
+    }
+
+    public static GameKeyBind getInstance() {
+        if (instance == null) {
+            instance = new GameKeyBind();
+        }
+        return instance;
+    }
+
+    public KeyCode getKeyCode(KeyAction keyAction) {
+        return instance.actionToKeyMap.get(keyAction);
+    }
+
+    public KeyAction getKeyAction(KeyCode keyCode) {
+        return instance.keyToActionMap.get(keyCode);
+    }
+
+    /**
+     * Binds a key to a key action
+     *
+     * @return true if successfully bind
+     */
+    public boolean bindKeyToAction(KeyCode keyCode, KeyAction keyAction) {
+        if (instance.keyToActionMap.containsKey(keyCode)) {
+            // if the key has been bound to other action, return false
+            return false;
+        } else {
+            instance.keyToActionMap.put(keyCode, keyAction); // add key -> action
+            KeyCode oldKeyCode = instance.actionToKeyMap
+                .get(keyAction); // get old key for the action
+            instance.keyToActionMap.remove(oldKeyCode); // remove the old key -> action
+            instance.actionToKeyMap
+                .replace(keyAction, keyCode); // replace the old key by the newer one
+            return true;
+        }
+    }
+
+    public void toggleTurningMode() {
+        continuouslyTurning = !continuouslyTurning;
+    }
+
+    public Boolean isContinuouslyTurning() {
+        return continuouslyTurning;
+    }
+
+}

src/main/java/seng302/model/GeoPoint.java

@@ -0,0 +1,36 @@
+package seng302.model;
+
+/**
+ * A class represent Geo location (latitude, lnggitude).
+ * Created by Haoming on 15/5/2017
+ */
+public class GeoPoint {
+
+	private double lat, lng;
+
+	public GeoPoint(double lat, double lng) {
+		this.lat = lat;
+		this.lng = lng;
+	}
+
+	public double getLat() {
+		return lat;
+	}
+
+	public void setLat(double lat) {
+		this.lat = lat;
+	}
+
+	public double getLng() {
+		return lng;
+	}
+
+	public void setLng(double lng) {
+		this.lng = lng;
+	}
+
+	@Override
+	public String toString() {
+		return "lat: " + lat + " lng: " + lng;
+	}
+}

src/main/java/seng302/model/KeyAction.java

@@ -0,0 +1,40 @@
+package seng302.model;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum KeyAction {
+    ZOOM_IN(1),
+    ZOOM_OUT(2),
+    VMG(3),
+    SAILS_STATE(4),
+    TACK_GYBE(5),
+    UPWIND(6),
+    DOWNWIND(7),
+    VIEW(8),
+    RIGHT(9),
+    LEFT(10),
+    FORWARD(11),
+    BACKWARD(12);
+
+    private final int type;
+    private static final Map<Integer, KeyAction> intToTypeMap = new HashMap<>();
+
+    static {
+        for (KeyAction type : KeyAction.values()) {
+            intToTypeMap.put(type.getValue(), type);
+        }
+    }
+
+    KeyAction(int type) {
+        this.type = type;
+    }
+
+    public static KeyAction getType(int value) {
+        return intToTypeMap.get(value);
+    }
+
+    public int getValue() {
+        return this.type;
+    }
+}

src/main/java/seng302/model/Limit.java

@@ -0,0 +1,23 @@
+package seng302.model;
+
+/**
+ * Stores data on the border of a race
+ */
+public class Limit extends GeoPoint {
+
+    private Integer seqID;
+
+    public Limit(Integer seqID, Double lat, Double lng) {
+        super(lat, lng);
+        this.seqID = seqID;
+    }
+
+    public Integer getSeqID() {
+        return seqID;
+    }
+
+    @Override
+    public String toString(){
+        return "Limit = {seqID=" + seqID + ", lat=" + getLat() + ", lng=" + getLng() + "}";
+    }
+}

src/main/java/seng302/model/Player.java

@@ -0,0 +1,68 @@
+package seng302.model;
+
+import java.net.Socket;
+
+/**
+ * A Class defining a player and their respective details in the game as held by the model
+ * Created by wmu16 on 10/07/17.
+ */
+public class Player {
+
+    private Socket socket;
+    private ServerYacht yacht;
+    private Integer lastMarkPassed;
+
+
+    public Player(Socket socket, ServerYacht yacht) {
+        this.socket = socket;
+        this.yacht = yacht;
+    }
+
+    public Socket getSocket() {
+        return socket;
+    }
+
+    public Integer getLastMarkPassed() {
+        return lastMarkPassed;
+    }
+
+    public void setLastMarkPassed(Integer lastMarkPassed) {
+        this.lastMarkPassed = lastMarkPassed;
+    }
+
+    public ServerYacht getYacht() {
+        return yacht;
+    }
+
+    @Override
+    public String toString() {
+        String playerAddress = null;
+
+        if (socket == null){
+            return "Disconnected Player";
+        }
+
+        playerAddress = socket.getRemoteSocketAddress().toString();
+
+
+        return playerAddress;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null){
+            return false;
+        }
+
+        if (!(obj instanceof Player)){
+            return false;
+        }
+
+        return ((Player) obj).socket.equals(socket);
+    }
+
+    @Override
+    public int hashCode(){
+        return socket.hashCode();
+    }
+}

src/main/java/seng302/model/PolarTable.java

@@ -0,0 +1,215 @@
+package seng302.model;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A static class for parsing and storing the polars. Will parse the whole polar table and also store the optimised
+ * upwind and downwind in separate tables here as well
+ * Created by wmu16 on 22/05/17.
+ */
+public final class PolarTable {
+
+    //A Polar table will consist of a wind speed key to a hashmap value of pairs of wind angles and boat speeds
+    private static HashMap<Double, HashMap<Double, Double>> polarTable;
+    private static HashMap<Double, HashMap<Double, Double>> upwindOptimal;
+    private static HashMap<Double, HashMap<Double, Double>> downwindOptimal;
+    private static Double optimalAngle;
+
+    private static int upTwaIndex;
+    private static int dnTwaIndex;
+
+
+    /**
+     * Iterates through each row of the polar table, in pairs, to extract the row into a hashmap of angle to boat speed.
+     * These angle boatspeed hashmaps are then added to an outer hashmap at the end of wind speed key to each row hashmap
+     * as a value
+     * @param polarFile polarFile to be parsed
+     */
+    public static void parsePolarFile(InputStream polarFile) {
+        polarTable = new HashMap<>();
+        upwindOptimal = new HashMap<>();
+        downwindOptimal = new HashMap<>();
+
+        String line = null;
+        String check;
+        Boolean isHeaderLine = true;
+
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(polarFile))) {
+            while ((check = br.readLine()) != null) {
+                line = check;
+                String[] thisLine = line.split(",");
+
+                //Initial line in file
+                if (isHeaderLine) {
+                    deduceHeaders(thisLine);
+                    isHeaderLine = false;
+                } else {
+                    HashMap<Double, Double> thisPolar = new HashMap<>();
+                    HashMap<Double, Double> thisUpWindPolar = new HashMap<>();
+                    HashMap<Double, Double> thisDnWindPolar = new HashMap<>();
+                    Double thisWindSpeed = Double.parseDouble(thisLine[0]);
+
+                    // -3 <== -1 for length -1, and a further -2 as we iterate in pairs of 2 so finish before final 2
+                    for (int i = 1; i < thisLine.length; i += 2) {
+                        Double thisWindAngle = Double.parseDouble(thisLine[i]);
+                        Double thisBoatSpeed = Double.parseDouble(thisLine[i + 1]);
+                        thisPolar.put(thisWindAngle, thisBoatSpeed);
+                        if (i == upTwaIndex) {
+                            thisUpWindPolar.put(thisWindAngle, thisBoatSpeed);
+                        } else if (i == dnTwaIndex) {
+                            thisDnWindPolar.put(thisWindAngle, thisBoatSpeed);
+                        }
+                    }
+
+                    polarTable.put(thisWindSpeed, thisPolar);
+                    upwindOptimal.put(thisWindSpeed, thisUpWindPolar);
+                    downwindOptimal.put(thisWindSpeed, thisDnWindPolar);
+                }
+
+
+            }
+            getMaxSpeedAngle(line);
+
+        } catch (IOException e) {
+            System.out.println("[PolarTable] IO exception");
+        }
+    }
+
+
+    /**
+     * Passes the final line of the polar table and iterates over the speeds for each
+     * angle, velocity pair to find the angle that produces the highest velocity
+     *
+     * @param line The last line of the polar file
+     */
+    private static void getMaxSpeedAngle(String line) {
+        String[] theLastLine = line.split(",");
+        Double maxWindVal = Double.parseDouble(theLastLine[0]);
+        Double optimalAngle = Double.parseDouble(theLastLine[1]);
+        Double maxSpeed = Double.parseDouble(theLastLine[2]);
+        for (Map.Entry<Double, Double> entry : polarTable.get(maxWindVal).entrySet()) {
+            if (entry.getValue() > maxSpeed) {
+                maxSpeed = entry.getValue();
+                optimalAngle = entry.getKey();
+            }
+        }
+        PolarTable.optimalAngle = optimalAngle;
+    }
+
+
+
+    /**
+     * Parses the header line of a polar file
+     * @param thisLine The line which is the header of a polar file
+     */
+    private static void deduceHeaders(String[] thisLine) {
+
+        for (int i = 0; i < thisLine.length; i++) {
+            String thisItem = thisLine[i];
+            if (thisItem.toLowerCase().startsWith("uptwa")) {
+                upTwaIndex = i;
+            } else if (thisItem.toLowerCase().startsWith("dntwa")) {
+                dnTwaIndex = i;
+            }
+        }
+    }
+
+
+    public static Double getOptimalAngle() {
+        return optimalAngle;
+    }
+
+
+    /**
+     * @return The entire polar table
+     */
+    public static HashMap<Double, HashMap<Double, Double>> getPolarTable() {
+        return polarTable;
+    }
+
+
+    /**
+     * @return The polar table just containing the optimal upwind values
+     */
+    public static HashMap<Double, HashMap<Double, Double>> getUpwindOptimal() {
+        return upwindOptimal;
+    }
+
+
+    /**
+     * @return The polar table just containing the optimal downwind values
+     */
+    public static HashMap<Double, HashMap<Double, Double>> getDownwindOptimal() {
+        return downwindOptimal;
+    }
+
+
+    /**
+     * Will raise an exception if a polar table has just one row of data
+     * @param thisWindSpeed The current wind speed
+     * @return HashMap containing just the optimal upwind angle and resulting boat speed
+     */
+    public static HashMap<Double, Double> getOptimalUpwindVMG(Double thisWindSpeed) {
+
+        Double polarWindSpeed = getClosestWindSpeedInPolar(thisWindSpeed);
+        return upwindOptimal.get(polarWindSpeed);
+    }
+
+
+    /**
+     * Will raise an exception if a polar table has just one row of data
+     * @param thisWindSpeed The current wind speed
+     * @return HashMap containing just the optimal downwind angle and resulting boat speed
+     */
+    public static HashMap<Double, Double> getOptimalDownwindVMG(Double thisWindSpeed) {
+
+        Double polarWindSpeed = getClosestWindSpeedInPolar(thisWindSpeed);
+        return downwindOptimal.get(polarWindSpeed);
+    }
+
+
+    public static Double getBoatSpeed(Double thisWindSpeed, Double thisHeading) {
+
+        Double polarWindSpeed = getClosestWindSpeedInPolar(thisWindSpeed);
+        Double polarAngle = getClosestAngleInPolar(polarTable.get(polarWindSpeed), thisHeading);
+
+        return polarTable.get(polarWindSpeed).get(polarAngle);
+    }
+
+
+    public static Double getClosestWindSpeedInPolar(Double thisWindSpeed) {
+        Double smallestDif = Double.POSITIVE_INFINITY;
+        Double closestWind = 0d;
+        for (Double polarWindSpeed : polarTable.keySet()) {
+            Double difference = Math.abs(polarWindSpeed - thisWindSpeed);
+            if (difference < smallestDif) {
+                smallestDif = difference;
+                closestWind = polarWindSpeed;
+            }
+        }
+        return closestWind;
+    }
+
+
+    public static Double getClosestAngleInPolar(HashMap<Double, Double> thisWindSpeedPolar, Double thisHeading) {
+        Double smallestDif = Double.POSITIVE_INFINITY;
+        Double closestAngle = 0d;
+
+        for (Double polarAngle : thisWindSpeedPolar.keySet()) {
+            Double difference = Math.abs(polarAngle - thisHeading);
+            if (difference < smallestDif) {
+                smallestDif = difference;
+                closestAngle = polarAngle;
+            }
+        }
+        return closestAngle;
+    }
+
+
+}

src/main/java/seng302/model/RaceState.java

@@ -0,0 +1,137 @@
+package seng302.model;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.TimeZone;
+import javafx.beans.property.ReadOnlyDoubleProperty;
+import javafx.beans.property.ReadOnlyDoubleWrapper;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import seng302.model.stream.parser.RaceStartData;
+import seng302.model.stream.parser.RaceStatusData;
+import seng302.utilities.Sounds;
+
+/**
+ * Class for storing race data that does not relate to specific vessels or marks such as time or wind.
+ * Calculates the state of critical race attributes when relevant data is added.
+ */
+public class RaceState {
+
+    @FunctionalInterface
+    public interface CollisionListener {
+        void notifyCollision(GeoPoint location);
+    }
+
+//    private final DateFormat DATE_TIME_FORMAT = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
+    private final DateFormat DATE_TIME_FORMAT = new SimpleDateFormat("HH:mm:ss");
+    private ReadOnlyDoubleWrapper windSpeed = new ReadOnlyDoubleWrapper();
+    private ReadOnlyDoubleWrapper windDirection = new ReadOnlyDoubleWrapper();
+    private long serverSystemTime;
+    private long expectedStartTime;
+    private boolean raceRunning = false;
+    private boolean gunFired = false;
+    private boolean raceFinished = false;
+    long timeTillStart;
+    private ObservableList<ClientYacht> playerPositions;
+    private List<ClientYacht> collisions = new ArrayList<>();
+    private List<CollisionListener> collisionListeners = new ArrayList<>();
+
+    public RaceState() {
+        playerPositions = FXCollections.observableArrayList();
+    }
+
+    public void updateState (RaceStatusData data) {
+        this.windSpeed.set(data.getWindSpeed());
+        this.windDirection.set(data.getWindDirection());
+        this.serverSystemTime = data.getCurrentTime();
+        this.expectedStartTime = data.getExpectedStartTime();
+        this.raceRunning = data.isRaceStarted();
+    }
+
+    public void setTimeZone (TimeZone timeZone) {
+        DATE_TIME_FORMAT.setTimeZone(timeZone);
+    }
+
+    public void updateState (RaceStartData data) {
+        this.timeTillStart = data.getRaceStartTime();
+    }
+
+    public String getRaceTimeStr () {
+        long raceTime = serverSystemTime - expectedStartTime;
+        if (raceTime < 0) {
+            return "-" + DATE_TIME_FORMAT.format(-1 * (raceTime - 1000));
+        } else {
+            if (!gunFired) {
+                gunFired = true;
+                Sounds.playCapGunSound();
+            }
+            return DATE_TIME_FORMAT.format(serverSystemTime - expectedStartTime);
+        }
+    }
+
+    public long getTimeTillStart () {
+        return (expectedStartTime - serverSystemTime);
+    }
+
+    public double getWindSpeed() {
+        return windSpeed.doubleValue();
+    }
+
+    public ReadOnlyDoubleProperty windSpeedProperty() {
+        return windSpeed.getReadOnlyProperty();
+    }
+
+    public ReadOnlyDoubleProperty windDirectionProperty() {
+        return windDirection.getReadOnlyProperty();
+    }
+
+    public long getRaceTime() {
+        return serverSystemTime;
+    }
+
+    public boolean isRaceStarted () {
+        return raceRunning;
+    }
+
+    public void setRaceStarted(Boolean value) {
+        this.raceRunning = value;
+    }
+    public void setBoats(Collection<ClientYacht> clientYachts) {
+        playerPositions.setAll(clientYachts);
+    }
+
+    public void sortPlayers() {
+        playerPositions.sort((yacht1, yacht2) -> Integer.compare(yacht2.getLegNumber(),
+            yacht1.getLegNumber()));
+    }
+
+    public ObservableList<ClientYacht> getPlayerPositions() {
+        return playerPositions;
+    }
+
+    public void storeCollision(ClientYacht yacht) {
+        collisions.add(yacht);
+        for (CollisionListener collisionListener : collisionListeners) {
+            collisionListener.notifyCollision(yacht.getLocation());
+        }
+    }
+
+    public void addCollisionListener(CollisionListener collisionListener) {
+        collisionListeners.add(collisionListener);
+    }
+
+    public void removeCollisionListener(CollisionListener collisionListener) {
+        collisionListeners.remove(collisionListener);
+    }
+
+    public void setRaceFinished() {
+        raceFinished = true;
+    }
+
+    public Boolean getRaceFinished() {
+        return raceFinished;
+    }
+}

src/main/java/seng302/model/ScaledPoint.java

@@ -0,0 +1,122 @@
+package seng302.model;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import javafx.geometry.Point2D;
+import seng302.utilities.GeoUtility;
+
+/**
+ * Contains information on a scaled lat lon point for use with mapping geographical elements to a 2d plane.
+ */
+public class ScaledPoint extends GeoPoint {
+
+    public enum ScaleDirection {
+        HORIZONTAL,
+        VERTICAL
+    }
+
+    private double x, y, scaleFactor;
+    private ScaleDirection scaleDirection;
+
+    private ScaledPoint(double lat, double lng, double x, double y, double scaleFactor, ScaleDirection direction) {
+        super(lat, lng);
+        this.x = x;
+        this.y = y;
+        this.scaleFactor = scaleFactor;
+        this.scaleDirection = direction;
+    }
+
+    public double getX() {
+        return x;
+    }
+
+    public double getY() {
+        return y;
+    }
+
+    public double getScaleFactor() {
+        return scaleFactor;
+    }
+
+    public ScaleDirection getScaleDirection() {
+        return scaleDirection;
+    }
+
+    public Point2D findScaledXY(GeoPoint unscaled) {
+        return findScaledXY(unscaled.getLat(), unscaled.getLng());
+    }
+
+    public Point2D findScaledXY(double unscaledLat, double unscaledLon) {
+        double distanceFromReference;
+        double angleFromReference;
+        double xReference = this.getX();
+        double yReference = this.getY();
+
+        angleFromReference = GeoUtility.getBearingRad(
+            this, new GeoPoint(unscaledLat, unscaledLon)
+        );
+        distanceFromReference = GeoUtility.getDistance(
+            this, new GeoPoint(unscaledLat, unscaledLon)
+        );
+        if (angleFromReference >= 0 && angleFromReference <= Math.PI / 2) {
+            xReference += scaleFactor * Math.sin(angleFromReference) * distanceFromReference;
+            yReference -= scaleFactor * Math.cos(angleFromReference) * distanceFromReference;
+        } else if (angleFromReference >= 0) {
+            angleFromReference = angleFromReference - Math.PI / 2;
+            xReference += scaleFactor * Math.cos(angleFromReference) * distanceFromReference;
+            yReference += scaleFactor * Math.sin(angleFromReference) * distanceFromReference;
+        } else if (angleFromReference < 0 && angleFromReference >= -Math.PI / 2) {
+            angleFromReference = Math.abs(angleFromReference);
+            xReference -= scaleFactor * Math.sin(angleFromReference) * distanceFromReference;
+            yReference -= scaleFactor * Math.cos(angleFromReference) * distanceFromReference;
+        } else {
+            angleFromReference = Math.abs(angleFromReference) - Math.PI / 2;
+            xReference -= scaleFactor * Math.cos(angleFromReference) * distanceFromReference;
+            yReference += scaleFactor * Math.sin(angleFromReference) * distanceFromReference;
+        }
+        return new Point2D(xReference, yReference);
+    }
+
+    public static ScaledPoint makeScaledPoint(double width, double height,
+        List<? extends GeoPoint> points, boolean centered) {
+
+        double referencePointX, referencePointY, scaleFactor, lat, lng;
+        ScaleDirection scaleDirection;
+        points = new ArrayList<>(points);
+        points.sort(Comparator.comparingDouble(GeoPoint::getLat));
+        GeoPoint minLatPoint = points.get(0);
+        GeoPoint maxLatPoint = points.get(points.size() - 1);
+
+        points.sort(Comparator.comparingDouble(GeoPoint::getLng));
+        GeoPoint minLonPoint = points.get(0);
+        GeoPoint maxLonPoint = points.get(points.size() - 1);
+
+        referencePointX = centered ? 0 : width / 2;
+        referencePointY = centered ? 0 : height / 2;
+
+        lat = (maxLatPoint.getLat() - minLatPoint.getLat()) / 2 + minLatPoint.getLat();
+        lng = (maxLonPoint.getLng() - minLonPoint.getLng()) / 2 + minLonPoint.getLng();
+
+        GeoPoint ref = new GeoPoint(lat, lng);
+
+        double vertDistance = GeoUtility.getDistance(
+            ref, new GeoPoint(ref.getLat(), maxLonPoint.getLng())
+        ) * 2.1;
+
+        double horiDistance = GeoUtility.getDistance(
+            ref, new GeoPoint(maxLatPoint.getLat(), ref.getLng())
+        ) * 2.1;
+
+        double vertScale = height / vertDistance;
+
+        if (horiDistance * vertScale > width) {
+            scaleFactor = width / horiDistance;
+            scaleDirection = ScaleDirection.HORIZONTAL;
+        } else {
+            scaleFactor = vertScale;
+            scaleDirection = ScaleDirection.VERTICAL;
+        }
+        return new ScaledPoint(lat, lng, referencePointX, referencePointY, scaleFactor, scaleDirection);
+    }
+}

src/main/java/seng302/model/ServerYacht.java

@@ -0,0 +1,499 @@
+package seng302.model;
+
+import java.util.HashMap;
+import javafx.scene.paint.Color;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import seng302.gameServer.GameState;
+import seng302.gameServer.messages.BoatStatus;
+import seng302.model.mark.Mark;
+import seng302.model.token.TokenType;
+import seng302.utilities.GeoUtility;
+import seng302.visualiser.fxObjects.assets_3D.BoatMeshType;
+
+/**
+ * Yacht class for the racing boat. <p> Class created to store more variables (eg. boat statuses)
+ * compared to the XMLParser boat class, also done outside Boat class because some old variables are
+ * not used anymore.
+ */
+public class ServerYacht {
+
+    private Logger logger = LoggerFactory.getLogger(ServerYacht.class);
+
+    //Boat info
+    private BoatMeshType boatType;
+    private Double turnStep = 5.0;
+    private Double boatTypeSpeedMultiplier = 1.0;
+    private Double boatTypeTurnStepMultiplier = 1.0;
+    private Double boatTypeAccelerationMultiplier = 1.0;
+    private Integer sourceId;
+    private String hullID; //matches HullNum in the XML spec.
+    private String shortName;
+    private String boatName;
+    private String country;
+    private BoatStatus boatStatus;
+    private Color boatColor;
+
+    //Location
+    private Double lastHeading;
+    private Boolean sailIn;
+    private Double heading;
+    private GeoPoint lastLocation;
+    private GeoPoint location;
+    private Double currentVelocity;
+    private Boolean isAuto;
+    private Double autoHeading;
+    private Integer legNumber;
+
+    //Mark Rounding
+    private Integer currentMarkSeqID;
+    private Boolean hasEnteredRoundingZone;
+    private Mark closestCurrentMark;
+    private Boolean hasPassedLine;
+    private Boolean hasPassedThroughGate;
+
+    //PowerUp
+    private TokenType powerUp;
+    private Long powerUpStartTime;
+    private Double powerUpSpeedMultiplier;
+    private Integer powerUpHandlingMultiplier;
+
+    //turning mode
+    private Boolean continuouslyTurning;
+
+    public ServerYacht(BoatMeshType boatType, Integer sourceId, String hullID, String shortName,
+        String boatName, String country) {
+        setBoatType(boatType);
+        this.boatStatus = BoatStatus.PRESTART;
+        this.sourceId = sourceId;
+        this.hullID = hullID;
+        this.shortName = shortName;
+        this.boatName = boatName;
+        this.country = country;
+        this.sailIn = false;
+        this.isAuto = false;
+        this.location = new GeoPoint(57.67046, 11.83751);
+        this.lastLocation = location;
+        this.heading = 120.0;   //In degrees
+        this.currentVelocity = 0d;     //in mms-1
+        this.currentMarkSeqID = 0;
+        this.legNumber = 0;
+        this.boatColor = Colors.getColor(sourceId - 1);
+        this.powerUp = null;
+        this.powerUpSpeedMultiplier = 1d;
+        this.powerUpHandlingMultiplier = 1;
+        this.hasEnteredRoundingZone = false;
+        this.hasPassedLine = false;
+        this.hasPassedThroughGate = false;
+        this.continuouslyTurning = false;
+    }
+
+
+    /**
+     * Changes the boats current currentVelocity by a set amount, positive or negative
+     *
+     * @param velocityChange The ammount to change the currentVelocity by, in mms-1
+     */
+    public void changeVelocity(Double velocityChange) {
+        currentVelocity += velocityChange;
+    }
+
+    /**
+     * Updates the boat to a new GeoPoint whilst preserving the last location
+     *
+     * @param secondsElapsed The seconds elapsed since the last update of this yacht
+     */
+    public void updateLocation(Double secondsElapsed) {
+        //test
+        lastLocation = location;
+        location = GeoUtility.getGeoCoordinate(location, heading, currentVelocity * secondsElapsed);
+    }
+
+    public void setLocation(GeoPoint geoPoint) {
+        location = geoPoint;
+    }
+
+    /**
+     * Powers up a yacht with a given yacht, only after powering it down first to avoid double power
+     * ups
+     *
+     * @param powerUp The given power up
+     */
+    public void powerUp(TokenType powerUp) {
+        powerDown();
+        switch (powerUp) {
+            case BOOST:
+                powerUpSpeedMultiplier = GameState.VELOCITY_BOOST_MULTIPLIER;
+                break;
+            case HANDLING:
+                powerUpHandlingMultiplier = GameState.HANDLING_BOOST_MULTIPLIER;
+                break;
+        }
+        this.powerUp = powerUp;
+        powerUpStartTime = System.currentTimeMillis();
+    }
+
+    /**
+     * Powers down a yacht, returning its power multipliers back to 1
+     */
+    public void powerDown() {
+        this.powerUp = null;
+        this.powerUpSpeedMultiplier = 1d;
+        this.powerUpHandlingMultiplier = 1;
+    }
+
+    public Long getPowerUpStartTime() {
+        return powerUpStartTime;
+    }
+
+    public TokenType getPowerUp() {
+        return powerUp;
+    }
+
+    /**
+     * Adjusts the heading of the boat by a given amount, while recording the boats last heading.
+     *
+     * @param amount the amount by which to adjust the boat heading.
+     */
+    public void adjustHeading(Double amount) {
+        Double newVal = heading + amount * powerUpHandlingMultiplier * boatTypeTurnStepMultiplier;
+        lastHeading = heading;
+        heading = (double) Math.floorMod(newVal.longValue(), 360L);
+    }
+
+    /**
+     * Swaps the boats direction from one side of the wind to the other.
+     * @param windDirection .
+     */
+    public void tackGybe(Double windDirection) {
+        if (isAuto) {
+            disableAutoPilot();
+        } else {
+            Double normalizedHeading = normalizeHeading();
+            Double newVal = (-2 * normalizedHeading) + heading;
+            Double newHeading = (double) Math.floorMod(newVal.longValue(), 360L);
+            setAutoPilot(newHeading);
+        }
+    }
+
+    /**
+     * Enables the boats auto pilot feature, which will move the boat towards a given heading.
+     *
+     * @param newHeading The heading to move the boat towards.
+     */
+    private void setAutoPilot(Double newHeading) {
+        isAuto = true;
+        autoHeading = newHeading;
+    }
+
+    /**
+     * Disables the auto pilot function.
+     */
+    public void disableAutoPilot() {
+        isAuto = false;
+    }
+
+    /**
+     * Moves the boat towards the given heading when the auto pilot was set. Disables the auto pilot
+     * in the event that the boat is within the range of 1 turn step of its goal.
+     */
+    public void runAutoPilot() {
+        if (isAuto) {
+            turnTowardsHeading(autoHeading);
+            if (Math.abs(heading - autoHeading)
+                <= turnStep*1.5) {
+                isAuto = false;
+                setHeading(autoHeading);
+            }
+        }
+    }
+
+    public void toggleSailIn() {
+        sailIn = !sailIn;
+    }
+
+    public void turnUpwind() {
+        disableAutoPilot();
+        Double normalizedHeading = normalizeHeading();
+        if (continuouslyTurning) {
+            adjustHeading(turnStep);
+        } else {
+            if (normalizedHeading == 0) {
+                if (lastHeading < 180) {
+                    adjustHeading(-turnStep);
+                } else {
+                    adjustHeading(turnStep);
+                }
+            } else if (normalizedHeading == 180) {
+                if (lastHeading < 180) {
+                    adjustHeading(turnStep);
+                } else {
+                    adjustHeading(-turnStep);
+                }
+            } else if (normalizedHeading < 180) {
+                adjustHeading(-turnStep);
+            } else {
+                adjustHeading(turnStep);
+            }
+        }
+    }
+
+    public void turnDownwind() {
+        disableAutoPilot();
+        Double normalizedHeading = normalizeHeading();
+        if (continuouslyTurning) {
+            adjustHeading(-turnStep);
+        } else {
+            if (normalizedHeading == 0) {
+                if (lastHeading < 180) {
+                    adjustHeading(turnStep);
+                } else {
+                    adjustHeading(-turnStep);
+                }
+            } else if (normalizedHeading == 180) {
+                if (lastHeading < 180) {
+                    adjustHeading(-turnStep);
+                } else {
+                    adjustHeading(turnStep);
+                }
+            } else if (normalizedHeading < 180) {
+                adjustHeading(turnStep);
+            } else {
+                adjustHeading(-turnStep);
+            }
+        }
+    }
+
+    /**
+     * Takes the VMG from the polartable for upwind or downwind depending on the boats direction,
+     * and uses this to calculate a heading to move the yacht towards.
+     */
+    public void turnToVMG() {
+        if (isAuto) {
+            disableAutoPilot();
+        } else {
+            Double normalizedHeading = normalizeHeading();
+            Double optimalHeading;
+            HashMap<Double, Double> optimalPolarMap;
+
+            if (normalizedHeading >= 90 && normalizedHeading <= 270) { // Downwind
+                optimalPolarMap = PolarTable.getOptimalDownwindVMG(GameState.getWindSpeedKnots());
+            } else {
+                optimalPolarMap = PolarTable.getOptimalUpwindVMG(GameState.getWindSpeedKnots());
+            }
+            optimalHeading = optimalPolarMap.keySet().iterator().next();
+
+            if (normalizedHeading > 180) {
+                optimalHeading = 360 - optimalHeading;
+            }
+
+            // Take optimal heading and turn into a boat heading rather than a wind heading.
+            optimalHeading =
+                (optimalHeading + GameState.getWindDirection()) % 360;
+
+            setAutoPilot(optimalHeading);
+        }
+    }
+
+    /**
+     * Takes a given heading and rotates the boat towards that heading. This does not care about
+     * being upwind or downwind, just which direction will reach a given heading faster.
+     *
+     * @param newHeading The heading to turn the yacht towards.
+     */
+    private void turnTowardsHeading(Double newHeading) {
+        Double newVal = heading - newHeading;
+        if (Math.floorMod(newVal.longValue(), 360L) > 180) {
+            adjustHeading(turnStep  / 5);
+        } else {
+            adjustHeading(-turnStep / 5);
+        }
+    }
+
+    /**
+     * Returns a heading normalized for the wind direction. Heading direction into the wind is 0,
+     * directly away is 180.
+     *
+     * @return The normalized heading accounting for wind direction.
+     */
+    private Double normalizeHeading() {
+        Double normalizedHeading = heading - GameState.windDirection;
+        normalizedHeading = (double) Math.floorMod(normalizedHeading.longValue(), 360L);
+        return normalizedHeading;
+    }
+
+    public Integer getSourceId() {
+        //@TODO Remove and merge with Creating Game Loop
+        if (sourceId == null) {
+            return 0;
+        }
+        return sourceId;
+    }
+
+    // TODO: 15/08/17 This method is implicitly called from the XML generator for boats DO NOT DELETE
+    public String getHullID() {
+        if (hullID == null) {
+            return "";
+        }
+        return hullID;
+    }
+
+    // TODO: 15/08/17 This method is implicitly called from the XML generator for boats DO NOT DELETE
+    public String getShortName() {
+        return shortName;
+    }
+
+    public String getBoatName() {
+        return boatName;
+    }
+
+    public String getCountry() {
+        if (country == null) {
+            return "";
+        }
+        return country;
+    }
+
+    public void setBoatName(String name) {
+        boatName = name;
+        shortName = name.split(" ")[0];
+    }
+
+    public GeoPoint getLocation() {
+        return location;
+    }
+
+
+    public Double getHeading() {
+        return heading;
+    }
+
+    public void setHeading(Double heading) {
+        this.heading = heading;
+    }
+
+    public Boolean getSailIn() {
+        return sailIn;
+    }
+
+    @Override
+    public String toString() {
+        return boatName;
+    }
+
+    public Double getCurrentVelocity() {
+        return currentVelocity;
+    }
+
+    public void setCurrentVelocity(Double currentVelocity) {
+        this.currentVelocity = currentVelocity;
+    }
+
+    public Integer getCurrentMarkSeqID() {
+        return currentMarkSeqID;
+    }
+
+    public GeoPoint getLastLocation() {
+        return lastLocation;
+    }
+
+    public Mark getClosestCurrentMark() {
+        return closestCurrentMark;
+    }
+
+    public void setClosestCurrentMark(Mark closestCurrentMark) {
+        this.closestCurrentMark = closestCurrentMark;
+    }
+
+    public void setHasEnteredRoundingZone(Boolean hasEnteredRoundingZone) {
+        this.hasEnteredRoundingZone = hasEnteredRoundingZone;
+    }
+
+    public void setHasPassedLine(Boolean hasPassedLine) {
+        this.hasPassedLine = hasPassedLine;
+    }
+
+    public void setHasPassedThroughGate(Boolean hasPassedThroughGate) {
+        this.hasPassedThroughGate = hasPassedThroughGate;
+    }
+
+    public BoatStatus getBoatStatus() {
+        return boatStatus;
+    }
+
+    public void setBoatStatus(BoatStatus boatStatus) {
+        this.boatStatus = boatStatus;
+    }
+
+    public void incrementMarkSeqID() {
+        currentMarkSeqID++;
+    }
+
+    public Boolean hasEnteredRoundingZone() {
+        return hasEnteredRoundingZone;
+    }
+
+    public Boolean hasPassedThroughGate() {
+        return hasPassedThroughGate;
+    }
+
+    public Boolean hasPassedLine() {
+        return hasPassedLine;
+    }
+
+    public void incrementLegNumber() {
+        legNumber++;
+    }
+
+    public Integer getLegNumber() {
+        return legNumber;
+    }
+
+    public void setBoatColor(Color color) {
+        this.boatColor = color;
+    }
+
+    public Color getBoatColor() {
+        return boatColor;
+    }
+
+    public void setBoatType(BoatMeshType boatType) {
+        this.boatTypeAccelerationMultiplier = boatType.accelerationMultiplier;
+        this.boatTypeSpeedMultiplier = boatType.maxSpeedMultiplier;
+        this.boatTypeTurnStepMultiplier = boatType.turnStep;
+        this.boatType = boatType;
+    }
+
+    public Double getBoatTypeSpeedMultiplier() {
+        return boatTypeSpeedMultiplier;
+    }
+
+    public Double getBoatTypeAccelerationMultiplier() {
+        return boatTypeAccelerationMultiplier;
+    }
+
+
+    public BoatMeshType getBoatType() {
+        return boatType;
+    }
+
+    public void setContinuouslyTurning(Boolean continuouslyTurning) {
+        this.continuouslyTurning = continuouslyTurning;
+    }
+
+    public Double getPowerUpSpeedMultiplier() {
+        return powerUpSpeedMultiplier;
+    }
+
+    public void setPowerUpSpeedMultiplier(Double powerUpSpeedMultiplier) {
+        this.powerUpSpeedMultiplier = powerUpSpeedMultiplier;
+    }
+
+    public Integer getPowerUpHandlingMultiplier() {
+        return powerUpHandlingMultiplier;
+    }
+
+    public void setPowerUpHandlingMultiplier(Integer powerUpHandlingMultiplier) {
+        this.powerUpHandlingMultiplier = powerUpHandlingMultiplier;
+    }
+}

src/main/java/seng302/model/mark/CompoundMark.java

@@ -0,0 +1,130 @@
+package seng302.model.mark;
+
+import java.util.Collections;
+import java.util.List;
+import seng302.gameServer.messages.RoundingSide;
+import seng302.model.GeoPoint;
+import seng302.utilities.GeoUtility;
+
+public class CompoundMark {
+
+	private int compoundMarkId;
+	private String name;
+	private List<Mark> marks;
+    private GeoPoint midPoint;
+
+    public CompoundMark(int markID, String name, List<Mark> marks) {
+        this.compoundMarkId = markID;
+        this.name = name;
+        this.marks = Collections.unmodifiableList(marks);
+        if (marks.size() > 1) {
+            this.midPoint = GeoUtility.getDirtyMidPoint(marks.get(0), marks.get(1));
+        } else {
+            this.midPoint = marks.get(0);
+        }
+    }
+
+	/**
+	 * Prints out compoundMark's info and its marks, good for testing
+	 * @return a string showing its details
+	 */
+	@Override
+	public String toString(){
+		String info = String.format(
+			"CompoundMark: %d (%s), [%s", compoundMarkId, name, marks.get(0).toString()
+		);
+		if (marks.size() > 1) {
+			info += String.format(", %s", marks.get(1).toString());
+		}
+		return info + "]";
+	}
+
+	public int getId() {
+		return compoundMarkId;
+	}
+
+	public void setId (int markID) {
+		this.compoundMarkId = markID;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+    public void setRoundingSide(RoundingSide roundingSide) {;
+        switch (roundingSide) {
+            case SP:
+                getSubMark(1).setRoundingSide(RoundingSide.STARBOARD);
+                getSubMark(2).setRoundingSide(RoundingSide.PORT);
+                break;
+            case PS:
+                getSubMark(1).setRoundingSide(RoundingSide.PORT);
+                getSubMark(2).setRoundingSide(RoundingSide.STARBOARD);
+                break;
+            case PORT:
+                getSubMark(1).setRoundingSide(RoundingSide.PORT);
+                break;
+            case STARBOARD:
+                getSubMark(1).setRoundingSide(RoundingSide.STARBOARD);
+                break;
+
+
+        }
+    }
+
+    /**
+     * Returns the mark contained in the compound mark. Marks are numbered 1 to n;
+     * @param singleMarkId the id of the desired mark contained in this compound mark.
+     * @return the desired mark. Returns null if the ID is not in range (1, NUM_MARKS)
+     */
+	public Mark getSubMark(int singleMarkId) {
+	    try {
+            return marks.get(singleMarkId - 1);
+        } catch (IndexOutOfBoundsException e) {
+	        return null;
+        }
+    }
+
+    /**
+     * NOTE: This is a 'dirty' mid point as it is simply calculated as an xy point would be.
+     * NO CHECKING FOR LAT / LNG WRAPPING IS DONE IN CREATION OF THIS MIDPOINT
+     *
+     * @return GeoPoint of the midpoint of the two marks, or the one mark if there is only one
+     */
+    public GeoPoint getMidPoint() {
+        return midPoint;
+    }
+
+    /**
+     * Returns whether or not this CompoundMark is a Gate. It is generally cleaner to program to a
+     * specific singleMark or the list of marks.
+     *
+     * @return True if the compound mark is a gate, false otherwise.
+     */
+    public boolean isGate () {
+	    return marks.size() > 1;
+    }
+
+    /**
+     * Returns the list of marks in the compoundMark
+     *
+     * @return All marks contained in this mark.
+     */
+    public List<Mark> getMarks () {
+        return marks;
+    }
+
+	@Override
+	public int hashCode() {
+    	int hash = 0;
+    	for (Mark mark : marks) {
+    		hash += Double.hashCode(mark.getSourceID()) + Double.hashCode(mark.getLat())
+				+ Double.hashCode(mark.getLng()) + mark.getName().hashCode();
+		}
+		return hash + getName().hashCode() + Integer.hashCode(getId());
+	}
+}

src/main/java/seng302/model/mark/Corner.java

@@ -0,0 +1,41 @@
+package seng302.model.mark;
+
+/**
+ * Stores the data for the cornering of a mark.
+ */
+public class Corner {
+
+    private Integer seqID;
+    private Integer compoundMarkID;
+    private String rounding;
+    private Integer zoneSize;
+
+    public Corner(Integer seqID, Integer compoundMarkID, String rounding, Integer zoneSize) {
+        this.seqID = seqID;
+        this.compoundMarkID = compoundMarkID;
+        this.rounding = rounding;
+        this.zoneSize = zoneSize;
+    }
+
+    public Integer getSeqID() {
+        return seqID;
+    }
+
+    public Integer getCompoundMarkID() {
+        return compoundMarkID;
+    }
+
+    public String getRounding() {
+        return rounding;
+    }
+
+    public Integer getZoneSize() {
+        return zoneSize;
+    }
+
+    @Override
+    public String toString() {
+        return "Corner = {seqID=" + seqID + ", compoundMarkID=" + compoundMarkID + ", rounding="
+            + rounding +", zoneSize=" + zoneSize + "}";
+    }
+}

src/main/java/seng302/model/mark/Mark.java

@@ -0,0 +1,86 @@
+package seng302.model.mark;
+
+import java.util.ArrayList;
+import java.util.List;
+import seng302.gameServer.messages.RoundingSide;
+import seng302.model.GeoPoint;
+
+/**
+ * An abstract class to represent general marks
+ * Created by Haoming Yin (hyi25) on 17/3/17.
+ */
+public class Mark extends GeoPoint {
+
+    @FunctionalInterface
+    public interface PositionListener {
+        void notifyPositionChange(Mark mark, double lat, double lon);
+    }
+
+    private int seqID;
+    private String name;
+    private int sourceID;
+    private List<PositionListener> positionListeners = new ArrayList<>();
+    private RoundingSide roundingSide;
+
+    public Mark(String name, int seqID, double lat, double lng, int sourceID) {
+        super(lat, lng);
+        this.name = name;
+        this.sourceID = sourceID;
+        this.seqID = seqID;
+    }
+
+    /**
+     * Prints out mark's info and its geo location, good for testing
+     * @return a string showing its details
+     */
+    @Override
+    public String toString() {
+        return String.format("Mark%d: %s, source: %d, lat: %f, lng: %f", seqID, name, sourceID, getLat(), getLng());
+    }
+
+    public int getSeqID() {
+        return seqID;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public int getSourceID() {
+        return sourceID;
+    }
+
+    public RoundingSide getRoundingSide() {
+        return roundingSide;
+    }
+
+    public void setRoundingSide(RoundingSide roundingSide) {
+        this.roundingSide = roundingSide;
+    }
+
+    public void setSourceID(int sourceID) {
+        this.sourceID = sourceID;
+    }
+
+    public void updatePosition (double lat, double lon) {
+        this.setLat(lat);
+        this.setLng(lon);
+        for (PositionListener listener : positionListeners) {
+            listener.notifyPositionChange(this, lat, lon);
+        }
+    }
+
+    public void addPositionListener (PositionListener listener) {
+        positionListeners.add(listener);
+    }
+
+    public void removePositionListener (PositionListener listener) {
+        positionListeners.remove(listener);
+    }
+}
+
+

src/main/java/seng302/model/mark/MarkOrder.java

@@ -0,0 +1,79 @@
+package seng302.model.mark;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import seng302.gameServer.messages.RoundingSide;
+import seng302.model.stream.xml.parser.RaceXMLData;
+
+/**
+ * Class to hold the order of the marks in the race.
+ */
+public class MarkOrder {
+    private List<CompoundMark> raceMarkOrder;
+    private List<CompoundMark> orderedUniqueCompoundMarks;
+    private Logger logger = LoggerFactory.getLogger(MarkOrder.class);
+    private List<Mark> allMarks;
+
+
+    public MarkOrder(RaceXMLData raceXMLData){
+        raceMarkOrder = new ArrayList<>();
+        for (Corner corner : raceXMLData.getMarkSequence()){
+            CompoundMark compoundMark = raceXMLData.getCompoundMarks().get(corner.getCompoundMarkID());
+            compoundMark.setRoundingSide(
+                RoundingSide.getRoundingSide(corner.getRounding())
+            );
+            raceMarkOrder.add(compoundMark);
+        }
+        orderedUniqueCompoundMarks = new ArrayList<>(raceXMLData.getCompoundMarks().values());
+    }
+
+    /**
+     * @return An ordered list of marks in the race
+     *         OR null if the mark order could not be loaded
+     */
+    public List<CompoundMark> getMarkOrder() {
+        if (raceMarkOrder == null){
+            logger.warn("Race order accessed but not instantiated");
+            return null;
+        }
+        return Collections.unmodifiableList(raceMarkOrder);
+    }
+
+    public List<CompoundMark> getOrderedUniqueCompoundMarks() {
+        return orderedUniqueCompoundMarks;
+    }
+
+    /**
+     * @param seqID The seqID of the current mark the boat is heading to
+     * @return A Boolean indicating if this coming mark is the last one (finish line)
+     */
+    public Boolean isLastMark(Integer seqID) {
+        return seqID == raceMarkOrder.size() - 1;
+    }
+
+    /**
+     * @param currentSeqID The seqID of the current mark the boat is heading to
+     * @return The mark last passed
+     * @throws IndexOutOfBoundsException if there is no next mark. Check seqID != 0 first
+     */
+    public CompoundMark getPreviousMark(Integer currentSeqID) throws IndexOutOfBoundsException {
+        return raceMarkOrder.get(currentSeqID - 1);
+    }
+
+    public CompoundMark getCurrentMark(Integer currentSeqID) {
+        return raceMarkOrder.get(currentSeqID);
+    }
+
+    /**
+     * @param currentSeqID The seqID of the current mark the boat is heading to
+     * @return The mark following the mark that the boat is heading to
+     * @throws IndexOutOfBoundsException if there is no next mark. Check using {@link
+     * #isLastMark(Integer)}
+     */
+    public CompoundMark getNextMark(Integer currentSeqID) throws IndexOutOfBoundsException {
+        return raceMarkOrder.get(currentSeqID + 1);
+    }
+}

src/main/java/seng302/model/stream/packets/PacketType.java

@@ -0,0 +1,78 @@
+package seng302.model.stream.packets;
+
+public enum PacketType {
+    HEARTBEAT,
+    RACE_STATUS,
+    DISPLAY_TEXT_MESSAGE,
+    RACE_XML,
+    REGATTA_XML,
+    BOAT_XML,
+    RACE_START_STATUS,
+    YACHT_EVENT_CODE,
+    YACHT_ACTION_CODE,
+    CHATTER_TEXT,
+    BOAT_LOCATION,
+    MARK_ROUNDING,
+    COURSE_WIND,
+    AVG_WIND,
+    BOAT_ACTION,
+    OTHER,
+    RACE_REGISTRATION_REQUEST,
+    RACE_REGISTRATION_RESPONSE,
+    RACE_CUSTOMIZATION_REQUEST,
+    RACE_CUSTOMIZATION_RESPONSE,
+
+    SERVER_REGISTRATION, ROOM_CODE_REQUEST, LOBBY_REQUEST;
+
+    public static PacketType assignPacketType(int packetType, byte[] payload){
+        switch(packetType){
+            case 1:
+                return HEARTBEAT;
+            case 12:
+                return RACE_STATUS;
+            case 20:
+                return DISPLAY_TEXT_MESSAGE;
+            case 26:
+                switch (payload[9]) { //The type of XML message
+                    case 5:
+                        return REGATTA_XML;
+                    case 6:
+                        return RACE_XML;
+                    case 7:
+                        return BOAT_XML;
+                }
+            case 27:
+                return RACE_START_STATUS;
+            case 29:
+                return YACHT_EVENT_CODE;
+            case 31:
+                return YACHT_ACTION_CODE;
+            case 36:
+                return CHATTER_TEXT;
+            case 37:
+                return BOAT_LOCATION;
+            case 38:
+                return MARK_ROUNDING;
+            case 44:
+                return COURSE_WIND;
+            case 47:
+                return AVG_WIND;
+            case 100:
+                return BOAT_ACTION;
+            case 101:
+                return RACE_REGISTRATION_REQUEST;
+            case 102:
+                return RACE_REGISTRATION_RESPONSE;
+            case 103:
+                return RACE_CUSTOMIZATION_REQUEST;
+            case 104:
+                return RACE_CUSTOMIZATION_RESPONSE;
+            case 201:
+                return SERVER_REGISTRATION;
+            case 202:
+                return ROOM_CODE_REQUEST;
+            default:
+        }
+        return OTHER;
+    }
+}

src/main/java/seng302/model/stream/packets/StreamPacket.java

@@ -0,0 +1,37 @@
+package seng302.model.stream.packets;
+
+/**
+ * Created by kre39 on 23/04/17.
+ */
+public class StreamPacket {
+
+    //Change int to an ENUM for the type
+    private PacketType type;
+
+    private long messageLength;
+    private long timeStamp;
+    private byte[] payload;
+
+    public StreamPacket(int type, long messageLength, long timeStamp, byte[] payload) {
+        this.type = PacketType.assignPacketType(type, payload);
+        this.messageLength = messageLength;
+        this.timeStamp = timeStamp;
+        this.payload = payload;
+    }
+
+    public PacketType getType() {
+        return type;
+    }
+
+    public long getMessageLength() {
+        return messageLength;
+    }
+
+    public byte[] getPayload() {
+        return payload;
+    }
+
+    public long getTimeStamp() {
+        return timeStamp;
+    }
+}

src/main/java/seng302/model/stream/parser/MarkRoundingData.java

@@ -0,0 +1,36 @@
+package seng302.model.stream.parser;
+
+
+/**
+ * Simple data wrapper for mark rounding data packet.
+ */
+public class MarkRoundingData {
+
+    private int boatId;
+    private int markId;
+    private int roundingSide;
+    private long timeStamp;
+
+    public MarkRoundingData(int boatId, int markId, int roundingSide, long timeStamp) {
+        this.boatId = boatId;
+        this.markId = markId;
+        this.roundingSide = roundingSide;
+        this.timeStamp = timeStamp;
+    }
+
+    public int getBoatId() {
+        return boatId;
+    }
+
+    public int getMarkId() {
+        return markId;
+    }
+
+    public int getRoundingSide() {
+        return roundingSide;
+    }
+
+    public long getTimeStamp() {
+        return timeStamp;
+    }
+}

src/main/java/seng302/model/stream/parser/PositionUpdateData.java

@@ -0,0 +1,50 @@
+package seng302.model.stream.parser;
+
+public class PositionUpdateData {
+
+    public enum DeviceType {
+        YACHT_TYPE,
+        MARK_TYPE
+    }
+
+    private int deviceId;
+    private DeviceType type;
+    private double lat;
+    private double lon;
+    private double heading;
+    private double groundSpeed;
+
+    public PositionUpdateData(int deviceId, DeviceType type, double lat, double lon,
+        double heading, double groundSpeed) {
+        this.deviceId = deviceId;
+        this.type = type;
+        this.lat = lat;
+        this.lon = lon;
+        this.heading = heading;
+        this.groundSpeed = groundSpeed;
+    }
+
+    public int getDeviceId() {
+        return deviceId;
+    }
+
+    public DeviceType getType() {
+        return type;
+    }
+
+    public double getLat() {
+        return lat;
+    }
+
+    public double getLon() {
+        return lon;
+    }
+
+    public double getHeading() {
+        return heading;
+    }
+
+    public double getGroundSpeed() {
+        return groundSpeed;
+    }
+}