diff --git a/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/ArmPosTestEngine.java b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/ArmPosTestEngine.java
index 595b96b..7d8e52f 100644
--- a/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/ArmPosTestEngine.java
+++ b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/ArmPosTestEngine.java
@@ -9,7 +9,7 @@ import org.timecrafters.CenterStage.TeleOp.States.YellowMinibotTeleOP;
 
 import dev.cyberarm.engine.V2.CyberarmEngine;
 
-@TeleOp(name = "arm test prototype bot")
+@TeleOp(name = "arm test prototype bot", group = "PROTOTYPE")
 
     public class ArmPosTestEngine extends CyberarmEngine {
     private PrototypeRobot robot;
diff --git a/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/CompetitionRobotV1Engine.java b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/CompetitionRobotV1Engine.java
index 867b395..06b0861 100644
--- a/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/CompetitionRobotV1Engine.java
+++ b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/CompetitionRobotV1Engine.java
@@ -7,7 +7,7 @@ import org.timecrafters.CenterStage.TeleOp.States.CompetitionTeleOpState;
 
 import dev.cyberarm.engine.V2.CyberarmEngine;
 
-@TeleOp(name = "Competition V1 TeleOp", group = "Competition V1")
+@TeleOp(name = "Competition V1 TeleOp", group = "0 Competition V1")
 public class CompetitionRobotV1Engine extends CyberarmEngine {
     private CompetitionRobotV1 robot;
     @Override
diff --git a/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/DriveMotorPortTestEngine.java b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/DriveMotorPortTestEngine.java
index adab912..5198cf6 100644
--- a/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/DriveMotorPortTestEngine.java
+++ b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/DriveMotorPortTestEngine.java
@@ -10,7 +10,7 @@ import org.timecrafters.CenterStage.TeleOp.TestingState.MotorPortTestingState;
 
 import dev.cyberarm.engine.V2.CyberarmEngine;
 
-@TeleOp (name = "Motor Port Test")
+@TeleOp (name = "Motor Port Test", group = "PROTOTYPE")
 public class DriveMotorPortTestEngine extends CyberarmEngine {
 
     MotorPortTestRobot robot;
diff --git a/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/MiniBTeleOPEngine.java b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/MiniBTeleOPEngine.java
index a1fc648..2a87ecb 100644
--- a/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/MiniBTeleOPEngine.java
+++ b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/MiniBTeleOPEngine.java
@@ -7,7 +7,7 @@ import org.timecrafters.CenterStage.TeleOp.States.BlackMiniTeleOP;
 
 import dev.cyberarm.engine.V2.CyberarmEngine;
 
-@TeleOp(name = "Black Minibot")
+@TeleOp(name = "Black Minibot", group = "MINIBOT_SODI")
 
 public class MiniBTeleOPEngine extends CyberarmEngine {
     private MiniBTeleOPBot robot;
diff --git a/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/MiniYTeleOPEngine.java b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/MiniYTeleOPEngine.java
index 3437439..3918eae 100644
--- a/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/MiniYTeleOPEngine.java
+++ b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/MiniYTeleOPEngine.java
@@ -8,7 +8,7 @@ import org.timecrafters.CenterStage.TeleOp.States.YellowMinibotTeleOP;
 
 import dev.cyberarm.engine.V2.CyberarmEngine;
 
-@TeleOp(name = "A Yellow Minibot")
+@TeleOp(name = "A Yellow Minibot", group = "MINIBOT_SODI")
 
     public class MiniYTeleOPEngine extends CyberarmEngine {
     private MiniYTeleOPBot robot;
diff --git a/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/SodiPizzaTeleOPEngine.java b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/SodiPizzaTeleOPEngine.java
index a6133a7..ca1f406 100644
--- a/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/SodiPizzaTeleOPEngine.java
+++ b/TeamCode/src/main/java/org/timecrafters/CenterStage/TeleOp/Engines/SodiPizzaTeleOPEngine.java
@@ -6,7 +6,7 @@ import org.timecrafters.CenterStage.TeleOp.States.SodiPizzaTeleOPState;
 
 import dev.cyberarm.engine.V2.CyberarmEngine;
 
-@TeleOp(name = "Sodi Pizza Box Bot TeleOP", group = "")
+@TeleOp(name = "Sodi Pizza Box Bot TeleOP", group = "MINIBOT_SODI")
 public class SodiPizzaTeleOPEngine extends CyberarmEngine {
     @Override
     public void setup() {