diff --git a/Advanced Software Engineering/Advanced Software Engineering/Command.cs b/Advanced Software Engineering/Advanced Software Engineering/Command.cs
index 6520c82..6d7a546 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Command.cs	
+++ b/Advanced Software Engineering/Advanced Software Engineering/Command.cs	
@@ -14,6 +14,7 @@ namespace Advanced_Software_Engineering {
             string[] parameters = commandAndParameters.Keys.Contains("parameters") ? commandAndParameters["parameters"] : new string[] { };
 
             switch (command) {
+                case "move":
                 case "moveto":
                     //Check parameters
                     if (parameters.Length == 2) {
@@ -43,7 +44,8 @@ namespace Advanced_Software_Engineering {
                             throw e;
                         }
                     } else throw new Exception("Command has an incorrect number of parameters");
-                case "shape":
+                case "regularpolygon":
+                case "rp":
                     //Check parameters
                     if (parameters.Length == 2) {
                         return new
@@ -69,7 +71,6 @@ namespace Advanced_Software_Engineering {
                 case "clear":
                 case "pen":
                 case "fill":
-                case "color":
                     throw new Exception("Not implemented");
 
                 default: