diff --git a/website/public/scout/index.html b/website/public/scout/index.html
index 940850be..07cb0de1 100644
--- a/website/public/scout/index.html
+++ b/website/public/scout/index.html
@@ -44,7 +44,34 @@
       <option value="Ludicrous">Ludicrous</option>
     </select>
     <div>
-      Strategy: <input type="text" name="" value="" id="strat">
+      Team Contribution: <select id="contrib">
+        <option value="Weak">Weak</option>
+        <option value="Equal">Equal</option>
+        <option value="Strong">Strong</option>
+        <option value="IDK">IDK</option>
+      </select>
+    </div>
+    <div>
+      Endgame Size: <select class="" name="" id="egs">
+        <option value="Small">Small</option>
+        <option value="Medium">Medium</option>
+        <option value="Large">Large</option>
+        <option value="Jumbo">Jumbo</option>
+        <option value="IDK">IDK</option>
+      </select>
+    </div>
+    <div>
+      HAB Start:
+      <select class="" name="" id="habs">
+        <option value="None">None</option>
+        <option value="Hab I">Hab I</option>
+        <option value="Hab II">Hab II</option>
+        <option value="Hab III">Hab III</option>
+        <option value="IDK">IDK</option>
+      </select>
+      <div>
+        Strategy: <input type="text" name="" value="" id="strat">
+      </div>
     </div>
     <h3>Sandstorm:</h3>
     <div>
@@ -55,54 +82,65 @@
       </select>
     </div>
     <div>
-      Cargo Ship Hatch Panels Placed Successfully: <input type="number" name="quantity" value="0" min="0" max="3" id="SCHS">
+      Strongest Object: <select id="SSO">
+        <option value="Neither">Neither</option>
+        <option value="Ball">Cargo</option>
+        <option value="Hatch">Hatch Panels</option>
+        <option value="Both">Both</option>
+      </select>
     </div>
     <div>
-      Cargo Ship Hatch Panels Placed Unsuccessfully: <input type="number" name="quantity" value="0" min="0" max="3" id="SCHU">
+      Was Functional:
+      <select id="DOA">
+        <option value="Yes">Yes</option>
+        <option value="Sorta">Sorta</option>
+        <option value="No">No</option>
+        <option value="IDK">IDK</option>
+      </select>
     </div>
     <div>
-      Rocket Hatch Panels Placed Successfully: <input type="number" name="quantity" value="0" min="0" max="9" id="SRHS">
-    </div>
-    <div>
-      Rocket Hatch Panels Placed Unsuccessfully: <input type="number" name="quantity" value="0" min="0" max="9" id="SRHU">
-    </div>
-    <div>
-      Cargo Ship Cargo Placed Successfully: <input type="number" name="quantity" value="0" min="0" max="3" id="SCCS">
-    </div>
-    <div>
-      Cargo Ship Cargo Placed Unsuccessfully: <input type="number" name="quantity" value="0" min="0" max="3" id="SCCU">
-    </div>
-    <div>
-      Rocket Cargo Placed Successfully: <input type="number" name="quantity" value="0" min="0" max="18" id="SRCS">
-    </div>
-    <div>
-      Rocket Cargo Placed Unsuccessfully: <input type="number" name="quantity" value="0" min="0" max="18" id="SRCU">
+      Fill Choice: <select id="SFill">
+        <option value="Low Rocket">Low-Mid Rocket</option>
+        <option value="High Rocket">Mid-High Rocket</option>
+        <option value="Cargo">Cargo Ship</option>
+        <option value="None">None</option>
+      </select>
     </div>
     <h3>Tele-Op:</h3>
     <div>
-      Cargo Ship Hatch Panels Placed Successfully: <input type="number" name="quantity" value="0" min="0" max="3" id="TCHS">
+      Strongest Object: <select id="TSO">
+        <option value="Neither">Neither</option>
+        <option value="Ball">Cargo</option>
+        <option value="Hatch">Hatch Panels</option>
+        <option value="Both">Both</option>
+      </select>
     </div>
     <div>
