diff --git a/Robot2019/src/main/java/frc/robot/commands/EjectCargo.java b/Robot2019/src/main/java/frc/robot/commands/EjectCargo.java
index 6a2a8ea..62b5c2e 100644
--- a/Robot2019/src/main/java/frc/robot/commands/EjectCargo.java
+++ b/Robot2019/src/main/java/frc/robot/commands/EjectCargo.java
@@ -9,6 +9,7 @@
 
 import edu.wpi.first.wpilibj.Timer;
 import edu.wpi.first.wpilibj.command.Command;
+import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
 import frc.robot.subsystems.Cargo;
 
 public class EjectCargo extends Command {
@@ -43,6 +44,9 @@ protected boolean isFinished() {
   @Override
   protected void end() {
     cargo.stopIntake();
+    if (isFinished()) {
+      SmartDashboard.putBoolean("Has cargo", false);
+    }
   }
 
   @Override
diff --git a/Robot2019/src/main/java/frc/robot/commands/IntakeCargo.java b/Robot2019/src/main/java/frc/robot/commands/IntakeCargo.java
index 706a219..0bd5aac 100644
--- a/Robot2019/src/main/java/frc/robot/commands/IntakeCargo.java
+++ b/Robot2019/src/main/java/frc/robot/commands/IntakeCargo.java
@@ -9,6 +9,7 @@
 
 import edu.wpi.first.wpilibj.Timer;
 import edu.wpi.first.wpilibj.command.Command;
+import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
 import frc.robot.subsystems.Cargo;
 
 public class IntakeCargo extends Command {
@@ -50,7 +51,12 @@ protected boolean isFinished() {
 
   @Override
   protected void end() {
-    cargo.keepIntake();
+    if (isFinished()) {
+      cargo.keepIntake();
+      SmartDashboard.putBoolean("Has cargo", true);
+    } else {
+      cargo.stopIntake();
+    }
   }
 
   @Override