diff --git a/app/data/page.tsx b/app/data/page.tsx
index a9dd2c1..8c73c27 100644
--- a/app/data/page.tsx
+++ b/app/data/page.tsx
@@ -35,7 +35,6 @@ export default function DataPage() {
                 microphone: team.microphone,
                 number: team.teamNumber,
                 park: team.park,
-                pickupLocation: team.pickupLocation,
                 notesAttempted: team.notesAttempted,
                 trap: team.trap
             });
diff --git a/app/page.tsx b/app/page.tsx
index 937008b..0fffb1b 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -51,7 +51,6 @@ export default function Home() {
 
 	// Post Match
 	const [defense, setDefense] = useState(false);
-	const [pickupLocation, setPickupLocation] = useState(PickupLocation.None);
 	const [defenseScale, setDefenseScale] = useState<DefenseRange | null>(null);
 	const [comments, setComments] = useState("");
 
@@ -61,8 +60,8 @@ export default function Home() {
 		setAutoNotesAttempted(prevState => [...prevState, thisAutoNotesAttempted]);
 	}
 
-	const updateAutoNotesCollected = (thisNotesAttempted: NoteShot) => {
-     	setAutoNotesAttempted(prevState => [...prevState, thisNotesAttempted])
+	const updateAutoNotesCollected = (thisNotesCollected: AutoNoteCollected) => {
+     	setAutoNotesCollected(prevState => [...prevState, thisNotesCollected])
 	}
 
 	const updateAutoPark = (thisAutoPark: boolean) => {
@@ -105,10 +104,6 @@ export default function Home() {
 		setDefense(thisDefense);
 	}
 
-	const updatePickupLocation = (thisPickupLocation: PickupLocation) => {
-		setPickupLocation(thisPickupLocation);
-	}
-
 	const updateComments = (thisComments: string) => {
 		setComments(thisComments);
 	}
@@ -160,7 +155,6 @@ export default function Home() {
 			microphone: microphone,
 			number: teamNumber,
 			park: park,
-			pickupLocation: pickupLocation,
 			notesAttempted: notesAttempted,
 			trap: trap
 		});
@@ -185,7 +179,6 @@ export default function Home() {
 				microphone: microphone,
 				number: teamNumber,
 				park: park,
-				pickupLocation: pickupLocation,
 				notesAttempted: notesAttempted,
 				trap: trap
 			}]}
@@ -221,7 +214,6 @@ export default function Home() {
 		setDefense(false);
 		setDefenseScale(null);
 		setComments("");
-		setPickupLocation(PickupLocation.None);
 	}
 
 	switch (state) {
@@ -272,7 +264,7 @@ export default function Home() {
 							clear();
 						}}>Next Match</Button>
 					</div>
-					<PostGame updateDefense={updateDefense} updatePickupLocation={updatePickupLocation} updateDefenseScale={updateDefenseScale}
+					<PostGame updateDefense={updateDefense} updateDefenseScale={updateDefenseScale}
 							  updateComments={updateComments} />
 				</section>
 			)
diff --git a/app/postgame.tsx b/app/postgame.tsx
index e4a85fb..1db76b3 100644
--- a/app/postgame.tsx
+++ b/app/postgame.tsx
@@ -6,24 +6,11 @@ import {PickupLocation} from "@/components/data";
 import {Textarea} from "@nextui-org/input";
 
 // @ts-ignore
