diff --git a/racevisionGame/src/main/java/mock/model/MockBoat.java b/racevisionGame/src/main/java/mock/model/MockBoat.java
index a3332095..6e51295d 100644
--- a/racevisionGame/src/main/java/mock/model/MockBoat.java
+++ b/racevisionGame/src/main/java/mock/model/MockBoat.java
@@ -33,7 +33,7 @@ public class MockBoat extends Boat {
     /**
      * Stores whether the boat is on autoVMG or not
      */
-    private boolean autoVMG = true;
+    private boolean autoVMG = false;
 
 
 
diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java
index 48c55958..496d1299 100644
--- a/racevisionGame/src/main/java/mock/model/MockRace.java
+++ b/racevisionGame/src/main/java/mock/model/MockRace.java
@@ -321,10 +321,10 @@ public class MockRace extends Race {
 
         if (!finish && totalElapsedMilliseconds >= updatePeriodMilliseconds && !boat.isSailsOut()) {
 
-            if (boat.getCurrentSpeed() == 0) {
-                newOptimalVMG(boat);
-                boat.setBearing(boat.calculateBearingToNextMarker());
-            }
+//            if (boat.getCurrentSpeed() == 0) {
+//                newOptimalVMG(boat);
+//                boat.setBearing(boat.calculateBearingToNextMarker());
+//            }
 
             setBoatSpeed(boat);
 
diff --git a/racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java b/racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
index 3cdb1085..197c4ba7 100644
--- a/racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
+++ b/racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
@@ -19,8 +19,10 @@ public class CommandFactory {
         switch(action) {
             case AUTO_PILOT: return new VMGCommand(race, boat);
             case TACK_GYBE: return new TackGybeCommand(race, boat);
-            case SAILS_IN: return new SailsInCommand(race, boat);
-            case SAILS_OUT: return new SailsOutCommand(race, boat);
+            case UPWIND: return new WindCommand(race, boat, true);
+            case DOWNWIND: return new WindCommand(race, boat, false);
+            case SAILS_OUT: return new SailsCommand(race, boat, true);
+            case SAILS_IN: return new SailsCommand(race, boat, false);
             default: return null; // TODO - please please have discussion over what to default to
         }
     }
diff --git a/racevisionGame/src/main/java/mock/model/commandFactory/SailsInCommand.java b/racevisionGame/src/main/java/mock/model/commandFactory/SailsCommand.java
similarity index 52%
rename from racevisionGame/src/main/java/mock/model/commandFactory/SailsInCommand.java
rename to racevisionGame/src/main/java/mock/model/commandFactory/SailsCommand.java
index 2fc6a311..7d620a42 100644
--- a/racevisionGame/src/main/java/mock/model/commandFactory/SailsInCommand.java
+++ b/racevisionGame/src/main/java/mock/model/commandFactory/SailsCommand.java
@@ -3,18 +3,19 @@ package mock.model.commandFactory;
 import mock.model.MockBoat;
 import mock.model.MockRace;
 
-public class SailsInCommand implements Command {
+public class SailsCommand implements Command {
     private MockRace race;
     private MockBoat boat;
+    private boolean sailsOut;
 
-    public SailsInCommand(MockRace race, MockBoat boat) {
+    public SailsCommand(MockRace race, MockBoat boat, Boolean sailsOut) {
         this.race = race;
         this.boat = boat;
+        this.sailsOut = sailsOut;
     }
 
     @Override
     public void execute() {
-        this.boat.setSailsOut(false);
-        System.out.println("hi");
+        this.boat.setSailsOut(this.sailsOut);
     }
 }
diff --git a/racevisionGame/src/main/java/mock/model/commandFactory/SailsOutCommand.java b/racevisionGame/src/main/java/mock/model/commandFactory/SailsOutCommand.java
deleted file mode 100644
index 79e3648b..00000000
--- a/racevisionGame/src/main/java/mock/model/commandFactory/SailsOutCommand.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package mock.model.commandFactory;
-
-import mock.model.MockBoat;
-import mock.model.MockRace;
-
-public class SailsOutCommand implements Command {
-    private MockRace race;
-    private MockBoat boat;
-
-    public SailsOutCommand(MockRace race, MockBoat boat) {
-        this.race = race;
-        this.boat = boat;
-    }
-
-    @Override
-    public void execute() {
-        this.boat.setSailsOut(true);
-        System.out.println("hi2");
-    }
-}