diff --git a/src/main/java/frc4388/robot/Constants.java b/src/main/java/frc4388/robot/Constants.java
index 96f6747..9cfb137 100644
--- a/src/main/java/frc4388/robot/Constants.java
+++ b/src/main/java/frc4388/robot/Constants.java
@@ -153,9 +153,9 @@ public final class Constants {
     }
 
     public static final class ShooterConstants {
-        public static final int LEFT_SHOOTER_ID = 15; //TODO:
-        public static final int RIGHT_SHOOTER_ID = 16; //TODO:
-        public static final double SHOOTER_SPEED = 1.d; //TODO:
+        public static final int LEFT_SHOOTER_ID = 15; // final
+        public static final int RIGHT_SHOOTER_ID = 16; // final
+        public static final double SHOOTER_SPEED = 0.8; // final
     }
 
     public static final class IntakeConstants {
diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java
index 6aaa7d2..8f7c682 100644
--- a/src/main/java/frc4388/robot/RobotContainer.java
+++ b/src/main/java/frc4388/robot/RobotContainer.java
@@ -43,9 +43,9 @@ public class RobotContainer {
                                                                   m_robotMap.rightBack,
                                                                   m_robotMap.gyro);
     
-    private final Shooter m_robotShooter = new Shooter(m_robotMap.leftShooter, m_robotMap.rightShooter);
+    // private final Shooter m_robotShooter = new Shooter(m_robotMap.leftShooter, m_robotMap.rightShooter);
     
-    private final Intake m_robotIntake = new Intake(m_robotMap.intakeMotor);
+    //private final Intake m_robotIntake = new Intake(m_robotMap.intakeMotor);
 
     /* Controllers */
     private final DeadbandedXboxController m_driverXbox = new DeadbandedXboxController(OIConstants.XBOX_DRIVER_ID);
@@ -110,11 +110,11 @@ public class RobotContainer {
         new JoystickButton(getDeadbandedDriverController(), XboxController.LEFT_BUMPER_BUTTON) // final
             .onTrue(new InstantCommand(() -> m_robotSwerveDrive.setToSlow()));
         
+        // new JoystickButton(getDeadbandedDriverController(), XboxController.B_BUTTON)
+        //     .onTrue(new InstantCommand(() -> m_robotShooter.spin(), m_robotShooter))
+        //     .onFalse(new InstantCommand(() -> m_robotShooter.stop(), m_robotShooter));
         
         /* Operator Buttons */
-        new JoystickButton(getDeadbandedDriverController(), XboxController.A_BUTTON)
-            .onTrue(new InstantCommand(() -> m_robotShooter.spin(), m_robotShooter))
-            .onFalse(new InstantCommand(() -> m_robotShooter.stop(), m_robotShooter));
         
         
     }
diff --git a/src/main/java/frc4388/robot/RobotMap.java b/src/main/java/frc4388/robot/RobotMap.java
index 713ff4f..12b3524 100644
--- a/src/main/java/frc4388/robot/RobotMap.java
+++ b/src/main/java/frc4388/robot/RobotMap.java
@@ -63,11 +63,11 @@ public class RobotMap {
     public final CANCoder rightBackEncoder = new CANCoder(SwerveDriveConstants.IDs.RIGHT_BACK_ENCODER_ID);
 
     /* Shooter Subsystem */
-    public final WPI_TalonFX leftShooter = new WPI_TalonFX(ShooterConstants.LEFT_SHOOTER_ID);
-    public final WPI_TalonFX rightShooter = new WPI_TalonFX(ShooterConstants.RIGHT_SHOOTER_ID);
+    //public final WPI_TalonFX leftShooter = new WPI_TalonFX(ShooterConstants.LEFT_SHOOTER_ID);
+    //public final WPI_TalonFX rightShooter = new WPI_TalonFX(ShooterConstants.RIGHT_SHOOTER_ID);
 
     /* Intake Subsystem */
-    public final CANSparkMax intakeMotor = new CANSparkMax(IntakeConstants.INTAKE_MOTOR_ID, MotorType.kBrushed); //TODO: MOTOR TYPE
+    //public final CANSparkMax intakeMotor = new CANSparkMax(IntakeConstants.INTAKE_MOTOR_ID, MotorType.kBrushed); //TODO: MOTOR TYPE
 
     void configureLEDMotorControllers() {    
     }
diff --git a/src/main/java/frc4388/robot/subsystems/Shooter.java b/src/main/java/frc4388/robot/subsystems/Shooter.java
index ffbe649..9044eae 100644
--- a/src/main/java/frc4388/robot/subsystems/Shooter.java
+++ b/src/main/java/frc4388/robot/subsystems/Shooter.java
@@ -29,8 +29,8 @@ public class Shooter extends SubsystemBase {
   }
 
   public void spin(double speed) {
-    leftShooter.set(speed);    
-    rightShooter.set(-speed);
+    leftShooter.set(-speed);    
+    rightShooter.set(speed);
   }
 
   public void stop() {