diff --git a/falconscoutcore/config.json b/falconscoutcore/config.json
index 947050f..c88a6e2 100644
--- a/falconscoutcore/config.json
+++ b/falconscoutcore/config.json
@@ -7,26 +7,31 @@
             "Alliance",
             "DriverStation",
             "TeamNumber",
-            "AutoSpeaker",
-            "AutoAmp",
-            "AutoLeave",
+            "AutoCoralL1",
+            "AutoCoralL2",
+            "AutoCoralL3",
+            "AutoCoralL4",
+            "AutoBarge",
+            "AutoProcessor",
             "AutoCenterline",
+            "AutoLeave",
             "AutoNotes",
-            "TeleopSpeaker",
-            "TeleopAmp",
-            "TeleopTrap",
-            "TeleopPassing",
+            "TeleopCoralL1",
+            "TeleopCoralL2",
+            "TeleopCoralL3",
+            "TeleopCoralL4",
+            "TeleopAlgaeBarge",
+            "TeleopAlgaeProcessor",
             "TeleopNotes",
             "Parked",
             "ClimbStatus",
-            "Harmonized",
             "ClimbSpeed",
             "EndgameNotes",
             "Disabled",
+            "StabilityRating",
+            "RobotStyleType",
             "DriverRating",
-            "DefenseTime",
-            "DefenseSkill",
-            "CounterDefenseSkill",
+            "IntakeDefenseRating",
             "RatingNotes"
         ],
         "qualitative_data_labels": [
@@ -38,11 +43,8 @@
             "AutoDrivingSkills",
             "AutoGeneralNotes",
             "TeleopIntakeLocation",
-            "SpeakerAccuracy",
-            "AmpAccuracy",
-            "AligningSpeed",
-            "ScoringSpeed",
-            "IntakingSpeed",
+            "TeleopGeneralNotes",
+            "ClimbAlignmentSpeed",
             "EndgameGeneralNotes"
         ],
         "json_file": "./data/2024cur_match_data.json",
