diff --git a/src/components/CursorWrapper.tsx b/src/components/CursorWrapper.tsx
new file mode 100644
index 0000000..8f17e47
--- /dev/null
+++ b/src/components/CursorWrapper.tsx
@@ -0,0 +1,50 @@
+import React, { useEffect, useRef } from "react";
+import { Table } from "@mantine/core";
+
+type CursorWrapperProps = {
+  clickFunc: () => void;
+  bg: string;
+  children: React.ReactNode;
+  isCursor: boolean;
+  getNextPage: (cursorIdx: number) => void;
+  cursorIdx: number;
+};
+
+const CursorWrapper: React.FC<CursorWrapperProps> = ({
+  clickFunc,
+  bg,
+  children,
+  isCursor,
+  getNextPage,
+  cursorIdx,
+}) => {
+  const ref = useRef<HTMLTableRowElement | null>(null);
+
+  useEffect(() => {
+    if (!isCursor) return;
+    const element = ref.current;
+
+    if (!element) return;
+
+    const observer = new IntersectionObserver(
+      ([entry]) => {
+        if (entry.isIntersecting) {
+          getNextPage(cursorIdx);
+        }
+      },
+      { threshold: 0.5 },
+    );
+
+    observer.observe(element);
+
+    return () => observer.disconnect();
+  }, []);
+
+  return (
+    <Table.Tr ref={ref} onClick={clickFunc} bg={bg}>
+      {children}
+    </Table.Tr>
+  );
+};
+
+export default CursorWrapper;
diff --git a/src/components/DataTable.tsx b/src/components/DataTable.tsx
index 8ee822e..1e53a7c 100644
--- a/src/components/DataTable.tsx
+++ b/src/components/DataTable.tsx
@@ -1,6 +1,7 @@
 import { Table } from "@mantine/core";
 import { useMantineTheme } from "@mantine/core";
 import { Input, Textarea } from "@mantine/core";
