diff --git a/config/analysis-modules.json b/config/analysis-modules.json
index ba5b0ea5..3157d141 100644
--- a/config/analysis-modules.json
+++ b/config/analysis-modules.json
@@ -122,14 +122,7 @@
                     "name": "Amp",
                     "path": "counts.scoreAmp"
                 },
-                {
-                    "name": "Speaker",
-                    "path": "counts.scoreSpeaker"
-                },
-                {
-                    "name": "Amped Speaker",
-                    "path": "counts.scoreAmpedSpeaker"
-                },
+               
                 {
                     "name": "Miss",
                     "path": "counts.miss"
@@ -155,32 +148,6 @@
             ]
         }
     },
-    {
-        "view": "team",
-        "module": "Pie",
-        "position": "main",
-        "name": "Shot Location Distribution",
-        "options": {
-            "slices": [
-                {
-                    "name": "Subwoofer",
-                    "path": "counts.scoreSubwoofer"
-                },
-                {
-                    "name": "Wing",
-                    "path": "counts.scoreWing"
-                },
-                {
-                    "name": "Podium",
-                    "path": "counts.scorePodium"
-                },
-                {
-                    "name": "Midfield",
-                    "path": "counts.scoreMidfield"
-                }
-            ]
-        }
-    },
     {
         "view": "team",
         "module": "Bar",
@@ -319,31 +286,5 @@
                 }
             ]
         }
-    },
-    {
-        "view": "match",
-        "module": "Pie",
-        "position": "main",
-        "name": "Shot Distribution",
-        "options": {
-            "slices": [
-                {
-                    "name": "Amp",
-                    "path": "averages.scoreAmp"
-                },
-                {
-                    "name": "Speaker",
-                    "path": "averages.scoreSpeaker"
-                },
-                {
-                    "name": "Amped Speaker",
-                    "path": "averages.scoreAmpedSpeaker"
-                },
-                {
-                    "name": "Miss",
-                    "path": "averages.miss"
-                }
-            ]
-        }
     }
 ]