diff --git a/scoutingapp/src/components/inputs/IncrementNumberInput.tsx b/scoutingapp/src/components/inputs/IncrementNumberInput.tsx
index 5793dd7..da2d55b 100644
--- a/scoutingapp/src/components/inputs/IncrementNumberInput.tsx
+++ b/scoutingapp/src/components/inputs/IncrementNumberInput.tsx
@@ -28,7 +28,7 @@ function IncrementNumberInput(props: ComponentSetup) {
                 >
                     -
                 </button>
-                <div className={`flex w-1/3 h-full text-2xl float-left items-center ${color == "red" ? "bg-red-400" : color == "yellow" ? "bg-amber-300" : color == "blue" ? "bg-blue-500" : color == "green" ? "bg-green-400" : "bg-white"}`}>
+                <div className={`flex w-1/3 h-full text-2xl float-left items-center ${color == "red" ? "bg-red-400" : color == "yellow" ? "bg-amber-300" : color == "blue" ? "bg-blue-500" : color == "green" ? "bg-green-400" : color == "purple" ? "bg-purple-400" : color == "orange" ? "bg-orange-400" : "bg-white"}`}>
                     <p className={"text-center w-full"}>{counter}</p>
                 </div>
                 <button
diff --git a/scoutingapp/src/config/structure.json b/scoutingapp/src/config/structure.json
index 50d54c3..67bd6b6 100644
--- a/scoutingapp/src/config/structure.json
+++ b/scoutingapp/src/config/structure.json
@@ -70,33 +70,97 @@
             },
             {
                 "type": "GenericHeaderTwo",
-                "text": "Auto Game Pieces"
+                "text": "Auto"
+            },
+            {
+                "type": "GenericDropdown",
+                "text": "Robot Starting Position",
+                "options": [
+                    "Far Coral Station",
+                    "Middle",
+                    "Close Coral Station"
+                ],
+                "id": "StartingPosition"
+            },
+            {
+                "type": "GenericToggle",
+                "text": "Did they leave the starting zone (black line)?",
+                "id": "AutoLeave"
+            },
+            {
+                "type": "GenericCheckboxSelect",
+                "text": "Auto Scoring Side",
+                "options": [
+                    "Far Coral Station",
+                    "Close Coral Station"
+                ],
+                "id": "ScoringSide"
             },
             {
                 "type": "IncrementNumberInput",
-                "text": "Auto Speaker Cycles",
+                "text": "Auto Coral L1 Cycles",
                 "placeholder": [
                     "0"
                 ],
-                "id": "AutoSpeaker"
+                "options": [
+                    "purple"
+                ],
+                "id": "AutoCoralL1"
             },
             {
                 "type": "IncrementNumberInput",
-                "text": "Auto Amp Cycles",
+                "text": "Auto Coral L2 Cycles",
                 "placeholder": [
                     "0"
                 ],
-                "id": "AutoAmp"
+                "options": [
+                    "purple"
+                ],
+                "id": "AutoCoralL2"
             },
             {
-                "type": "GenericToggle",
-                "text": "Did they intake from the centerline during auto?",
-                "id": "AutoCenterline"
+                "type": "IncrementNumberInput",
+                "text": "Auto Coral L3 Cycles",
+                "placeholder": [
+                    "0"
+                ],
+                "options": [
+                    "purple"
+                ],
+                "id": "AutoCoralL3"
             },
             {
-                "type": "GenericToggle",
-                "text": "Did they leave the starting zone (white line)?",
-                "id": "AutoLeave"
+                "type": "IncrementNumberInput",
+                "text": "Auto Coral L4 Cycles",
+                "placeholder": [
+                    "0"
+                ],
+                "options": [
+                    "purple"
+                ],
+                "id": "AutoCoralL4"
+            },
+            {
+                "type": "IncrementNumberInput",
+                "text": "Auto Barge Cycles",
+                "placeholder": [
+                    "0"
+                ],
+                "options": [
+                    "green"
+                ],
+                "id": "AutoBarge"
+            },
+            {
+                "type": "IncrementNumberInput",
+                "text": "Auto Processor Cycles",
+                "placeholder": [
+                    "0"
+                ],
+                "options": [
+                    "green"
+                ],
+                "id": "AutoProcessor"
             },
             {
                 "type": "GenericTextArea",
@@ -108,52 +172,74 @@
             },
             {
                 "type": "GenericHeaderTwo",
-                "text": "Teleop Game Pieces"
+                "text": "Teleop"
             },
             {
                 "type": "IncrementNumberInput",
-                "text": "Teleop Speaker Cycles",
+                "text": "Teleop Coral L1 Cycles",
                 "placeholder": [
                     "0"
                 ],
                 "options": [
-                    "red"
+                    "purple"
                 ],
-                "id": "TeleopSpeaker"
+                "id": "TeleopCoralL1"
             },
             {
                 "type": "IncrementNumberInput",
-                "text": "Teleop Amp Cycles",
+                "text": "Teleop Coral L2 Cycles",
                 "placeholder": [
                     "0"
                 ],
                 "options": [
-                    "yellow"
+                    "purple"
                 ],
-                "id": "TeleopAmp"
+                "id": "TeleopCoralL2"
             },
             {
                 "type": "IncrementNumberInput",
-                "text": "Teleop/Endgame Trap Cycles",
+                "text": "Teleop Coral L3 Cycles",
                 "placeholder": [
                     "0"
                 ],
                 "options": [
-                    "green"
+                    "purple"
                 ],
-                "id": "TeleopTrap"
+                "id": "TeleopCoralL3"
             },
             {
                 "type": "IncrementNumberInput",
-                "text": "Coral L4 Cycles",
+                "text": "Teleop Coral L4 Cycles",
                 "placeholder": [
                     "0"
                 ],
                 "options": [
-                    "blue"
+                    "purple"
                 ],
                 "id": "TeleopCoralL4"
             },
+            {
+                "type": "IncrementNumberInput",
+                "text": "Teleop Barge Cycles",
+                "placeholder": [
+                    "0"
+                ],
+                "options": [
+                    "green"
+                ],
+                "id": "TeleopAlgaeBarge"
+            },
+            {
+                "type": "IncrementNumberInput",
+                "text": "Teleop Processor Cycles",
+                "placeholder": [
+                    "0"
+                ],
+                "options": [
+                    "green"
+                ],
+                "id": "TeleopAlgaeProcessor"
+            },
             {
                 "type": "GenericTextArea",
                 "text": "Teleop Qualitative Notes",
@@ -272,15 +358,23 @@
                 "Alliance",
                 "DriverStation",
                 "TeamNumber",
-                "AutoSpeaker",
-                "AutoAmp",
-                "AutoCenterline",
+                "StartingPosition",
                 "AutoLeave",
+                "ScoringSide",
+                "AutoCoralL1",
+                "AutoCoralL2",
+                "AutoCoralL3",
+                "AutoCoralL4",
+                "AutoBarge",
+                "AutoProcessor",
+                "AutoCenterline",
                 "AutoNotes",
-                "TeleopSpeaker",
-                "TeleopAmp",
-                "TeleopTrap",
+                "TeleopCoralL1",
+                "TeleopCoralL2",
+                "TeleopCoralL3",
                 "TeleopCoralL4",
+                "TeleopAlgaeBarge",
+                "TeleopAlgaeProcessor",
                 "TeleopNotes",
                 "Parked",
                 "ClimbStatus",