-      Cargo Ship Hatch Panels Placed Unsuccessfully: <input type="number" name="quantity" value="0" min="0" max="3" id="TCHU">
-    </div>
-    <div>
-      Rocket Hatch Panels Placed Successfully: <input type="number" name="quantity" value="0" min="0" max="9" id="TRHS">
-    </div>
-    <div>
-      Rocket Hatch Panels Placed Unsuccessfully: <input type="number" name="quantity" value="0" min="0" max="9" id="TRHU">
-    </div>
-    <div>
-      Cargo Ship Cargo Placed Successfully: <input type="number" name="quantity" value="0" min="0" max="3" id="TCCS">
-    </div>
-    <div>
-      Cargo Ship Cargo Placed Unsuccessfully: <input type="number" name="quantity" value="0" min="0" max="3" id="TCCU">
-    </div>
-    <div>
-      Rocket Cargo Placed Successfully: <input type="number" name="quantity" value="0" min="0" max="18" id="TRCS">
-    </div>
-    <div>
-      Rocket Cargo Placed Unsuccessfully: <input type="number" name="quantity" value="0" min="0" max="18" id="TRCU">
+      Fill Choice: <select id="TFill">
+        <option value="Low Rocket">Low-Mid Rocket</option>
+        <option value="High Rocket">Mid-High Rocket</option>
+        <option value="Cargo">Cargo Ship</option>
+        <option value="None">None</option>
+      </select>
     </div>
+    Cargo Ship Success Rate: <select id="CSSR">
+      <option value="N/A">N/A</option>
+      <option value="Low">Low</option>
+      <option value="Mid">Medium</option>
+      <option value="High">High</option>
+    </select>
+    Low Rocket Success Rate: <select id="LRSR">
+      <option value="N/A">N/A</option>
+      <option value="Low">Low</option>
+      <option value="Mid">Medium</option>
+      <option value="High">High</option>
+    </select>
+    High Rocket Success Rate: <select id="HRSR">
+      <option value="N/A">N/A</option>
+      <option value="Low">Low</option>
+      <option value="Mid">Medium</option>
+      <option value="High">High</option>
+    </select>
     <h3>Endgame:</h3>
     <div>
       HAB Climb: <select id="HAB">