\ No newline at end of file
diff --git a/config/analysis-pipeline.json b/config/analysis-pipeline.json
index d002ffb8..814d93fb 100644
--- a/config/analysis-pipeline.json
+++ b/config/analysis-pipeline.json
@@ -1,6 +1,22 @@
 [
-    {  
+    {
+        "type": "tmp",
+        "name": "countActions",
+        "outputPath": "counts",
+        "options": {
+            "all": true
+        }
+      },
+      {
         "type": "team",
+        "name": "countActions",
+        "outputPath": "counts",
+        "options": {
+            "all": true
+        }
+      },
+    {  
+        "type": "tmp",
         "name": "sum",
         "outputPath": "counts.scoreSpeaker",
         "options": {
@@ -12,12 +28,106 @@
             ]
         }
     },
-    {
+    {  
+        "type": "team",
+        "name": "sum",
+        "outputPath": "CountsTotalSubwoofer",
+        "options": {
+            "addends": [
+                "counts.scoreSubwoofer",
+                "counts.scoreAmpedSubwoofer"
+            ]
+        }
+    },
+    {  
+        "type": "team",
+        "name": "sum",
+        "outputPath": "CountsTotalPodium",
+        "options": {
+            "addends": [
+                "counts.scorePodium",
+                "counts.scoreAmpedPodium"
+            ]
+        }
+    },
+    {  
+        "type": "team",
+        "name": "sum",
+        "outputPath": "CountsTotalWing",
+        "options": {
+            "addends": [
+                "counts.scoreWing",
+                "counts.scoreAmpedWing"
+            ]
+        }
+    },
+    {  
+
+        "type": "team",
+        "name": "sum",
+        "outputPath": "CountsTotalMidfield",
+        "options": {
+            "addends": [
+                "counts.scoreMidfield",
+                "counts.scoreAmpedMidfield"
+            ]
+        }
+    },
+    {  
+        "type": "team",
+        "name": "average",
+        "outputPath": "averages.scoreSpeaker",
+        "options": {
+            "path": "counts.scoreSpeaker"
+        }
+    },
+    {  
+        "type": "team",
+        "name": "average",
+        "outputPath": "averages.scoreAmp",
+        "options": {
+            "path": "counts.scoreAmp"
+        }
+    },
+    {  
         "type": "tmp",
-        "name": "countActions",
-        "outputPath": "counts",
+        "name": "sum",
+        "outputPath": "counts.scoreAmpedSpeaker",
         "options": {
-            "all": true
+            "addends": [
+                "counts.scoreAmpedSubwoofer",
+                "counts.scoreAmpedWing",
+                "counts.scoreAmpedPodium",
+                "counts.scoreAmpedMidfield"
+            ]
+        }
+    },
+    {  
+        "type": "tmp",
+        "name": "sum",
+        "outputPath": "CountsTotalSpeaker",
+        "options": {
+            "addends": [
+                "counts.scoreAmpedSpeaker",
+                "counts.scoreSpeaker"
+            ]
+        }
+    },
+
+    {  
+        "type": "team",
+        "name": "average",
+        "outputPath": "averages.totalSpeaker",
+        "options": {
+            "path": "CountsTotalSpeaker"
+        }
+    },
+    {  
+        "type": "team",
+        "name": "average",
+        "outputPath": "averages.scoreAmpedSpeaker",
+        "options": {
+            "path": "counts.scoreAmpedSpeaker"
         }
     },
     {
@@ -78,7 +188,10 @@
                 "scoreWing",
                 "scorePodium",
                 "scoreMidfield",
-                "scoreAmpedSpeaker"
+                "scoreAmpedSubwoofer",
+                "scoreAmpedWing",
+                "scoreAmpedPodium",
+                "scoreAmpedMidfield"
             ],
             "misses": [
                 "miss"
@@ -255,7 +368,10 @@
                 "countsTeleop.scoreWing": 2,
                 "countsTeleop.scorePodium": 2,
                 "countsTeleop.scoreMidfield": 2,
-                "countsTeleop.scoreAmpedSpeaker": 5
+                "countsTeleop.scoreAmpedSubwoofer": 5,
+                "countsTeleop.scoreAmpedWing": 5,
+                "countsTeleop.scoreAmpedPodium": 5,
+                "countsTeleop.scoreAmpedMidfield": 5
             }
         }
     },
diff --git a/config/match-scouting.json b/config/match-scouting.json
index ca763ca8..9f0eab1f 100644
--- a/config/match-scouting.json
+++ b/config/match-scouting.json
@@ -40,7 +40,36 @@
                             ]
                         }
                     ]
+                },
+
+                {
+                    "id": "preloadNote",
+                    "displayText": "Preload Note",
+                    "gridArea": [
+                        "4",
+                        "1",
+                        "6",
+                        "5"
+                    ],
+                    "class": "orange",
+                    "type": "action",
+                    "executables": []
+                },
+                {
+                    "id": "preloadNone",
+                    "displayText": "Preload None",
+                    "gridArea": [
+                        "4",
+                        "6",
+                        "6",
+                        "10"
+                    ],
+                    "class": "gray",
+                    "type": "action",
+                    "executables": []
                 }
