diff --git a/Robot2019/src/main/java/frc/robot/RobotMap.java b/Robot2019/src/main/java/frc/robot/RobotMap.java
index d7d8897..975b8cd 100644
--- a/Robot2019/src/main/java/frc/robot/RobotMap.java
+++ b/Robot2019/src/main/java/frc/robot/RobotMap.java
@@ -60,7 +60,7 @@ public class RobotMap {
     cargoRoller = new VictorSP(0);
 
     // Initialize solenoid on hatch panel mech
-    hatchPistons = new DoubleSolenoid(0, 1);
+    hatchPistons = new DoubleSolenoid(7, 0); // 7 is A/Forward, 0 is B/Reverse 
 
     leftEnc = new Encoder(new DigitalInput(0), new DigitalInput(1));
     rightEnc = new Encoder(new DigitalInput(2), new DigitalInput(3));
@@ -74,7 +74,7 @@ public class RobotMap {
     cameraServer = CameraServer.getInstance().getServer();
     cameraServer.setSource(driveCamera);
 
-    cargoPDPPort = -1;  // TODO: set ports to actual cargo motor port in pdp
+    cargoPDPPort = 5;  // TODO: set ports to actual cargo motor port in pdp
   }
 
   private static BaseMotorController createConfiguredMotorController(int port) {
diff --git a/Robot2019/src/main/java/frc/robot/commands/EjectCargo.java b/Robot2019/src/main/java/frc/robot/commands/EjectCargo.java
index 9a7d088..6a2a8ea 100644
--- a/Robot2019/src/main/java/frc/robot/commands/EjectCargo.java
+++ b/Robot2019/src/main/java/frc/robot/commands/EjectCargo.java
@@ -21,6 +21,7 @@ public class EjectCargo extends Command {
   public EjectCargo(Cargo cargo) {
     requires(cargo);
     this.cargo = cargo;
+    timer = new Timer();
   }
 
   @Override
diff --git a/Robot2019/src/main/java/frc/robot/commands/IntakeCargo.java b/Robot2019/src/main/java/frc/robot/commands/IntakeCargo.java
index 28264b3..24d3e1a 100644
--- a/Robot2019/src/main/java/frc/robot/commands/IntakeCargo.java
+++ b/Robot2019/src/main/java/frc/robot/commands/IntakeCargo.java
@@ -19,6 +19,7 @@ public class IntakeCargo extends Command {
   public IntakeCargo(Cargo cargo) {
     requires(cargo);
     this.cargo = cargo;
+    timer = new Timer();
     overdraw = false;
   }