diff --git a/frontend/src/app/analytics/revenue-forecast/page.tsx b/frontend/src/app/analytics/revenue-forecast/page.tsx
index 69d089c9..a24bacff 100644
--- a/frontend/src/app/analytics/revenue-forecast/page.tsx
+++ b/frontend/src/app/analytics/revenue-forecast/page.tsx
@@ -1,7 +1,14 @@
 "use client";
 
 import { useQuery } from "@apollo/client";
-import { format, endOfMonth, subMonths, isSameDay, getDaysInMonth } from "date-fns";
+import {
+  format,
+  endOfMonth,
+  subMonths,
+  isSameDay,
+  getDaysInMonth,
+  getDate,
+} from "date-fns";
 import { useState, useEffect } from "react";
 import { DatePicker } from "@/components/DatePicker";
 import { REVENUE_FORECAST_QUERY } from "./query";
@@ -15,14 +22,26 @@ import {
 } from "@/components/ui/table";
 import { Checkbox } from "@/components/ui/checkbox";
 import Link from "next/link";
+import SectionHeader from "@/components/SectionHeader";
 
 export default function RevenueForecastPage() {
   const [date, setDate] = useState<Date>(new Date());
-  const [showPartialPreviousMonth, setShowPartialPreviousMonth] = useState(false);
-  const [sortConfig, setSortConfig] = useState<{
-    key: string;
-    direction: 'asc' | 'desc';
-  }>({ key: 'current.total', direction: 'desc' });
+  const [showPartialPreviousMonth, setShowPartialPreviousMonth] =
+    useState(false);
+  const [sortConfigs, setSortConfigs] = useState<
+    Record<
+      string,
+      {
+        key: string;
+        direction: "asc" | "desc";
+      }
+    >
+  >({
+    consulting: { key: "current", direction: "desc" },
+    consultingPre: { key: "current", direction: "desc" },
+    handsOn: { key: "current", direction: "desc" },
+    squad: { key: "current", direction: "desc" },
+  });
 
   useEffect(() => {
     const today = new Date();
@@ -30,74 +49,274 @@ export default function RevenueForecastPage() {
   }, []);
 
   const previousMonthDate = endOfMonth(subMonths(date, 1));
-  
-  // Calculate the partial previous month date
+  const twoMonthsAgoDate = endOfMonth(subMonths(date, 2));
+  const threeMonthsAgoDate = endOfMonth(subMonths(date, 3));
+
   const getPreviousMonthPartialDate = () => {
     const previousMonth = subMonths(date, 1);
     const currentDay = date.getDate();
     const daysInPreviousMonth = getDaysInMonth(previousMonth);
     const targetDay = Math.min(currentDay, daysInPreviousMonth);
-    return new Date(previousMonth.getFullYear(), previousMonth.getMonth(), targetDay);
+    return new Date(
+      previousMonth.getFullYear(),
+      previousMonth.getMonth(),
+      targetDay
+    );
+  };
+
+  const getTwoMonthsAgoPartialDate = () => {
+    const twoMonthsAgo = subMonths(date, 2);
+    const currentDay = date.getDate();
+    const daysInTwoMonthsAgo = getDaysInMonth(twoMonthsAgo);
+    const targetDay = Math.min(currentDay, daysInTwoMonthsAgo);
+    return new Date(
+      twoMonthsAgo.getFullYear(),
+      twoMonthsAgo.getMonth(),
+      targetDay
+    );
+  };
+
+  const getThreeMonthsAgoPartialDate = () => {
+    const threeMonthsAgo = subMonths(date, 3);
+    const currentDay = date.getDate();
+    const daysInThreeMonthsAgo = getDaysInMonth(threeMonthsAgo);
+    const targetDay = Math.min(currentDay, daysInThreeMonthsAgo);
+    return new Date(
+      threeMonthsAgo.getFullYear(),
+      threeMonthsAgo.getMonth(),
+      targetDay
+    );
   };
 
   const previousMonthPartialDate = getPreviousMonthPartialDate();
+  const twoMonthsAgoPartialDate = getTwoMonthsAgoPartialDate();
+  const threeMonthsAgoPartialDate = getThreeMonthsAgoPartialDate();
 
   const { loading, error, data } = useQuery(REVENUE_FORECAST_QUERY, {
     variables: {
       inAnalysisDate: format(date, "yyyy-MM-dd"),
       previousMonthDate: format(previousMonthDate, "yyyy-MM-dd"),
       previousMonthPartialDate: format(previousMonthPartialDate, "yyyy-MM-dd"),
+      twoMonthsAgoDate: format(twoMonthsAgoDate, "yyyy-MM-dd"),
+      twoMonthsAgoPartialDate: format(twoMonthsAgoPartialDate, "yyyy-MM-dd"),
+      threeMonthsAgoDate: format(threeMonthsAgoDate, "yyyy-MM-dd"),
+      threeMonthsAgoPartialDate: format(
+        threeMonthsAgoPartialDate,
+        "yyyy-MM-dd"
+      ),
     },
   });
 
   if (loading) return <div>Loading...</div>;
   if (error) return <div>Error: {error.message}</div>;
 
-  // Merge client data from both queries
-  const clients = new Map();
-
-  const previousData = showPartialPreviousMonth ? data.previous_month_partial : data.previous_month;
-
-  previousData.summaries.byClient.forEach((client: any) => {
-    clients.set(client.slug, {
-      name: client.name,
-      previous: {
-        regular: client.regular,
-        preContracted: client.preContracted,
-        total: client.total,
-      },
-      current: {
-        regular: 0,
-        preContracted: 0,
-        total: 0,
-      },
+  // Process data for each service type
+  const processServiceData = (
+    type:
+      | "regular"
+      | "preContracted"
+      | "consultingFee"
+      | "consultingPreFee"
+      | "handsOnFee"
+      | "squadFee"
+  ) => {
+    const clients = new Map();
+
+    data.three_months_ago.summaries.byClient.forEach((client: any) => {
+      if (client[type]) {
+        clients.set(client.slug, {
+          name: client.name,
+          slug: client.slug,
+          threeMonthsAgoFull: client[type],
+          threeMonthsAgoPartial: 0,
+          twoMonthsAgoFull: 0,
+          twoMonthsAgoPartial: 0,
+          previousFull: 0,
+          previousPartial: 0,
+          current: 0,
+          projected: 0,
+          expected: 0,
+        });
+      }
     });
-  });
 
-  data.in_analysis.summaries.byClient.forEach((client: any) => {
-    if (clients.has(client.slug)) {
-      const existingClient = clients.get(client.slug);
-      existingClient.current = {
-        regular: client.regular,
-        preContracted: client.preContracted,
-        total: client.total,
-      };
-    } else {
-      clients.set(client.slug, {
-        name: client.name,
-        previous: {
-          regular: 0,
-          preContracted: 0,
-          total: 0,
-        },
-        current: {
-          regular: client.regular,
-          preContracted: client.preContracted,
-          total: client.total,
-        },
-      });
-    }
-  });
+    data.three_months_ago_partial.summaries.byClient.forEach((client: any) => {
+      if (client[type]) {
+        if (clients.has(client.slug)) {
+          clients.get(client.slug).threeMonthsAgoPartial = client[type];
+        } else {
+          clients.set(client.slug, {
+            name: client.name,
+            slug: client.slug,
+            threeMonthsAgoFull: 0,
+            threeMonthsAgoPartial: client[type],
+            twoMonthsAgoFull: 0,
+            twoMonthsAgoPartial: 0,
+            previousFull: 0,
+            previousPartial: 0,
+            current: 0,
+            projected: 0,
+            expected: 0,
+          });
+        }
+      }
+    });
+
+    data.two_months_ago.summaries.byClient.forEach((client: any) => {
+      if (client[type]) {
+        if (clients.has(client.slug)) {
+          clients.get(client.slug).twoMonthsAgoFull = client[type];
+        } else {
+          clients.set(client.slug, {
+            name: client.name,
+            slug: client.slug,
+            threeMonthsAgoFull: 0,
+            threeMonthsAgoPartial: 0,
+            twoMonthsAgoFull: client[type],
+            twoMonthsAgoPartial: 0,
+            previousFull: 0,
+            previousPartial: 0,
+            current: 0,
+            projected: 0,
+            expected: 0,
+          });
+        }
+      }
+    });
+
+    data.two_months_ago_partial.summaries.byClient.forEach((client: any) => {
+      if (client[type]) {
+        if (clients.has(client.slug)) {
+          clients.get(client.slug).twoMonthsAgoPartial = client[type];
+        } else {
+          clients.set(client.slug, {
+            name: client.name,
+            slug: client.slug,
+            threeMonthsAgoFull: 0,
+            threeMonthsAgoPartial: 0,
+            twoMonthsAgoFull: 0,
+            twoMonthsAgoPartial: client[type],
+            previousFull: 0,
+            previousPartial: 0,
+            current: 0,
+            projected: 0,
+            expected: 0,
+          });
+        }
+      }
+    });
+
+    data.previous_month.summaries.byClient.forEach((client: any) => {
+      if (client[type]) {
+        if (clients.has(client.slug)) {
+          clients.get(client.slug).previousFull = client[type];
+        } else {
+          clients.set(client.slug, {
+            name: client.name,
+            slug: client.slug,
+            threeMonthsAgoFull: 0,
+            threeMonthsAgoPartial: 0,
+            twoMonthsAgoFull: 0,
+            twoMonthsAgoPartial: 0,
+            previousFull: client[type],
+            previousPartial: 0,
+            current: 0,
+            projected: 0,
+            expected: 0,
+          });
+        }
+      }
+    });
+
+    data.previous_month_partial.summaries.byClient.forEach((client: any) => {
+      if (client[type]) {
+        if (clients.has(client.slug)) {
+          clients.get(client.slug).previousPartial = client[type];
+        } else {
+          clients.set(client.slug, {
+            name: client.name,
+            slug: client.slug,
+            threeMonthsAgoFull: 0,
+            threeMonthsAgoPartial: 0,
+            twoMonthsAgoFull: 0,
+            twoMonthsAgoPartial: 0,
+            previousFull: 0,
+            previousPartial: client[type],
+            current: 0,
+            projected: 0,
+            expected: 0,
+          });
+        }
+      }
+    });
+
+    data.in_analysis.summaries.byClient.forEach((client: any) => {
+      if (client[type]) {
+        if (clients.has(client.slug)) {
+          const currentValue = client[type];
+          const clientData = clients.get(client.slug);
+          clientData.current = currentValue;
+
+          // Calculate projected value based on current day of month
+          const currentDay = getDate(date);
+          const daysInMonth = getDaysInMonth(date);
+          const projectedValue = (currentValue / currentDay) * daysInMonth;
+          clientData.projected = projectedValue;
+
+          // Calculate expected value (60% previous month + 25% two months ago + 15% three months ago)
+          const previousValue = clientData.previousFull || 0;
+          const twoMonthsAgoValue = clientData.twoMonthsAgoFull || 0;
+          const threeMonthsAgoValue = clientData.threeMonthsAgoFull || 0;
+
+          // If there's no history, use projected value as expected
+          if (previousValue === 0 && twoMonthsAgoValue === 0 && threeMonthsAgoValue === 0) {
+            clientData.expected = projectedValue;
+          }
+          // If only has previous month
+          else if (twoMonthsAgoValue === 0 && threeMonthsAgoValue === 0) {
+            clientData.expected = previousValue;
+          }
+          // If has previous and two months ago
+          else if (threeMonthsAgoValue === 0) {
+            clientData.expected = previousValue * 0.8 + twoMonthsAgoValue * 0.2;
+          }
+          // If has all three months
+          else {
+            clientData.expected =
+              previousValue * 0.6 +
+              twoMonthsAgoValue * 0.25 +
+              threeMonthsAgoValue * 0.15;
+          }
+        } else {
+          const currentValue = client[type];
+          const currentDay = getDate(date);
+          const daysInMonth = getDaysInMonth(date);
+          const projectedValue = (currentValue / currentDay) * daysInMonth;
+
+          clients.set(client.slug, {
+            name: client.name,
+            slug: client.slug,
+            threeMonthsAgoFull: 0,
+            threeMonthsAgoPartial: 0,
+            twoMonthsAgoFull: 0,
+            twoMonthsAgoPartial: 0,
+            previousFull: 0,
+            previousPartial: 0,
+            current: currentValue,
+            projected: projectedValue,
+            expected: projectedValue, // Use projected value as expected when no history
+          });
+        }
+      }
+    });
+
+    return clients;
+  };
+
+  const consultingClients = processServiceData("consultingFee");
+  const consultingPreClients = processServiceData("consultingPreFee");
+  const handsOnClients = processServiceData("handsOnFee");
+  const squadClients = processServiceData("squadFee");
 
   const formatCurrency = (value: number) => {
     return new Intl.NumberFormat("en-US", {
@@ -107,216 +326,520 @@ export default function RevenueForecastPage() {
     }).format(value);
   };
 
-  // Calculate totals
-  const totals = Array.from(clients.values()).reduce((acc, client) => ({
-    previous: {
-      regular: acc.previous.regular + client.previous.regular,
-      preContracted: acc.previous.preContracted + client.previous.preContracted,
-      total: acc.previous.total + client.previous.total,
-    },
-    current: {
-      regular: acc.current.regular + client.current.regular,
-      preContracted: acc.current.preContracted + client.current.preContracted,
-      total: acc.current.total + client.current.total,
-    }
-  }), {
-    previous: { regular: 0, preContracted: 0, total: 0 },
-    current: { regular: 0, preContracted: 0, total: 0 }
-  });
+  const formatPercentage = (value: number, total: number) => {
+    if (total === 0 || value === 0) return "";
+    return `${((value / total) * 100).toFixed(1)}%`;
+  };
 
-  const requestSort = (key: string) => {
-    let direction: 'asc' | 'desc' = 'desc';
-    if (sortConfig.key === key && sortConfig.direction === 'desc') {
-      direction = 'asc';
-    }
-    setSortConfig({ key, direction });
+  const requestSort = (key: string, tableId: string) => {
+    setSortConfigs((prevConfigs) => {
+      const newConfigs = { ...prevConfigs };
+      let direction: "asc" | "desc" = "desc";
+      if (
+        newConfigs[tableId].key === key &&
+        newConfigs[tableId].direction === "desc"
+      ) {
+        direction = "asc";
+      }
+      newConfigs[tableId] = { key, direction };
+      return newConfigs;
+    });
   };
 
-  const getSortedClients = () => {
+  const getSortedClients = (clients: Map<string, any>, tableId: string) => {
     const clientsArray = Array.from(clients.values());
-    if (!sortConfig.key) return clientsArray;
+    const sortConfig = sortConfigs[tableId];
+    if (!sortConfig?.key) return clientsArray;
 
     return clientsArray.sort((a, b) => {
-      let aValue = 0;
-      let bValue = 0;
-
-      // Extract values based on sort key
-      if (sortConfig.key.includes('.')) {
-        const [period, type] = sortConfig.key.split('.');
-        if (period === 'diff') {
-          aValue = a.current[type] - a.previous[type];
-          bValue = b.current[type] - b.previous[type];
-        } else {
-          aValue = a[period][type];
-          bValue = b[period][type];
-        }
-      }
+      const aValue = a[sortConfig.key];
+      const bValue = b[sortConfig.key];
 
       if (aValue < bValue) {
-        return sortConfig.direction === 'asc' ? -1 : 1;
+        return sortConfig.direction === "asc" ? -1 : 1;
       }
       if (aValue > bValue) {
-        return sortConfig.direction === 'asc' ? 1 : -1;
+        return sortConfig.direction === "asc" ? 1 : -1;
       }
       return 0;
     });
   };
 
-  const sortedClients = getSortedClients();
-
-  return (
-    <div className="flex flex-col gap-6">
-      <div className="flex items-center">
-        <DatePicker date={date} onSelectedDateChange={setDate} />
-        <div className="flex-grow h-px bg-gray-200 ml-2"></div>
-      </div>
+  const renderConsultingTable = (
+    title: string,
+    clients: Map<string, any>,
+    tableId: string
+  ) => {
+    const sortedClients = getSortedClients(clients, tableId);
+    const sortConfig = sortConfigs[tableId];
+    const total = sortedClients.reduce(
+      (acc, client) => ({
+        threeMonthsAgoFull: acc.threeMonthsAgoFull + client.threeMonthsAgoFull,
+        threeMonthsAgoPartial:
+          acc.threeMonthsAgoPartial + client.threeMonthsAgoPartial,
+        twoMonthsAgoFull: acc.twoMonthsAgoFull + client.twoMonthsAgoFull,
+        twoMonthsAgoPartial:
+          acc.twoMonthsAgoPartial + client.twoMonthsAgoPartial,
+        previousFull: acc.previousFull + client.previousFull,
+        previousPartial: acc.previousPartial + client.previousPartial,
+        current: acc.current + client.current,
+        projected: acc.projected + client.projected,
+        expected: acc.expected + client.expected,
+      }),
+      {
+        threeMonthsAgoFull: 0,
+        threeMonthsAgoPartial: 0,
+        twoMonthsAgoFull: 0,
+        twoMonthsAgoPartial: 0,
+        previousFull: 0,
+        previousPartial: 0,
+        current: 0,
+        projected: 0,
+        expected: 0,
+      }
+    );
 
-      <div className="ml-2 mr-2">
+    return (
+      <div className="mb-8">
+        <SectionHeader title={title} subtitle={""} />
         <Table>
           <TableHeader className="bg-gray-50">
             <TableRow>
               <TableHead rowSpan={2} className="w-[50px] text-center">#</TableHead>
-              <TableHead rowSpan={2}>Client</TableHead>
-              <TableHead colSpan={3} className="text-center border-l border-gray-300">
-                <div className="flex items-center justify-center gap-2">
-                  {format(previousMonthDate, 'MMMM yyyy')}
-                  <div className="flex items-center space-x-2">
-                    <Checkbox
-                      id="showPartial"
-                      checked={showPartialPreviousMonth}
-                      onCheckedChange={(checked) => setShowPartialPreviousMonth(checked as boolean)}
-                    />
-                    <label htmlFor="showPartial" className="text-sm text-gray-600">
-                      Until {format(previousMonthPartialDate, "EEEE, dd")}
-                    </label>
-                  </div>
-                </div>
+              <TableHead rowSpan={2} className="border-r border-gray-400">Client</TableHead>
+              <TableHead
+                colSpan={2}
+                className="text-center border-x border-gray-400"
+              >
+                {format(threeMonthsAgoDate, "MMM yyyy")}
+              </TableHead>
+              <TableHead
+                colSpan={2}
+                className="text-center border-x border-gray-400"
+              >
+                {format(twoMonthsAgoDate, "MMM yyyy")}
+              </TableHead>
+              <TableHead
+                colSpan={2}
+                className="text-center border-x border-gray-400"
+              >
+                {format(previousMonthDate, "MMM yyyy")}
+              </TableHead>
+              <TableHead
+                colSpan={3}
+                className="text-center border-x border-gray-400"
+              >
+                {format(date, "MMM yyyy")}
               </TableHead>
-              <TableHead colSpan={3} className="text-center border-l border-gray-300">{format(date, "MMMM yyyy 'until' EEEE, dd")}</TableHead>
-              <TableHead colSpan={3} className="text-center border-l border-gray-300">Difference</TableHead>
             </TableRow>
             <TableRow>
-              <TableHead onClick={() => requestSort('previous.regular')} className="text-right w-[100px] relative border-l border-gray-300 cursor-pointer hover:bg-gray-100">Regular {sortConfig.key === 'previous.regular' && (sortConfig.direction === 'asc' ? '↑' : '↓')}</TableHead>
-              <TableHead onClick={() => requestSort('previous.preContracted')} className="text-right w-[100px] relative border-l border-gray-100 cursor-pointer hover:bg-gray-100">Pre {sortConfig.key === 'previous.preContracted' && (sortConfig.direction === 'asc' ? '↑' : '↓')}</TableHead>
-              <TableHead onClick={() => requestSort('previous.total')} className="text-right w-[100px] relative font-bold border-l border-gray-100 cursor-pointer hover:bg-gray-100">Total {sortConfig.key === 'previous.total' && (sortConfig.direction === 'asc' ? '↑' : '↓')}</TableHead>
-              <TableHead onClick={() => requestSort('current.regular')} className="text-right w-[100px] relative border-l border-gray-300 cursor-pointer hover:bg-gray-100">Regular {sortConfig.key === 'current.regular' && (sortConfig.direction === 'asc' ? '↑' : '↓')}</TableHead>
-              <TableHead onClick={() => requestSort('current.preContracted')} className="text-right w-[100px] relative border-l border-gray-100 cursor-pointer hover:bg-gray-100">Pre {sortConfig.key === 'current.preContracted' && (sortConfig.direction === 'asc' ? '↑' : '↓')}</TableHead>
-              <TableHead onClick={() => requestSort('current.total')} className="text-right w-[100px] relative font-bold border-l border-gray-100 cursor-pointer hover:bg-gray-100">Total {sortConfig.key === 'current.total' && (sortConfig.direction === 'asc' ? '↑' : '↓')}</TableHead>
-              <TableHead onClick={() => requestSort('diff.regular')} className="text-right w-[100px] relative border-l border-gray-300 cursor-pointer hover:bg-gray-100">Regular {sortConfig.key === 'diff.regular' && (sortConfig.direction === 'asc' ? '↑' : '↓')}</TableHead>
-              <TableHead onClick={() => requestSort('diff.preContracted')} className="text-right w-[100px] relative border-l border-gray-100 cursor-pointer hover:bg-gray-100">Pre {sortConfig.key === 'diff.preContracted' && (sortConfig.direction === 'asc' ? '↑' : '↓')}</TableHead>
-              <TableHead onClick={() => requestSort('diff.total')} className="text-right w-[100px] relative font-bold border-l border-gray-100 cursor-pointer hover:bg-gray-100">Total {sortConfig.key === 'diff.total' && (sortConfig.direction === 'asc' ? '↑' : '↓')}</TableHead>
+              <TableHead
+                onClick={() => requestSort("threeMonthsAgoPartial", tableId)}
+                className="text-right w-[95px] border-x border-gray-200 cursor-pointer hover:bg-gray-100"
+              >
+                Until {format(threeMonthsAgoPartialDate, "dd")}{" "}
+                {sortConfig.key === "threeMonthsAgoPartial" &&
+                  (sortConfig.direction === "asc" ? "↑" : "↓")}
+              </TableHead>
+              <TableHead
+                onClick={() => requestSort("threeMonthsAgoFull", tableId)}
+                className="text-right w-[95px] border-r border-gray-400 cursor-pointer hover:bg-gray-100"
+              >
+                Full Month{" "}
+                {sortConfig.key === "threeMonthsAgoFull" &&
+                  (sortConfig.direction === "asc" ? "↑" : "↓")}
+              </TableHead>
+              <TableHead
+                onClick={() => requestSort("twoMonthsAgoPartial", tableId)}
+                className="text-right w-[95px] border-x border-gray-200 cursor-pointer hover:bg-gray-100"
+              >
+                Until {format(twoMonthsAgoPartialDate, "dd")}{" "}
+                {sortConfig.key === "twoMonthsAgoPartial" &&
+                  (sortConfig.direction === "asc" ? "↑" : "↓")}
+              </TableHead>
+              <TableHead
+                onClick={() => requestSort("twoMonthsAgoFull", tableId)}
+                className="text-right w-[95px] border-r border-gray-400 cursor-pointer hover:bg-gray-100"
+              >
+                Full Month{" "}
+                {sortConfig.key === "twoMonthsAgoFull" &&
+                  (sortConfig.direction === "asc" ? "↑" : "↓")}
+              </TableHead>
+              <TableHead
+                onClick={() => requestSort("previousPartial", tableId)}
+                className="text-right w-[95px] border-x border-gray-200 cursor-pointer hover:bg-gray-100"
+              >
+                Until {format(previousMonthPartialDate, "dd")}{" "}
+                {sortConfig.key === "previousPartial" &&
+                  (sortConfig.direction === "asc" ? "↑" : "↓")}
+              </TableHead>
+              <TableHead
+                onClick={() => requestSort("previousFull", tableId)}
+                className="text-right w-[95px] border-r border-gray-400 cursor-pointer hover:bg-gray-100"
+              >
+                Full Month{" "}
+                {sortConfig.key === "previousFull" &&
+                  (sortConfig.direction === "asc" ? "↑" : "↓")}
+              </TableHead>
+              <TableHead
+                onClick={() => requestSort("current", tableId)}
+                className="text-right cursor-pointer hover:bg-gray-100 w-[120px] border-x border-gray-200"
+              >
+                Realized{" "}
+                {sortConfig.key === "current" &&
+                  (sortConfig.direction === "asc" ? "↑" : "↓")}
+              </TableHead>
+              <TableHead
+                onClick={() => requestSort("projected", tableId)}
+                className="text-right cursor-pointer hover:bg-gray-100 w-[120px] border-x border-gray-200"
+              >
+                Projected{" "}
+                {sortConfig.key === "projected" &&
+                  (sortConfig.direction === "asc" ? "↑" : "↓")}
+              </TableHead>
+              <TableHead
+                onClick={() => requestSort("expected", tableId)}
+                className="text-right cursor-pointer hover:bg-gray-100 w-[120px] border-r border-gray-400"
+              >
+                Expected{" "}
+                {sortConfig.key === "expected" &&
+                  (sortConfig.direction === "asc" ? "↑" : "↓")}
+              </TableHead>
             </TableRow>
           </TableHeader>
           <TableBody>
             {sortedClients.map((client: any, index: number) => (
-              <TableRow key={client.name}>
-                <TableCell className="text-center text-gray-500 text-[10px] h-[57px]">{index + 1}</TableCell>
-                <TableCell className="h-[57px]">
+              <TableRow key={client.name} className="h-[57px] border-b-[1px]">
+                <TableCell className="text-center text-gray-500 text-[10px]">
+                  {index + 1}
+                </TableCell>
+                <TableCell className="border-r border-gray-400">
                   {client.slug ? (
-                    <Link href={`/about-us/clients/${client.slug}`} className="text-blue-600 hover:underline">
+                    <Link
+                      href={`/about-us/clients/${client.slug}`}
+                      className="text-blue-600 hover:underline"
+                    >
                       {client.name}
                     </Link>
                   ) : (
                     <span>{client.name}</span>
                   )}
                 </TableCell>
-                <TableCell className={`text-right w-[100px] relative h-[57px] border-l border-gray-300 text-sm ${client.previous.regular === 0 ? 'text-gray-300' : ''} ${client.previous.regular > client.current.regular ? 'bg-red-50' : ''}`}>{formatCurrency(client.previous.regular)}</TableCell>
-                <TableCell className={`text-right w-[100px] relative h-[57px] border-l border-gray-100 text-sm ${client.previous.preContracted === 0 ? 'text-gray-300' : ''} ${client.previous.preContracted > client.current.preContracted ? 'bg-red-50' : ''}`}>
-                  {formatCurrency(client.previous.preContracted)}
+                <TableCell
+                  className={`text-right border-x border-gray-200 text-[12px] ${
+                    client.threeMonthsAgoPartial === 0 ? "text-gray-300" : ""
+                  } relative`}
+                >
+                  {formatCurrency(client.threeMonthsAgoPartial)}
+                  <span className="absolute bottom-0 right-1 text-[10px] text-gray-400">
+                    {formatPercentage(
+                      client.threeMonthsAgoPartial,
+                      total.threeMonthsAgoPartial
+                    )}
+                  </span>
                 </TableCell>
-                <TableCell className={`text-right w-[100px] relative h-[57px] font-bold border-l border-gray-100 text-sm ${client.previous.total === 0 ? 'text-gray-300' : ''} ${client.previous.total > client.current.total ? 'bg-red-50' : ''}`}>{formatCurrency(client.previous.total)}</TableCell>
-                <TableCell className={`text-right w-[100px] relative h-[57px] border-l border-gray-300 text-sm ${client.current.regular === 0 ? 'text-gray-300' : ''} ${client.current.regular > client.previous.regular ? 'bg-green-50' : ''}`}>{formatCurrency(client.current.regular)}</TableCell>
-                <TableCell className={`text-right w-[100px] relative h-[57px] border-l border-gray-100 text-sm ${client.current.preContracted === 0 ? 'text-gray-300' : ''} ${client.current.preContracted > client.previous.preContracted ? 'bg-green-50' : ''}`}>
-                  {formatCurrency(client.current.preContracted)}
+                <TableCell
+                  className={`text-right border-r border-gray-400 text-[12px] ${
+                    client.threeMonthsAgoFull === 0 ? "text-gray-300" : ""
+                  } relative`}
+                >
+                  {formatCurrency(client.threeMonthsAgoFull)}
+                  <span className="absolute bottom-0 right-1 text-[10px] text-gray-400">
+                    {formatPercentage(
+                      client.threeMonthsAgoFull,
+                      total.threeMonthsAgoFull
+                    )}
+                  </span>
                 </TableCell>
-                <TableCell className={`text-right w-[100px] relative h-[57px] font-bold border-l border-gray-100 text-sm ${client.current.total === 0 ? 'text-gray-300' : ''} ${client.current.total > client.previous.total ? 'bg-green-50' : ''}`}>{formatCurrency(client.current.total)}</TableCell>
-                <TableCell className={`text-right w-[100px] relative h-[57px] border-l border-gray-300 text-sm ${(client.current.regular - client.previous.regular) === 0 ? 'text-gray-300' : ''}`}>
-                  {formatCurrency(client.current.regular - client.previous.regular)}
-                  {client.current.regular - client.previous.regular !== 0 && (
-                    <div className={`absolute bottom-1 right-2 text-[10px] ${client.current.regular > client.previous.regular ? 'text-green-600' : 'text-red-600'}`}>
-                      {new Intl.NumberFormat('en-US', {
-                        style: 'percent',
-                        minimumFractionDigits: 1,
-                        maximumFractionDigits: 1,
-                      }).format((client.current.regular - client.previous.regular) / client.previous.regular)}
-                    </div>
-                  )}
+                <TableCell
+                  className={`text-right border-x border-gray-200 text-[12px] ${
+                    client.twoMonthsAgoPartial === 0 ? "text-gray-300" : ""
+                  } relative`}
+                >
+                  {formatCurrency(client.twoMonthsAgoPartial)}
+                  <span className="absolute bottom-0 right-1 text-[10px] text-gray-400">
+                    {formatPercentage(
+                      client.twoMonthsAgoPartial,
+                      total.twoMonthsAgoPartial
+                    )}
+                  </span>
                 </TableCell>
-                <TableCell className={`text-right w-[100px] relative h-[57px] border-l border-gray-100 text-sm ${(client.current.preContracted - client.previous.preContracted) === 0 ? 'text-gray-300' : ''}`}>
-                  {formatCurrency(client.current.preContracted - client.previous.preContracted)}
-                  {client.current.preContracted - client.previous.preContracted !== 0 && (
-                    <div className={`absolute bottom-1 right-2 text-[10px] ${client.current.preContracted > client.previous.preContracted ? 'text-green-600' : 'text-red-600'}`}>
-                      {new Intl.NumberFormat('en-US', {
-                        style: 'percent',
-                        minimumFractionDigits: 1,
-                        maximumFractionDigits: 1,
-                      }).format((client.current.preContracted - client.previous.preContracted) / client.previous.preContracted)}
-                    </div>
-                  )}
+                <TableCell
+                  className={`text-right border-r border-gray-400 text-[12px] ${
+                    client.twoMonthsAgoFull === 0 ? "text-gray-300" : ""
+                  } relative`}
+                >
+                  {formatCurrency(client.twoMonthsAgoFull)}
+                  <span className="absolute bottom-0 right-1 text-[10px] text-gray-400">
+                    {formatPercentage(
+                      client.twoMonthsAgoFull,
+                      total.twoMonthsAgoFull
+                    )}
+                  </span>
                 </TableCell>
-                <TableCell className={`text-right w-[100px] relative h-[57px] font-bold border-l border-gray-100 text-sm ${(client.current.total - client.previous.total) === 0 ? 'text-gray-300' : ''}`}>
-                  {formatCurrency(client.current.total - client.previous.total)}
-                  {client.current.total - client.previous.total !== 0 && (
-                    <div className={`absolute bottom-1 right-2 text-[10px] ${client.current.total > client.previous.total ? 'text-green-600' : 'text-red-600'}`}>
-                      {new Intl.NumberFormat('en-US', {
-                        style: 'percent',
-                        minimumFractionDigits: 1,
-                        maximumFractionDigits: 1,
-                      }).format((client.current.total - client.previous.total) / client.previous.total)}
-                    </div>
-                  )}
+                <TableCell
+                  className={`text-right border-x border-gray-200 text-[12px] ${
+                    client.previousPartial === 0 ? "text-gray-300" : ""
+                  } relative`}
+                >
+                  {formatCurrency(client.previousPartial)}
+                  <span className="absolute bottom-0 right-1 text-[10px] text-gray-400">
+                    {formatPercentage(
+                      client.previousPartial,
+                      total.previousPartial
+                    )}
+                  </span>
+                </TableCell>
+                <TableCell
+                  className={`text-right border-r border-gray-400 text-[12px] ${
+                    client.previousFull === 0 ? "text-gray-300" : ""
+                  } relative`}
+                >
+                  {formatCurrency(client.previousFull)}
+                  <span className="absolute bottom-0 right-1 text-[10px] text-gray-400">
+                    {formatPercentage(client.previousFull, total.previousFull)}
+                  </span>
+                </TableCell>
+                <TableCell
+                  className={`text-right border-x border-gray-200 ${
+                    client.current === 0 ? "text-gray-300" : ""
+                  } relative`}
+                >
+                  {formatCurrency(client.current)}
+                  <span className="absolute bottom-0 right-1 text-[10px] text-gray-400">
+                    {formatPercentage(client.current, total.current)}
+                  </span>
+                </TableCell>
+                <TableCell
+                  className={`text-right border-x border-gray-200 ${
+                    client.projected === 0 ? "text-gray-300" : ""
+                  } relative`}
+                >
+                  {formatCurrency(client.projected)}
+                  <span className="absolute bottom-0 right-1 text-[10px] text-gray-400">
+                    {formatPercentage(client.projected, total.projected)}
+                  </span>
+                </TableCell>
+                <TableCell
+                  className={`text-right border-r border-gray-400 relative`}
+                >
+                  {formatCurrency(client.expected)}
+                  <span className="absolute bottom-0 right-1 text-[10px] text-gray-400">
+                    {formatPercentage(client.expected, total.expected)}
+                  </span>
                 </TableCell>
               </TableRow>
             ))}
-            <TableRow className="font-bold border-t-2">
+            <TableRow className="font-bold border-t-4 h-[57px]">
               <TableCell></TableCell>
-              <TableCell>Total</TableCell>
-              <TableCell className={`text-right w-[100px] relative h-[57px] border-l border-gray-300 text-sm ${totals.previous.regular === 0 ? 'text-gray-300' : ''} ${totals.previous.regular > totals.current.regular ? 'bg-red-50' : ''}`}>{formatCurrency(totals.previous.regular)}</TableCell>
-              <TableCell className={`text-right w-[100px] relative h-[57px] border-l border-gray-100 text-sm ${totals.previous.preContracted === 0 ? 'text-gray-300' : ''} ${totals.previous.preContracted > totals.current.preContracted ? 'bg-red-50' : ''}`}>{formatCurrency(totals.previous.preContracted)}</TableCell>
-              <TableCell className={`text-right w-[100px] relative h-[57px] font-bold border-l border-gray-100 text-sm ${totals.previous.total === 0 ? 'text-gray-300' : ''} ${totals.previous.total > totals.current.total ? 'bg-red-50' : ''}`}>{formatCurrency(totals.previous.total)}</TableCell>
-              <TableCell className={`text-right w-[100px] relative h-[57px] border-l border-gray-300 text-sm ${totals.current.regular === 0 ? 'text-gray-300' : ''} ${totals.current.regular > totals.previous.regular ? 'bg-green-50' : ''}`}>{formatCurrency(totals.current.regular)}</TableCell>
-              <TableCell className={`text-right w-[100px] relative h-[57px] border-l border-gray-100 text-sm ${totals.current.preContracted === 0 ? 'text-gray-300' : ''} ${totals.current.preContracted > totals.previous.preContracted ? 'bg-green-50' : ''}`}>{formatCurrency(totals.current.preContracted)}</TableCell>
-              <TableCell className={`text-right w-[100px] relative h-[57px] font-bold border-l border-gray-100 text-sm ${totals.current.total === 0 ? 'text-gray-300' : ''} ${totals.current.total > totals.previous.total ? 'bg-green-50' : ''}`}>{formatCurrency(totals.current.total)}</TableCell>
-              <TableCell className={`text-right w-[100px] relative h-[57px] border-l border-gray-300 text-sm ${(totals.current.regular - totals.previous.regular) === 0 ? 'text-gray-300' : ''}`}>
-                {formatCurrency(totals.current.regular - totals.previous.regular)}
-                {totals.current.regular - totals.previous.regular !== 0 && (
-                  <div className={`absolute bottom-1 right-2 text-[10px] ${totals.current.regular > totals.previous.regular ? 'text-green-600' : 'text-red-600'}`}>
-                    {new Intl.NumberFormat('en-US', {
-                      style: 'percent',
-                      minimumFractionDigits: 1,
-                      maximumFractionDigits: 1,
-                    }).format((totals.current.regular - totals.previous.regular) / totals.previous.regular)}
-                  </div>
-                )}
+              <TableCell className="border-r border-gray-400">Total</TableCell>
+              <TableCell className="text-right border-x border-gray-200 text-[12px]">
+                {formatCurrency(total.threeMonthsAgoPartial)}
+              </TableCell>
+              <TableCell className="text-right border-r border-gray-400 text-[12px]">
+                {formatCurrency(total.threeMonthsAgoFull)}
+              </TableCell>
+              <TableCell className="text-right border-x border-gray-200 text-[12px]">
+                {formatCurrency(total.twoMonthsAgoPartial)}
+              </TableCell>
+              <TableCell className="text-right border-r border-gray-400 text-[12px]">
+                {formatCurrency(total.twoMonthsAgoFull)}
+              </TableCell>
+              <TableCell className="text-right border-x border-gray-200 text-[12px]">
+                {formatCurrency(total.previousPartial)}
+              </TableCell>
+              <TableCell className="text-right border-r border-gray-400 text-[12px]">
+                {formatCurrency(total.previousFull)}
+              </TableCell>
+              <TableCell className="text-right border-x border-gray-200">
+                {formatCurrency(total.current)}
               </TableCell>
-              <TableCell className={`text-right w-[100px] relative h-[57px] border-l border-gray-100 text-sm ${(totals.current.preContracted - totals.previous.preContracted) === 0 ? 'text-gray-300' : ''}`}>
-                {formatCurrency(totals.current.preContracted - totals.previous.preContracted)}
-                {totals.current.preContracted - totals.previous.preContracted !== 0 && (
-                  <div className={`absolute bottom-1 right-2 text-[10px] ${totals.current.preContracted > totals.previous.preContracted ? 'text-green-600' : 'text-red-600'}`}>
-                    {new Intl.NumberFormat('en-US', {
-                      style: 'percent',
-                      minimumFractionDigits: 1,
-                      maximumFractionDigits: 1,
-                    }).format((totals.current.preContracted - totals.previous.preContracted) / totals.previous.preContracted)}
-                  </div>
-                )}
+              <TableCell className="text-right border-x border-gray-200">
+                {formatCurrency(total.projected)}
               </TableCell>
-              <TableCell className={`text-right w-[100px] relative h-[57px] font-bold border-l border-gray-100 text-sm ${(totals.current.total - totals.previous.total) === 0 ? 'text-gray-300' : ''}`}>
-                {formatCurrency(totals.current.total - totals.previous.total)}
-                {totals.current.total - totals.previous.total !== 0 && (
-                  <div className={`absolute bottom-1 right-2 text-[10px] ${totals.current.total > totals.previous.total ? 'text-green-600' : 'text-red-600'}`}>
-                    {new Intl.NumberFormat('en-US', {
-                      style: 'percent',
-                      minimumFractionDigits: 1,
-                      maximumFractionDigits: 1,
-                    }).format((totals.current.total - totals.previous.total) / totals.previous.total)}
-                  </div>
-                )}
+              <TableCell className="text-right border-r border-gray-400">
+                {formatCurrency(total.expected)}
               </TableCell>
             </TableRow>
           </TableBody>
         </Table>
       </div>
+    );
+  };
+
+  const renderOtherTable = (
+    title: string,
+    clients: Map<string, any>,
+    tableId: string
+  ) => {
+    const sortedClients = getSortedClients(clients, tableId);
+    const sortConfig = sortConfigs[tableId];
+    const total = sortedClients.reduce(
+      (acc, client) => ({
+        threeMonthsAgoFull: acc.threeMonthsAgoFull + client.threeMonthsAgoFull,
+        twoMonthsAgoFull: acc.twoMonthsAgoFull + client.twoMonthsAgoFull,
+        previousFull: acc.previousFull + client.previousFull,
+        current: acc.current + client.current,
+      }),
+      {
+        threeMonthsAgoFull: 0,
+        twoMonthsAgoFull: 0,
+        previousFull: 0,
+        current: 0,
+      }
+    );
+
+    return (
+      <div className="mb-8">
+        <SectionHeader title={title} subtitle={""} />
+        <div className="px-2">
+          <Table>
+            <TableHeader className="bg-gray-50">
+              <TableRow>
+                <TableHead className="w-[50px] text-center">#</TableHead>
+                <TableHead>Client</TableHead>
+                <TableHead
+                  onClick={() => requestSort("threeMonthsAgoFull", tableId)}
+                  className="text-center border-x w-[95px] cursor-pointer hover:bg-gray-100"
+                >
+                  {format(threeMonthsAgoDate, "MMM yyyy")}{" "}
+                  {sortConfig.key === "threeMonthsAgoFull" &&
+                    (sortConfig.direction === "asc" ? "↑" : "↓")}
+                </TableHead>
+                <TableHead
+                  onClick={() => requestSort("twoMonthsAgoFull", tableId)}
+                  className="text-center border-x w-[95px] cursor-pointer hover:bg-gray-100"
+                >
+                  {format(twoMonthsAgoDate, "MMM yyyy")}{" "}
+                  {sortConfig.key === "twoMonthsAgoFull" &&
+                    (sortConfig.direction === "asc" ? "↑" : "↓")}
+                </TableHead>
+                <TableHead
+                  onClick={() => requestSort("previousFull", tableId)}
+                  className="text-center border-x w-[95px] cursor-pointer hover:bg-gray-100"
+                >
+                  {format(previousMonthDate, "MMM yyyy")}{" "}
+                  {sortConfig.key === "previousFull" &&
+                    (sortConfig.direction === "asc" ? "↑" : "↓")}
+                </TableHead>
+                <TableHead
+                  onClick={() => requestSort("current", tableId)}
+                  className="text-center border-x w-[120px] cursor-pointer hover:bg-gray-100"
+                >
+                  {format(date, "MMM yyyy")}{" "}
+                  {sortConfig.key === "current" &&
+                    (sortConfig.direction === "asc" ? "↑" : "↓")}
+                </TableHead>
+              </TableRow>
+            </TableHeader>
+            <TableBody>
+              {sortedClients.map((client: any, index: number) => (
+                <TableRow key={client.name} className="h-[57px]">
+                  <TableCell className="text-center text-gray-500 text-[10px]">
+                    {index + 1}
+                  </TableCell>
+                  <TableCell>
+                    {client.slug ? (
+                      <Link
+                        href={`/about-us/clients/${client.slug}`}
+                        className="text-blue-600 hover:underline"
+                      >
+                        {client.name}
+                      </Link>
+                    ) : (
+                      <span>{client.name}</span>
+                    )}
+                  </TableCell>
+                  <TableCell
+                    className={`text-right border-x text-[12px] ${
+                      client.threeMonthsAgoFull === 0 ? "text-gray-300" : ""
+                    } relative`}
+                  >
+                    {formatCurrency(client.threeMonthsAgoFull)}
+                    <span className="absolute bottom-0 right-1 text-[10px] text-gray-400">
+                      {formatPercentage(
+                        client.threeMonthsAgoFull,
+                        total.threeMonthsAgoFull
+                      )}
+                    </span>
+                  </TableCell>
+                  <TableCell
+                    className={`text-right border-x text-[12px] ${
+                      client.twoMonthsAgoFull === 0 ? "text-gray-300" : ""
+                    } relative`}
+                  >
+                    {formatCurrency(client.twoMonthsAgoFull)}
+                    <span className="absolute bottom-0 right-1 text-[10px] text-gray-400">
+                      {formatPercentage(
+                        client.twoMonthsAgoFull,
+                        total.twoMonthsAgoFull
+                      )}
+                    </span>
+                  </TableCell>
+                  <TableCell
+                    className={`text-right border-x text-[12px] ${
+                      client.previousFull === 0 ? "text-gray-300" : ""
+                    } relative`}
+                  >
+                    {formatCurrency(client.previousFull)}
+                    <span className="absolute bottom-0 right-1 text-[10px] text-gray-400">
+                      {formatPercentage(
+                        client.previousFull,
+                        total.previousFull
+                      )}
+                    </span>
+                  </TableCell>
+                  <TableCell
+                    className={`text-right border-x ${
+                      client.current === 0 ? "text-gray-300" : ""
+                    } relative`}
+                  >
+                    {formatCurrency(client.current)}
+                    <span className="absolute bottom-0 right-1 text-[10px] text-gray-400">
+                      {formatPercentage(client.current, total.current)}
+                    </span>
+                  </TableCell>
+                </TableRow>
+              ))}
+              <TableRow className="font-bold border-t-2 h-[57px]">
+                <TableCell></TableCell>
+                <TableCell>Total</TableCell>
+                <TableCell className="text-right border-x text-[12px]">
+                  {formatCurrency(total.threeMonthsAgoFull)}
+                </TableCell>
+                <TableCell className="text-right border-x text-[12px]">
+                  {formatCurrency(total.twoMonthsAgoFull)}
+                </TableCell>
+                <TableCell className="text-right border-x text-[12px]">
+                  {formatCurrency(total.previousFull)}
+                </TableCell>
+                <TableCell className="text-right border-x">
+                  {formatCurrency(total.current)}
+                </TableCell>
+              </TableRow>
+            </TableBody>
+          </Table>
+        </div>
+      </div>
+    );
+  };
+
+  return (
+    <div className="flex flex-col gap-6">
+      <div className="flex items-center">
+        <DatePicker date={date} onSelectedDateChange={setDate} />
+      </div>
+
+      <div className="ml-2 mr-2">
+        {renderConsultingTable("Consulting", consultingClients, "consulting")}
+        {renderOtherTable(
+          "Consulting Pre",
+          consultingPreClients,
+          "consultingPre"
+        )}
+        {renderOtherTable("Hands On", handsOnClients, "handsOn")}
+        {renderOtherTable("Squad", squadClients, "squad")}
+      </div>
     </div>
   );
 }
diff --git a/frontend/src/app/analytics/revenue-forecast/query.ts b/frontend/src/app/analytics/revenue-forecast/query.ts
index 84ab23d8..e47466a7 100644
--- a/frontend/src/app/analytics/revenue-forecast/query.ts
+++ b/frontend/src/app/analytics/revenue-forecast/query.ts
@@ -1,7 +1,7 @@
 import { gql } from "@apollo/client";
 
 export const REVENUE_FORECAST_QUERY = gql`
-  query RevenueForecast($inAnalysisDate: Date!, $previousMonthDate: Date!, $previousMonthPartialDate: Date!) {
+  query RevenueForecast($inAnalysisDate: Date!, $previousMonthDate: Date!, $previousMonthPartialDate: Date!, $twoMonthsAgoDate: Date!, $twoMonthsAgoPartialDate: Date!, $threeMonthsAgoDate: Date!, $threeMonthsAgoPartialDate: Date!) {
     in_analysis: revenueTracking(dateOfInterest: $inAnalysisDate) {
       summaries {
         byClient {
@@ -9,6 +9,10 @@ export const REVENUE_FORECAST_QUERY = gql`
           slug
           regular
           preContracted
+          consultingFee
+          consultingPreFee
+          handsOnFee
+          squadFee
           total
         }
       }
@@ -21,6 +25,10 @@ export const REVENUE_FORECAST_QUERY = gql`
           slug
           regular
           preContracted
+          consultingFee
+          consultingPreFee
+          handsOnFee
+          squadFee
           total
         }
       }
@@ -35,6 +43,74 @@ export const REVENUE_FORECAST_QUERY = gql`
           slug
           regular
           preContracted
+          consultingFee
+          consultingPreFee
+          handsOnFee
+          squadFee
+          total
+        }
+      }
+    }
+
+    two_months_ago: revenueTracking(dateOfInterest: $twoMonthsAgoDate) {
+      summaries {
+        byClient {
+          name
+          slug
+          regular
+          preContracted
+          consultingFee
+          consultingPreFee
+          handsOnFee
+          squadFee
+          total
+        }
+      }
+    }
+
+    two_months_ago_partial: revenueTracking(dateOfInterest: $twoMonthsAgoPartialDate) {
+      summaries {
+        byClient {
+          name
+          slug
+          regular
+          preContracted
+          consultingFee
+          consultingPreFee
+          handsOnFee
+          squadFee
+          total
+        }
+      }
+    }
+
+    three_months_ago: revenueTracking(dateOfInterest: $threeMonthsAgoDate) {
+      summaries {
+        byClient {
+          name
+          slug
+          regular
+          preContracted
+          consultingFee
+          consultingPreFee
+          handsOnFee
+          squadFee
+          total
+        }
+      }
+    }
+
+    three_months_ago_partial: revenueTracking(dateOfInterest: $threeMonthsAgoPartialDate) {
+      summaries {
+        byClient {
+          name
+          slug
+          regular
+          preContracted
+          consultingFee
+          consultingPreFee
+          handsOnFee
+          squadFee
           total
         }
       }
diff --git a/frontend/src/app/components/OmniCommands.tsx b/frontend/src/app/components/OmniCommands.tsx
index 3d1957f1..5ba02456 100644
--- a/frontend/src/app/components/OmniCommands.tsx
+++ b/frontend/src/app/components/OmniCommands.tsx
@@ -10,10 +10,11 @@ import {
   CommandItem,
   CommandList,
 } from "@/components/ui/command"
-import { 
-  getAnalyticsSidebarItems, 
-  getAboutUsSidebarItems, 
-  getAdministrativeSidebarItems 
+import {
+  getAnalyticsSidebarItems,
+  getAboutUsSidebarItems,
+  getAdministrativeSidebarItems,
+  getFinancialSidebarItems
 } from "@/app/navigation"
 import { Button } from "@/components/ui/button"
 import { MagnifyingGlassIcon } from "@radix-ui/react-icons"
@@ -80,16 +81,19 @@ export function OmniCommands({ open, setOpen }: OmniCommandsProps) {
   const router = useRouter()
   const { data } = useQuery(GET_CONSULTANTS)
   const { data: session } = useSession();
+  const [finantialsItems, setFinantialsItems] = React.useState<Array<{ title: string; url: string; icon: any }>>([])
   const [analyticsItems, setAnalyticsItems] = React.useState<Array<{ title: string; url: string; icon: any }>>([])
   const [aboutUsItems, setAboutUsItems] = React.useState<Array<{ title: string; url: string; icon: any }>>([])
   const [adminItems, setAdminItems] = React.useState<Array<{ title: string; url: string; icon: any }>>([])
 
   React.useEffect(() => {
     async function loadItems() {
+      const finantials = await getFinancialSidebarItems(session?.user?.email)
       const analytics = await getAnalyticsSidebarItems(session?.user?.email)
       const aboutUs = await getAboutUsSidebarItems()
       const admin = await getAdministrativeSidebarItems()
       
+      setFinantialsItems(finantials)
       setAnalyticsItems(analytics)
       setAboutUsItems(aboutUs)
       setAdminItems(admin)
@@ -118,7 +122,17 @@ export function OmniCommands({ open, setOpen }: OmniCommandsProps) {
       <CommandInput placeholder="Type a command or search..." />
       <CommandList>
         <CommandEmpty>No results found.</CommandEmpty>
-        
+        <CommandGroup heading="Financial">
+          {finantialsItems.map((item) => (
+              <CommandItem
+                key={item.url}
+                onSelect={() => runCommand(() => router.push(item.url))}
+              >
+                <item.icon className="mr-2 h-4 w-4" />
+                {item.title}
+              </CommandItem>
+          ))}
+        </CommandGroup>
         <CommandGroup heading="Analytics">
           {analyticsItems.map((item) => (
             <CommandItem
diff --git a/frontend/src/app/permissions.ts b/frontend/src/app/permissions.ts
index a96e25cb..9aed130c 100644
--- a/frontend/src/app/permissions.ts
+++ b/frontend/src/app/permissions.ts
@@ -15,6 +15,10 @@ export const FINANCIAL_USERS = [
   
     switch (permission) {
       case 'financial':
+        const username = email.split('@')[0];
+        if (FINANCIAL_USERS.some(financialEmail => financialEmail.startsWith(username + '@'))) {
+            return true;
+        }
         return FINANCIAL_USERS.includes(email as any);
       case 'admin':
         return email.endsWith('@eximia.co') || email.endsWith('@elemarjr.com');