+
+
             ],
             [
                 {
@@ -138,9 +167,9 @@
                     "id": "scoreSubwoofer",
                     "displayText": "Subwoofer",
                     "gridArea": [
-                        "3",
-                        "4",
+                        "6",
                         "4",
+                        "7",
                         "7"
                     ],
                     "class": "gray",
@@ -177,21 +206,34 @@
                     "id": "scoreMidfield",
                     "displayText": "Midfield",
                     "gridArea": [
-                        "6",
+                        "3",
+                        "4",
                         "4",
-                        "7",
                         "7"
                     ],
                     "class": "gray",
                     "type": "action",
                     "executables": []
                 },
+                {
+                    "id": "drop",
+                    "displayText": "Drop",
+                    "gridArea": [
+                        "5",
+                        "8",
+                        "6",
+                        "9"
+                    ],
+                    "class": "yellow",
+                    "type": "action",
+                    "executables": []
+                },
                 {
                     "id": "miss",
                     "displayText": "Miss",
                     "gridArea": [
                         "5",
-                        "8",
+                        "9",
                         "6",
                         "10"
                     ],
@@ -325,9 +367,9 @@
                     "id": "scoreSubwoofer",
                     "displayText": "Subwoofer",
                     "gridArea": [
-                        "3",
-                        "4",
+                        "6",
                         "4",
+                        "7",
                         "7"
                     ],
                     "class": "gray",
@@ -364,23 +406,34 @@
                     "id": "scoreMidfield",
                     "displayText": "Midfield",
                     "gridArea": [
-                        "6",
+                        "3",
+                        "4",
                         "4",
-                        "7",
                         "7"
                     ],
                     "class": "gray",
                     "type": "action",
                     "executables": []
                 },
-
-
+                {
+                    "id": "drop",
+                    "displayText": "Drop",
+                    "gridArea": [
+                        "5",
+                        "8",
+                        "6",
+                        "9"
+                    ],
+                    "class": "yellow",
+                    "type": "action",
+                    "executables": []
+                },
                 {
                     "id": "miss",
                     "displayText": "Miss",
                     "gridArea": [
                         "5",
-                        "8",
+                        "9",
                         "6",
                         "10"
                     ],
@@ -511,12 +564,12 @@
                     ]
                 },
                 {
-                    "id": "scoreAmpedSpeaker",
+                    "id": "scoreAmpedSubwoofer",
                     "displayText": "Subwoofer",
                     "gridArea": [
-                        "3",
-                        "4",
+                        "6",
                         "4",
+                        "7",
                         "7"
                     ],
                     "class": "green",
@@ -524,7 +577,7 @@
                     "executables": []
                 },
                 {
-                    "id": "scoreAmpedSpeaker",
+                    "id": "scoreAmpedWing",
                     "displayText": "Wing",
                     "gridArea": [
                         "4",
@@ -537,7 +590,7 @@
                     "executables": []
                 },
                 {
-                    "id": "scoreAmpedSpeaker",
+                    "id": "scoreAmpedPodium",
                     "displayText": "Podium",
                     "gridArea": [
                         "5",
@@ -550,24 +603,37 @@
                     "executables": []
                 },
                 { 
-                    "id": "scoreAmpedSpeaker",
+                    "id": "scoreAmpedMidfield",
                     "displayText": "Midfield",
                     "gridArea": [
-                        "6",
+                        "3",
+                        "4",
                         "4",
-                        "7",
                         "7"
                     ],
                     "class": "green",
                     "type": "action",
                     "executables": []
                 },
+                {
+                    "id": "drop",
+                    "displayText": "Drop",
+                    "gridArea": [
+                        "5",
+                        "8",
+                        "6",
+                        "9"
+                    ],
+                    "class": "yellow",
+                    "type": "action",
+                    "executables": []
+                },
                 {
                     "id": "miss",
                     "displayText": "Miss",
                     "gridArea": [
                         "5",
-                        "8",
+                        "9",
                         "6",
                         "10"
                     ],
diff --git a/src/analysis/transformers/testingtesting123.js b/src/analysis/transformers/testingtesting123.js
deleted file mode 100644
index c7bbadab..00000000
--- a/src/analysis/transformers/testingtesting123.js
+++ /dev/null
@@ -1,28 +0,0 @@
-const { getPath, setPath } = require("../../lib/util");
-const {DataTransformer} = require("../DataTransformer");
-
-module.exports = {
-    /**
-     * @type {DataTransformer}
-     * @param options.addends {String[]} array of MatchTeamPerformance outputPaths 
-     */
-    tmp: new DataTransformer("test", (dataset, outputPath, options) => {
-        for (const tmp of dataset.tmps) {
-            // console.log(tmp)
-        }
-
-        return dataset;
-    }),
-
-    /**
-     * @type {DataTransformer}
-     * @param options.addends {String[]} array of Team outputPaths
-     */
-    team: new DataTransformer("test", (dataset, outputPath, options) => {
-        for (const [teamNumber, team] of Object.entries(dataset.teams)) {
-            // console.log(team)
-        }
-
-        return dataset;
-    })
-}
\ No newline at end of file