+import CursorWrapper from "./CursorWrapper";
 
 // Data table of the files/root page
 interface DataTableProps {
@@ -10,6 +11,7 @@ interface DataTableProps {
   setSelectedData: React.Dispatch<
     React.SetStateAction<MCAPFileInformation | undefined>
   >;
+  getNextPage: (cursorIdx: number) => void;
 }
 
 export default function DataTable({
@@ -17,6 +19,7 @@ export default function DataTable({
   selectedRow,
   setSelectedRow,
   setSelectedData,
+  getNextPage,
 }: DataTableProps) {
   const theme = useMantineTheme();
 
@@ -51,22 +54,27 @@ export default function DataTable({
       </Table.Td>
     </Table.Tr>
   ) : (
-    data.map((file) => (
-      <Table.Tr
+    data.map((file, idx) => (
+      <CursorWrapper
         key={file.id}
-        onClick={() => setPreviewData(file)}
+        clickFunc={() => setPreviewData(file)}
         bg={selectedRow === file.id ? theme.primaryColor : ""}
+        isCursor={idx === data.length - 1}
+        getNextPage={getNextPage}
+        cursorIdx={idx}
       >
         <Table.Td style={{ paddingLeft: "25px", size: "xs" }}>
-          {getFileNameWithoutExtension(file.mcap_files[0].file_name)}
+          {file.mcap_files
+            ? getFileNameWithoutExtension(file.mcap_files[0].file_name)
+            : null}
         </Table.Td>
         <Table.Td>{file.date}</Table.Td>
-        <Table.Td style={{ size: "xs"}}>
-          <Input.Wrapper >
+        <Table.Td style={{ size: "xs" }}>
+          <Input.Wrapper>
             <Textarea
               variant="unstyled"
               value={file.location}
-              style={{ whiteSpace: "normal", wordWrap: "break-word"}}
+              style={{ whiteSpace: "normal", wordWrap: "break-word" }}
               readOnly
               autosize
               placeholder="No Location Available"
@@ -75,13 +83,12 @@ export default function DataTable({
             />
           </Input.Wrapper>
         </Table.Td>
-
         <Table.Td style={{ paddingRight: "25px" }}>
           <Input.Wrapper>
             <Textarea
               variant="unstyled"
               value={file.notes}
-              style={{ whiteSpace: "normal", wordWrap: "break-word"}}
+              style={{ whiteSpace: "normal", wordWrap: "break-word" }}
               readOnly
               autosize
               placeholder="No Note Available"
@@ -90,7 +97,7 @@ export default function DataTable({
             />
           </Input.Wrapper>
         </Table.Td>
-      </Table.Tr>
+      </CursorWrapper>
     ))
   );
   return (
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index 9b8c47c..2a1f891 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -3,6 +3,7 @@ import "@/css/Navbar.css";
 import { NavLink } from "react-router-dom";
 import FileUpload from "@/components/FileUpload";
 import Feedback from "@/components/Feedback";
+import PingStatus from "@/components/PingStatus";
 import { Button } from "@mantine/core";
 import { IconHelp } from "@tabler/icons-react";
 
@@ -29,23 +30,26 @@ export default function Navbar() {
         alt="Logo"
         className="navbar-icon"
       />
-      <Button 
+      <Button
         variant="filled"
         component="a"
         target="_blank"
-        href="https://wiki.hytechracing.org/books/software/page/query-frontend-demo-and-documentation">
-          <IconHelp size="25"/>
+        href="https://wiki.hytechracing.org/books/software/page/query-frontend-demo-and-documentation"
+      >
+        <IconHelp size="25" />
       </Button>
       {links}
 
       {/* Once POST API is out -- Currently WIP */}
-      <FileUpload uploadUrl={`${import.meta.env.VITE_API_URL}/api/v2/mcaps/bulk_upload`}/>
-      <div style={{right: 0}}>
-      <Feedback/>
-      </div> 
+      <FileUpload
+        uploadUrl={`${import.meta.env.VITE_API_URL}/api/v2/mcaps/bulk_upload`}
+      />
+      <div style={{ right: 0 }}>
+        <Feedback />
+      </div>
       {/* Optionally render active link or other content here */}
       <h3 className="hytechName">{hytechName}</h3>
-      
+      <PingStatus />
     </nav>
   );
-}
\ No newline at end of file
+}
diff --git a/src/components/PingStatus.tsx b/src/components/PingStatus.tsx
new file mode 100644
index 0000000..04a34dc
--- /dev/null
+++ b/src/components/PingStatus.tsx
@@ -0,0 +1,37 @@
+import "@/css/Navbar.css";
+import { useEffect, useState } from "react";
+
+const PingStatus: React.FC = () => {
+  const [vpnActive, setVpnActive] = useState(false);
+  const [isHovering, setIsHovering] = useState(false);
+
+  const handleGetStatus = async () => {
+    try {
+      const res = await fetch(`${import.meta.env.VITE_API_URL}/ping`, {});
+
+      setVpnActive(res.ok); // res is always truthy if fetch didn't throw
+    } catch {
+      setVpnActive(false);
+    }
+  };
+
+  useEffect(() => {
+    handleGetStatus();
+  }, []);
+
+  return (
+    <div
+      className={`vpnStatus ${vpnActive ? "vpnStatusGood" : "vpnStatusBad"}`}
+      onMouseEnter={() => setIsHovering(true)}
+      onMouseLeave={() => setIsHovering(false)}
+    >
+      {isHovering ? (
+        <div className="vpnStatusHover">
+          VPN is {vpnActive ? "active" : "inactive"}
+        </div>
+      ) : null}
+    </div>
+  );
+};
+
+export default PingStatus;
diff --git a/src/css/Navbar.css b/src/css/Navbar.css
index 63a5ac6..709e613 100644
--- a/src/css/Navbar.css
+++ b/src/css/Navbar.css
@@ -1,47 +1,74 @@
-@import url('https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap');
+@import url("https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap");
 
 nav {
-    padding: 15px 0;
-    background: #B3A36A;
-    display: flex;
-    height: 50px;
-    align-items: center;
+  padding: 15px 0;
+  background: #b3a36a;
+  display: flex;
+  height: 50px;
+  align-items: center;
 }
 
 .nav-link {
-    padding: 3px 15px;
-    text-decoration: none;
-    color: #FFFFFF;
-    background-color: transparent;
-    border-radius: 8px;
-    font-weight: bold;
-    cursor: pointer;
-    transition: all 0.2s ease-in-out;
-    display: inline-block;
-    margin-left: 20px;
-    font-family: 'Roboto', sans-serif;
+  padding: 3px 15px;
+  text-decoration: none;
+  color: #ffffff;
+  background-color: transparent;
+  border-radius: 8px;
+  font-weight: bold;
+  cursor: pointer;
+  transition: all 0.2s ease-in-out;
+  display: inline-block;
+  margin-left: 20px;
+  font-family: "Roboto", sans-serif;
 }
 
 #navbar a.active {
-    background-color: #978750;
-    font-weight: bold;
+  background-color: #978750;
+  font-weight: bold;
 }
 
 .nav-link:hover {
-    color: white;
-    background-color: #D1BF80;
+  color: white;
+  background-color: #d1bf80;
 }
 
 .navbar-icon {
-    height: 30px;
-    margin-right: 20px;
-    margin-left: 20px;
+  height: 30px;
+  margin-right: 20px;
+  margin-left: 20px;
 }
 
 .hytechName {
-    margin-left: auto;
-    margin-right: 10px;
-    border-radius: 5px;
-    color: white;
-    font-weight: 900;
-}
\ No newline at end of file
+  margin-left: auto;
+  margin-right: 10px;
+  border-radius: 5px;
+  color: white;
+  font-weight: 900;
+}
+
+.vpnStatus {
+  border-radius: 100%;
+  width: 1rem;
+  height: 1rem;
+  margin: 1rem;
+  cursor: pointer;
+}
+
+.vpnStatusGood {
+  background-color: green;
+}
+
+.vpnStatusBad {
+  background-color: red;
+}
+
+.vpnStatusHover {
+  white-space: nowrap;
+  z-index: 10;
+  background-color: white;
+  width: fit-content;
+  border-radius: 5px;
+  transform: translate(-85%, 75%);
+  padding: 0.25rem;
+  border: 1px solid gray;
+}
diff --git a/src/routes/root.tsx b/src/routes/root.tsx
index d617a5c..65158ce 100644
--- a/src/routes/root.tsx
+++ b/src/routes/root.tsx
@@ -5,7 +5,10 @@ import DataTable from "@/components/DataTable";
 import PreviewCard from "@/components/PreviewCard";
 import { parseAsArrayOf, parseAsString, useQueryState } from "nuqs";
 
+const MCAP_PAGINATION_LIMIT: number = 10;
+
 export default function Root() {
+  const [mcapPaginationOffset, setMcapPaginationOffset] = useState<number>(0);
   const [filteredData, setFilteredData] = useState<MCAPFileInformation[]>();
   const [selectedRow, setSelectedRow] = useState<string>("");
   const [selectedData, setSelectedData] = useState<MCAPFileInformation>();
@@ -32,7 +35,7 @@ export default function Root() {
   );
   const [carModel] = useQueryState("carModel", parseAsString.withDefault(""));
 
-  // corresponds with index.d.ts - type SearchFilter 
+  // corresponds with index.d.ts - type SearchFilter
   const searchFilters = {
     location: selectedLocation,
     date: selectedEventType,
@@ -53,6 +56,14 @@ export default function Root() {
     return new Date(`${year}-${month}-${day}T${time}Z`).toISOString();
   };
 
+  const getNextPage = (cursorIdx: number) => {
+    // limit duplicate requests
+    if (cursorIdx + MCAP_PAGINATION_LIMIT >= mcapPaginationOffset) {
+      return;
+    }
+    setMcapPaginationOffset(cursorIdx + MCAP_PAGINATION_LIMIT);
+  };
+
   // fetch request of wanted files with filters as Query Params
   const fetchData = async (filters: SearchFilter) => {
     if (selectedId != "") {
@@ -64,7 +75,7 @@ export default function Root() {
       return data.data;
     }
 
-    // corresponds with index.d.ts - type SearchFilter 
+    // corresponds with index.d.ts - type SearchFilter
     const { location, date, eventType, searchText, carModel } = filters;
     let { afterDate, beforeDate } = filters;
 
@@ -80,10 +91,11 @@ export default function Root() {
       ...(beforeDate ? { before_date: beforeDate } : {}),
       ...(searchText ? { search_text: searchText } : {}),
       ...(carModel ? { car_model: carModel } : {}),
+      ...{ limit: JSON.stringify(MCAP_PAGINATION_LIMIT) },
+      ...{ offset: JSON.stringify(mcapPaginationOffset) },
     };
 
     const queryString = new URLSearchParams(params).toString();
-
     const res = await fetch(
       `${import.meta.env.VITE_API_URL}/api/v2/mcaps?${queryString}`,
     );
@@ -94,9 +106,6 @@ export default function Root() {
 
   const assignData = async () => {
     const data = await fetchData(searchFilters);
-    console.log(data);
-
-    
 
     const sortedData = data.sort(
       (a: MCAPFileInformation, b: MCAPFileInformation) => {
@@ -109,12 +118,12 @@ export default function Root() {
     setFilteredData(sortedData);
 
     const allLocationsIncludingNulls: (string | null | undefined)[] = data.map(
-      (item: MCAPFileInformation) => item.location
+      (item: MCAPFileInformation) => item.location,
     );
     const extractedLocations: string[] = allLocationsIncludingNulls.filter(
       (loc): loc is string => {
         return loc != null && loc.trim() !== "";
-      }
+      },
     );
     const uniqueLocations = Array.from(new Set(extractedLocations));
 
@@ -123,7 +132,7 @@ export default function Root() {
 
   useEffect(() => {
     assignData();
-  }, []);
+  }, [mcapPaginationOffset]);
 
   // Two useEffects bc of the way we are handling the Search Button D:
   useEffect(() => {
@@ -156,9 +165,13 @@ export default function Root() {
             selectedRow={selectedRow}
             setSelectedRow={setSelectedRow}
             setSelectedData={setSelectedData}
+            getNextPage={getNextPage}
           />
         </div>
-        <SearchBar setSearch={setSearch} distinctLocations={distinctLocations}/>
+        <SearchBar
+          setSearch={setSearch}
+          distinctLocations={distinctLocations}
+        />
       </div>
       <PreviewCard selectedRow={selectedRow} selectedData={selectedData} />
     </>