diff --git a/src/main/java/seng302/server/ServerThread.java b/src/main/java/seng302/server/ServerThread.java
index 094845ab..4270b633 100644
--- a/src/main/java/seng302/server/ServerThread.java
+++ b/src/main/java/seng302/server/ServerThread.java
@@ -1,5 +1,7 @@
 package seng302.server;
 
+import seng302.server.simulator.mark.CompoundMark;
+import seng302.server.simulator.mark.Mark;
 import seng302.server.messages.*;
 import seng302.server.simulator.Boat;
 import seng302.server.simulator.Simulator;
@@ -257,6 +259,53 @@ public class ServerThread implements Runnable, Observer {
         //Delays the new course xml data for 25 seconds so the boats are able to pass the starting line
     }
 
+    /**
+     * Starts sending boat location messages containing the mark positions
+     * Marks are flipped by 90 degrees from their original position
+     */
+    private void startUpdatingMarkPositions(){
+        Timer t = new Timer();
+        t.schedule(new TimerTask() {
+
+            /**
+             * Send the mark location message
+             * @param m The mark to send
+             * @param offset How far to move the marks from their original position
+             */
+            private void sendMark(Mark m, Double offset){
+                Message markLocation = new BoatLocationMessage(m.getSourceID(), server.getSequenceNumber(),
+                        m.getLat()-offset, m.getLng()+offset*2, 0, 0);
+
+                try {
+                    server.send(markLocation);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+
+            @Override
+            public void run() {
+                for (CompoundMark m : raceSimulator.getMarks()){
+                    if (m == null){
+                        continue;
+                    }
+
+                    Mark mark1 = m.getMark1();
+                    Mark mark2 = m.getMark2();
+
+                    if (mark1 != null){
+                        sendMark(mark1, 0.0002);
+                    }
+
+                    if (mark2 != null){
+                        sendMark(mark2, 0.0005);
+                    }
+
+                }
+            }
+        }, 21000, 1000);
+    }
+
     public void run() {
         try{
             server = new StreamingServerSocket(PORT_NUMBER);
@@ -275,6 +324,7 @@ public class ServerThread implements Runnable, Observer {
         startSendingRaceStartStatusMessages();
         startSendingRaceStatusMessages();
         sendPostStartCourseXml();
+        startUpdatingMarkPositions();
     }
 
     /**
diff --git a/src/main/java/seng302/server/simulator/Simulator.java b/src/main/java/seng302/server/simulator/Simulator.java
index 72d2717a..c279fea5 100644
--- a/src/main/java/seng302/server/simulator/Simulator.java
+++ b/src/main/java/seng302/server/simulator/Simulator.java
@@ -1,12 +1,15 @@
 package seng302.server.simulator;
 
+import seng302.server.simulator.mark.CompoundMark;
 import seng302.server.simulator.mark.Corner;
 import seng302.server.simulator.mark.Mark;
 import seng302.server.simulator.mark.Position;
 import seng302.server.simulator.parsers.RaceParser;
 
+import java.util.HashSet;
 import java.util.List;
 import java.util.Observable;
+import java.util.Set;
 import java.util.concurrent.ThreadLocalRandom;
 
 public class Simulator extends Observable implements Runnable {
@@ -138,4 +141,18 @@ public class Simulator extends Observable implements Runnable {
 	public void setRaceStarted(boolean raceStarted) {
 		isRaceStarted = raceStarted;
 	}
+
+	/**
+	 * @return A list of marks in the race
+	 */
+	public Set<CompoundMark> getMarks(){
+		Set<CompoundMark> marks =  new HashSet<>();
+
+		for (Corner c : course){
+			marks.add(c.getCompoundMark());
+			marks.add(c.getCompoundMark());
+		}
+
+		return marks;
+	}
 }