-export const PostGame = ({updateDefense, updatePickupLocation, updateDefenseScale, updateComments}) => {
+export const PostGame = ({updateDefense, updateDefenseScale, updateComments}) => {
     const [defense, setDefense] = useState(false);
-    const [pickupLocation, setPickupLocation] = useState(PickupLocation.None);
     const [defenseScale, setDefenseScale] = useState<number | number[]>(2);
     const [comments, setComments] = useState("");
 
-    // @ts-ignore
-    const handlePickupChange = (e) => {
-        setPickupLocation(e.target.value)
-    }
-
-    const pickupLocationList = [
-        PickupLocation.None,
-        PickupLocation.Floor,
-        PickupLocation.HumanPlayer,
-        PickupLocation.Both,
-    ]
-
     return (
         <>
             <Checkbox color="primary" isSelected={defense} onValueChange={(value) => {setDefense(value); updateDefense(value)}}>
@@ -66,21 +53,6 @@ export const PostGame = ({updateDefense, updatePickupLocation, updateDefenseScal
                 className="max-w-md"
             />
 
-            <Select
-                label="Pickup"
-                variant="bordered"
-                placeholder="Select"
-                selectedKeys={[pickupLocation]}
-                className="max-w-xs"
-                onChange={handlePickupChange}
-            >
-                {pickupLocationList.map((loc) => (
-                    <SelectItem key={loc} value={loc}>
-                        {loc}
-                    </SelectItem>
-                ))}
-            </Select>
-
             <Textarea
                 variant="underlined"
                 label="Comments"
diff --git a/app/teleop.tsx b/app/teleop.tsx
index df832a6..d2c6fe5 100644
--- a/app/teleop.tsx
+++ b/app/teleop.tsx
@@ -23,7 +23,7 @@ export const Teleop = ({alliance, updateNotesAttempted, updatePark, humanPlayerA
     const [x, setX] = useState(0);
     const [y, setY] = useState(0);
 
-    const handleClick = (e: React.MouseEvent<HTMLImageElement>) => {
+    const handleClick = (e: React.MouseEvent<HTMLImageElement, MouseEvent>) => {
         setX(e.pageX - offsetX);
         setY(e.pageY - offsetY);
     }
diff --git a/app/viewer/match.tsx b/app/viewer/match.tsx
index a1edfcd..41ffc0b 100644
--- a/app/viewer/match.tsx
+++ b/app/viewer/match.tsx
@@ -19,7 +19,7 @@ import {useEffect, useRef, useState} from "react";
 
 const DOWNSCALE = 0.77777777778;
 
-export const MatchListView = ({matchData, updateSelectedMatch}: {matchData: Data | undefined, updateSelectedMatch: (arg0: number | null) => void}) => {
+export const MatchListView = ({matchData, updateSelectedMatch, updateSelectedTeam}: {matchData: Data | undefined, updateSelectedMatch: (arg0: number | null) => void, updateSelectedTeam: (arg0: number | null) => void}) => {
     return (
         <div className="flex flex-col min-w-[100%]">
             <div className="flex min-w-[85%]">
@@ -68,7 +68,7 @@ export const MatchListView = ({matchData, updateSelectedMatch}: {matchData: Data
                 return (
                     <div key={match.matchNumber} className="min-w-[100%]">
                         <Divider/>
-                        <MatchView key={match.matchNumber} matchNumber={match.matchNumber} teams={match.teams} updateSelectedMatch={updateSelectedMatch}/>
+                        <MatchView key={match.matchNumber} matchNumber={match.matchNumber} teams={match.teams} updateSelectedMatch={updateSelectedMatch} updateSelectedTeam={updateSelectedTeam}/>
                     </div>
                 )
             })}
@@ -76,10 +76,8 @@ export const MatchListView = ({matchData, updateSelectedMatch}: {matchData: Data
     )
 }
 
-const MatchView = ({matchNumber, teams, updateSelectedMatch}:
-                       { matchNumber: number, teams: TeamMatchData[], updateSelectedMatch: (arg0: number | null) => void }) => {
-
-    const {isOpen, onOpen, onOpenChange} = useDisclosure();
+const MatchView = ({matchNumber, teams, updateSelectedMatch, updateSelectedTeam}:
+                       { matchNumber: number, teams: TeamMatchData[], updateSelectedMatch: (arg0: number | null) => void, updateSelectedTeam: (arg0: number | null) => void}) => {
 
     return (
         <div className="flex content-evenly min-w-full">
@@ -91,7 +89,7 @@ const MatchView = ({matchNumber, teams, updateSelectedMatch}:
             <div className="flex flex-col gap-4 min-w-full">
                 {teams.map((team, idx) => (
                     <div className="flex min-w-[85%]" key={team.teamNumber}>
-                        <Button onPress={onOpen} variant="light" key={idx} className="justify-start flex gap-4">{
+                        <Button onPress={() => updateSelectedTeam(team.teamNumber)} variant="light" key={idx} className="justify-start flex gap-4">{
                             <>
                                 {/* Maybe move color back to the button */}
                                 <a className={team.alliance == Alliance.Red ? "w-16 text-red-600" : "w-16 text-blue-600"}>{team.teamNumber}</a>
@@ -122,23 +120,6 @@ const MatchView = ({matchNumber, teams, updateSelectedMatch}:
                                 <Divider orientation="vertical"/>
                             </>
                         }</Button>
-
-                        <Modal isOpen={isOpen} onOpenChange={onOpenChange} size="5xl">
-                            <ModalContent>
-                                {(onClose) => (
-                                    <>
-                                        <ModalHeader className="flex flex-col gap-1">{team.teamNumber}</ModalHeader>
-                                        <ModalBody>
-                                        </ModalBody>
-                                        <ModalFooter>
-                                            <Button color="danger" variant="light" onPress={onClose}>
-                                                Close
-                                            </Button>
-                                        </ModalFooter>
-                                    </>
-                                )}
-                            </ModalContent>
-                        </Modal>
                     </div>
                 ))}
             </div>
@@ -239,7 +220,7 @@ const AutoView = ({team}: {team: TeamMatchData}) => {
             <Divider/>
 
             <div className="flex flex-col gap-1">
-                <a>{"Park: " + team.park}</a>
+                <a>{"Park: " + team.autoPark}</a>
                 <a>{"Amp in auto (flex): " + team.autoNotesAttempted.filter(note => note.locationScored == ScoreLocation.Amp).length}</a>
                 <a>Collected: {team.autoNotesCollected.map(note => (
                     <a key={note.time}>{note.location + " @ " + note.time + " "}</a>
@@ -309,12 +290,12 @@ const TeleopView = ({team}: { team: TeamMatchData }) => {
 
             <a>{"Comments: " + team.comments}</a>
 
-            { team.humanPlayerAmp ?
+            {team.humanPlayerAmp ?
                 <>
                     <a>{"Amp Played: " + team.ampPlayed}</a>
                     <a>{"Amplify: " + team.amplify}</a>
                     <a>{"Microphone: " + team.microphone}</a>
-                </> : <></> }
+                </> : <></>}
 
             <Image ref={imageRef} src={team.alliance === Alliance.Red ? "/Red.png" : "/Blue.png"} width={350}
                    alt="Field"/>
diff --git a/app/viewer/page.tsx b/app/viewer/page.tsx
index 8f328ec..5a910ac 100644
--- a/app/viewer/page.tsx
+++ b/app/viewer/page.tsx
@@ -4,9 +4,8 @@ import {useEffect, useState} from "react";
 import {Alliance, Data, parseFirebaseData, TeamMatchData} from "@/components/data";
 import {get, getDatabase, ref} from "@firebase/database";
 import {Button, ButtonGroup} from "@nextui-org/button";
-import {ModalFooter} from "@nextui-org/modal";
 import {MatchDetailView, MatchListView} from "@/app/viewer/match";
-import {TeamListView} from "@/app/viewer/team";
+import {TeamDetailView, TeamListView} from "@/app/viewer/team";
 
 enum View {
     Matches,
@@ -17,6 +16,7 @@ export default function ViewerPage() {
     const [data, setData] = useState<TeamMatchData[] | null>(null);
     const [matchData, setMatchData] = useState<Data>();
     const [selectedMatch, setSelectedMatch] = useState<number | null>(null);
+    const [selectedTeam, setSelectedTeam] = useState<number | null>(null);
 
     const [view, setView] = useState(View.Matches);
 
@@ -59,6 +59,10 @@ export default function ViewerPage() {
         setSelectedMatch(match)
     }
 
+    function updateSelectedTeam(team: number | null) {
+        setSelectedTeam(team)
+    }
+
     useEffect(() => {
         //@ts-ignore
         fetchAllMatches().then(value => convertMatches(value).then(value1 => setMatchData(value1)));
@@ -71,6 +75,13 @@ export default function ViewerPage() {
                 updateSelectedMatch={updateSelectedMatch}
             />
         )
+    } else if (selectedTeam) {
+        return (
+            <TeamDetailView data={matchData?.matches.flatMap(
+                match => match.teams.filter(
+                    team => team.teamNumber == selectedTeam
+                ))} updateSelectedTeam={updateSelectedTeam} />
+        )
     } else {
         return (
             <>
@@ -79,7 +90,7 @@ export default function ViewerPage() {
                     <Button variant="bordered" onPress={() => setView(View.Teams)}>Teams</Button>
                 </ButtonGroup>
 
-                {view == View.Matches ? <MatchListView matchData={matchData} updateSelectedMatch={updateSelectedMatch}/> : <TeamListView />}
+                {view == View.Matches ? <MatchListView matchData={matchData} updateSelectedMatch={updateSelectedMatch} updateSelectedTeam={updateSelectedTeam}/> : <TeamListView />}
             </>
         )
     }
diff --git a/app/viewer/team.tsx b/app/viewer/team.tsx
index 5bb7436..6b1d7b2 100644
--- a/app/viewer/team.tsx
+++ b/app/viewer/team.tsx
@@ -1,5 +1,135 @@
+'use client';
+
+import {Alliance, Climb, Park, ScoreLocation, TeamMatchData, Trap} from "@/components/data";
+import {Button} from "@nextui-org/button";
+import {Divider, Image} from "@nextui-org/react";
+import {useEffect, useRef, useState} from "react";
+import {ShootPoint} from "@/components/shot";
+
 export const TeamListView = () => {
     return (
-        <h1>Team View</h1>
+        <h1>Team List View</h1>
     )
-}
\ No newline at end of file
+}
+
+export const TeamDetailView = ({data, updateSelectedTeam,}: {
+    data: TeamMatchData[] | undefined;
+    updateSelectedTeam: (arg0: number | null) => void;
+}) => {
+    const [fastestTimes, setFastestTimes] = useState<
+        { location: string; time: number }[]
+    >([]);
+
+    useEffect(() => {
+        if (data) {
+            const notesByLocation: { [key: string]: number[] } = {};
+            data.forEach((match) => {
+                match.autoNotesCollected.forEach((note) => {
+                    if (!notesByLocation[note.location]) {
+                        notesByLocation[note.location] = [];
+                    }
+                    notesByLocation[note.location].push(note.time);
+                });
+            });
+
+            const fastestTimesByLocation = Object.entries(notesByLocation).map(
+                ([location, times]) => {
+                    const fastestTime = Math.min(...times);
+                    return { location, time: fastestTime };
+                }
+            );
+
+            setFastestTimes(fastestTimesByLocation);
+        }
+    }, [data]);
+
+    if (!data) { return (<></>) }
+
+    return (
+        <div className="flex flex-col gap-4">
+            <div className="flex">
+                <Button variant="bordered" onPress={() => updateSelectedTeam(null)}>
+                    Back
+                </Button>
+            </div>
+
+            <h1 className="content-center font-bold text-3xl">
+                {data?.[0]?.teamNumber}
+            </h1>
+
+            <div className="flex gap-4 justify-center content-center w-full h-5 items-center">
+                <div>
+                    <a>Average auto: </a>
+                    <a className="text-green-600">
+                        {data?.filter(
+                            (match) => match.autoNotesAttempted.filter((note) => note.made)
+                                .length
+                        ).length / data?.length}
+                    </a>
+
+                    <a>/</a>
+
+                    <a className="text-red-600">
+                        {data?.filter(
+                            (match) => match.autoNotesAttempted.filter((note) => !note.made).length
+                        ).length / data?.length}
+                    </a>
+                </div>
+                <Divider orientation="vertical"/>
+
+                <div className="flex flex-col">
+                    <a>
+                        {"Park (good): " +
+                            data.filter(match => match.park == Park.Good).length /
+                            data.length + "%"}
+                    </a>
+
+                    <a>
+                        {"Park (dangerous): " +
+                            data.filter(match => match.park == Park.Dangerous).length /
+                            data.length + "%"}
+                    </a>
+                </div>
+
+                <div className="flex flex-col">
+                    <a>{"Notes collected fastest: "}</a>
+                    {fastestTimes.map(({location, time}) => (
+                        <a key={location}>{`${location} @ ${time}`}</a>
+                    ))}
+                </div>
+
+                <div>
+                    <a>Average teleop: </a>
+                    <a className="text-green-600">
+                        {data?.filter(
+                            (match) => match.notesAttempted.filter((note) => note.made)
+                                .length
+                        ).length / data?.length}
+                    </a>
+
+                    <a>/</a>
+
+                    <a className="text-red-600">
+                        {data?.filter(
+                            (match) => match.notesAttempted.filter((note) => !note.made).length
+                        ).length / data?.length}
+                    </a>
+                </div>
+
+                <div>
+                    <a>Averayyge climb: </a>
+                    <a className="text-green-600">{data.filter(match => match.climb != Climb.None || Climb.Failed).length}</a>
+                    <a>/</a>
+                    <a className="text-red-600">{data.filter(match => match.climb == Climb.Solo || Climb.Double || Climb.Triple).length}</a>
+                </div>
+
+                <a>{"Trap (none, 1, 2, 3): " + data.filter(match => match.trap == Trap.None).length + ", " +
+                    data.filter(match => match.trap == Trap.One).length + ", " +
+                    data.filter(match => match.trap == Trap.Two).length + ", " +
+                    data.filter(match => match.trap == Trap.Three).length}</a>
+
+                <a>{"Park amount: " + data.map(match => match.park).length}</a>
+            </div>
+        </div>
+    );
+};
diff --git a/components/data.ts b/components/data.ts
index 9822254..ff90823 100644
--- a/components/data.ts
+++ b/components/data.ts
@@ -21,7 +21,6 @@ export interface TeamMatchData {
     trap: Trap,
     amplify: number,
     defense: boolean,
-    pickupLocation: PickupLocation,
     defenseScale: DefenseRange,
     comments: string
 }
@@ -160,7 +159,6 @@ export const parseFirebaseData = (data: any): TeamMatchData[] => {
                 trap: parseTrap(teamData.trap),
                 amplify: teamData.amplify,
                 defense: teamData.defense,
-                pickupLocation: parsePickupLocation(teamData.pickupLocation),
                 defenseScale: parseDefenseScale(teamData.defenseScale),
                 comments: teamData.comments || ""
             };
@@ -331,23 +329,6 @@ const parseClimb = (climb: string | undefined): Climb => {
     }
 };
 
-const parsePickupLocation = (pickupLocation: string | undefined): PickupLocation => {
-    if (!pickupLocation) { return PickupLocation.None; }
-
-    switch (pickupLocation) {
-        case "None":
-            return PickupLocation.None;
-        case "Floor":
-            return PickupLocation.Floor;
-        case "Human Player":
-            return PickupLocation.HumanPlayer;
-        case "Both":
-            return PickupLocation.Both;
-        default:
-            throw new Error("Invalid pickup location: " + pickupLocation);
-    }
-};
-
 const parseDefenseScale = (defenseScale: string | undefined): DefenseRange => {
     if (!defenseScale) { return DefenseRange.DidNotPlay; }
 
diff --git a/package-lock.json b/package-lock.json
index 6c4cd05..880e5bd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,6 +28,8 @@
         "@types/react-dom": "18.2.7",
         "@vercel/analytics": "^1.2.2",
         "autoprefixer": "10.4.16",
+        "chart.js": "^4.4.2",
+        "chartjs": "^0.3.24",
         "clsx": "^2.0.0",
         "eslint": "8.48.0",
         "eslint-config-next": "14.0.2",
@@ -2605,6 +2607,11 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@kurkle/color": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.2.tgz",
+      "integrity": "sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw=="
+    },
     "node_modules/@next/env": {
       "version": "14.0.2",
       "resolved": "https://registry.npmjs.org/@next/env/-/env-14.0.2.tgz",
@@ -6091,6 +6098,22 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/chart.js": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.2.tgz",
+      "integrity": "sha512-6GD7iKwFpP5kbSD4MeRRRlTnQvxfQREy36uEtm1hzHzcOqwWx0YEHuspuoNlslu+nciLIB7fjjsHkUv/FzFcOg==",
+      "dependencies": {
+        "@kurkle/color": "^0.3.0"
+      },
+      "engines": {
+        "pnpm": ">=8"
+      }
+    },
+    "node_modules/chartjs": {
+      "version": "0.3.24",
+      "resolved": "https://registry.npmjs.org/chartjs/-/chartjs-0.3.24.tgz",
+      "integrity": "sha512-h6G9qcDqmFYnSWqjWCzQMeOLiypS+pM6Fq2Rj7LPty8Kjx5yHonwwJ7oEHImZpQ2u9Pu36XGYfardvvBiQVrhg=="
+    },
     "node_modules/chokidar": {
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
diff --git a/package.json b/package.json
index 85e6211..c8b8d96 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,8 @@
     "@types/react-dom": "18.2.7",
     "@vercel/analytics": "^1.2.2",
     "autoprefixer": "10.4.16",
+    "chart.js": "^4.4.2",
+    "chartjs": "^0.3.24",
     "clsx": "^2.0.0",
     "eslint": "8.48.0",
     "eslint-config-next": "14.0.2",