diff --git a/website/public/scout/scripts.js b/website/public/scout/scripts.js
index 588cb3aa..cf43647e 100644
--- a/website/public/scout/scripts.js
+++ b/website/public/scout/scripts.js
@@ -67,26 +67,24 @@ function subRes() {
     push['speed'] = document.getElementById('speed').value
     push['sandstormCross'] = document.getElementById('SCross').value
     push['strategy']= document.getElementById('strat').value
+    push['contrubution'] = document.getElementById('contrib').value
+    push['startingHatch'] = document.getElementById('habs').value
+    push['size'] = document.getElementById('egs').value
 
-    push['sandstormCargoShipHatchSuccess'] = document.getElementById('SCHS').value
-    push['sandstormCargoShipHatchFailure'] = document.getElementById('SCHU').value
-    push['sandstormRocketHatchSuccess'] = document.getElementById('SRHS').value
-    push['sandstormRocketHatchFailure'] = document.getElementById('SRHU').value
-    push['sandstormCargoShipCargoSuccess'] = document.getElementById('SCCS').value
-    push['sandstormCargoShipCargoFailure'] = document.getElementById('SCCU').value
-    push['sandstormRocketCargoSuccess'] = document.getElementById('SRCS').value
-    push['sandstormRocketCargoFailure'] = document.getElementById('SRHU').value
+    push['fillChoice'] = document.getElementById('SFill').value
+    push['functional'] = document.getElementById('DOA').value
+    push['strongMedium'] = document.getElementById('SSO').value
+    push['sandstormCrossBonus'] = document.getElementById('SCross').value
 
-    push['teleOpCargoShipHatchSuccess'] = document.getElementById('TCHS').value
-    push['teleOpCargoShipHatchFailure'] = document.getElementById('TCHU').value
-    push['teleOpRocketHatchSuccess'] = document.getElementById('TRHS').value
-    push['teleOpRocketHatchFailure'] = document.getElementById('TRHU').value
-    push['teleOpCargoShipCargoSuccess'] = document.getElementById('TCCS').value
-    push['teleOpCargoShipCargoFailure'] = document.getElementById('SCCU').value
-    push['teleOpRocketCargoSuccess'] = document.getElementById('TRCS').value
-    push['teleOpRocketCargoFailure'] = document.getElementById('TRHU').value
+    push['fillChoiceTeleop'] = document.getElementById('TFill').value
+    push['strongMediumTeleop'] = document.getElementById('TSO').value
+
+    push['cargoSuccessTeleop'] = document.getElementById('CSSR').value
+    push['hiRocketSuccessTeleop'] = document.getElementById('HRSR').value
+    push['lowRocketSuccessTeleop'] = document.getElementById('LRSR').value
+
+    push['endingHab'] = document.getElementById('HAB').value
 
-    push['HABClimb'] = document.getElementById('HAB').value
     firebase.firestore().collection("teamData").doc('team-' + document.getElementById('tns').value).collection('scouts').doc(user.uid).collection(comp).doc("team-" + document.getElementById('tsn').value + "-match-" + document.getElementById('mn').value).set(push, {
       merge: true
     })
@@ -97,26 +95,24 @@ function subRes() {
       push['teamDBRef'] = 'team-' + document.getElementById('tsn').value
       push['speed'] = document.getElementById('speed').value
       push['sandstormCross'] = document.getElementById('SCross').value
+      push['strategy']= document.getElementById('strat').value
+      push['contrubution'] = document.getElementById('contrib').value
+      push['startingHatch'] = document.getElementById('habs').value
+      push['size'] = document.getElementById('egs').value
 
-      push['sandstormCargoShipHatchSuccess'] = document.getElementById('SCHS').value
-      push['sandstormCargoShipHatchFailure'] = document.getElementById('SCHU').value
-      push['sandstormRocketHatchSuccess'] = document.getElementById('SRHS').value
-      push['sandstormRocketHatchFailure'] = document.getElementById('SRHU').value
-      push['sandstormCargoShipCargoSuccess'] = document.getElementById('SCCS').value
-      push['sandstormCargoShipCargoFailure'] = document.getElementById('SCCU').value
-      push['sandstormRocketCargoSuccess'] = document.getElementById('SRCS').value
-      push['sandstormRocketCargoFailure'] = document.getElementById('SRHU').value
+      push['fillChoice'] = document.getElementById('SFill').value
+      push['functional'] = document.getElementById('DOA').value
+      push['strongMedium'] = document.getElementById('SSO').value
+      push['sandstormCrossBonus'] = document.getElementById('SCross').value
 
-      push['teleOpCargoShipHatchSuccess'] = document.getElementById('TCHS').value
-      push['teleOpCargoShipHatchFailure'] = document.getElementById('TCHU').value
-      push['teleOpRocketHatchSuccess'] = document.getElementById('TRHS').value
-      push['teleOpRocketHatchFailure'] = document.getElementById('TRHU').value
-      push['teleOpCargoShipCargoSuccess'] = document.getElementById('TCCS').value
-      push['teleOpCargoShipCargoFailure'] = document.getElementById('SCCU').value
-      push['teleOpRocketCargoSuccess'] = document.getElementById('TRCS').value
-      push['teleOpRocketCargoFailure'] = document.getElementById('TRHU').value
+      push['fillChoiceTeleop'] = document.getElementById('TFill').value
+      push['strongMediumTeleop'] = document.getElementById('TSO').value
 
-      push['HABClimb'] = document.getElementById('HAB').value
+      push['cargoSuccessTeleop'] = document.getElementById('CSSR').value
+      push['hiRocketSuccessTeleop'] = document.getElementById('HRSR').value
+      push['lowRocketSuccessTeleop'] = document.getElementById('LRSR').value
+
+      push['endingHab'] = document.getElementById('HAB').value
       firebase.firestore().collection("data").doc('team-' + document.getElementById('tns').value).collection(comp).doc("team-" + document.getElementById('tsn').value).collection('matches').doc('match-' + document.getElementById('mn').value).set(push, {
         merge: true
       })