diff --git a/y2024/control_loops/superstructure/superstructure_goal.fbs b/y2024/control_loops/superstructure/superstructure_goal.fbs
index 42caf9b..13cf4e0 100644
--- a/y2024/control_loops/superstructure/superstructure_goal.fbs
+++ b/y2024/control_loops/superstructure/superstructure_goal.fbs
@@ -12,6 +12,11 @@
     SPIT = 2,
 }
 
+enum IntakePivotGoal : ubyte {
+    UP = 0,
+    DOWN = 1,
+}
+
 // Represents goal for climber
 // FULL_EXTEND is for fully extending the climber
 // RETRACT is for retracting the climber
@@ -54,9 +59,13 @@
 
 table Goal {
     intake_goal:IntakeGoal = NONE (id: 0);
+    intake_pivot:IntakePivotGoal = UP (id: 5);
     climber_goal:ClimberGoal (id: 1);
     shooter_goal:ShooterGoal (id: 2);
     note_goal:NoteGoal (id: 3);
     fire: bool (id: 4);
+
+    // Tells the climber to go absurdly slow on FULL_EXTEND
+    slow_climber: bool = false (id: 6);
 }
 root_type Goal;
diff --git a/y2024/control_loops/superstructure/superstructure_status.fbs b/y2024/control_loops/superstructure/superstructure_status.fbs
index b728f4f..fd19e8d 100644
--- a/y2024/control_loops/superstructure/superstructure_status.fbs
+++ b/y2024/control_loops/superstructure/superstructure_status.fbs
@@ -78,9 +78,12 @@
   // Status of the aimer
   aimer:AimerStatus (id: 4);
 
-  turret_in_range:bool (id: 5);
-  altitude_in_range:bool (id: 6);
-  altitude_above_min_angle:bool (id: 7);
+  // True if auto-aiming.
+  auto_aiming:bool (id: 5);
+
+  turret_in_range:bool (id: 6);
+  altitude_in_range:bool (id: 7);
+  altitude_above_min_angle:bool (id: 8);
 }
 
 // Contains status of transfer rollers
@@ -178,6 +181,9 @@
 
   extend_beambreak:bool (id: 19);
   catapult_beambreak:bool (id: 20);
+
+  // Number of shots we have taken.
+  shot_count:uint32 (id:21);
 }
 
 root_type Status;