diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
index cd3b5a57..5255de71 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
@@ -61,8 +61,9 @@ public class HostController extends Controller {
     public void initialize(URL location, ResourceBundle resources){
         Image ac35Map = new Image(getClass().getClassLoader().getResourceAsStream("images/AC35_Racecourse_MAP.png"));
         Image oMap = new Image(getClass().getClassLoader().getResourceAsStream("images/oMapLayout.png"));
+        Image iMap = new Image(getClass().getClassLoader().getResourceAsStream("images/iMapLayout.png"));
 
-        listOfMaps = new ArrayList(Arrays.asList(ac35Map, oMap));
+        listOfMaps = new ArrayList(Arrays.asList(ac35Map, oMap, iMap));
         mapImage.setImage(listOfMaps.get(currentMapIndex));
     }
 
diff --git a/racevisionGame/src/main/resources/images/iMapLayout.png b/racevisionGame/src/main/resources/images/iMapLayout.png
new file mode 100644
index 00000000..f22e60da
Binary files /dev/null and b/racevisionGame/src/main/resources/images/iMapLayout.png differ
diff --git a/racevisionGame/src/main/resources/mock/mockXML/iMapLayout.xml b/racevisionGame/src/main/resources/mock/mockXML/iMapLayout.xml
index ca8d8beb..fefb15bf 100644
--- a/racevisionGame/src/main/resources/mock/mockXML/iMapLayout.xml
+++ b/racevisionGame/src/main/resources/mock/mockXML/iMapLayout.xml
@@ -18,41 +18,41 @@
         <Corner SeqID="3" CompoundMarkID="4" Rounding="Starboard" ZoneSize="3" />
         <Corner SeqID="4" CompoundMarkID="2" Rounding="Port" ZoneSize="3" />
         <Corner SeqID="5" CompoundMarkID="3" Rounding="Port" ZoneSize="3" />
-        <Corner SeqID="6" CompoundMarkID="5" Rounding="Starboard" ZoneSize="3" />
-        <Corner SeqID="7" CompoundMarkID="6" Rounding="SP" ZoneSize="3"/>
+        <Corner SeqID="7" CompoundMarkID="5" Rounding="SP" ZoneSize="3"/>
     </CompoundMarkSequence>
     <Course>
         <CompoundMark CompoundMarkID="1" Name="Start Line">
-            <Mark SeqId="1" Name="PRO" TargetLat="-40.681354" TargetLng="174.132354" SourceID="101"/>
-            <Mark SeqId="2" Name="PIN" TargetLat="-40.683415" TargetLng="174.133430" SourceID="102"/>
+            <Mark SeqId="1" Name="PRO" TargetLat="1.681354" TargetLng="1.132354" SourceID="101"/>
+            <Mark SeqId="2" Name="PIN" TargetLat="1.681354" TargetLng="1.135604" SourceID="102"/>
         </CompoundMark>
         <CompoundMark CompoundMarkID="2" Name="Marker 1">
-            <Mark Name="Marker1" TargetLat="-40.588713" TargetLng="174.041839" SourceID="103"/>
+            <Mark Name="Marker1" TargetLat="1.728713" TargetLng="1.131345" SourceID="103"/>
         </CompoundMark>
+
         <CompoundMark CompoundMarkID="3" Name="Marker 2">
-            <Mark Name="Marker2" TargetLat="-40.60120" TargetLng="173.950701" SourceID="104"/>
+            <Mark Name="Marker2" TargetLat="1.725120" TargetLng="1.109701" SourceID="104"/>
         </CompoundMark>
         <CompoundMark CompoundMarkID="4" Name="Gate 1">
-            <Mark Name="LGL" SeqId="1" TargetLat="-40.6711354" TargetLng="173.940101" SourceID="105"/>
-            <Mark Name="LGR" SeqId="2" TargetLat="-40.6711354" TargetLng="173.960101" SourceID="106"/>
+            <Mark Name="LGL" SeqId="1" TargetLat="1.707354" TargetLng="1.130505" SourceID="105"/>
+            <Mark Name="LGR" SeqId="2" TargetLat="1.707404" TargetLng="1.133304" SourceID="106"/>
         </CompoundMark>
-        <CompoundMark CompoundMarkID="5" Name="Gate 2">
-            <Mark Name="WGL" SeqId="1" TargetLat="-40.652999" TargetLng="174.1320989" SourceID="107"/>
-            <Mark Name="WGR" SeqId="2" TargetLat="-40.658575" TargetLng="174.1334647" SourceID="108"/>
-        </CompoundMark>
-        <CompoundMark CompoundMarkID="6" Name="Finish Line">
-            <Mark Name="FL" SeqId="1" TargetLat="-40.668169" TargetLng="173.892901" SourceID="109"/>
-            <Mark Name="FR" SeqId="2" TargetLat="-40.667232" TargetLng="173.895648" SourceID="110"/>
+        <CompoundMark CompoundMarkID="5" Name="Finish Line">
+            <Mark Name="FL" SeqId="1" TargetLat="1.690202" TargetLng="1.109606" SourceID="107"/>
+            <Mark Name="FR" SeqId="2" TargetLat="1.692202" TargetLng="1.112629" SourceID="108"/>
         </CompoundMark>
     </Course>
     <CourseLimit>
-        <Limit Lat="-40.984758" Lon="173.736846" SeqID="1"/>
-        <Limit Lat="-41.160757" Lon="173.140838" SeqID="2"/>
-        <Limit Lat="-39.937843" Lon="173.085906" SeqID="3"/>
-        <Limit Lat="-40.244616" Lon="174.420745" SeqID="4"/>
-        <Limit Lat="-40.627178" Lon="174.412505" SeqID="5"/>
-        <Limit Lat="-40.783337" Lon="174.093902" SeqID="6"/>
-        <Limit Lat="-40.612585" Lon="173.893401" SeqID="7"/>
-        <Limit Lat="-40.752134" Lon="173.723113" SeqID="8"/>
+        <Limit Lat="1.73558" Lon="1.105505" SeqID="1"/>
+
+        <Limit Lat="1.732444" Lon="1.137105" SeqID="2"/>
+
+        <Limit Lat="1.680404" Lon="1.140505" SeqID="3"/>
+
+        <Limit Lat="1.675232" Lon="1.122202" SeqID="4"/>
+
+        <Limit Lat="1.685101" Lon="1.120222" SeqID="5"/>
+
+        <Limit Lat="1.680101" Lon="1.102505" SeqID="6"/>
+
     </CourseLimit>
 </Race>
\ No newline at end of file
diff --git a/racevisionGame/src/main/resources/mock/mockXML/raceTest.xml b/racevisionGame/src/main/resources/mock/mockXML/raceTest.xml
deleted file mode 100644
index ad14d931..00000000
--- a/racevisionGame/src/main/resources/mock/mockXML/raceTest.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<Race>
-    <RaceID>5326</RaceID>
-    <RaceType>FLEET</RaceType>
-    <CreationTimeDate>RACE_CREATION_TIME</CreationTimeDate>
-    <RaceStartTime Postpone="false" Time="RACE_START_TIME"/>
-    <Participants>
-        <Yacht SourceID="121"/>
-        <Yacht SourceID="122"/>
-        <Yacht SourceID="123"/>
-        <Yacht SourceID="124"/>
-        <Yacht SourceID="125"/>
-        <Yacht SourceID="126"/>
-    </Participants>
-    <CompoundMarkSequence>
-        <Corner SeqID="1" CompoundMarkID="1" Rounding="SP" ZoneSize="3" />
-        <Corner SeqID="2" CompoundMarkID="2" Rounding="Port" ZoneSize="3" />
-        <Corner SeqID="3" CompoundMarkID="4" Rounding="Port" ZoneSize="3" />
-        <Corner SeqID="4" CompoundMarkID="3" Rounding="Starboard" ZoneSize="3" />
-        <Corner SeqID="5" CompoundMarkID="4" Rounding="Port" ZoneSize="3" />
-        <Corner SeqID="6" CompoundMarkID="5" Rounding="SP" ZoneSize="3"/>
-    </CompoundMarkSequence>
-    <Course>
-        <CompoundMark CompoundMarkID="1" Name="Start Line">
-            <Mark SeqId="1" Name="PRO" TargetLat="32.296577" TargetLng="-64.854304" SourceID="101"/>
-            <Mark SeqId="2" Name="PIN" TargetLat="32.293771" TargetLng="-64.855242" SourceID="102"/>
-        </CompoundMark>
-        <CompoundMark CompoundMarkID="2" Name="Marker 1">
-            <Mark Name="Marker1" TargetLat="32.293039" TargetLng="-64.843983" SourceID="103"/>
-        </CompoundMark>
-        <CompoundMark CompoundMarkID="3" Name="Windward Gate">
-            <Mark Name="WGL" SeqId="1" TargetLat="32.28468" TargetLng="-64.850045" SourceID="104"/>
-            <Mark Name="WGR" SeqId="2" TargetLat="32.280164" TargetLng="-64.847591" SourceID="105"/>
-        </CompoundMark>
-        <CompoundMark CompoundMarkID="4" Name="Leeward Gate">
-            <Mark Name="LGL" SeqId="1" TargetLat="32.309693" TargetLng="-64.835249" SourceID="106"/>
-            <Mark Name="LGR" SeqId="2" TargetLat="32.308046" TargetLng="-64.831785" SourceID="107"/>
-        </CompoundMark>
-        <CompoundMark CompoundMarkID="5" Name="Finish Line">
-            <Mark Name="FL" SeqId="1" TargetLat="32.317379" TargetLng="-64.839291" SourceID="108"/>
-            <Mark Name="FR" SeqId="2" TargetLat="32.317257" TargetLng="-64.83626" SourceID="109"/>
-        </CompoundMark>
-    </Course>
-    <CourseLimit>
-        <Limit Lat="32.313922" Lon="-64.837168" SeqID="1"/>
-        <Limit Lat="32.317379" Lon="-64.839291" SeqID="2"/>
-        <Limit Lat="32.317911" Lon="-64.836996" SeqID="3"/>
-        <Limit Lat="32.317257" Lon="-64.83626" SeqID="4"/>
-        <Limit Lat="32.304273" Lon="-64.822834" SeqID="5"/>
-        <Limit Lat="32.279097" Lon="-64.841545" SeqID="6"/>
-        <Limit Lat="32.279604" Lon="-64.849871" SeqID="7"/>
-        <Limit Lat="32.289545" Lon="-64.854162" SeqID="8"/>
-        <Limit Lat="32.290198" Lon="-64.858711" SeqID="9"/>
-        <Limit Lat="32.297164" Lon="-64.856394" SeqID="10"/>
-        <Limit Lat="32.296148" Lon="-64.849184" SeqID="11"/>
-    </CourseLimit>
-</Race>