From d0d6f31095a20b95359f2d9ddfce11c09882ad30 Mon Sep 17 00:00:00 2001
From: Ahmon <ahmonembaye@gmail.com>
Date: Sat, 26 Apr 2025 00:49:56 -0700
Subject: [PATCH 01/16] [add] feat: Implement auth checks in CourseMap, enhance
 UI

- Add authentication checks to CourseMap component to handle logged-in/out states, disabling features and preventing API calls for logged-out users.
- Replace navigation Links with styled Buttons in App and AgreementViewerPage.
- Introduce CustomCourseNode for React Flow and apply it in CourseMap.
- Overhaul application styling in App.css for a modern look and feel.

fix: Correct major/dept fetching and API category code

- Fix bug in AgreementViewerPage where 'dept' category was not fetched correctly if 'major' returned empty.
- Fix bug in college_transfer_API.py where category_code was sometimes hardcoded instead of using the provided parameter.

refactor: Improve caching, state management, and logging

- Refine caching logic for majors and images in AgreementViewerPage.
- Improve state management and cache updates in CourseMap for map creation, loading, saving, and deletion.
- Add console logs to PdfViewer for debugging.
---
 .../college_transfer_API.py                   |  10 +-
 src/App.css                                   | 142 ++++++++++------
 src/App.jsx                                   |  34 +++-
 src/components/AgreementViewerPage.jsx        | 131 ++++++++++-----
 src/components/CourseMap.jsx                  | 151 +++++++++++++-----
 src/components/CustomCourseNode.jsx           |  55 +++++++
 src/components/PdfViewer.jsx                  |   5 +
 7 files changed, 396 insertions(+), 132 deletions(-)
 create mode 100644 src/components/CustomCourseNode.jsx

diff --git a/backend/college_transfer_ai/college_transfer_API.py b/backend/college_transfer_ai/college_transfer_API.py
index fc71d86..0c432bf 100644
--- a/backend/college_transfer_ai/college_transfer_API.py
+++ b/backend/college_transfer_ai/college_transfer_API.py
@@ -69,7 +69,7 @@ def get_all_majors(self, sending_institution_id, receiving_institution_id, acade
         # sending_institution_id = 61
         # receiving_institution_id = 79
         # academic_year_id = 75
-        # category_code = "major"
+        category_code = "major"
 
         # Define the API endpoint and parameters
 
@@ -108,8 +108,14 @@ def get_major_from_key(self, key):
         sending_institution_id = int(keyArray[1])
         receiving_institution_id = int(keyArray[3])
         academic_year_id = int(keyArray[0])
+        category_code = "major"
+
+        if "Department" in key:
+            category_code = "dept"
+
+        url = f"https://assist.org/api/agreements?receivingInstitutionId={receiving_institution_id}&sendingInstitutionId={sending_institution_id}&academicYearId={academic_year_id}&categoryCode={category_code}"
 
-        url = f"https://assist.org/api/agreements?receivingInstitutionId={receiving_institution_id}&sendingInstitutionId={sending_institution_id}&academicYearId={academic_year_id}&categoryCode=major"
+        print(url)
 
         result = requests.get(url)
 
diff --git a/src/App.css b/src/App.css
index 6e2e23c..7749adb 100644
--- a/src/App.css
+++ b/src/App.css
@@ -1,129 +1,181 @@
 /* Reset and Base Styles */
+@keyframes fadeIn {
+  from { opacity: 0; transform: translateY(10px); }
+  to { opacity: 1; transform: translateY(0); }
+}
+
+
 body {
-  font-family: Arial, Helvetica, sans-serif; /* Common sans-serif font */
+  /* Use a modern system font stack */
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   margin: 0;
   padding: 0;
-  background-color: #f0f0f0; /* Light gray background like assist.org */
-  color: #333; /* Standard dark text color */
+  /* Placeholder background - replace with actual college images */
+  background-size: cover;
+  background-position: center;
+  background-attachment: fixed; /* Keep background fixed during scroll */
+  color: #333;
   line-height: 1.6;
+  font-size: 16px; /* Slightly larger base font */
 }
 
 /* Container for centering content */
 #root > div { /* Target the main div rendered by React */
-  margin: 20px auto; /* Center the container */
-  padding: 20px;
-  background-color: #fff; /* White background for content area */
-  border: 1px solid #ccc; /* Subtle border */
-  box-shadow: 0 2px 4px rgba(0,0,0,0.1); /* Slight shadow */
+  margin: 40px auto; /* More vertical margin */
+  padding: 30px 40px; /* Increased padding */
+  /* Slightly transparent white background */
+  background-color: rgba(255, 255, 255, 0.95);
+  border: 1px solid #e0e0e0; /* Softer border */
+  border-radius: 8px; /* Rounded corners */
+  box-shadow: 0 6px 18px rgba(0,0,0,0.12); /* Slightly stronger shadow */
+  /* Add a subtle fade-in animation */
+  animation: fadeIn 0.5s ease-out forwards;
 }
 
 h1, h2, h3 {
-  color: #003366; /* Dark blue for headings */
+  color: #1a2b4d; /* Darker, less saturated blue */
   margin-top: 0;
+  margin-bottom: 1em; /* Consistent bottom margin */
+  font-weight: 600; /* Slightly bolder */
+}
+
+h1 {
+  font-size: 2.2em; /* Larger H1 */
+  text-align: center; /* Center main title */
+  margin-bottom: 1.5em;
 }
 
 /* Form Styling */
 .form-group {
-  margin-bottom: 1rem;
-  position: relative; /* Needed for absolute positioning of dropdown */
+  margin-bottom: 1.5rem; /* Increased spacing */
+  position: relative;
+  /* Add transition for potential future effects */
+  transition: all 0.3s ease-in-out;
 }
 
 label {
   display: block;
-  margin-bottom: 0.5rem;
-  font-weight: bold;
+  margin-bottom: 0.6rem;
+  font-weight: 500; /* Medium weight */
   color: #555;
+  font-size: 0.95em;
 }
 
 input[type="text"],
-select { /* Style both text inputs and selects similarly */
-  padding: 8px 12px;
-  width: 100%; /* Full width within the container */
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  box-sizing: border-box; /* Include padding and border in width */
+select {
+  padding: 12px 15px; /* More padding */
+  width: 100%;
+  border: 1px solid #d1d5db; /* Slightly darker border */
+  border-radius: 6px; /* More rounded corners */
+  box-sizing: border-box;
   font-size: 1rem;
+  transition: border-color 0.2s ease, box-shadow 0.2s ease; /* Smooth transitions */
+}
+
+input[type="text"]:focus,
+select:focus {
+  outline: none;
+  border-color: #3b82f6; /* Blue focus border */
+  box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.3); /* Subtle blue glow */
 }
 
 input[type="text"]:disabled {
-  background-color: #e9ecef; /* Gray out disabled inputs */
+  background-color: #f3f4f6; /* Lighter disabled background */
   cursor: not-allowed;
+  color: #9ca3af;
 }
 
 /* Button Styling */
 button {
-  background-color: #005ea2; /* Assist.org primary blue */
+  background-image: linear-gradient(to right, #3b82f6, #2563eb); /* Blue gradient */
   color: white;
   border: none;
-  padding: 10px 20px;
-  border-radius: 4px;
+  padding: 12px 25px; /* More padding */
+  border-radius: 6px;
   cursor: pointer;
-  font-size: 1rem;
-  transition: background-color 0.2s ease;
-  display: inline-block; /* Allow setting width if needed, but default to content size */
-  width: auto; /* Override previous 100% width */
-  margin-bottom: 0; /* Remove default margin */
+  font-size: 1.05rem; /* Slightly larger font */
+  font-weight: 500;
+  transition: all 0.2s ease; /* Transition all properties */
+  display: inline-block;
+  width: auto;
+  margin-bottom: 0;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1); /* Subtle shadow */
 }
 
 button:hover {
-  background-color: #003366; /* Darker blue on hover */
+  background-image: linear-gradient(to right, #2563eb, #1d4ed8); /* Darker gradient on hover */
+  box-shadow: 0 4px 8px rgba(0,0,0,0.15); /* Slightly larger shadow on hover */
+  transform: translateY(-2px); /* Slightly more lift effect */
+}
+
+button:active {
+    transform: translateY(0); /* Remove lift on click */
+    box-shadow: 0 1px 2px rgba(0,0,0,0.1);
 }
 
 button:disabled {
-  background-color: #a0a0a0; /* Gray out disabled button */
+  background-image: none; /* Remove gradient */
+  background-color: #9ca3af; /* Gray out disabled button */
   cursor: not-allowed;
+  box-shadow: none;
+  transform: none;
 }
 
 /* Result Area */
 .result {
   margin-top: 25px;
-  padding: 15px;
+  padding: 20px; /* Increased padding */
   border: 1px solid #ddd;
-  background-color: #f8f8f8;
-  border-radius: 4px;
+  background-color: #f8f9fa; /* Slightly different background */
+  border-radius: 6px; /* Match other elements */
+  animation: fadeIn 0.5s ease-out forwards; /* Fade in results */
 }
 
 .result h3 {
   margin-top: 0;
-  color: #555;
+  color: #495057; /* Slightly darker heading */
 }
 
 /* Dropdown Styling */
 .dropdown {
   position: absolute;
   background-color: white;
-  border: 1px solid #ccc;
-  border-top: none; /* Attach visually to input */
+  border: 1px solid #d1d5db; /* Match input border */
+  border-top: none;
   max-height: 250px;
   overflow-y: auto;
-  width: 100%; /* Match input width */
+  width: 100%;
   box-sizing: border-box;
   z-index: 1000;
-  box-shadow: 0 4px 8px rgba(0,0,0,0.1);
-  border-radius: 0 0 4px 4px; /* Rounded bottom corners */
+  box-shadow: 0 6px 12px rgba(0,0,0,0.1); /* Slightly larger shadow */
+  border-radius: 0 0 6px 6px; /* Match input rounding */
+  margin-top: -1px; /* Overlap slightly with input */
 }
 
 .dropdown-item {
-  padding: 8px 12px;
+  padding: 10px 15px; /* More padding */
   cursor: pointer;
   font-size: 0.95rem;
-  border-bottom: 1px solid #eee; /* Separator lines */
+  border-bottom: 1px solid #f3f4f6; /* Lighter separator */
+  transition: background-color 0.15s ease, color 0.15s ease; /* Smooth hover */
 }
 .dropdown-item:last-child {
   border-bottom: none;
 }
 
 .dropdown-item:hover {
-  background-color: #e9f5ff; /* Light blue hover */
-  color: #005ea2;
+  background-color: #eff6ff; /* Very light blue hover */
+  color: #1d4ed8; /* Darker blue text on hover */
 }
 
-/* Link Styling (e.g., Back to Form in PdfViewer) */
+/* Link Styling */
 a {
-  color: #005ea2;
+  color: #2563eb; /* Match button blue */
   text-decoration: none;
+  transition: color 0.2s ease;
 }
 
 a:hover {
+  color: #1d4ed8; /* Darker blue on hover */
   text-decoration: underline;
 }
\ No newline at end of file
diff --git a/src/App.jsx b/src/App.jsx
index 2c05e64..27c3761 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
-import { Routes, Route, Link, useNavigate } from 'react-router-dom';
+// Import useNavigate
+import { Routes, Route, useNavigate } from 'react-router-dom';
 import { GoogleLogin, googleLogout } from '@react-oauth/google';
 import { jwtDecode } from "jwt-decode";
 import CollegeTransferForm from './components/CollegeTransferForm';
@@ -46,7 +47,7 @@ function App() {
     return null; // Default to null
   });
 
-  const navigate = useNavigate();
+  const navigate = useNavigate(); // Get navigate function
 
   // Function to handle successful login
   const handleLoginSuccess = (credentialResponse) => {
@@ -105,19 +106,39 @@ function App() {
       {/* Navigation/Header remains the same */}
       <nav style={{ padding: '10px 20px', backgroundColor: '#eee', borderBottom: '1px solid #ccc', display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
         <div>
-          <Link to="/" style={{ marginRight: '15px' }}>Home</Link>
-          {user && <Link to="/course-map">Course Map</Link>}
+          {/* Replace Link with button and onClick */}
+          <button 
+            onClick={() => navigate('/')} 
+            className="btn btn-primary" 
+            style={{ marginRight: '15px' }} // Keep margin separate if needed
+          >
+            Home
+          </button>
+          {/* Replace Link with button and onClick */}
+          <button 
+            onClick={() => navigate('/course-map')}
+            className="btn btn-secondary"
+          >
+            Course Map
+          </button>
         </div>
         <div>
           {user ? (
             <>
               <span style={{ marginRight: '10px', fontSize: '0.9em' }}>Welcome, {user.name || user.email}!</span>
-              <button onClick={handleLogout}>Logout</button>
+              {/* Style the logout button similarly */}
+              <button 
+                onClick={handleLogout}
+                className="btn btn-danger"
+              >
+                Logout
+              </button>
             </>
           ) : (
             <GoogleLogin
               onSuccess={handleLoginSuccess}
               onError={handleLoginError}
+              // Note: Styling the GoogleLogin button directly might require specific props or wrapper elements
             />
           )}
         </div>
@@ -132,7 +153,8 @@ function App() {
         />
         <Route
           path="/course-map"
-          element={user ? <CourseMap user={user} /> : <p>Please log in to view the course map.</p>}
+          // Always render CourseMap, pass user (null if not logged in)
+          element={<CourseMap user={user} />}
         />
       </Routes>
     </>
diff --git a/src/components/AgreementViewerPage.jsx b/src/components/AgreementViewerPage.jsx
index 77bb0fa..6072889 100644
--- a/src/components/AgreementViewerPage.jsx
+++ b/src/components/AgreementViewerPage.jsx
@@ -1,5 +1,6 @@
 import React, { useState, useEffect, useMemo, useRef, useCallback } from 'react';
-import { useParams, Link } from 'react-router-dom';
+// Import useNavigate and remove Link if no longer needed
+import { useParams, useNavigate } from 'react-router-dom'; 
 import { fetchData } from '../services/api';
 import PdfViewer from './PdfViewer';
 import ChatInterface from './ChatInterface';
@@ -12,6 +13,7 @@ const fixedMajorsWidth = 300; // Revert to fixed width for majors
 
 function AgreementViewerPage() {
     const { sendingId, receivingId, yearId } = useParams();
+    const navigate = useNavigate(); // Get navigate function
 
     // --- State for resizing ---
     // Only need state for the chat column width now
@@ -51,7 +53,7 @@ function AgreementViewerPage() {
             return;
         }
 
-        // Generate a unique cache key for this combination
+        // Generate a unique cache key for this combination (initially for major)
         const cacheKey = `majors-${sendingId}-${receivingId}-${yearId}`;
         let cachedMajors = null;
 
@@ -71,35 +73,70 @@ function AgreementViewerPage() {
             localStorage.removeItem(cacheKey); // Clear potentially corrupted cache entry
         }
 
-        // 2. If not cached or cache failed, fetch from API
-        console.log("Fetching majors from API:", cacheKey);
+        // 2. Fetch from API (try 'major' first)
+        console.log("Fetching majors (category: major) from API:", cacheKey);
         setIsLoadingMajors(true);
         setError(null);
-        fetchData(`majors?sendingInstitutionId=${sendingId}&receivingInstitutionId=${receivingId}&academicYearId=${yearId}&categoryCode=major`)
-            .then(data => {
-                if (data && Object.keys(data).length === 0) { // Check if data is not null/undefined before checking keys
-                    setError("No majors found for the selected combination.");
+
+        const fetchMajors = async (category) => {
+            try {
+                const data = await fetchData(`majors?sendingInstitutionId=${sendingId}&receivingInstitutionId=${receivingId}&academicYearId=${yearId}&categoryCode=${category}`);
+                return data; // Return the fetched data
+            } catch (err) {
+                console.error(`Error fetching majors (category: ${category}):`, err);
+                // Throw the error to be caught by the main catch block
+                throw new Error(`Failed to load majors (category: ${category}): ${err.message}`);
+            }
+        };
+
+        fetchMajors('major')
+            .then(majorData => {
+                console.log("Initial fetch (major) returned:", majorData); // Add for debugging
+                // Check if the first fetch returned null, undefined, OR an empty object
+                if (majorData === null || typeof majorData === 'undefined' || (typeof majorData === 'object' && Object.keys(majorData).length === 0)) {
+                    console.log("Major data was null, undefined, or empty object. Trying category: dept");
+                    // Retry with 'dept'
+                    return fetchMajors('dept'); // Return the promise for the second fetch
+                } else {
+                    // First fetch was successful and has data, return its data
+                    console.log("Using data from 'major' category.");
+                    return majorData;
+                }
+            })
+            .then(finalData => {
+                // *** ADD LOG HERE ***
+                console.log("Processing finalData (from major or dept):", finalData);
+
+                if (finalData && Object.keys(finalData).length === 0) {
+                    console.log("Setting error: No majors or departments found..."); // Log before setting error
+                    setError("No majors or departments found for the selected combination.");
                     setMajors({});
-                } else if (data) { // Check if data is not null/undefined
-                    setMajors(data);
+                } else if (finalData) {
+                    console.log("Setting majors data:", finalData); // Log before setting state
+                    setMajors(finalData);
+                    setError(null); // Clear any previous error if data is found
+                    // Cache the successful result (regardless of which category worked)
                     try {
-                        localStorage.setItem(cacheKey, JSON.stringify(data));
-                        console.log("Saved majors to cache:", cacheKey);
+                        localStorage.setItem(cacheKey, JSON.stringify(finalData));
+                        console.log("Saved final majors/depts data to cache:", cacheKey);
                     } catch (e) {
-                        console.error("Failed to save majors to cache:", e);
+                        console.error("Failed to save final majors/depts data to cache:", e);
                     }
                 } else {
-                     // Handle cases where fetchData might return null or undefined unexpectedly
-                     setError("Received unexpected empty response when fetching majors.");
-                     setMajors({});
+                    console.log("Setting error: Received unexpected empty response."); // Log before setting error
+                    setError("Received unexpected empty response when fetching majors/departments.");
+                    setMajors({});
                 }
             })
             .catch(err => {
-                console.error("Error fetching majors:", err);
-                setError(`Failed to load majors: ${err.message}`);
+                // *** ADD LOG HERE ***
+                console.error("Caught error in majors fetch chain:", err);
+                setError(err.message || "An error occurred fetching majors/departments.");
                 setMajors({});
             })
             .finally(() => {
+                // *** ADD LOG HERE ***
+                console.log("Majors fetch chain finally block executing.");
                 setIsLoadingMajors(false);
             });
 
@@ -181,29 +218,6 @@ function AgreementViewerPage() {
         }
     };
 
-    // Filter majors based on search term
-    const filteredMajors = useMemo(() => {
-        const lowerCaseSearchTerm = majorSearchTerm.toLowerCase();
-        // Ensure majors is an object before trying to get entries
-        if (typeof majors !== 'object' || majors === null) {
-            return [];
-        }
-        return Object.entries(majors).filter(([name]) =>
-            name.toLowerCase().includes(lowerCaseSearchTerm)
-        );
-    }, [majors, majorSearchTerm]);
-
-    // --- Resizing Logic (Simplified for one divider) ---
-    const handleMouseDown = useCallback((e) => {
-        e.preventDefault();
-        isResizingRef.current = true;
-        // Add the *same* memoized handleMouseMove function as the listener
-        window.addEventListener('mousemove', handleMouseMove);
-        window.addEventListener('mouseup', handleMouseUp);
-        document.body.style.cursor = 'col-resize';
-        document.body.style.userSelect = 'none';
-    }, []); // handleMouseMove is stable now, so no need to list it if it doesn't change
-
     const handleMouseMove = useCallback((e) => { // Keep useCallback, but dependencies change
         if (!isResizingRef.current || !containerRef.current) {
             return;
@@ -247,6 +261,33 @@ function AgreementViewerPage() {
     // Ensure handleMouseMove is included if it's used inside, though it's stable now
     }, [handleMouseMove]);
 
+    // Filter majors based on search term
+    const filteredMajors = useMemo(() => {
+        const lowerCaseSearchTerm = majorSearchTerm.toLowerCase();
+        // Ensure majors is an object before trying to get entries
+        if (typeof majors !== 'object' || majors === null) {
+            return [];
+        }
+        return Object.entries(majors).filter(([name]) =>
+            name.toLowerCase().includes(lowerCaseSearchTerm)
+        );
+    }, [majors, majorSearchTerm]);
+
+    // --- Resizing Logic (Simplified for one divider) ---
+    const handleMouseDown = useCallback((e) => {
+        e.preventDefault();
+        isResizingRef.current = true;
+        // Add the *same* memoized handleMouseMove function as the listener
+        window.addEventListener('mousemove', handleMouseMove);
+        window.addEventListener('mouseup', handleMouseUp);
+        document.body.style.cursor = 'col-resize';
+        document.body.style.userSelect = 'none';
+    }, [handleMouseMove, handleMouseUp]); // handleMouseMove is stable now, so no need to list it if it doesn't change
+
+    
+
+    
+
     // Cleanup listeners
     useEffect(() => {
         // Define cleanup using the memoized handleMouseMove
@@ -294,7 +335,13 @@ function AgreementViewerPage() {
                 <button onClick={toggleMajorsVisibility} style={{ marginRight: '2em' }}>
                     {isMajorsVisible ? 'Hide Majors' : 'Show Majors'}
                 </button>
-                 <Link to="/">Back to Form</Link>
+                 {/* Replace Link with button and onClick */}
+                 <button 
+                    onClick={() => navigate('/')} 
+                    className="btn btn-secondary" 
+                 >
+                    Back to Form
+                 </button>
             </div>
 
             {/* Main container using Flexbox */}
diff --git a/src/components/CourseMap.jsx b/src/components/CourseMap.jsx
index d5710b8..dbeddd8 100644
--- a/src/components/CourseMap.jsx
+++ b/src/components/CourseMap.jsx
@@ -1,12 +1,13 @@
 // filepath: c:\Users\notto\Desktop\Desktop\Projects\CollegeTransferAI\src\components\CourseMap.jsx
-import React, { useState, useCallback, useRef, useEffect } from 'react';
+import React, { useState, useCallback, useRef, useEffect, useMemo } from 'react'; // Added useMemo
 import ReactFlow, {
   Controls, Background, addEdge, MiniMap, BackgroundVariant,
   ReactFlowProvider, useReactFlow, useNodesState, useEdgesState,
+  Position // Import Position
 } from 'reactflow';
 import 'reactflow/dist/style.css';
 import { fetchData } from '../services/api';
-
+import CustomCourseNode from './CustomCourseNode'; // Import the custom node
 
 // --- Default/Initial Data (used for NEW maps) ---
 const defaultNodes = []; // Start new maps empty
@@ -81,7 +82,7 @@ const removeFromCache = (key) => {
 // --- End Helper Functions for Cache ---
 
 
-function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
+function CourseMapFlow({ user }) { // user object now contains id, idToken, etc. or is null
   const reactFlowWrapper = useRef(null);
   const { screenToFlowPosition } = useReactFlow();
   const [nodes, setNodes, onNodesChange] = useNodesState(defaultNodes);
@@ -98,12 +99,15 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
   const [isMapListLoading, setIsMapListLoading] = useState(true);
   // --- End State for Multiple Maps ---
 
+  const isLoggedIn = !!user; // Check if user object exists
+
   const userId = user?.id; // Get user ID for cache keys
 
   // --- Load Map List (with Cache) ---
   const loadMapList = useCallback(async (forceRefresh = false) => {
     const cacheKey = getCacheKey('courseMapList', userId);
-    if (!userId) {
+    // If not logged in, don't attempt to load or cache user-specific lists
+    if (!isLoggedIn) {
         setMapList([]);
         setIsMapListLoading(false);
         return [];
@@ -152,11 +156,12 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
     } finally {
       setIsMapListLoading(false);
     }
-  }, [userId, user?.idToken]); // Depend on userId and token
+  }, [userId, user?.idToken, isLoggedIn]); // Add isLoggedIn dependency
 
   const handleNewMap = useCallback(async () => {
-    if (!userId || !user?.idToken) {
-      setSaveStatus("Please log in to create a map.");
+    // Check isLoggedIn first
+    if (!isLoggedIn) {
+      setSaveStatus("Please log in to create a new map.");
       return;
     }
 
@@ -236,12 +241,24 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
     } finally {
       setIsLoading(false); // Hide loading state
     }
-  }, [userId, user?.idToken, setNodes, setEdges, setMapList]); // Added setMapList dependency
+  }, [userId, user?.idToken, setNodes, setEdges, setMapList, isLoggedIn]); // Add isLoggedIn dependency
 
   // --- Load Specific Map (with Cache) ---
   const loadSpecificMap = useCallback(async (mapId, forceRefresh = false) => {
     const cacheKey = getCacheKey('courseMap', userId, mapId);
 
+    // If not logged in, always show the default empty state
+    if (!isLoggedIn) {
+      setNodes(defaultNodes);
+      setEdges(defaultEdges);
+      setCurrentMapId(null);
+      setCurrentMapName('Untitled Map');
+      idCounter = 0;
+      setIsLoading(false);
+      setSaveStatus(''); // Clear any previous status
+      return;
+    }
+
     if (!userId || !mapId) { // Handle new map case
       setNodes(defaultNodes);
       setEdges(defaultEdges);
@@ -260,7 +277,11 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
     if (!forceRefresh) {
         const cachedMap = loadFromCache(cacheKey);
         if (cachedMap && cachedMap.nodes && cachedMap.edges) {
-            setNodes(cachedMap.nodes);
+            const loadedNodes = cachedMap.nodes.map(node => ({
+                ...node,
+                type: node.type || 'courseNode' // Assign 'courseNode' if type is missing or default
+            }));
+            setNodes(loadedNodes);
             setEdges(cachedMap.edges);
             setCurrentMapId(cachedMap.map_id);
             setCurrentMapName(cachedMap.map_name || 'Untitled Map');
@@ -281,7 +302,11 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
       });
       if (data && data.nodes && data.edges) {
         console.log("Loaded map data from API:", data);
-        setNodes(data.nodes);
+        const loadedNodes = data.nodes.map(node => ({
+            ...node,
+            type: node.type || 'courseNode' // Assign 'courseNode' if type is missing or default
+        }));
+        setNodes(loadedNodes);
         setEdges(data.edges);
         setCurrentMapId(data.map_id);
         setCurrentMapName(data.map_name || 'Untitled Map');
@@ -304,27 +329,31 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
     } finally {
       setIsLoading(false);
     }
-  }, [userId, user?.idToken, setNodes, setEdges, handleNewMap]); // Added handleNewMap dependency
+  }, [userId, user?.idToken, setNodes, setEdges, handleNewMap, isLoggedIn]); // Add isLoggedIn dependency
 
   // --- Initial Load Effect ---
   useEffect(() => {
     setIsLoading(true); // Set loading true initially
-    loadMapList().then((list) => {
-      // After loading the list, decide which map to load
-      if (list && list.length > 0) {
-        // Load the most recently updated map by default
-        loadSpecificMap(list[0].map_id);
-      } else {
-        // No saved maps, start with a new one
-        loadSpecificMap(null); // This will reset to default empty state
-      }
-    });
-  }, [loadMapList, loadSpecificMap]); // Depend on the loading functions
+    // If logged in, load the list and then the appropriate map
+    if (isLoggedIn) {
+        loadMapList().then((list) => {
+            if (list && list.length > 0) {
+                loadSpecificMap(list[0].map_id);
+            } else {
+                loadSpecificMap(null); // Load empty state if no maps found
+            }
+        });
+    } else {
+        // If not logged in, just load the empty state directly
+        loadSpecificMap(null);
+    }
+  }, [loadMapList, loadSpecificMap, isLoggedIn]); // Add isLoggedIn dependency
 
   // --- Save Map Data (Create or Update) ---
   const handleSave = useCallback(async () => {
-    if (!userId || !user?.idToken) {
-      setSaveStatus("Please log in to save.");
+    // Check isLoggedIn first
+    if (!isLoggedIn) {
+      setSaveStatus("Please log in to save changes.");
       return;
     }
     setSaveStatus("Saving...");
@@ -425,11 +454,16 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
       console.error("Failed to save course map:", error);
       setSaveStatus(`Error saving map: ${error.message}`);
     }
-  }, [userId, user?.idToken, nodes, edges, currentMapId, currentMapName, loadMapList, setMapList]); // Added setMapList dependency
+  }, [userId, user?.idToken, nodes, edges, currentMapId, currentMapName, loadMapList, setMapList, isLoggedIn]); // Add isLoggedIn dependency
   
 
   // --- Handle Map Selection Change ---
   const handleMapSelectChange = (event) => {
+    // If not logged in, selecting anything should just show the empty map
+    if (!isLoggedIn) {
+        loadSpecificMap(null);
+        return;
+    }
     const selectedId = event.target.value;
     if (selectedId === "__NEW__") {
         console.log("Selected [Untitled Map], resetting view.");
@@ -442,6 +476,12 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
 
     // --- Handle Delete Map ---
     const handleDeleteMap = useCallback(async () => {
+      // Check isLoggedIn first
+      if (!isLoggedIn) {
+          setSaveStatus("Please log in to delete maps.");
+          return;
+      }
+
       if (!currentMapId || !userId || !user?.idToken) {
           setSaveStatus("No map selected to delete or not logged in.");
           return;
@@ -511,22 +551,29 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
           // Optionally, force refresh the list from API on error to ensure consistency
           loadMapList(true);
       }
-  }, [userId, user?.idToken, currentMapId, currentMapName, loadMapList, loadSpecificMap, setMapList, setNodes, setEdges]); // Added setMapList, setNodes, setEdges
+  }, [userId, user?.idToken, currentMapId, currentMapName, loadMapList, loadSpecificMap, setMapList, setNodes, setEdges, isLoggedIn]); // Add isLoggedIn dependency
 
 
   // --- Other Callbacks (onConnect, addNode, startEditing, handleEditChange, saveEdit, onPaneClick) remain the same ---
    const onConnect = useCallback((connection) => {
+       // Allow connecting nodes even when not logged in
        const newEdge = { ...connection, label: 'Prereq' };
        setEdges((eds) => addEdge(newEdge, eds));
      }, [setEdges]);
 
    const addNode = useCallback(() => {
+     // Allow adding nodes even when not logged in
      const newNodeId = getUniqueNodeId();
      const position = screenToFlowPosition({
        x: reactFlowWrapper.current.clientWidth / 2,
        y: reactFlowWrapper.current.clientHeight / 3,
      });
-     const newNode = { id: newNodeId, position, data: { label: `New Course ${idCounter}` } };
+     const newNode = {
+       id: newNodeId,
+       type: 'courseNode', // Specify the custom node type here
+       position,
+       data: { label: `New Course ${idCounter}` }
+     };
      setNodes((nds) => nds.concat(newNode));
    }, [screenToFlowPosition, setNodes]);
 
@@ -554,42 +601,69 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
    const onPaneClick = useCallback(() => saveEdit(), [saveEdit]);
   // --- End Other Callbacks ---
 
+  // --- Define Node Types ---
+  // Use useMemo to prevent this object from being recreated on every render
+  const nodeTypes = useMemo(() => ({
+      courseNode: CustomCourseNode, // Map 'courseNode' type to your component
+      // You can add other custom node types here if needed
+  }), []);
+
   // Render loading state for the whole map area
   if (isMapListLoading || isLoading) {
-    return <p>Loading course maps...</p>;
+    // Show loading only if logged in and actually loading data
+    if (isLoggedIn) {
+        return <p>Loading course maps...</p>;
+    }
+    // If not logged in, loading is instant (just showing default state)
+    // so don't show loading message, let the component render below.
   }
 
   return (
     <div style={{ height: 'calc(100vh - 60px)', width: '100%', border: '1px solid #ccc', position: 'relative' }} ref={reactFlowWrapper}>
       {editingElement && <EditInput element={editingElement} value={editValue} onChange={handleEditChange} onSave={saveEdit} />}
 
+      {/* --- Login Required Note --- */}
+      {!isLoggedIn && (
+        <div style={{ padding: '10px', background: '#fff3cd', color: '#856404', borderBottom: '1px solid #ffeeba', textAlign: 'center', fontWeight: 'bold' }}>
+          Please log in to save your course map or access saved maps.
+        </div>
+      )}
+
       {/* --- Map Management Bar --- */}
       <div style={{ padding: '10px', borderBottom: '1px solid #eee', display: 'flex', gap: '10px', alignItems: 'center', flexWrap: 'wrap', background: '#f8f8f8' }}>
         {/* Display the current map name */}
         <span style={{fontWeight: 'bold'}}>Editing:</span>
-        <span style={{ fontStyle: currentMapId ? 'normal' : 'italic' }}>
-            {currentMapName} {currentMapId ? '' : '(unsaved)'}
+        <span style={{ fontStyle: currentMapId || !isLoggedIn ? 'italic' : 'normal' }}>
+            {currentMapName} {currentMapId || !isLoggedIn ? '(unsaved)' : ''}
         </span>
         <span style={{margin: '0 5px'}}>|</span> {/* Separator */}
 
         <label htmlFor="map-select" style={{fontWeight: 'bold'}}>Load Map:</label>
-        <select id="map-select" value={currentMapId || "__NEW__"} onChange={handleMapSelectChange} style={{maxWidth: '250px', padding: '5px'}}>
+        <select
+            id="map-select"
+            value={currentMapId || "__NEW__"}
+            onChange={handleMapSelectChange}
+            style={{maxWidth: '250px', padding: '5px'}}
+            disabled={!isLoggedIn} // Disable dropdown if not logged in
+            title={!isLoggedIn ? "Log in to load saved maps" : ""}
+        >
             <option value="__NEW__">[Untitled Map]</option>
-            {mapList.map(map => (
+            {isLoggedIn && mapList.map(map => ( // Only show list if logged in
                 <option key={map.map_id} value={map.map_id}>
                     {map.map_name} ({new Date(map.last_updated).toLocaleDateString()})
                 </option>
             ))}
         </select>
-        <button onClick={handleNewMap}>New Map</button>
-        <button onClick={handleSave} disabled={saveStatus === "Saving..."} title="Save the current map">Save</button>
-        <button onClick={handleDeleteMap} disabled={!currentMapId || saveStatus === "Deleting..."} title="Delete the currently selected map">Delete</button>
+        <button onClick={handleNewMap} disabled={!isLoggedIn || saveStatus === "Creating new map..."} title={!isLoggedIn ? "Log in to create a new map" : "Create a new map"}>New Map</button>
+        <button onClick={handleSave} disabled={!isLoggedIn || saveStatus === "Saving..."} title={!isLoggedIn ? "Log in to save changes" : "Save the current map"}>Save</button>
+        <button onClick={handleDeleteMap} disabled={!isLoggedIn || !currentMapId || saveStatus === "Deleting..."} title={!isLoggedIn ? "Log in to delete maps" : "Delete the currently selected map"}>Delete</button>
 
-        {saveStatus && <span style={{ fontSize: '0.9em', color: saveStatus.startsWith('Error') ? 'red' : 'green' }}>{saveStatus}</span>}
+        {saveStatus && <span style={{ fontSize: '0.9em', color: saveStatus.startsWith('Error') ? 'red' : (saveStatus.includes('log in') ? 'orange' : 'green') }}>{saveStatus}</span>}
       </div>
       {/* --- End Map Management Bar --- */}
 
       {/* --- Instructions Bar --- */}
+      {/* Instructions are always visible */}
       <div style={{ padding: '5px 10px', borderBottom: '1px solid #eee', display: 'flex', gap: '15px', alignItems: 'center', flexWrap: 'wrap', fontSize: '0.9em', color: '#555' }}>
         <button onClick={addNode} title="Add a new course node to the map">Add Course</button>
         <span>| Double-click to rename | Select + Backspace/Delete to remove | Drag handles to connect</span>
@@ -601,6 +675,8 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
         onConnect={onConnect} onNodeDoubleClick={onNodeDoubleClick} onEdgeDoubleClick={onEdgeDoubleClick}
         onPaneClick={onPaneClick} fitView attributionPosition="bottom-left"
         deleteKeyCode={['Backspace', 'Delete']} nodesDraggable={true} nodesConnectable={true} elementsSelectable={true}
+        nodeTypes={nodeTypes} // Pass the nodeTypes object here
+        // Prevent interaction if loading user data? Maybe not necessary.
       >
         <Controls />
         <Background variant={BackgroundVariant.Dots} gap={12} size={1} />
@@ -615,9 +691,10 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
 }
 
 // Wrap with Provider
-export default function CourseMap({ user }) {
+export default function CourseMap({ user }) { // Receive user prop
   return (
     <ReactFlowProvider>
+      {/* Pass user down to the actual flow component */}
       <CourseMapFlow user={user} />
     </ReactFlowProvider>
   );
diff --git a/src/components/CustomCourseNode.jsx b/src/components/CustomCourseNode.jsx
new file mode 100644
index 0000000..506a7d9
--- /dev/null
+++ b/src/components/CustomCourseNode.jsx
@@ -0,0 +1,55 @@
+// filepath: src/components/CustomCourseNode.jsx
+import React, { memo } from 'react';
+import { Handle, Position } from 'reactflow';
+
+// Style for the node container
+const nodeStyle = {
+  padding: '12px 18px', // Slightly more padding
+  // background: 'linear-gradient(145deg, #f0f0f0, #ffffff)', // Subtle gradient
+  background: '#ffffff', // Clean white background
+  border: '1px solid #ddd', // Lighter border
+  borderRadius: '8px', // Slightly more rounded corners
+  textAlign: 'center',
+  minWidth: '120px', // Slightly wider minimum width
+  fontSize: '14px', // Slightly larger font size
+  color: '#333', // Darker text color for contrast
+  fontFamily: 'Arial, sans-serif', // Cleaner font
+  boxShadow: '0 2px 8px rgba(0, 0, 0, 0.1)', // Soft shadow for depth
+  position: 'relative', // Keep for handle positioning if needed later
+};
+
+// Style for handles
+const handleStyle = {
+    background: '#777', // Slightly lighter handle color
+    width: '8px',
+    height: '8px',
+    border: '1px solid #fff', // Add a small border to handles
+};
+
+// memo prevents unnecessary re-renders
+const CustomCourseNode = ({ data }) => {
+  return (
+    <div style={nodeStyle}>
+      {/* Target Handle at the Top (for incoming prerequisites) */}
+      <Handle
+        type="target"
+        position={Position.Top}
+        id="handle-top" // Unique ID for this handle
+        style={handleStyle}
+      />
+
+      {/* Node Label */}
+      <div>{data.label}</div>
+
+      {/* Source Handle at the Bottom (for outgoing connections) */}
+      <Handle
+        type="source"
+        position={Position.Bottom}
+        id="handle-bottom" // Unique ID for this handle
+        style={handleStyle}
+      />
+    </div>
+  );
+};
+
+export default memo(CustomCourseNode);
\ No newline at end of file
diff --git a/src/components/PdfViewer.jsx b/src/components/PdfViewer.jsx
index 4c467ec..6e321da 100644
--- a/src/components/PdfViewer.jsx
+++ b/src/components/PdfViewer.jsx
@@ -3,6 +3,9 @@ import React from 'react';
 // Accept imageFilenames directly as a prop
 function PdfViewer({ imageFilenames, isLoading, error, filename }) { // Added isLoading, error, filename for context messages
 
+  // Log props on every render
+  console.log("PdfViewer Render - isLoading:", isLoading, "error:", error, "filename:", filename, "imageFilenames:", imageFilenames);
+
   // Render content based on props
   return (
     <div style={{ height: '100%', display: 'flex', flexDirection: 'column' }}>
@@ -25,8 +28,10 @@ function PdfViewer({ imageFilenames, isLoading, error, filename }) { // Added is
             padding: '5px'
           }}
         >
+          {console.log("PdfViewer: Conditions met, attempting to map imageFilenames:", imageFilenames)} {/* <-- UPDATED LOG */}
           {imageFilenames.map((imgFilename) => {
             const imageUrl = `/api/image/${imgFilename}`;
+            // console.log("Rendering image:", imageUrl); // Keep this if needed
             return (
               <div key={imgFilename} style={{ marginBottom: '0.5em' }}>
                 <img

From f2d1ed140ff65bf837b331f130829ad681a8b0e5 Mon Sep 17 00:00:00 2001
From: Ahmon <ahmonembaye@gmail.com>
Date: Sat, 26 Apr 2025 01:09:10 -0700
Subject: [PATCH 02/16] [fix] annoying api bug

---
 backend/college_transfer_ai/app.py            |  1 +
 .../college_transfer_API.py                   |  5 +---
 src/components/AgreementViewerPage.jsx        | 25 ++++++++++---------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/backend/college_transfer_ai/app.py b/backend/college_transfer_ai/app.py
index 47c26fd..14ca3c2 100644
--- a/backend/college_transfer_ai/app.py
+++ b/backend/college_transfer_ai/app.py
@@ -151,6 +151,7 @@ def get_all_majors():
         return jsonify({"error": "Missing required parameters (sendingInstitutionId, receivingInstitutionId, academicYearId, categoryCode)"}), 400
     try:
         majors = api.get_all_majors(sending_institution_id, receiving_institution_id, academic_year_id, category_code)
+        print(majors)
         return jsonify(majors)
     except Exception as e:
         print(f"Error in /majors: {e}")
diff --git a/backend/college_transfer_ai/college_transfer_API.py b/backend/college_transfer_ai/college_transfer_API.py
index 0c432bf..9d26ee3 100644
--- a/backend/college_transfer_ai/college_transfer_API.py
+++ b/backend/college_transfer_ai/college_transfer_API.py
@@ -64,12 +64,11 @@ def get_year_from_id(self, id):
                 if idx == "Id" and value == id:
                     return str(k["FallYear"]) + "-" + str(k["FallYear"] + 1)
                 
-    def get_all_majors(self, sending_institution_id, receiving_institution_id, academic_year_id, category_code="major"):
+    def get_all_majors(self, sending_institution_id, receiving_institution_id, academic_year_id, category_code):
         # Define the parameters
         # sending_institution_id = 61
         # receiving_institution_id = 79
         # academic_year_id = 75
-        category_code = "major"
 
         # Define the API endpoint and parameters
 
@@ -115,8 +114,6 @@ def get_major_from_key(self, key):
 
         url = f"https://assist.org/api/agreements?receivingInstitutionId={receiving_institution_id}&sendingInstitutionId={sending_institution_id}&academicYearId={academic_year_id}&categoryCode={category_code}"
 
-        print(url)
-
         result = requests.get(url)
 
         result_json = {}
diff --git a/src/components/AgreementViewerPage.jsx b/src/components/AgreementViewerPage.jsx
index 6072889..becd974 100644
--- a/src/components/AgreementViewerPage.jsx
+++ b/src/components/AgreementViewerPage.jsx
@@ -56,7 +56,7 @@ function AgreementViewerPage() {
         // Generate a unique cache key for this combination (initially for major)
         const cacheKey = `majors-${sendingId}-${receivingId}-${yearId}`;
         let cachedMajors = null;
-
+        
         // 1. Try loading from localStorage
         try {
             const cachedData = localStorage.getItem(cacheKey);
@@ -89,32 +89,33 @@ function AgreementViewerPage() {
             }
         };
 
+        let triedDept = false; // Flag to track if dept was attempted
+
         fetchMajors('major')
             .then(majorData => {
-                console.log("Initial fetch (major) returned:", majorData); // Add for debugging
-                // Check if the first fetch returned null, undefined, OR an empty object
+                console.log("Initial fetch (major) returned:", majorData);
                 if (majorData === null || typeof majorData === 'undefined' || (typeof majorData === 'object' && Object.keys(majorData).length === 0)) {
                     console.log("Major data was null, undefined, or empty object. Trying category: dept");
-                    // Retry with 'dept'
-                    return fetchMajors('dept'); // Return the promise for the second fetch
+                    triedDept = true; // Set the flag
+                    return fetchMajors('dept');
                 } else {
-                    // First fetch was successful and has data, return its data
                     console.log("Using data from 'major' category.");
                     return majorData;
                 }
             })
             .then(finalData => {
-                // *** ADD LOG HERE ***
-                console.log("Processing finalData (from major or dept):", finalData);
+                // Log which attempt produced this data
+                console.log(`Processing finalData (from ${triedDept ? 'dept' : 'major'} attempt):`, finalData);
 
                 if (finalData && Object.keys(finalData).length === 0) {
-                    console.log("Setting error: No majors or departments found..."); // Log before setting error
+                    // This condition implies triedDept must be true if majorData was empty initially
+                    console.log(`Setting error: No majors or departments found (result from ${triedDept ? 'dept' : 'major'} attempt).`);
                     setError("No majors or departments found for the selected combination.");
                     setMajors({});
                 } else if (finalData) {
-                    console.log("Setting majors data:", finalData); // Log before setting state
+                    console.log(`Setting majors data (from ${triedDept ? 'dept' : 'major'} attempt):`, finalData);
                     setMajors(finalData);
-                    setError(null); // Clear any previous error if data is found
+                    setError(null);
                     // Cache the successful result (regardless of which category worked)
                     try {
                         localStorage.setItem(cacheKey, JSON.stringify(finalData));
@@ -123,7 +124,7 @@ function AgreementViewerPage() {
                         console.error("Failed to save final majors/depts data to cache:", e);
                     }
                 } else {
-                    console.log("Setting error: Received unexpected empty response."); // Log before setting error
+                     console.log(`Setting error: Received unexpected empty response (from ${triedDept ? 'dept' : 'major'} attempt).`);
                     setError("Received unexpected empty response when fetching majors/departments.");
                     setMajors({});
                 }

From 3f8bc3f7566abd7f113e1650e6045d3b12757d56 Mon Sep 17 00:00:00 2001
From: Ahmon <ahmonembaye@gmail.com>
Date: Sat, 26 Apr 2025 22:23:45 -0700
Subject: [PATCH 03/16] [fix] feat: Improve chat context awareness and history
 handling

- Implemented correct history processing in the backend /chat endpoint for Gemini.
- Passed specific agreement context (institutions, year, major) from frontend page to chat component.
- Enhanced the initial AI prompt to utilize the provided context and maintain conversational memory.
---
 backend/college_transfer_ai/app.py            |  92 +--
 .../college_transfer_API.py                   | 150 +++--
 src/components/AgreementViewerPage.jsx        | 537 +++++++++---------
 src/components/ChatInterface.jsx              | 292 +++++++---
 src/components/CustomCourseNode.jsx           |  38 +-
 5 files changed, 667 insertions(+), 442 deletions(-)

diff --git a/backend/college_transfer_ai/app.py b/backend/college_transfer_ai/app.py
index 14ca3c2..6ff2125 100644
--- a/backend/college_transfer_ai/app.py
+++ b/backend/college_transfer_ai/app.py
@@ -251,17 +251,16 @@ def chat_with_agreement():
         if not data: return jsonify({"error": "Invalid JSON payload"}), 400
 
         new_user_message_text = data.get('new_message')
-        # Google's ChatSession manages history internally, but we need to format it initially
-        openai_history = data.get('history', [])
+        # History from frontend (e.g., [{'role': 'user', 'content': 'Hi'}, {'role': 'assistant', 'content': 'Hello!'}])
+        frontend_history = data.get('history', [])
         image_filenames = data.get('image_filenames') # Only sent on first turn
 
         if not new_user_message_text: return jsonify({"error": "Missing 'new_message' text"}), 400
 
-        # Inside the /chat endpoint
-
         # --- Prepare Input for Gemini ---
-        prompt_parts = [new_user_message_text] # Start with the text part
+        prompt_parts = [] # Initialize prompt parts list
 
+        # --- Add Images (if provided, typically only on the first turn) ---
         if image_filenames:
             print(f"Processing {len(image_filenames)} images for Gemini.")
             image_count = 0
@@ -273,68 +272,79 @@ def chat_with_agreement():
                         continue
 
                     image_bytes = grid_out.read()
-                    # --- Determine MIME type (ensure it's correct) ---
-                    # Use getattr for safety, default to image/png if not found
                     mime_type = getattr(grid_out, 'contentType', None)
                     if not mime_type:
-                         # Basic check based on filename extension if contentType is missing
-                         if filename.lower().endswith(".jpg") or filename.lower().endswith(".jpeg"):
-                             mime_type = "image/jpeg"
-                         elif filename.lower().endswith(".png"):
-                              mime_type = "image/png"
-                         # Add more types if needed (webp, heic, heif)
-                         else:
-                             mime_type = "image/png" # Default fallback
+                         if filename.lower().endswith(".jpg") or filename.lower().endswith(".jpeg"): mime_type = "image/jpeg"
+                         elif filename.lower().endswith(".png"): mime_type = "image/png"
+                         else: mime_type = "image/png"
                          print(f"Warning: contentType missing for {filename}, inferred as {mime_type}")
-                    # --- End MIME type determination ---
-
 
-                    # --- Correct way to add image part ---
-                    # Append a dictionary, not genai.types.Part
+                    # Append image part as a dictionary
                     prompt_parts.append({
                         "mime_type": mime_type,
-                        "data": image_bytes # Send raw bytes directly
+                        "data": image_bytes
                     })
-                    # --- End Correction ---
-
                     image_count += 1
                 except Exception as img_err:
                     print(f"Error reading/processing image {filename} for Gemini: {img_err}. Skipping.")
-            print(f"Added {image_count} images to Gemini prompt.")
+            print(f"Added {image_count} images to Gemini prompt parts.")
         else:
-            print("No image filenames provided for Gemini.")
+            print("No image filenames provided for this turn.")
 
-        # --- Convert OpenAI history to Gemini format (remains the same) ---
-        gemini_history = []
-        # ... (history conversion code) ...
+        # --- Always add the new user message text part ---
+        prompt_parts.append(new_user_message_text)
 
-        # --- Initialize Gemini Model and Chat (remains the same) ---
-        model = genai.GenerativeModel('gemini-1.5-flash-latest')
+        # --- Convert Frontend History to Gemini Format ---
+        gemini_history = []
+        print(f"Converting {len(frontend_history)} messages from frontend history.")
+        for msg in frontend_history:
+            # Map frontend roles ('user', 'assistant') to Gemini roles ('user', 'model')
+            role = 'model' if msg.get('role') == 'assistant' else 'user'
+            # Ensure content exists and is a string
+            content = msg.get('content', '')
+            if not isinstance(content, str):
+                print(f"Warning: Skipping history item with non-string content: {content}")
+                continue
+            # Append structured content for Gemini history
+            gemini_history.append({
+                "role": role,
+                "parts": [content] # Gemini history parts are lists
+            })
+        print(f"Converted history for Gemini: {len(gemini_history)} items.")
+        # --- End History Conversion ---
+
+
+        # --- Initialize Gemini Model and Chat ---
+        # Use safety settings suitable for your use case
+        safety_settings = {
+            HarmCategory.HARM_CATEGORY_HARASSMENT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
+            HarmCategory.HARM_CATEGORY_HATE_SPEECH: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
+            HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
+            HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
+        }
+        model = genai.GenerativeModel(
+            'gemini-1.5-flash-latest', # Or your preferred model
+            safety_settings=safety_settings
+            )
+        # Start the chat WITH the converted history
         chat = model.start_chat(history=gemini_history)
 
-        print(f"Sending request to Gemini with {len(prompt_parts)} parts...")
+        print(f"Sending request to Gemini with {len(prompt_parts)} parts in the new message...")
+        # print(f"Gemini History being used: {gemini_history}") # Optional: Log the history being passed
 
-        # --- Send message to Gemini (remains the same) ---
-        safety_settings = { # Optional safety settings
-            # ... (safety settings) ...
-        }
-        response = chat.send_message(prompt_parts, safety_settings=safety_settings)
+        # --- Send message to Gemini ---
+        # Note: We send only the NEW prompt_parts here. The history is managed by the chat object.
+        response = chat.send_message(prompt_parts) # Removed safety_settings here if set in model
 
         assistant_reply = response.text
         print("Received reply from Gemini.")
 
         return jsonify({"reply": assistant_reply})
 
-    # ... (exception handling remains the same) ...
-
     except Exception as e:
         print(f"Error in /chat endpoint (Gemini): {e}")
         traceback.print_exc()
-        # Try to provide a more specific error if possible
         error_message = f"An unexpected error occurred with the AI chat: {str(e)}"
-        # Check for specific Google API errors if needed
-        # if isinstance(e, google.api_core.exceptions.GoogleAPIError):
-        #     error_message = f"Google API Error: {e}"
         return jsonify({"error": error_message}), 500
 
 # --- End Chat Endpoint ---
diff --git a/backend/college_transfer_ai/college_transfer_API.py b/backend/college_transfer_ai/college_transfer_API.py
index 9d26ee3..5b4719b 100644
--- a/backend/college_transfer_ai/college_transfer_API.py
+++ b/backend/college_transfer_ai/college_transfer_API.py
@@ -176,46 +176,112 @@ def get_receiving_institutions(self, receiving_institution_id):
         return result_dict_non_ccs
     
     
-    def get_articulation_agreement(self, academic_year_id, sending_institution_id, receiving_institution_id, major_key):
-        filename = (
-            f"{self.get_college_from_id(sending_institution_id)}_to_"
-            f"{self.get_college_from_id(receiving_institution_id)}_"
-            f"{self.get_major_from_key(major_key)}_"
-            f"{self.get_year_from_id(academic_year_id)}.pdf"
-        )
-
-        MONGO_URI = os.getenv("MONGO_URI") 
-
-        client = MongoClient(MONGO_URI)
-        db = client["CollegeTransferAICluster"]
-        fs = gridfs.GridFS(db)
-
-        # Check if file already exists
-        if fs.find_one({"filename": filename}):
-            client.close()
-            return filename
-
-        url = (
-            f"https://assist.org/transfer/results?year={academic_year_id}"
-            f"&institution={sending_institution_id}"
-            f"&agreement={receiving_institution_id}"
-            f"&agreementType=to&viewAgreementsOptions=true&view=agreement"
-            f"&viewBy=major&viewSendingAgreements=false&viewByKey={major_key}"
-        )
-
-        with sync_playwright() as p:
-            browser = p.chromium.launch(headless=True)
-            page = browser.new_page()
-            page.goto(url, wait_until="networkidle")
-            pdf_bytes = page.pdf(format="A4")  # Get PDF as bytes
-            browser.close()
+    def get_articulation_agreement(self, academic_year_id, sending_institution_id, receiving_institution_id, key):
+        try: # Wrap more of the logic for better error handling
+            college_name = self.get_college_from_id(sending_institution_id)
+            receiving_name = self.get_college_from_id(receiving_institution_id)
+            major_name = self.get_major_from_key(key)
+            year_name = self.get_year_from_id(academic_year_id)
+
+            if not all([college_name, receiving_name, major_name, year_name]):
+                 print(f"Warning: Could not resolve all names for key {key}. Using fallback names.")
+                 # Provide fallback names or handle the error more gracefully
+                 college_name = college_name or f"sending_{sending_institution_id}"
+                 receiving_name = receiving_name or f"receiving_{receiving_institution_id}"
+                 major_name = major_name or f"major_{key.split('/')[-1]}" # Use last part of key
+                 year_name = year_name or f"year_{academic_year_id}"
+
+            filename = (
+                f"{college_name}_to_"
+                f"{receiving_name}_"
+                f"{major_name}_"
+                f"{year_name}.pdf"
+            )
+            # Basic sanitization
+            filename = filename.replace('/', '_').replace('\\', '_')
+            print(f"Generated filename: {filename}")
+
+            # --- Check if already exists in GridFS (Optional, keep if you still want GridFS check) ---
+            MONGO_URI = os.getenv("MONGO_URI")
+            if not MONGO_URI:
+                raise ValueError("MONGO_URI environment variable not set.")
+            client = MongoClient(MONGO_URI)
+            db = client["CollegeTransferAICluster"]
+            fs = gridfs.GridFS(db)
+            if fs.find_one({"filename": filename}):
+                print(f"PDF '{filename}' already exists in GridFS. Skipping download.")
+                client.close()
+                return filename # Return existing filename if found
+
+            # --- Construct URL (same as before) ---
+            viewBy = "major"
+            if "Department" in key:
+                viewBy = "dept" 
+
+            url = (
+                f"https://assist.org/transfer/results?year={academic_year_id}"
+                f"&institution={sending_institution_id}"
+                f"&agreement={receiving_institution_id}"
+                f"&agreementType=to&viewAgreementsOptions=true&view=agreement"
+                f"&viewBy={viewBy}&viewSendingAgreements=false&viewByKey={key}"
+            )
+            print(f"Attempting to fetch PDF from URL: {url}")
+
+            # --- Download PDF using Playwright (same as before) ---
+            pdf_bytes = None
+            with sync_playwright() as p:
+                browser = None
+                try:
+                    browser = p.chromium.launch(headless=True)
+                    page = browser.new_page()
+                    page.goto(url, wait_until="networkidle", timeout=60000) # Increased timeout
+                    page.wait_for_timeout(2000) # Small delay
+                    pdf_bytes = page.pdf(format="A4")
+                    print(f"Successfully downloaded PDF bytes (size: {len(pdf_bytes)} bytes)")
+                except Exception as playwright_err:
+                     print(f"Playwright error fetching PDF from {url}: {playwright_err}")
+                     if browser: browser.close() # Ensure browser closes on error
+                     client.close() # Ensure mongo client closes
+                     return None # Indicate failure
+                finally:
+                    if browser: browser.close()
+
+            # --- Save PDF Locally ---
+            if pdf_bytes:
+                # local_pdf_path = f"./{filename}" # Save in the current directory where the script runs
+                # try:
+                #     with open(local_pdf_path, "wb") as f_local: # Open in binary write mode
+                #         f_local.write(pdf_bytes)
+                #     print(f"Successfully saved PDF locally to: {local_pdf_path}")
+                # except Exception as local_save_err:
+                #     print(f"Error saving PDF locally to {local_pdf_path}: {local_save_err}")
+                #     # Decide if you still want to proceed with GridFS or return failure
+                #     client.close()
+                #     return None # Indicate failure if local save fails
+
+                # --- Save to GridFS (Optional - keep or remove) ---
+                try:
+                    fs.put(pdf_bytes, filename=filename, contentType='application/pdf')
+                    print(f"Successfully saved PDF '{filename}' to GridFS.")
+                except Exception as gridfs_err:
+                    print(f"Error saving PDF '{filename}' to GridFS: {gridfs_err}")
+                    # Handle GridFS save error if needed
+
+            else:
+                 print("Failed to obtain PDF bytes, cannot save.")
+                 client.close()
+                 return None # Indicate failure
 
-        fs.put(pdf_bytes, filename=filename)
-        client.close()
-
-        return filename
-        
-
-
-
-api = CollegeTransferAPI()
+            client.close()
+            return filename # Return the filename on success
+
+        except Exception as e:
+            print(f"General error in get_articulation_agreement for key {key}: {e}")
+            import traceback
+            traceback.print_exc()
+            # Ensure client is closed if it was opened
+            if 'client' in locals() and client:
+                 client.close()
+            return None # Indicate failure
+
+api = CollegeTransferAPI()
\ No newline at end of file
diff --git a/src/components/AgreementViewerPage.jsx b/src/components/AgreementViewerPage.jsx
index becd974..f0ac100 100644
--- a/src/components/AgreementViewerPage.jsx
+++ b/src/components/AgreementViewerPage.jsx
@@ -1,39 +1,35 @@
 import React, { useState, useEffect, useMemo, useRef, useCallback } from 'react';
-// Import useNavigate and remove Link if no longer needed
-import { useParams, useNavigate } from 'react-router-dom'; 
+import { useParams } from 'react-router-dom';
 import { fetchData } from '../services/api';
 import PdfViewer from './PdfViewer';
 import ChatInterface from './ChatInterface';
 import '../App.css';
 
-// Define minColWidth and dividerWidth as constants outside the component
+// Constants remain the same
 const minColWidth = 150;
 const dividerWidth = 1;
-const fixedMajorsWidth = 300; // Revert to fixed width for majors
+const fixedMajorsWidth = 300;
 
-function AgreementViewerPage() {
+function AgreementViewerPage({ user }) {
     const { sendingId, receivingId, yearId } = useParams();
-    const navigate = useNavigate(); // Get navigate function
 
     // --- State for resizing ---
-    // Only need state for the chat column width now
     const [chatColumnWidth, setChatColumnWidth] = useState(400);
     const isResizingRef = useRef(false);
-    // Only need one divider ref now
-    const dividerRef = useRef(null); // Ref for the divider between Chat and PDF
-    const containerRef = useRef(null); // Ref for the main container
+    const dividerRef = useRef(null);
+    const containerRef = useRef(null);
 
     // --- State for Majors Column Visibility ---
     const [isMajorsVisible, setIsMajorsVisible] = useState(true);
-    // --- Ref to hold the latest visibility state for the event listener ---
     const isMajorsVisibleRef = useRef(isMajorsVisible);
 
-    // --- Effect to update the ref whenever the state changes ---
+    // --- Effect to update the ref ---
     useEffect(() => {
         isMajorsVisibleRef.current = isMajorsVisible;
     }, [isMajorsVisible]);
 
     // --- Existing State ---
+    const [selectedCategory, setSelectedCategory] = useState('major');
     const [majors, setMajors] = useState({});
     const [isLoadingMajors, setIsLoadingMajors] = useState(true);
     const [error, setError] = useState(null);
@@ -44,129 +40,207 @@ function AgreementViewerPage() {
     const [imageFilenames, setImageFilenames] = useState([]);
     const [isLoadingPdf, setIsLoadingPdf] = useState(false);
     const [majorSearchTerm, setMajorSearchTerm] = useState('');
+    const [hasMajorsAvailable, setHasMajorsAvailable] = useState(true);
+    const [hasDepartmentsAvailable, setHasDepartmentsAvailable] = useState(true);
+    const [isLoadingAvailability, setIsLoadingAvailability] = useState(true);
 
-    // --- Effect for Fetching Majors (with Caching) ---
+    // --- Existing Effects (Availability, Fetching Data, Cleanup) ---
     useEffect(() => {
         if (!sendingId || !receivingId || !yearId) {
-            setError("Required institution or year information is missing in URL.");
+            setIsLoadingAvailability(false);
+            setHasMajorsAvailable(false);
+            setHasDepartmentsAvailable(false);
+            return;
+        }
+
+        setIsLoadingAvailability(true);
+        setHasMajorsAvailable(false);
+        setHasDepartmentsAvailable(false);
+
+        const checkAvailability = async (category) => {
+            const cacheKey = `agreements-${category}-${sendingId}-${receivingId}-${yearId}`;
+            try {
+                const storedData = localStorage.getItem(cacheKey);
+                if (storedData) {
+                    const parsedData = JSON.parse(storedData);
+                    if (parsedData && Object.keys(parsedData).length > 0) {
+                        return true;
+                    }
+                }
+            } catch (e) {
+                console.error(`Failed to read or parse ${category} cache for availability check:`, e);
+                localStorage.removeItem(cacheKey);
+            }
+
+            try {
+                const data = await fetchData(`majors?sendingInstitutionId=${sendingId}&receivingInstitutionId=${receivingId}&academicYearId=${yearId}&categoryCode=${category}`);
+                return data && Object.keys(data).length > 0;
+            } catch (err) {
+                console.error(`Error checking availability for ${category}:`, err);
+                return false;
+            }
+        };
+
+        Promise.all([checkAvailability('major'), checkAvailability('dept')])
+            .then(([majorsExist, deptsExist]) => {
+                setHasMajorsAvailable(majorsExist);
+                setHasDepartmentsAvailable(deptsExist);
+
+                if (selectedCategory === 'major' && !majorsExist && deptsExist) {
+                    setSelectedCategory('dept');
+                } else if (selectedCategory === 'dept' && !deptsExist && majorsExist) {
+                    setSelectedCategory('major');
+                } else if (!majorsExist && !deptsExist) {
+                    setError("No majors or departments found for the selected combination.");
+                }
+
+            })
+            .finally(() => {
+                setIsLoadingAvailability(false);
+            });
+
+    }, [sendingId, receivingId, yearId, selectedCategory]);
+
+    useEffect(() => {
+        if (isLoadingAvailability || !sendingId || !receivingId || !yearId) {
+            if (!sendingId || !receivingId || !yearId) {
+                setError("Required institution or year information is missing in URL.");
+                setIsLoadingMajors(false);
+                setMajors({});
+            }
+            return;
+        }
+
+        if ((selectedCategory === 'major' && !hasMajorsAvailable) || (selectedCategory === 'dept' && !hasDepartmentsAvailable)) {
+            setError(`No ${selectedCategory}s found for the selected combination.`);
             setIsLoadingMajors(false);
+            setMajors({});
             return;
         }
 
-        // Generate a unique cache key for this combination (initially for major)
-        const cacheKey = `majors-${sendingId}-${receivingId}-${yearId}`;
-        let cachedMajors = null;
-        
-        // 1. Try loading from localStorage
+        const cacheKey = `agreements-${selectedCategory}-${sendingId}-${receivingId}-${yearId}`;
+        let cachedData = null;
+
         try {
-            const cachedData = localStorage.getItem(cacheKey);
-            if (cachedData) {
-                cachedMajors = JSON.parse(cachedData);
-                console.log("Loaded majors from cache:", cacheKey);
-                setMajors(cachedMajors);
+            const storedData = localStorage.getItem(cacheKey);
+            if (storedData) {
+                cachedData = JSON.parse(storedData);
+                console.log(`Loaded ${selectedCategory}s from cache:`, cacheKey);
+                setMajors(cachedData);
                 setIsLoadingMajors(false);
                 setError(null);
-                return; // Exit early if loaded from cache
+                return;
             }
         } catch (e) {
-            console.error("Failed to read or parse majors cache:", e);
-            localStorage.removeItem(cacheKey); // Clear potentially corrupted cache entry
+            console.error(`Failed to read or parse ${selectedCategory}s cache:`, e);
+            localStorage.removeItem(cacheKey);
         }
 
-        // 2. Fetch from API (try 'major' first)
-        console.log("Fetching majors (category: major) from API:", cacheKey);
+        console.log(`Fetching ${selectedCategory}s from API:`, cacheKey);
         setIsLoadingMajors(true);
         setError(null);
+        setMajors({});
 
-        const fetchMajors = async (category) => {
+        const fetchCategoryData = async () => {
             try {
-                const data = await fetchData(`majors?sendingInstitutionId=${sendingId}&receivingInstitutionId=${receivingId}&academicYearId=${yearId}&categoryCode=${category}`);
-                return data; // Return the fetched data
-            } catch (err) {
-                console.error(`Error fetching majors (category: ${category}):`, err);
-                // Throw the error to be caught by the main catch block
-                throw new Error(`Failed to load majors (category: ${category}): ${err.message}`);
-            }
-        };
-
-        let triedDept = false; // Flag to track if dept was attempted
-
-        fetchMajors('major')
-            .then(majorData => {
-                console.log("Initial fetch (major) returned:", majorData);
-                if (majorData === null || typeof majorData === 'undefined' || (typeof majorData === 'object' && Object.keys(majorData).length === 0)) {
-                    console.log("Major data was null, undefined, or empty object. Trying category: dept");
-                    triedDept = true; // Set the flag
-                    return fetchMajors('dept');
-                } else {
-                    console.log("Using data from 'major' category.");
-                    return majorData;
-                }
-            })
-            .then(finalData => {
-                // Log which attempt produced this data
-                console.log(`Processing finalData (from ${triedDept ? 'dept' : 'major'} attempt):`, finalData);
+                const data = await fetchData(`majors?sendingInstitutionId=${sendingId}&receivingInstitutionId=${receivingId}&academicYearId=${yearId}&categoryCode=${selectedCategory}`);
+                console.log(`API response for ${selectedCategory}:`, data);
 
-                if (finalData && Object.keys(finalData).length === 0) {
-                    // This condition implies triedDept must be true if majorData was empty initially
-                    console.log(`Setting error: No majors or departments found (result from ${triedDept ? 'dept' : 'major'} attempt).`);
-                    setError("No majors or departments found for the selected combination.");
-                    setMajors({});
-                } else if (finalData) {
-                    console.log(`Setting majors data (from ${triedDept ? 'dept' : 'major'} attempt):`, finalData);
-                    setMajors(finalData);
+                if (data && Object.keys(data).length > 0) {
+                    setMajors(data);
                     setError(null);
-                    // Cache the successful result (regardless of which category worked)
                     try {
-                        localStorage.setItem(cacheKey, JSON.stringify(finalData));
-                        console.log("Saved final majors/depts data to cache:", cacheKey);
+                        localStorage.setItem(cacheKey, JSON.stringify(data));
+                        console.log(`Saved ${selectedCategory}s data to cache:`, cacheKey);
                     } catch (e) {
-                        console.error("Failed to save final majors/depts data to cache:", e);
+                        console.error(`Failed to save ${selectedCategory}s data to cache:`, e);
                     }
                 } else {
-                     console.log(`Setting error: Received unexpected empty response (from ${triedDept ? 'dept' : 'major'} attempt).`);
-                    setError("Received unexpected empty response when fetching majors/departments.");
+                    setError(`No ${selectedCategory}s found for the selected combination.`);
                     setMajors({});
+                    if (selectedCategory === 'major') setHasMajorsAvailable(false);
+                    if (selectedCategory === 'dept') setHasDepartmentsAvailable(false);
                 }
-            })
-            .catch(err => {
-                // *** ADD LOG HERE ***
-                console.error("Caught error in majors fetch chain:", err);
-                setError(err.message || "An error occurred fetching majors/departments.");
+            } catch (err) {
+                console.error(`Error fetching ${selectedCategory}s:`, err);
+                setError(err.message || `An error occurred fetching ${selectedCategory}s.`);
                 setMajors({});
-            })
-            .finally(() => {
-                // *** ADD LOG HERE ***
-                console.log("Majors fetch chain finally block executing.");
+                if (selectedCategory === 'major') setHasMajorsAvailable(false);
+                if (selectedCategory === 'dept') setHasDepartmentsAvailable(false);
+            } finally {
                 setIsLoadingMajors(false);
-            });
+            }
+        };
+
+        fetchCategoryData();
+
+    }, [sendingId, receivingId, yearId, selectedCategory, isLoadingAvailability, hasMajorsAvailable, hasDepartmentsAvailable]);
+
+    const handleMouseMove = useCallback((e) => {
+        if (!isResizingRef.current || !containerRef.current) {
+            return;
+        }
+
+        const containerRect = containerRef.current.getBoundingClientRect();
+        const mouseX = e.clientX;
+        const containerLeft = containerRect.left;
+        const totalWidth = containerRect.width;
+        const gapWidth = 16;
+
+        const currentVisibility = isMajorsVisibleRef.current;
+
+        const majorsEffectiveWidth = currentVisibility ? fixedMajorsWidth : 0;
+        const gap1EffectiveWidth = currentVisibility ? gapWidth : 0;
+        const chatStartOffset = majorsEffectiveWidth + gap1EffectiveWidth;
+
+        let newChatWidth = mouseX - containerLeft - chatStartOffset;
 
-    }, [sendingId, receivingId, yearId]); // Re-run effect if IDs change
+        const maxChatWidth = totalWidth - chatStartOffset - minColWidth - gapWidth - dividerWidth;
+        newChatWidth = Math.max(minColWidth, Math.min(newChatWidth, maxChatWidth));
+
+        setChatColumnWidth(newChatWidth);
+
+    }, []);
+
+    const handleMouseUp = useCallback(() => {
+        if (isResizingRef.current) {
+            isResizingRef.current = false;
+            window.removeEventListener('mousemove', handleMouseMove);
+            window.removeEventListener('mouseup', handleMouseUp);
+            document.body.style.cursor = '';
+            document.body.style.userSelect = '';
+        }
+    }, [handleMouseMove]);
+
+    useEffect(() => {
+        const currentHandleMouseMove = handleMouseMove;
+        const currentHandleMouseUp = handleMouseUp;
+        return () => {
+            window.removeEventListener('mousemove', currentHandleMouseMove);
+            window.removeEventListener('mouseup', currentHandleMouseUp);
+        };
+    }, [handleMouseMove, handleMouseUp]);
 
-    // Fetch PDF filename AND image filenames when major is selected
     const handleMajorSelect = async (majorKey, majorName) => {
         if (!majorKey || isLoadingPdf) return;
 
         setSelectedMajorKey(majorKey);
-        setSelectedMajorName(majorName); // Store name
-        setSelectedPdfFilename(null); // Clear previous PDF filename
-        setImageFilenames([]); // Clear previous images
+        setSelectedMajorName(majorName);
+        setSelectedPdfFilename(null);
+        setImageFilenames([]);
         setIsLoadingPdf(true);
-        setError(null); // Clear general errors
-        setPdfError(null); // Clear specific PDF errors
+        setError(null);
+        setPdfError(null);
 
         try {
-            // 1. Get PDF Filename
             const agreementData = await fetchData(`articulation-agreement?key=${majorKey}`);
             if (agreementData && agreementData.pdf_filename) {
                 const pdfFilename = agreementData.pdf_filename;
-                setSelectedPdfFilename(pdfFilename); // Set filename for context
+                setSelectedPdfFilename(pdfFilename);
 
-                // --- Image Caching Logic ---
                 const imageCacheKey = `pdf-images-${pdfFilename}`;
                 let fetchedFromCache = false;
 
-                // 2a. Try loading images from localStorage
                 try {
                     const cachedImageData = localStorage.getItem(imageCacheKey);
                     if (cachedImageData) {
@@ -174,25 +248,22 @@ function AgreementViewerPage() {
                         if (parsedImageData && parsedImageData.image_filenames) {
                             console.log("Loaded images from cache:", imageCacheKey);
                             setImageFilenames(parsedImageData.image_filenames);
-                            fetchedFromCache = true; // Mark as fetched from cache
+                            fetchedFromCache = true;
                         } else {
-                             console.warn("Cached image data invalid, removing:", imageCacheKey);
-                             localStorage.removeItem(imageCacheKey);
+                            console.warn("Cached image data invalid, removing:", imageCacheKey);
+                            localStorage.removeItem(imageCacheKey);
                         }
                     }
                 } catch (e) {
                     console.error("Failed to read or parse images cache:", e);
-                    localStorage.removeItem(imageCacheKey); // Clear potentially corrupted cache entry
+                    localStorage.removeItem(imageCacheKey);
                 }
-                // --- End Image Caching Logic ---
 
-                // 2b. Fetch images from API if not loaded from cache
                 if (!fetchedFromCache) {
                     console.log("Fetching images from API:", imageCacheKey);
                     const imageData = await fetchData(`pdf-images/${pdfFilename}`);
                     if (imageData && imageData.image_filenames) {
                         setImageFilenames(imageData.image_filenames);
-                        // 3. Save successful image fetch to localStorage
                         try {
                             localStorage.setItem(imageCacheKey, JSON.stringify(imageData));
                             console.log("Saved images to cache:", imageCacheKey);
@@ -200,7 +271,6 @@ function AgreementViewerPage() {
                             console.error("Failed to save images to cache:", e);
                         }
                     } else {
-                        // Handle case where API returns error or no filenames
                         throw new Error(imageData?.error || 'Failed to load image list for PDF');
                     }
                 }
@@ -211,240 +281,165 @@ function AgreementViewerPage() {
             }
         } catch (err) {
             console.error("Error fetching agreement or images:", err);
-            setPdfError(err.message); // Set specific PDF error
-            setSelectedPdfFilename(null); // Clear filename on error
-            setImageFilenames([]); // Clear images on error
+            setPdfError(err.message);
+            setSelectedPdfFilename(null);
+            setImageFilenames([]);
         } finally {
-            setIsLoadingPdf(false); // Done loading PDF info + images
+            setIsLoadingPdf(false);
         }
     };
 
-    const handleMouseMove = useCallback((e) => { // Keep useCallback, but dependencies change
-        if (!isResizingRef.current || !containerRef.current) {
-            return;
-        }
-
-        const containerRect = containerRef.current.getBoundingClientRect();
-        const mouseX = e.clientX;
-        const containerLeft = containerRect.left;
-        const totalWidth = containerRect.width;
-        const gapWidth = 16; // Assumed 1em = 16px
-
-        // --- Read the *current* visibility from the ref ---
-        const currentVisibility = isMajorsVisibleRef.current;
-
-        // Calculate the starting position of the chat column
-        const majorsEffectiveWidth = currentVisibility ? fixedMajorsWidth : 0;
-        const gap1EffectiveWidth = currentVisibility ? gapWidth : 0; // Gap between majors and chat
-        const chatStartOffset = majorsEffectiveWidth + gap1EffectiveWidth;
-
-        // Calculate desired chat width based on mouse position relative to chat start
-        let newChatWidth = mouseX - containerLeft - chatStartOffset;
-
-        // Constraints: ensure chat and PDF columns have minimum width
-        const maxChatWidth = totalWidth - chatStartOffset - minColWidth - gapWidth - dividerWidth;
-        newChatWidth = Math.max(minColWidth, Math.min(newChatWidth, maxChatWidth));
-
-        setChatColumnWidth(newChatWidth);
-
-    // --- Remove isMajorsVisible from dependencies, rely on the ref ---
-    }, []); // Empty dependency array is okay now because we use the ref
-
-    const handleMouseUp = useCallback(() => {
-        if (isResizingRef.current) {
-            isResizingRef.current = false;
-            // Remove the *same* handleMouseMove function instance
-            window.removeEventListener('mousemove', handleMouseMove);
-            window.removeEventListener('mouseup', handleMouseUp);
-            document.body.style.cursor = '';
-            document.body.style.userSelect = '';
-        }
-    // Ensure handleMouseMove is included if it's used inside, though it's stable now
-    }, [handleMouseMove]);
+    
 
-    // Filter majors based on search term
-    const filteredMajors = useMemo(() => {
-        const lowerCaseSearchTerm = majorSearchTerm.toLowerCase();
-        // Ensure majors is an object before trying to get entries
-        if (typeof majors !== 'object' || majors === null) {
-            return [];
-        }
-        return Object.entries(majors).filter(([name]) =>
-            name.toLowerCase().includes(lowerCaseSearchTerm)
-        );
-    }, [majors, majorSearchTerm]);
+    
 
-    // --- Resizing Logic (Simplified for one divider) ---
     const handleMouseDown = useCallback((e) => {
         e.preventDefault();
         isResizingRef.current = true;
-        // Add the *same* memoized handleMouseMove function as the listener
         window.addEventListener('mousemove', handleMouseMove);
         window.addEventListener('mouseup', handleMouseUp);
         document.body.style.cursor = 'col-resize';
         document.body.style.userSelect = 'none';
-    }, [handleMouseMove, handleMouseUp]); // handleMouseMove is stable now, so no need to list it if it doesn't change
-
-    
-
-    
-
-    // Cleanup listeners
-    useEffect(() => {
-        // Define cleanup using the memoized handleMouseMove
-        const currentHandleMouseMove = handleMouseMove;
-        const currentHandleMouseUp = handleMouseUp;
-        return () => {
-            window.removeEventListener('mousemove', currentHandleMouseMove);
-            window.removeEventListener('mouseup', currentHandleMouseUp);
-        };
-    }, [handleMouseMove, handleMouseUp]); // Depend on the memoized functions
+    }, [handleMouseMove, handleMouseUp]);
+
+    const handleCategoryChange = (event) => {
+        setSelectedCategory(event.target.value);
+        setSelectedMajorKey(null);
+        setSelectedMajorName('');
+        setSelectedPdfFilename(null);
+        setImageFilenames([]);
+        setPdfError(null);
+        setError(null);
+    };
 
-    // --- Toggle Majors Visibility ---
     const toggleMajorsVisibility = () => {
-        const gapWidth = 16; // Ensure this matches the gap used in styles/calculations
-
-        // Use the functional update form to get the latest states
+        const gapWidth = 16;
         setIsMajorsVisible(prevVisible => {
             const nextVisible = !prevVisible;
-
-            // Adjust chat width based on the *change* in visibility
             setChatColumnWidth(prevChatWidth => {
-                if (nextVisible === false) { // Majors are being hidden
-                    // Increase chat width to absorb the space
+                if (nextVisible === false) { // Hiding
                     return prevChatWidth + fixedMajorsWidth + gapWidth;
-                } else { // Majors are being shown
-                    // Decrease chat width, ensuring it doesn't go below min width
+                } else { // Showing
                     const newWidth = prevChatWidth - fixedMajorsWidth - gapWidth;
                     return Math.max(minColWidth, newWidth);
                 }
             });
-
-            return nextVisible; // Return the new visibility state
+            return nextVisible;
         });
     };
 
+    const filteredMajors = useMemo(() => {
+        const lowerCaseSearchTerm = majorSearchTerm.toLowerCase();
+        if (typeof majors !== 'object' || majors === null) {
+            return [];
+        }
+        return Object.entries(majors).filter(([name]) =>
+            name.toLowerCase().includes(lowerCaseSearchTerm)
+        );
+    }, [majors, majorSearchTerm]);
 
-    // Calculate effective widths for flex styling based on visibility
     const currentMajorsFlexBasis = isMajorsVisible ? `${fixedMajorsWidth}px` : '0px';
     const currentChatFlexBasis = `${chatColumnWidth}px`;
+    const userName = user?.name || user?.email || "You";
+
+    // Adjust height calculation - remove buttonBarHeight
+    const mainContentHeight = `calc(90vh - 53px)`; // Assuming nav is 60px
 
     return (
         <>
-            {/* Button Bar */}
-            <div style={{ padding: '0.5em 1em', borderBottom: '1px solid #ccc', backgroundColor: '#f8f8f8', display: 'flex', alignItems: 'center' }}>
-                <button onClick={toggleMajorsVisibility} style={{ marginRight: '2em' }}>
-                    {isMajorsVisible ? 'Hide Majors' : 'Show Majors'}
-                </button>
-                 {/* Replace Link with button and onClick */}
-                 <button 
-                    onClick={() => navigate('/')} 
-                    className="btn btn-secondary" 
-                 >
-                    Back to Form
-                 </button>
-            </div>
+            {/* --- Removed Button Bar --- */}
 
             {/* Main container using Flexbox */}
             <div
                 ref={containerRef}
                 style={{
                     display: 'flex',
-                    height: 'calc(91vh - 40px)', // Adjust based on button bar height
+                    height: mainContentHeight, // Use updated height
                     padding: '0.5em',
                     boxSizing: 'border-box',
                     color: "#333",
                 }}>
 
-                {/* Left Column (Majors List) - Conditionally Rendered, Fixed Width */}
+                {/* Left Column (Majors/Depts List) */}
                 {isMajorsVisible && (
                     <div style={{
-                        flex: `0 0 ${currentMajorsFlexBasis}`, // Fixed basis when visible
+                        flex: `0 0 ${currentMajorsFlexBasis}`,
                         display: 'flex',
                         flexDirection: 'column',
-                        minWidth: isMajorsVisible ? `${minColWidth}px` : '0px', // Min width only if visible
+                        minWidth: `${minColWidth}px`,
                         overflow: 'hidden',
-                        transition: 'flex-basis 0.3s ease, min-width 0.3s ease', // Optional: Add transition
-                        marginRight: isMajorsVisible ? '1em' : '0' // Add margin instead of gap
-                     }}>
-                        {/* Content of Majors Column */}
-                        <h2 style={{ marginTop: '0', marginBottom: '0.5em', whiteSpace: 'nowrap' }}>Select Major</h2>
-                        <input
-                            type="text"
-                            placeholder="Search majors..."
-                            value={majorSearchTerm}
-                            onChange={(e) => setMajorSearchTerm(e.target.value)}
-                            style={{ marginBottom: '0.5em', padding: '8px', border: '1px solid #ccc' }}
-                        />
+                        transition: 'flex-basis 0.3s ease, min-width 0.3s ease',
+                        marginRight: '1em',
+                        position: 'relative',
+                        paddingTop: '2.5em'
+                    }}>
+                        {/* --- Hide Majors Button (Stays Here) --- */}
+                        <button
+                            onClick={toggleMajorsVisibility}
+                            style={{
+                                position: 'absolute',
+                                top: '0.5em',
+                                left: '0.5em',
+                                zIndex: 1,
+                                padding: '4px 8px',
+                                fontSize: '0.85em'
+                            }}
+                            className="btn btn-sm btn-outline-secondary"
+                        >
+                            Hide Majors
+                        </button>
+                        {/* --- End Hide Majors Button --- */}
+
+                        {/* Content of Majors/Depts Column */}
+                        <h2 style={{ marginTop: '0', marginBottom: '0.5em', whiteSpace: 'nowrap' }}>
+                            Select {selectedCategory === 'major' ? 'Major' : 'Department'}
+                        </h2>
+                        {/* ... rest of majors column content ... */}
+                         <div style={{ marginBottom: '0.5em', display: 'flex', justifyContent: 'center', gap: '1em' }}>
+                            {isLoadingAvailability ? ( <p>Checking availability...</p> ) : (
+                                <>
+                                    <label style={{ opacity: hasMajorsAvailable ? 1 : 0.5, cursor: hasMajorsAvailable ? 'pointer' : 'not-allowed' }}>
+                                        <input type="radio" name="category" value="major" checked={selectedCategory === 'major'} onChange={handleCategoryChange} disabled={!hasMajorsAvailable} /> Majors
+                                    </label>
+                                    <label style={{ opacity: hasDepartmentsAvailable ? 1 : 0.5, cursor: hasDepartmentsAvailable ? 'pointer' : 'not-allowed' }}>
+                                        <input type="radio" name="category" value="dept" checked={selectedCategory === 'dept'} onChange={handleCategoryChange} disabled={!hasDepartmentsAvailable} /> Departments
+                                    </label>
+                                </>
+                            )}
+                        </div>
+                        <input type="text" placeholder={`Search ${selectedCategory === 'major' ? 'majors' : 'departments'}...`} value={majorSearchTerm} onChange={(e) => setMajorSearchTerm(e.target.value)} style={{ marginBottom: '0.5em', padding: '8px', border: '1px solid #ccc' }} />
                         {error && <div style={{ color: 'red', marginBottom: '1em' }}>Error: {error}</div>}
-                        {isLoadingMajors && <p>Loading available majors...</p>}
+                        {isLoadingMajors && <p>Loading available {selectedCategory === 'major' ? 'majors' : 'departments'}...</p>}
                         {!isLoadingMajors && filteredMajors.length > 0 && (
                             <div style={{ flex: '1 1 auto', overflowY: 'auto', border: '1px solid #ccc' }}>
-                                {filteredMajors.map(([name, key]) => (
-                                    <div
-                                        key={key}
-                                        onClick={() => handleMajorSelect(key, name)}
-                                        style={{
-                                            padding: '8px 12px',
-                                            cursor: 'pointer',
-                                            borderBottom: '1px solid #eee',
-                                            backgroundColor: selectedMajorKey === key ? '#e0e0e0' : 'transparent',
-                                            fontWeight: selectedMajorKey === key ? 'bold' : 'normal'
-                                        }}
-                                        className="major-list-item"
-                                    >
-                                        {name}
-                                        {selectedMajorKey === key && isLoadingPdf && <span style={{ marginLeft: '10px', fontStyle: 'italic' }}>(Loading...)</span>}
-                                    </div>
-                                ))}
+                                {filteredMajors.map(([name, key]) => ( <div key={key} onClick={() => handleMajorSelect(key, name)} style={{ padding: '8px 12px', cursor: 'pointer', borderBottom: '1px solid #eee', backgroundColor: selectedMajorKey === key ? '#e0e0e0' : 'transparent', fontWeight: selectedMajorKey === key ? 'bold' : 'normal' }} className="major-list-item"> {name} {selectedMajorKey === key && isLoadingPdf && <span style={{ marginLeft: '10px', fontStyle: 'italic' }}>(Loading...)</span>} </div> ))}
                             </div>
                         )}
-                        {!isLoadingMajors && filteredMajors.length === 0 && Object.keys(majors).length > 0 && (
-                            <p style={{ marginTop: '1em' }}>No majors match your search.</p>
-                        )}
-                        {!isLoadingMajors && Object.keys(majors).length === 0 && !error && (
-                            <p>No majors found.</p>
-                        )}
+                        {!isLoadingMajors && filteredMajors.length === 0 && Object.keys(majors).length > 0 && ( <p style={{ marginTop: '1em' }}>No {selectedCategory === 'major' ? 'majors' : 'departments'} match your search.</p> )}
+                        {!isLoadingMajors && Object.keys(majors).length === 0 && !error && ( <p>No {selectedCategory === 'major' ? 'majors' : 'departments'} found.</p> )}
+                        {!isLoadingMajors && !isLoadingAvailability && !hasMajorsAvailable && !hasDepartmentsAvailable && ( <p>No majors or departments found for this combination.</p> )}
                     </div>
                 )}
 
-
-                {/* Middle Column (Chat Interface) - Dynamically Sized */}
+                {/* Middle Column (Chat Interface) */}
                 <div style={{ flex: `0 0 ${currentChatFlexBasis}`, display: 'flex', flexDirection: 'column', minWidth: `${minColWidth}px` }}>
-                    {/* Render ChatInterface unconditionally */}
+                    {/* Pass visibility state and toggle function */}
                     <ChatInterface
-                        imageFilenames={imageFilenames} // Pass current imageFilenames (might be empty)
-                        selectedMajorName={selectedMajorName} // Pass current major name (might be empty)
-                    />
-                </div>
-
-                {/* --- Draggable Divider 2 (Now the only one) --- */}
-                <div
-                    ref={dividerRef} // Use the single dividerRef
-                    style={{
-                        width: `${dividerWidth}px`,
-                        cursor: 'col-resize',
-                        backgroundColor: '#e0e0e0',
-                        borderLeft: '1px solid #ccc',
-                        borderRight: '1px solid #ccc',
-                        alignSelf: 'stretch',
-                        flexShrink: 0
-                    }}
-                    onMouseDown={handleMouseDown} // Use the single handleMouseDown
-                />
-                {/* --- End Divider --- */}
-
-
-                {/* Right Column (PDF Viewer) - Takes Remaining Space */}
-                <div style={{ flex: '1 1 0', display: 'flex', flexDirection: 'column', minWidth: `${minColWidth}px` }}>
-                    <PdfViewer
                         imageFilenames={imageFilenames}
-                        isLoading={isLoadingPdf}
-                        error={pdfError}
-                        filename={selectedPdfFilename}
+                        selectedMajorName={selectedMajorName}
+                        userName={userName}
+                        isMajorsVisible={isMajorsVisible}
+                        toggleMajorsVisibility={toggleMajorsVisibility}
                     />
                 </div>
 
+                {/* Draggable Divider */}
+                <div ref={dividerRef} style={{ width: `${dividerWidth}px`, cursor: 'col-resize', backgroundColor: '#e0e0e0', borderLeft: '1px solid #ccc', borderRight: '1px solid #ccc', alignSelf: 'stretch', flexShrink: 0, marginLeft: isMajorsVisible ? '1em' : '0' }} onMouseDown={handleMouseDown} />
+
+                {/* Right Column (PDF Viewer) */}
+                <div style={{ flex: '1 1 0', display: 'flex', flexDirection: 'column', minWidth: `${minColWidth}px`, marginLeft: '1em' }}>
+                    <PdfViewer imageFilenames={imageFilenames} isLoading={isLoadingPdf} error={pdfError} filename={selectedPdfFilename} />
+                </div>
             </div>
         </>
     );
diff --git a/src/components/ChatInterface.jsx b/src/components/ChatInterface.jsx
index 976faa3..c09a4fd 100644
--- a/src/components/ChatInterface.jsx
+++ b/src/components/ChatInterface.jsx
@@ -1,98 +1,218 @@
-import React, { useState, useEffect, useRef } from 'react'; // Make sure useRef is imported if needed elsewhere
+import React, { useState, useEffect, useRef } from 'react';
 import { fetchData } from '../services/api';
 
-function ChatInterface({ imageFilenames, selectedMajorName }) {
+// Helper function to parse basic markdown (bold/italic/bullets)
+function formatText(text) {
+  if (!text) return ''; // Handle null or undefined text
+
+  // 1. Pre-process lines for bullets ('* ' -> '• ')
+  const lines = text.split('\n');
+  const processedLines = lines.map(line => {
+    // Use trim() to handle potential leading whitespace before '*'
+    if (line.trim().startsWith('* ')) {
+      // Replace '* ' with '• ' and keep the rest of the line content
+      // Use indexOf to find the first '*' to correctly handle indentation
+      const starIndex = line.indexOf('*');
+      const prefix = line.substring(0, starIndex); // Keep indentation
+      return prefix + '• ' + line.substring(starIndex + 2);
+    }
+    return line;
+  });
+  const textWithBullets = processedLines.join('\n');
+
+  // 2. Apply bold/italic formatting to the text with bullets
+  const regex = /(\*\*.*?\*\*|`.*?`)/g; // Regex to find **bold** or `italic`
+  let lastIndex = 0;
+  const result = [];
+  let match;
+
+  try {
+      // Use textWithBullets for bold/italic parsing
+      while ((match = regex.exec(textWithBullets)) !== null) {
+        // Add text before the match
+        if (match.index > lastIndex) {
+          result.push(textWithBullets.substring(lastIndex, match.index));
+        }
+
+        const matchedText = match[0];
+        // Add bold or italic element
+        if (matchedText.startsWith('**') && matchedText.endsWith('**')) {
+          // Ensure content exists before slicing
+          const content = matchedText.length > 4 ? matchedText.slice(2, -2) : '';
+          result.push(<strong key={`bold-${lastIndex}`}>{content}</strong>); // Use unique keys
+        } else if (matchedText.startsWith('`') && matchedText.endsWith('`')) {
+           // Ensure content exists before slicing
+          const content = matchedText.length > 2 ? matchedText.slice(1, -1) : '';
+          result.push(<em key={`italic-${lastIndex}`}>{content}</em>); // Use unique keys
+        } else {
+           // Should not happen with this regex, but as fallback, add the raw match
+           result.push(matchedText);
+        }
+
+        lastIndex = regex.lastIndex;
+      }
+
+      // Add any remaining text after the last match
+      if (lastIndex < textWithBullets.length) {
+        result.push(textWithBullets.substring(lastIndex));
+      }
+
+      // Filter out potential empty strings and ensure valid React children
+      return result.filter(part => part !== null && part !== '');
+   } catch (error) {
+       console.error("Error formatting text:", error, "Original text:", text);
+       return text; // Return original text on error
+   }
+}
+
+// Accept new props: isMajorsVisible, toggleMajorsVisibility
+function ChatInterface({ imageFilenames, selectedMajorName, userName, isMajorsVisible, toggleMajorsVisibility }) {
     const [userInput, setUserInput] = useState('');
-    const [messages, setMessages] = useState([]); // State to hold the conversation history
+    const [messages, setMessages] = useState([]);
     const [isLoading, setIsLoading] = useState(false);
     const [chatError, setChatError] = useState(null);
-    const [messageNum, setMessageNum] = useState(0); // Track the number of messages sent/received pairs
 
-    // Ref for scrolling
     const messagesEndRef = useRef(null);
+    const initialAnalysisSentRef = useRef(false); // Ref to track if initial analysis was sent
+
+    // --- Add this useEffect to log messages ---
+    useEffect(() => {
+        console.log("Current message history:", messages);
+    }, [messages]); // Run whenever the messages array changes
+    // --- End logging effect ---
 
     // Scroll to bottom effect
     useEffect(() => {
         messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
-    }, [messages]); // Trigger scroll whenever messages update
+    }, [messages]);
 
-    // Clear chat and reset message count when agreement context changes
+    // Clear chat and reset flag when agreement context changes
     useEffect(() => {
-        setMessages([]); // Clear history
+        setMessages([]);
         setUserInput('');
         setChatError(null);
-        setMessageNum(0); // Reset message counter for new agreement
+        initialAnalysisSentRef.current = false; // Reset flag for new agreement
         console.log("Chat cleared due to new agreement context.");
-    }, [imageFilenames, selectedMajorName]); // Depend on the context identifiers
+    }, [imageFilenames, selectedMajorName]);
+
+    // Effect to send initial analysis request when images are loaded
+    useEffect(() => {
+        // Run only if:
+        // - We have image filenames.
+        // - Analysis hasn't been sent for this context yet.
+        // - We are not currently loading anything (prevents race conditions).
+        if (imageFilenames && imageFilenames.length > 0 && !initialAnalysisSentRef.current && !isLoading) {
+
+            const sendInitialAnalysis = async () => {
+                console.log("Sending initial analysis request...");
+                setIsLoading(true);
+                setChatError(null);
+                initialAnalysisSentRef.current = true; // Mark as sent for this context
+
+                // --- Updated Initial Prompt ---
+                const initialPrompt = `You are a helpful, knowledgeable, and supportive college counselor specializing in helping community college students successfully transfer to four-year universities. Your guidance should be clear, encouraging, and personalized based on each student's academic goals, major, preferred universities, and career aspirations. You provide information about transfer requirements, application tips, deadlines, articulation agreements, financial aid, scholarships, and campus life insights. Always empower students with accurate, up-to-date information and a positive, motivating tone. If you don't know an answer, offer to help them find resources or suggest next steps.
+
+Analyze the provided agreement images thoroughly. In your response, **first provide a concise summary of the key details found in the agreement**, including articulated courses, non-articulated courses, requirements, and any important notes or conditions. After the summary, answer the user's potential implicit question based on the analysis (e.g., how many courses are not articulated, suggest next steps/institutions if applicable based on proximity or course needs).
+
+**Please format key details, lists (like courses or requirements), and action items using bullet points (* or -). Use **bold** for emphasis on key terms or numbers, and \`italic\` for specific course codes or titles where appropriate.**
+
+**Important:** If the user asks about the details of the agreement being discussed (like the major, institutions, or year), refer to the context provided or the summary you generated. Do not state that you lack personal information about the user in this case.`;
+                // --- End Updated Initial Prompt ---
+
+                // Display a system message while analysis runs
+                setMessages([{ type: 'system', text: "Analyzing agreement and generating summary..." }]);
+
+                const payload = {
+                    new_message: initialPrompt,
+                    history: [], // No history for the very first message
+                    image_filenames: imageFilenames // Send images with this first request
+                };
+
+                try {
+                    console.log("Sending initial analysis to /chat:", payload);
+                    const response = await fetchData('chat', {
+                        method: 'POST',
+                        headers: { 'Content-Type': 'application/json' },
+                        body: JSON.stringify(payload)
+                    });
+
+                    if (response && response.reply) {
+                        // --- Removed cleaning to allow '*' for bullets ---
+                        // const cleanedReply = response.reply.replace(/[*`]/g, '');
+                        const replyText = response.reply; // Use raw reply
+                        // Replace "Analyzing..." message with the actual reply
+                        setMessages([{ type: 'bot', text: replyText }]);
+                    } else {
+                        throw new Error(response?.error || "No reply received for initial analysis.");
+                    }
+                } catch (err) {
+                    console.error("Initial analysis API error:", err);
+                    const errorMsg = `Failed initial analysis: ${err.message}`;
+                    setChatError(errorMsg);
+                    // Replace "Analyzing..." message with an error message
+                    setMessages([{ type: 'system', text: `Error during analysis: ${err.message}` }]);
+                    // Keep initialAnalysisSentRef true to prevent retries on error for this context
+                } finally {
+                    setIsLoading(false);
+                }
+            };
+
+            sendInitialAnalysis();
+        }
+        // This effect depends on imageFilenames to know when context is ready,
+        // and isLoading to avoid running while another request is in progress.
+    }, [imageFilenames, isLoading]);
+
 
     const handleSend = async () => {
-        // Basic guard: Check for input, loading state.
-        // Allow sending even if imageFilenames is empty *after* the first message.
+        // Guard: Check for input, loading state.
         if (!userInput.trim() || isLoading) return;
-        // Guard specifically for the *first* message if images are required then.
-        if (messageNum < 1 && (!imageFilenames || imageFilenames.length === 0)) {
-             console.warn("Attempted to send first message without image filenames.");
-             setChatError("Agreement images not loaded yet. Cannot start chat."); // Inform user
-             return;
-        }
 
+        // User can only send manually *after* the initial analysis is attempted.
 
-        const currentInput = userInput; // Capture input before clearing
-        const currentHistory = [...messages]; // Capture history *before* adding the new user message
+        const currentInput = userInput;
+        const currentHistory = [...messages];
 
-        // Add user message to local state immediately for UI responsiveness
+        // Add user message to local state
         setMessages(prev => [...prev, { type: 'user', text: currentInput }]);
-        setUserInput(''); // Clear input field
+        setUserInput('');
         setIsLoading(true);
         setChatError(null);
 
-        // --- Prepare data for Backend ---
-        // Map frontend message state to the format expected by the backend/OpenAI
+        // Prepare history for API
         const apiHistory = currentHistory.map(msg => ({
-            role: msg.type === 'bot' ? 'assistant' : msg.type, // Map 'bot' to 'assistant'
-            content: msg.text // Assuming simple text content for history
-            // NOTE: This simple mapping assumes previous messages didn't contain complex content like images.
-            // If the assistant could previously return images, or if user could upload images mid-convo,
-            // the 'content' structure here and in the backend would need to be more robust.
+            role: msg.type === 'bot' ? 'assistant' : msg.type,
+            content: msg.text
         }));
 
+        // Payload for subsequent messages (no image_filenames needed)
         const payload = {
             new_message: currentInput,
             history: apiHistory
         };
 
-        // Add image_filenames only for the very first message (messageNum is 0)
-        const shouldSendImages = messageNum < 1;
-        if (shouldSendImages) {
-            payload.image_filenames = imageFilenames;
-            console.log("Sending image filenames with the first message.");
-        }
-
         // --- Backend Call ---
         try {
-            console.log("Sending to /chat:", payload); // Log what's being sent
+            console.log("Sending to /chat:", JSON.stringify(payload));
             const response = await fetchData('chat', {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
                 },
-                body: JSON.stringify(payload) // Send new message, history, and optional images
+                body: JSON.stringify(payload)
             });
 
-            // Check if the response contains a reply
             if (response && response.reply) {
-                 // Add bot reply to local state
-                 setMessages(prev => [...prev, { type: 'bot', text: response.reply }]);
-                 setMessageNum(prev => prev + 1); // Increment message counter *after* successful round trip
+                 // --- Removed cleaning to allow '*' for bullets ---
+                 // const cleanedReply = response.reply.replace(/[*`]/g, '');
+                 const replyText = response.reply; // Use raw reply
+                 setMessages(prev => [...prev, { type: 'bot', text: replyText }]);
             } else {
-                 // Handle cases where backend might return an error structure differently
-                 throw new Error(response?.error || "No reply received or unexpected response format from chat API.");
+                 throw new Error(response?.error || "No reply received or unexpected response format.");
             }
         } catch (err) {
             console.error("Chat API error:", err);
             setChatError(`Failed to get response: ${err.message}`);
-            // Optionally add a system message indicating the error, or revert the user message
-            // Reverting might be complex, adding a system error is simpler:
             setMessages(prev => [...prev, { type: 'system', text: `Error: ${err.message}` }]);
         } finally {
             setIsLoading(false);
@@ -100,27 +220,64 @@ function ChatInterface({ imageFilenames, selectedMajorName }) {
         // --- End Backend Call ---
     };
 
-    // Disable input/button logic adjusted:
-    // Disable if loading.
-    // Disable if it's the first message (messageNum === 0) AND imageFilenames are missing/empty.
-    const isSendDisabled = isLoading || !userInput.trim() || (messageNum < 1 && (!imageFilenames || imageFilenames.length === 0));
-    const placeholderText = (messageNum < 1 && (!imageFilenames || imageFilenames.length === 0))
-        ? "Loading agreement context..."
-        : "Ask about the agreement...";
+    // Disable input/button if loading (covers initial analysis and subsequent messages)
+    const isSendDisabled = isLoading || !userInput.trim();
+    // Adjust placeholder based on loading state and if messages exist
+    const placeholderText = isLoading
+        ? (messages.length === 0 ? "Analyzing agreement..." : "Thinking...") // More specific loading text
+        : (messages.length === 0 ? "Select an agreement to start." : "Ask a follow-up question..."); // Default placeholder
 
 
     return (
-        <div style={{ height: '100%', display: 'flex', flexDirection: 'column', border: '1px solid #ccc', backgroundColor: '#f9f9f9' }}>
-            {/* Optional Header */}
-            <div style={{ padding: '8px 12px', borderBottom: '1px solid #ccc', backgroundColor: '#eee', fontSize: '0.9em', color: '#555' }}>
-                Chatting about: {selectedMajorName || "Selected Agreement"}
+        <div style={{
+            height: '100%',
+            display: 'flex',
+            flexDirection: 'column',
+            border: '1px solid #ccc',
+            backgroundColor: '#f9f9f9'
+        }}>
+            {/* Chat Header */}
+            <div style={{
+                padding: '8px 12px',
+                borderBottom: '1px solid #ccc',
+                backgroundColor: '#eee',
+                fontSize: '0.9em',
+                color: '#555',
+                display: 'flex', // Use flex to position button
+                justifyContent: 'space-between', // Space between title and button
+                alignItems: 'center' // Vertically align items
+            }}>
+                {/* Title */}
+                <span>Chatting about: {selectedMajorName || "Selected Agreement"}</span>
+
+                {/* --- Show Majors Button (Conditional) --- */}
+                {!isMajorsVisible && (
+                    <button
+                        onClick={toggleMajorsVisibility} // Use the passed function
+                        style={{
+                            padding: '2px 6px', // Smaller padding
+                            fontSize: '0.8em', // Smaller font
+                            marginLeft: '10px' // Add some space
+                        }}
+                        className="btn btn-sm btn-outline-secondary"
+                    >
+                        Show Majors
+                    </button>
+                )}
+                {/* --- End Show Majors Button --- */}
             </div>
 
             {/* Message Display Area */}
-            <div style={{ flex: '1 1 auto', overflowY: 'auto', padding: '10px' }}>
+            <div style={{
+                flex: '1 1 auto',
+                overflowY: 'auto',
+                padding: '10px',
+                minHeight: 0
+            }}>
+                {/* Display placeholder only if not loading and no messages */}
                 {messages.length === 0 && !isLoading && (
                     <div style={{ textAlign: 'center', color: '#888', marginTop: '20px' }}>
-                        {placeholderText === "Loading agreement context..." ? placeholderText : "Ask a question about the selected transfer agreement."}
+                        {placeholderText}
                     </div>
                 )}
                 {messages.map((msg, index) => (
@@ -133,16 +290,19 @@ function ChatInterface({ imageFilenames, selectedMajorName }) {
                             color: msg.type === 'user' ? 'white' : (msg.type === 'system' ? '#721c24' : '#333'),
                             border: msg.type === 'system' ? '1px solid #f5c6cb' : 'none',
                             maxWidth: '80%',
-                            wordWrap: 'break-word' // Ensure long words break
+                            wordWrap: 'break-word',
+                            whiteSpace: 'pre-wrap' // Crucial for rendering newlines and spaces correctly
                         }}>
-                            {msg.text}
+                            {/* Add Prefix based on type */}
+                            {msg.type === 'bot' && <strong style={{ marginRight: '5px' }}>AI:</strong>}
+                            {msg.type === 'user' && <strong style={{ marginRight: '5px' }}>{userName}:</strong>}
+                            {/* Render formatted text */}
+                            {formatText(msg.text)}
                         </span>
                     </div>
                 ))}
-                {/* Add a ref to the end of the messages list for scrolling */}
                 <div ref={messagesEndRef} />
-                {/* Loading/Error Indicators */}
-                {isLoading && <p style={{ fontStyle: 'italic', textAlign: 'center', color: '#666' }}>Thinking...</p>}
+                {/* Error Indicator */}
                 {chatError && !isLoading && <p style={{ color: 'red', textAlign: 'center', fontWeight: 'bold' }}>{chatError}</p>}
             </div>
 
@@ -155,11 +315,11 @@ function ChatInterface({ imageFilenames, selectedMajorName }) {
                     onKeyDown={(e) => e.key === 'Enter' && !isSendDisabled && handleSend()}
                     placeholder={placeholderText}
                     style={{ flexGrow: 1, marginRight: '10px', padding: '10px', borderRadius: '20px', border: '1px solid #ccc' }}
-                    disabled={isLoading || (messageNum < 1 && (!imageFilenames || imageFilenames.length === 0))} // Simplified disable logic
+                    disabled={isLoading} // Only disable when loading
                 />
                 <button
                     onClick={handleSend}
-                    disabled={isSendDisabled} // Use the combined disabled state
+                    disabled={isSendDisabled}
                     style={{ padding: '10px 15px', borderRadius: '20px', border: 'none', backgroundColor: '#007bff', color: 'white', cursor: isSendDisabled ? 'not-allowed' : 'pointer' }}
                 >
                     Send
diff --git a/src/components/CustomCourseNode.jsx b/src/components/CustomCourseNode.jsx
index 506a7d9..b2e5392 100644
--- a/src/components/CustomCourseNode.jsx
+++ b/src/components/CustomCourseNode.jsx
@@ -2,50 +2,44 @@
 import React, { memo } from 'react';
 import { Handle, Position } from 'reactflow';
 
-// Style for the node container
+// Style for the node container - Light Theme
 const nodeStyle = {
-  padding: '12px 18px', // Slightly more padding
-  // background: 'linear-gradient(145deg, #f0f0f0, #ffffff)', // Subtle gradient
-  background: '#ffffff', // Clean white background
-  border: '1px solid #ddd', // Lighter border
-  borderRadius: '8px', // Slightly more rounded corners
+  padding: '12px 18px',
+  background: '#ffffff', // White background
+  border: '1px solid #ddd', // Light grey border
+  borderRadius: '8px',
   textAlign: 'center',
-  minWidth: '120px', // Slightly wider minimum width
-  fontSize: '14px', // Slightly larger font size
-  color: '#333', // Darker text color for contrast
-  fontFamily: 'Arial, sans-serif', // Cleaner font
-  boxShadow: '0 2px 8px rgba(0, 0, 0, 0.1)', // Soft shadow for depth
-  position: 'relative', // Keep for handle positioning if needed later
+  minWidth: '120px',
+  fontSize: '14px',
+  color: '#333', // Dark text color
+  fontFamily: '"Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif', // Use Roboto font
+  boxShadow: '0 2px 8px rgba(0, 0, 0, 0.1)', // Soft shadow
+  position: 'relative',
 };
 
-// Style for handles
+// Style for handles - Light Theme
 const handleStyle = {
-    background: '#777', // Slightly lighter handle color
+    background: '#777', // Medium grey handle
     width: '8px',
     height: '8px',
-    border: '1px solid #fff', // Add a small border to handles
+    border: '1px solid #fff', // White border for contrast on handle
 };
 
 // memo prevents unnecessary re-renders
 const CustomCourseNode = ({ data }) => {
   return (
     <div style={nodeStyle}>
-      {/* Target Handle at the Top (for incoming prerequisites) */}
       <Handle
         type="target"
         position={Position.Top}
-        id="handle-top" // Unique ID for this handle
+        id="handle-top"
         style={handleStyle}
       />
-
-      {/* Node Label */}
       <div>{data.label}</div>
-
-      {/* Source Handle at the Bottom (for outgoing connections) */}
       <Handle
         type="source"
         position={Position.Bottom}
-        id="handle-bottom" // Unique ID for this handle
+        id="handle-bottom"
         style={handleStyle}
       />
     </div>

From 3d0fa6181e44cdba5c3fdff3450e35728af5316a Mon Sep 17 00:00:00 2001
From: Ahmon <ahmonembaye@gmail.com>
Date: Sun, 27 Apr 2025 23:10:19 -0700
Subject: [PATCH 04/16] feat: Implement multi-sender support, user auth/tiers &
 Stripe

- Allow selecting multiple sending institutions on the form.
- Find common receiving institutions & years via intersection.
- Display multiple agreements with tabs on AgreementViewerPage.
- Integrate user authentication (Google Login) for chat & status.
- Send auth token with relevant API calls.
- Implement user tiers (free/paid) fetched from backend.
- Add Stripe checkout flow for upgrades.
- Display user tier, usage limits, and upgrade options.
- Enhance chat prompt for multi-agreement context.
- Add Stripe, Tailwind, PostCSS, Autoprefixer dependencies.
---
 backend/college_transfer_ai/app.py            | 781 +++++++++++++++---
 .../college_transfer_API.py                   |  52 +-
 package-lock.json                             | 198 +++++
 package.json                                  |   4 +
 requirements.txt                              |   1 +
 src/App.jsx                                   | 153 +++-
 src/components/AgreementViewerPage.jsx        | 526 +++++++++---
 src/components/ChatInterface.jsx              | 179 ++--
 src/components/CollegeTransferForm.jsx        | 611 +++++++++++---
 9 files changed, 2078 insertions(+), 427 deletions(-)

diff --git a/backend/college_transfer_ai/app.py b/backend/college_transfer_ai/app.py
index 6ff2125..72af869 100644
--- a/backend/college_transfer_ai/app.py
+++ b/backend/college_transfer_ai/app.py
@@ -2,15 +2,21 @@
 import base64
 import traceback
 import uuid # Import uuid for map IDs
-import datetime # Import datetime
-from flask import Flask, jsonify, request, Response
+# Use datetime from datetime module consistently
+from datetime import datetime, timedelta, time, timezone # Add timezone
+from flask import Flask, jsonify, request, Response, redirect # Add redirect
 from flask_cors import CORS
 from .college_transfer_API import CollegeTransferAPI # Use a leading dot
 import gridfs
 from pymongo import MongoClient
+from bson.objectid import ObjectId # Import ObjectId
 import fitz
 from openai import OpenAI
 from dotenv import load_dotenv
+import stripe # Import stripe
+import json # Import json for webhook parsing
+import io # Import io for image processing
+from PIL import Image # Import Image for image processing
 
 # --- Google Auth Imports ---
 from google.oauth2 import id_token
@@ -30,7 +36,17 @@
 MONGO_URI = os.getenv("MONGO_URI")
 GOOGLE_CLIENT_ID = os.getenv("GOOGLE_CLIENT_ID")
 GOOGLE_API_KEY = os.getenv("GOOGLE_API_KEY")
-# --- End Config Vars ---
+
+# --- Stripe Config ---
+stripe.api_key = os.getenv("STRIPE_SECRET_KEY")
+STRIPE_PRICE_ID = os.getenv("STRIPE_PRICE_ID")
+STRIPE_WEBHOOK_SECRET = os.getenv("STRIPE_WEBHOOK_SECRET")
+FRONTEND_URL = os.getenv("FRONTEND_URL", "http://localhost:5173") # Default if not set
+# --- End Stripe Config ---
+
+# --- Rate Limits (Example: Daily) ---
+FREE_TIER_DAILY_LIMIT = 10
+PAID_TIER_DAILY_LIMIT = 200 # Example limit for paid users
 
 # --- Add this print statement ---
 print(f"--- Attempting to configure Google AI with Key: '{GOOGLE_API_KEY}' ---")
@@ -58,14 +74,20 @@
     print("MongoDB connection successful.")
     db = client["CollegeTransferAICluster"]
     fs = gridfs.GridFS(db)
-    course_maps_collection = db["course_maps"] # Collection remains the same name
-    # Ensure index on google_user_id and map_id for efficient lookups
+    course_maps_collection = db["course_maps"] # Collection for course maps
+    users_collection = db["users"] # NEW: Collection for user data and tiers
+
+    # Ensure index on google_user_id and map_id for course maps
     course_maps_collection.create_index([("google_user_id", 1)])
     course_maps_collection.create_index([("google_user_id", 1), ("map_id", 1)], unique=True)
 
+    # NEW: Ensure index on google_user_id for users collection (unique)
+    users_collection.create_index([("google_user_id", 1)], unique=True)
+    print("MongoDB collections and indexes configured.")
+
 except Exception as e:
-    print(f"CRITICAL: Failed to connect to MongoDB or create index: {e}")
-    # exit(1)
+    print(f"CRITICAL: Failed to connect to MongoDB or configure collections/indexes: {e}")
+    # exit(1) # Consider if you want the app to stop if DB fails
 
 if not GOOGLE_CLIENT_ID:
     print("Warning: GOOGLE_CLIENT_ID not set. Google Sign-In endpoints will fail.")
@@ -88,8 +110,10 @@ def verify_google_token(token):
         idinfo = id_token.verify_oauth2_token(
             token, google_requests.Request(), GOOGLE_CLIENT_ID
         )
-        google_user_id = idinfo['sub']
-        print(f"Token verified for user: {google_user_id}")
+        # Minimal check for required fields
+        if 'sub' not in idinfo:
+             raise ValueError("Token verification failed: Missing 'sub' (user ID).")
+        print(f"Token verified for user: {idinfo['sub']}")
         return idinfo
     except ValueError as e:
         print(f"Token verification failed: {e}")
@@ -99,6 +123,150 @@ def verify_google_token(token):
         raise ValueError(f"Token verification error: {e}")
 # --- End Helper ---
 
+# --- NEW Helper: Get or Create User ---
+# Modify get_or_create_user to include Stripe fields if they don't exist
+def get_or_create_user(idinfo):
+    """
+    Finds a user by google_user_id or creates a new one with default free tier.
+    Ensures Stripe-related fields exist.
+    Returns the user document from MongoDB.
+    """
+    google_user_id = idinfo.get('sub')
+    if not google_user_id:
+        raise ValueError("Missing 'sub' (user ID) in token info.")
+
+    user = users_collection.find_one({'google_user_id': google_user_id})
+
+    if not user:
+        print(f"User {google_user_id} not found. Creating new user.")
+        new_user_data = {
+            'google_user_id': google_user_id,
+            'email': idinfo.get('email'),
+            'name': idinfo.get('name'),
+            'tier': 'free', # Default tier
+            'requests_used_this_period': 0,
+            'period_start_date': datetime.utcnow(),
+            'created_at': datetime.utcnow(),
+            'last_login': datetime.utcnow(),
+            # Add Stripe fields with defaults
+            "stripe_customer_id": None,
+            "stripe_subscription_id": None,
+            "subscription_status": None,
+            "subscription_expires": None
+        }
+        try:
+            users_collection.insert_one(new_user_data)
+            print(f"Successfully created new user: {google_user_id}")
+            user = users_collection.find_one({'google_user_id': google_user_id})
+            if not user:
+                 raise Exception(f"Failed to retrieve newly created user {google_user_id}")
+        except Exception as e:
+            print(f"Error creating user {google_user_id}: {e}")
+            raise Exception(f"Database error creating user: {e}")
+    else:
+        # Ensure Stripe fields exist for older users & update last_login
+        update_needed = False
+        update_query = {'last_login': datetime.utcnow()} # Always update last login
+        if 'stripe_customer_id' not in user:
+            update_query['stripe_customer_id'] = None
+            update_needed = True
+        if 'stripe_subscription_id' not in user:
+            update_query['stripe_subscription_id'] = None
+            update_needed = True
+        if 'subscription_status' not in user:
+            update_query['subscription_status'] = None
+            update_needed = True
+        if 'subscription_expires' not in user:
+            update_query['subscription_expires'] = None
+            update_needed = True
+
+        users_collection.update_one(
+            {'google_user_id': google_user_id},
+            {'$set': update_query}
+        )
+        if update_needed:
+             # Re-fetch user data after update if fields were added
+             user = users_collection.find_one({"google_user_id": google_user_id})
+
+        print(f"Found existing user: {google_user_id}, Tier: {user.get('tier')}")
+
+    return user
+# --- End NEW Helper ---
+
+# --- Helper: Check and Update Usage ---
+def check_and_update_usage(user_data):
+    """
+    Checks if the user is within their daily limit.
+    Resets the count if a new day has started.
+    Increments the count if the request proceeds.
+    Returns True if the user is within limits, False otherwise.
+    Raises Exception on database error.
+    """
+    user_id = user_data['google_user_id']
+    tier = user_data.get('tier', 'free')
+    requests_used = user_data.get('requests_used_this_period', 0)
+    period_start = user_data.get('period_start_date')
+
+    limit = PAID_TIER_DAILY_LIMIT if tier == 'paid' else FREE_TIER_DAILY_LIMIT
+
+    now = datetime.utcnow()
+    reset_usage = False
+
+    # Check if period_start exists and is a datetime object
+    if period_start and isinstance(period_start, datetime):
+        # Check if the period start date is before today (UTC)
+        if period_start.date() < now.date():
+            print(f"New day detected for user {user_id}. Resetting usage count.")
+            requests_used = 0
+            period_start = now # Start the new period today
+            reset_usage = True
+        # else: # Period started today, continue counting
+            # print(f"Usage period started today for user {user_id}.")
+    else:
+        # If period_start is missing or invalid, start a new period now
+        print(f"Period start date missing or invalid for user {user_id}. Starting new period.")
+        requests_used = 0
+        period_start = now
+        reset_usage = True
+
+    # Check if limit is exceeded
+    if requests_used >= limit:
+        print(f"User {user_id} (Tier: {tier}) has reached daily limit of {limit}.")
+        return False # Limit exceeded
+
+    # --- If limit is not exceeded, increment count ---
+    try:
+        update_fields = {
+            '$inc': {'requests_used_this_period': 1},
+            '$set': {'last_request_timestamp': now} # Optional: track last request time
+        }
+        # Only update period_start_date if it was reset
+        if reset_usage:
+            update_fields['$set']['period_start_date'] = period_start
+            update_fields['$set']['requests_used_this_period'] = 1 # Start count at 1 for the new period
+
+        result = users_collection.update_one(
+            {'google_user_id': user_id},
+            update_fields
+        )
+        if result.modified_count == 0 and not reset_usage:
+             # This might happen if the user doc was deleted between fetch and update
+             # Or if the increment somehow failed. Handle defensively.
+             print(f"Warning: Failed to increment usage count for user {user_id}. Proceeding anyway.")
+             # Optionally raise an error or retry
+        elif reset_usage:
+             print(f"Usage reset and incremented to 1 for user {user_id} for new period starting {period_start.date()}.")
+        else:
+             print(f"Usage incremented for user {user_id}. New count: {requests_used + 1}/{limit}")
+
+        return True # Within limit, usage incremented
+
+    except Exception as e:
+        print(f"Database error updating usage for user {user_id}: {e}")
+        # Decide if you want to let the request proceed or block it on DB error
+        raise Exception(f"Failed to update usage count: {e}")
+
+# --- End Helper ---
 
 # --- Existing Endpoints (Home, Institutions, PDF/Image handling, Chat etc. remain the same) ---
 @app.route('/')
@@ -120,7 +288,7 @@ def get_institutions():
 # Endpoint to get receiving institutions
 @app.route('/receiving-institutions', methods=['GET'])
 def get_receiving_institutions():
-    sending_institution_id = request.args.get('sendingInstitutionId')
+    sending_institution_id = request.args.get('sendingId')
     if not sending_institution_id:
         return jsonify({"error": "Missing sendingInstitutionId parameter"}), 400
     try:
@@ -133,8 +301,11 @@ def get_receiving_institutions():
 # Endpoint to get academic years
 @app.route('/academic-years', methods=['GET'])
 def get_academic_years():
+    sending_institution_id = request.args.get('sendingId')
+    receiving_institution_id = request.args.get('receivingId')
+    print(f"Received sendingId: {sending_institution_id}, receivingId: {receiving_institution_id}")
     try:
-        academic_years = api.get_academic_years()
+        academic_years = api.get_academic_years(int(sending_institution_id),int(receiving_institution_id))
         return jsonify(academic_years)
     except Exception as e:
         print(f"Error in /academic-years: {e}")
@@ -151,32 +322,75 @@ def get_all_majors():
         return jsonify({"error": "Missing required parameters (sendingInstitutionId, receivingInstitutionId, academicYearId, categoryCode)"}), 400
     try:
         majors = api.get_all_majors(sending_institution_id, receiving_institution_id, academic_year_id, category_code)
-        print(majors)
         return jsonify(majors)
     except Exception as e:
         print(f"Error in /majors: {e}")
         return jsonify({"error": str(e)}), 500
 
-# Endpoint to get articulation agreement PDF filename
-@app.route('/articulation-agreement', methods=['GET'])
-def get_articulation_agreement():
-    key = request.args.get("key")
-    if not key:
-        return jsonify({"error": "Missing key parameter"}), 400
+# REMOVE or COMMENT OUT old endpoint:
+# @app.route('/articulation-agreement', methods=['GET'])
+# def get_articulation_agreement(): ...
+
+# NEW Endpoint to get multiple articulation agreement PDF filenames
+@app.route('/articulation-agreements', methods=['POST']) # Changed to POST
+def get_multiple_articulation_agreements():
+    print("Received request for multiple articulation agreements.")
+    
     try:
-        keyArray = key.split("/")
-        if len(keyArray) < 4:
-             return jsonify({"error": "Invalid key format"}), 400
-        sending_institution_id = int(keyArray[1])
-        receiving_institution_id = int(keyArray[3])
-        academic_year_id = int(keyArray[0])
-        pdf_filename = api.get_articulation_agreement(academic_year_id, sending_institution_id, receiving_institution_id, key)
-        return jsonify({"pdf_filename": pdf_filename})
-    except ValueError:
-         return jsonify({"error": "Invalid numeric value in key"}), 400
+        data = request.get_json()
+        if not data:
+            return jsonify({"error": "Invalid JSON payload"}), 400
+
+        sending_ids = data.get('sending_ids')
+        print(f"Received sending_ids: {sending_ids}")
+        receiving_id = data.get('receiving_id')
+        year_id = data.get('year_id')
+        major_key = data.get('major_key') # Key like 'Major/fc50cced...' or 'Department/...'
+
+        key_components = major_key.split('/')
+        major_id = key_components[-1] if len(key_components) > 1 else None
+        category_code = key_components[4] if len(key_components) > 0 else None
+        print(f"Extracted major_id: {major_id} from major_key: {major_key} \n")
+        if not all([sending_ids, receiving_id, year_id, major_key]) or not isinstance(sending_ids, list):
+            return jsonify({"error": "Missing or invalid parameters (sending_ids list, receiving_id, year_id, major_key required)"}), 400
+
+        print(f"Received request for agreements: Sending={sending_ids}, Receiving={receiving_id}, Year={year_id}, MajorKey={major_key}")
+
+        results = []
+        for sending_id in sending_ids:
+            try:
+                # Construct the 'key' needed by the underlying API function
+                # Assumes major_key is like 'Major/...' or 'Department/...'
+                # Adjust if your major_key format is different
+                constructed_key = f"{year_id}/{sending_id}/to/{receiving_id}/{category_code}/{major_id}"
+                print(f"Calling api.get_articulation_agreement for key: {constructed_key}")
+
+                # Call the original function for each sending ID
+                pdf_filename = api.get_articulation_agreement(
+                    int(year_id),
+                    int(sending_id),
+                    int(receiving_id),
+                    constructed_key # Pass the constructed key
+                )
+                results.append({
+                    "sendingId": sending_id, # Return string ID to match frontend state
+                    "pdfFilename": pdf_filename
+                })
+            except ValueError:
+                 print(f"Warning: Invalid numeric value for sending_id {sending_id}, skipping.")
+                 results.append({"sendingId": sending_id, "pdfFilename": None, "error": "Invalid ID format"})
+            except Exception as single_err:
+                # Log error for this specific agreement but continue with others
+                print(f"Error fetching agreement for sending_id {sending_id}: {single_err}")
+                # Optionally include error in response for frontend to display
+                results.append({"sendingId": sending_id, "pdfFilename": None, "error": str(single_err)})
+
+        return jsonify({"agreements": results})
+
     except Exception as e:
-        print(f"Error in /articulation-agreement: {e}")
-        return jsonify({"error": str(e)}), 500
+        print(f"Error in /articulation-agreements: {e}")
+        traceback.print_exc()
+        return jsonify({"error": f"Failed to process agreement request: {str(e)}"}), 500
 
 # Endpoint to get image filenames for a PDF (extracts if needed)
 @app.route('/pdf-images/<filename>')
@@ -246,107 +460,126 @@ def chat_with_agreement():
     if not GOOGLE_API_KEY: # Check if Google AI is configured
         return jsonify({"error": "Google AI client not configured."}), 500
 
+    # --- Authentication and User Retrieval ---
+    try:
+        auth_header = request.headers.get('Authorization')
+        if not auth_header or not auth_header.startswith('Bearer '):
+            return jsonify({"error": "Authorization token missing or invalid"}), 401
+        token = auth_header.split(' ')[1]
+        user_info = verify_google_token(token)
+        user_data = get_or_create_user(user_info) # Get/Create user record
+        user_tier = user_data.get('tier', 'free')
+        google_user_id = user_data['google_user_id']
+        print(f"[/chat] Request received from user {google_user_id} (Tier: {user_tier})")
+
+    except ValueError as auth_err:
+         print(f"[/chat] Authentication error: {auth_err}")
+         return jsonify({"error": str(auth_err)}), 401
+    except Exception as e:
+        print(f"[/chat] Error during user retrieval: {e}")
+        traceback.print_exc()
+        return jsonify({"error": f"Failed to retrieve user data: {str(e)}"}), 500
+    # --- End Authentication ---
+
+    # --- Rate Limiting Check ---
+    try:
+        # Check usage *before* processing the request
+        # The helper function will increment the count if within limits
+        if not check_and_update_usage(user_data):
+            limit = PAID_TIER_DAILY_LIMIT if user_tier == 'paid' else FREE_TIER_DAILY_LIMIT
+            return jsonify({
+                "error": f"Daily request limit ({limit}) reached for your tier ({user_tier}). Please try again tomorrow or upgrade for more requests."
+            }), 429 # Too Many Requests
+    except Exception as usage_err:
+        # Handle DB errors during usage check/update
+        print(f"[/chat] Error checking/updating usage for user {google_user_id}: {usage_err}")
+        traceback.print_exc()
+        # Decide if you want to block the request or proceed cautiously
+        return jsonify({"error": "Could not verify usage limits. Please try again later."}), 500
+    # --- End Rate Limiting Check ---
+
+    # --- Proceed with Chat Logic (if within limits) ---
     try:
         data = request.get_json()
-        if not data: return jsonify({"error": "Invalid JSON payload"}), 400
+        if not data:
+            return jsonify({"error": "Missing JSON payload"}), 400
 
         new_user_message_text = data.get('new_message')
-        # History from frontend (e.g., [{'role': 'user', 'content': 'Hi'}, {'role': 'assistant', 'content': 'Hello!'}])
-        frontend_history = data.get('history', [])
-        image_filenames = data.get('image_filenames') # Only sent on first turn
+        history = data.get('history', [])
+        image_filenames = data.get('image_filenames', []) # Expecting list of filenames
 
-        if not new_user_message_text: return jsonify({"error": "Missing 'new_message' text"}), 400
+        if not new_user_message_text:
+            return jsonify({"error": "Missing 'new_message' in request"}), 400
+        if not isinstance(history, list):
+             return jsonify({"error": "'history' must be a list"}), 400
+        if not isinstance(image_filenames, list):
+             return jsonify({"error": "'image_filenames' must be a list"}), 400
 
         # --- Prepare Input for Gemini ---
-        prompt_parts = [] # Initialize prompt parts list
-
-        # --- Add Images (if provided, typically only on the first turn) ---
+        prompt_parts = []
+        # Image processing
         if image_filenames:
-            print(f"Processing {len(image_filenames)} images for Gemini.")
-            image_count = 0
-            for filename in image_filenames:
+            print(f"Processing {len(image_filenames)} image(s)...")
+            for img_filename in image_filenames:
                 try:
-                    grid_out = fs.find_one({"filename": filename})
+                    grid_out = fs.find_one({"filename": img_filename})
                     if not grid_out:
-                        print(f"Image {filename} not found in GridFS. Skipping.")
-                        continue
-
+                        print(f"Warning: Image '{img_filename}' not found in GridFS.")
+                        continue # Skip missing images
                     image_bytes = grid_out.read()
-                    mime_type = getattr(grid_out, 'contentType', None)
-                    if not mime_type:
-                         if filename.lower().endswith(".jpg") or filename.lower().endswith(".jpeg"): mime_type = "image/jpeg"
-                         elif filename.lower().endswith(".png"): mime_type = "image/png"
-                         else: mime_type = "image/png"
-                         print(f"Warning: contentType missing for {filename}, inferred as {mime_type}")
-
-                    # Append image part as a dictionary
-                    prompt_parts.append({
-                        "mime_type": mime_type,
-                        "data": image_bytes
-                    })
-                    image_count += 1
+                    prompt_parts.append(Image.open(io.BytesIO(image_bytes)))
                 except Exception as img_err:
-                    print(f"Error reading/processing image {filename} for Gemini: {img_err}. Skipping.")
-            print(f"Added {image_count} images to Gemini prompt parts.")
-        else:
-            print("No image filenames provided for this turn.")
+                    print(f"Error processing image {img_filename}: {img_err}")
+                    # Decide if you want to fail the request or just skip the image
+                    # return jsonify({"error": f"Failed to process image {img_filename}"}), 500
 
-        # --- Always add the new user message text part ---
+        # Add text message
         prompt_parts.append(new_user_message_text)
 
-        # --- Convert Frontend History to Gemini Format ---
+        # History conversion
         gemini_history = []
-        print(f"Converting {len(frontend_history)} messages from frontend history.")
-        for msg in frontend_history:
-            # Map frontend roles ('user', 'assistant') to Gemini roles ('user', 'model')
-            role = 'model' if msg.get('role') == 'assistant' else 'user'
-            # Ensure content exists and is a string
-            content = msg.get('content', '')
-            if not isinstance(content, str):
-                print(f"Warning: Skipping history item with non-string content: {content}")
-                continue
-            # Append structured content for Gemini history
-            gemini_history.append({
-                "role": role,
-                "parts": [content] # Gemini history parts are lists
-            })
-        print(f"Converted history for Gemini: {len(gemini_history)} items.")
-        # --- End History Conversion ---
-
+        for msg in history:
+            role = "user" if msg.get("role") == "user" else "model"
+            text = msg.get("text")
+            if text: # Ensure text exists
+                 gemini_history.append({'role': role, 'parts': [text]})
+            else:
+                 print(f"Warning: Skipping history message with no text: {msg}")
+
+
+        # --- Model Selection based on Tier ---
+        if user_tier == 'paid':
+            model_name = 'gemini-1.5-pro' # Or your preferred paid model
+            print(f"Using PAID tier model: {model_name}")
+        else: # Default to free tier model
+            model_name = 'gemini-1.5-flash-latest' # Or your preferred free model
+            print(f"Using FREE tier model: {model_name}")
+        # --- End Model Selection ---
 
         # --- Initialize Gemini Model and Chat ---
-        # Use safety settings suitable for your use case
-        safety_settings = {
-            HarmCategory.HARM_CATEGORY_HARASSMENT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
-            HarmCategory.HARM_CATEGORY_HATE_SPEECH: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
-            HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
-            HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
+        safety_settings = { # Define your safety settings
+             HarmCategory.HARM_CATEGORY_HARASSMENT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
+             # ... other categories ...
         }
-        model = genai.GenerativeModel(
-            'gemini-1.5-flash-latest', # Or your preferred model
-            safety_settings=safety_settings
-            )
-        # Start the chat WITH the converted history
+        model = genai.GenerativeModel(model_name, safety_settings=safety_settings)
         chat = model.start_chat(history=gemini_history)
 
-        print(f"Sending request to Gemini with {len(prompt_parts)} parts in the new message...")
-        # print(f"Gemini History being used: {gemini_history}") # Optional: Log the history being passed
-
-        # --- Send message to Gemini ---
-        # Note: We send only the NEW prompt_parts here. The history is managed by the chat object.
-        response = chat.send_message(prompt_parts) # Removed safety_settings here if set in model
-
+        print(f"Sending request to Gemini ({model_name}) with {len(prompt_parts)} parts...")
+        response = chat.send_message(prompt_parts)
         assistant_reply = response.text
         print("Received reply from Gemini.")
 
+        # --- Usage count was already incremented by check_and_update_usage ---
+
         return jsonify({"reply": assistant_reply})
 
     except Exception as e:
-        print(f"Error in /chat endpoint (Gemini): {e}")
+        print(f"[/chat] Error during chat processing for user {google_user_id}: {e}")
         traceback.print_exc()
-        error_message = f"An unexpected error occurred with the AI chat: {str(e)}"
-        return jsonify({"error": error_message}), 500
-
+        # Note: Usage count might have been incremented even if this part fails.
+        # Consider adding logic to decrement if a failure occurs *after* the increment,
+        # though this adds complexity.
+        return jsonify({"error": f"An error occurred processing your request: {str(e)}"}), 500
 # --- End Chat Endpoint ---
 
 
@@ -360,8 +593,9 @@ def list_course_maps():
         if not auth_header or not auth_header.startswith('Bearer '):
             return jsonify({"error": "Authorization token missing or invalid"}), 401
         token = auth_header.split(' ')[1]
-        user_info = verify_google_token(token)
-        google_user_id = user_info['sub']
+        user_info = verify_google_token(token) # Verify token first
+        user_data = get_or_create_user(user_info) # Get/Create user record
+        google_user_id = user_data['google_user_id'] # Use ID from user_data
 
         # Find maps for the user, projecting only necessary fields
         maps_cursor = course_maps_collection.find(
@@ -370,7 +604,7 @@ def list_course_maps():
         ).sort('last_updated', -1) # Sort by most recently updated
 
         map_list = list(maps_cursor)
-        print(f"Found {len(map_list)} maps for user {google_user_id}")
+        print(f"Found {len(map_list)} maps for user {google_user_id} (Tier: {user_data.get('tier')})")
         return jsonify(map_list), 200
 
     except ValueError as auth_err:
@@ -389,7 +623,8 @@ def load_specific_course_map(map_id):
             return jsonify({"error": "Authorization token missing or invalid"}), 401
         token = auth_header.split(' ')[1]
         user_info = verify_google_token(token)
-        google_user_id = user_info['sub']
+        user_data = get_or_create_user(user_info) # Get/Create user record
+        google_user_id = user_data['google_user_id']
 
         # Find the specific map for the user
         map_data = course_maps_collection.find_one(
@@ -420,7 +655,8 @@ def save_or_update_course_map():
             return jsonify({"error": "Authorization token missing or invalid"}), 401
         token = auth_header.split(' ')[1]
         user_info = verify_google_token(token)
-        google_user_id = user_info['sub']
+        user_data = get_or_create_user(user_info) # Get/Create user record
+        google_user_id = user_data['google_user_id']
 
         data = request.get_json()
         if not data or 'nodes' not in data or 'edges' not in data:
@@ -431,7 +667,7 @@ def save_or_update_course_map():
         map_id = data.get('map_id') # Get map_id if provided (for updates)
         map_name = data.get('map_name', 'Untitled Map') # Get name or use default
 
-        current_time = datetime.datetime.utcnow()
+        current_time = datetime.utcnow()
 
         if map_id: # Update existing map
             print(f"Updating map {map_id} for user {google_user_id}")
@@ -482,7 +718,8 @@ def delete_specific_course_map(map_id):
             return jsonify({"error": "Authorization token missing or invalid"}), 401
         token = auth_header.split(' ')[1]
         user_info = verify_google_token(token)
-        google_user_id = user_info['sub']
+        user_data = get_or_create_user(user_info) # Get/Create user record
+        google_user_id = user_data['google_user_id']
 
         # --- Add Logging ---
         print(f"[Delete Request] Received Map ID: {map_id}, User ID from Token: {google_user_id}")
@@ -513,6 +750,330 @@ def delete_specific_course_map(map_id):
         return jsonify({"error": f"Failed to delete course map: {str(e)}"}), 500
 # --- End Course Map Endpoints ---
 
+# --- NEW Endpoint: Get User Status ---
+@app.route('/user-status', methods=['GET'])
+def get_user_status():
+    try:
+        auth_header = request.headers.get('Authorization')
+        if not auth_header or not auth_header.startswith('Bearer '):
+            return jsonify({"error": "Authorization token missing or invalid"}), 401
+        token = auth_header.split(' ')[1]
+        user_info = verify_google_token(token)
+        user_data = get_or_create_user(user_info)
+        google_user_id = user_data['google_user_id']
+
+        tier = user_data.get('tier', 'free')
+        requests_used = user_data.get('requests_used_this_period', 0)
+        period_start = user_data.get('period_start_date')
+
+        limit = PAID_TIER_DAILY_LIMIT if tier == 'paid' else FREE_TIER_DAILY_LIMIT
+
+        now = datetime.utcnow()
+        reset_time = None
+
+        # Calculate reset time (assuming daily reset at UTC midnight)
+        # Find the start of the next day in UTC
+        tomorrow_midnight = datetime.combine(now.date() + timedelta(days=1), time(0, 0), tzinfo=now.tzinfo)
+        reset_time = tomorrow_midnight.isoformat() + "Z" # Format as ISO string with Z for UTC
+
+        # Check if usage needs reset (if period_start is before today)
+        # This ensures the returned 'requests_used' is accurate for today
+        if period_start and isinstance(period_start, datetime) and period_start.date() < now.date():
+            requests_used = 0 # Report 0 if the period hasn't been reset yet by a request
+
+        print(f"User status requested for {google_user_id}: Used={requests_used}, Limit={limit}, Tier={tier}, Resets={reset_time}")
+
+        return jsonify({
+            "tier": tier,
+            "usageCount": requests_used,
+            "usageLimit": limit,
+            "resetTime": reset_time # ISO 8601 format string (UTC)
+        }), 200
+
+    except ValueError as auth_err:
+         return jsonify({"error": str(auth_err)}), 401
+    except Exception as e:
+        print(f"Error getting user status: {e}")
+        traceback.print_exc()
+        return jsonify({"error": f"Failed to get user status: {str(e)}"}), 500
+# --- End NEW Endpoint ---
+
+# --- NEW: Stripe Checkout Session Endpoint ---
+@app.route('/create-checkout-session', methods=['POST'])
+def create_checkout_session():
+    try:
+        # 1. Authenticate User
+        auth_header = request.headers.get('Authorization')
+        if not auth_header or not auth_header.startswith('Bearer '):
+            return jsonify({"error": "Authorization token missing or invalid"}), 401
+        token = auth_header.split(' ')[1]
+        user_info = verify_google_token(token)
+        user_data = get_or_create_user(user_info)
+        google_user_id = user_data['google_user_id']
+        mongo_user_id = str(user_data['_id']) # Use MongoDB _id as client_reference_id
+
+        print(f"Creating checkout session for user: {google_user_id} (Mongo ID: {mongo_user_id})")
+
+        # 2. Create Stripe Checkout Session
+        checkout_session = stripe.checkout.Session.create(
+            line_items=[
+                {
+                    'price': STRIPE_PRICE_ID, # Price ID from .env
+                    'quantity': 1,
+                },
+            ],
+            mode='subscription',
+            success_url=f'{FRONTEND_URL}/payment-success?session_id={{CHECKOUT_SESSION_ID}}',
+            cancel_url=f'{FRONTEND_URL}/payment-cancel',
+            # Link session to your internal user ID
+            client_reference_id=mongo_user_id,
+            # Optionally prefill email
+            customer_email=user_data.get('email'),
+            # If user already has a stripe_customer_id, use it
+            customer=user_data.get('stripe_customer_id') if user_data.get('stripe_customer_id') else None,
+            # If creating a new customer, attach metadata
+            customer_creation='always' if not user_data.get('stripe_customer_id') else None, # Create if not exists
+            customer_update={'name': 'auto', 'address': 'auto'} if user_data.get('stripe_customer_id') else None, # Update if exists
+            subscription_data={
+                'metadata': {
+                    'mongo_user_id': mongo_user_id,
+                    'google_user_id': google_user_id
+                }
+            } if not user_data.get('stripe_customer_id') else None, # Add metadata only if creating sub with new customer
+        )
+        print(f"Stripe session created: {checkout_session.id}")
+        return jsonify({'sessionId': checkout_session.id})
+
+    except ValueError as auth_err:
+        print(f"[/create-checkout-session] Authentication error: {auth_err}")
+        return jsonify({"error": str(auth_err)}), 401
+    except stripe.error.StripeError as e:
+        print(f"Stripe error creating checkout session: {e}")
+        return jsonify({'error': f'Stripe error: {str(e)}'}), 500
+    except Exception as e:
+        print(f"Error creating checkout session: {e}")
+        traceback.print_exc()
+        return jsonify({'error': f'Internal server error: {str(e)}'}), 500
+
+# --- NEW: Stripe Webhook Endpoint ---
+@app.route('/stripe-webhook', methods=['POST'])
+def stripe_webhook():
+    payload = request.data
+    sig_header = request.headers.get('Stripe-Signature')
+    event = None
+
+    if not STRIPE_WEBHOOK_SECRET:
+        print("Webhook Error: STRIPE_WEBHOOK_SECRET not set.")
+        return jsonify({'error': 'Webhook secret not configured'}), 500
+
+    print("\n--- Stripe Webhook Received ---")
+
+    try:
+        event = stripe.Webhook.construct_event(
+            payload, sig_header, STRIPE_WEBHOOK_SECRET
+        )
+        print(f"Webhook Event Type: {event['type']}")
+    except ValueError as e:
+        # Invalid payload
+        print(f"Webhook Error: Invalid payload - {e}")
+        return jsonify({'error': 'Invalid payload'}), 400
+    except stripe.error.SignatureVerificationError as e:
+        # Invalid signature
+        print(f"Webhook Error: Invalid signature - {e}")
+        return jsonify({'error': 'Invalid signature'}), 400
+    except Exception as e:
+        print(f"Webhook Error: Unexpected error constructing event - {e}")
+        return jsonify({'error': 'Webhook construction error'}), 500
+
+    # --- Handle the event ---
+    try:
+        event_type = event['type']
+        event_data = event['data']['object']
+
+        # Handle the checkout.session.completed event
+        if event_type == 'checkout.session.completed':
+            session = event_data
+            mongo_user_id = session.get('client_reference_id')
+            stripe_customer_id = session.get('customer')
+            stripe_subscription_id = session.get('subscription')
+
+            print(f"Checkout session completed for Mongo User ID: {mongo_user_id}")
+            print(f"  Stripe Customer ID: {stripe_customer_id}")
+            print(f"  Stripe Subscription ID: {stripe_subscription_id}")
+
+            if not mongo_user_id or not stripe_customer_id or not stripe_subscription_id:
+                 print("Webhook Error: Missing required data in checkout.session.completed event.")
+                 return jsonify({'error': 'Missing data in event'}), 400
+
+            # Retrieve subscription details to get status and period end
+            try:
+                subscription = stripe.Subscription.retrieve(stripe_subscription_id)
+                subscription_status = subscription.status
+                # Convert Unix timestamp to datetime (UTC)
+                subscription_expires_ts = subscription.current_period_end
+                subscription_expires_dt = datetime.fromtimestamp(subscription_expires_ts, tz=timezone.utc) if subscription_expires_ts else None
+
+                print(f"  Subscription Status: {subscription_status}")
+                print(f"  Subscription Expires: {subscription_expires_dt}")
+
+                # Update user document in MongoDB
+                update_result = users_collection.update_one(
+                    {"_id": ObjectId(mongo_user_id)}, # Use ObjectId to find user
+                    {"$set": {
+                        "tier": "paid",
+                        "stripe_customer_id": stripe_customer_id,
+                        "stripe_subscription_id": stripe_subscription_id,
+                        "subscription_status": subscription_status,
+                        "subscription_expires": subscription_expires_dt,
+                        # Reset usage count upon successful upgrade
+                        "requests_used_this_period": 0,
+                        "period_start_date": datetime.utcnow() # Reset period start
+                    }}
+                )
+                if update_result.matched_count == 0:
+                     print(f"Webhook Error: User not found for Mongo ID: {mongo_user_id}")
+                     # Consider logging this error more formally
+                else:
+                     print(f"User {mongo_user_id} updated to paid tier.")
+
+            except stripe.error.StripeError as sub_err:
+                print(f"Webhook Error: Failed to retrieve subscription {stripe_subscription_id}: {sub_err}")
+                # Decide how to handle - maybe retry later or log for manual check
+                return jsonify({'error': 'Failed to retrieve subscription details'}), 500
+            except Exception as e:
+                print(f"Webhook Error: Unexpected error updating user after checkout: {e}")
+                traceback.print_exc()
+                return jsonify({'error': 'Internal server error updating user'}), 500
+
+
+        # Handle subscription deleted (canceled immediately or at period end)
+        elif event_type in ['customer.subscription.deleted', 'customer.subscription.updated']:
+            subscription = event_data
+            stripe_subscription_id = subscription.id
+            subscription_status = subscription.status # 'canceled', 'active', 'past_due', etc.
+            cancel_at_period_end = subscription.cancel_at_period_end
+
+            print(f"Subscription update/deleted event for Sub ID: {stripe_subscription_id}")
+            print(f"  Status: {subscription_status}, Cancel at Period End: {cancel_at_period_end}")
+
+            # Downgrade if the subscription is truly canceled or set to cancel at period end
+            # We only downgrade if the status becomes 'canceled' or if cancel_at_period_end is true
+            # We don't want to downgrade for other updates (e.g., payment method change)
+            if subscription_status == 'canceled' or cancel_at_period_end:
+                print(f"Downgrading user associated with subscription {stripe_subscription_id}")
+                # Find user by subscription ID
+                update_result = users_collection.update_one(
+                    {"stripe_subscription_id": stripe_subscription_id},
+                    {"$set": {
+                        "tier": "free",
+                        "subscription_status": "canceled" if subscription_status == 'canceled' else "ending", # Indicate if it's ending soon
+                        # Keep stripe_subscription_id for history? Or clear? Let's keep it for now.
+                        # "stripe_subscription_id": None,
+                        "subscription_expires": None # Clear expiration as it's no longer active/renewing
+                    }}
+                )
+                if update_result.matched_count == 0:
+                     print(f"Webhook Warning: No user found for subscription ID {stripe_subscription_id} during downgrade.")
+                else:
+                     print(f"User associated with {stripe_subscription_id} downgraded/marked as ending.")
+            elif subscription_status == 'active' and not cancel_at_period_end:
+                 # Handle case where subscription was updated but remains active (e.g., plan change, payment update)
+                 # Update expiration date and status just in case
+                 subscription_expires_ts = subscription.current_period_end
+                 subscription_expires_dt = datetime.fromtimestamp(subscription_expires_ts, tz=timezone.utc) if subscription_expires_ts else None
+                 update_result = users_collection.update_one(
+                    {"stripe_subscription_id": stripe_subscription_id},
+                    {"$set": {
+                        "subscription_status": subscription_status,
+                        "subscription_expires": subscription_expires_dt
+                    }}
+                 )
+                 if update_result.matched_count > 0:
+                     print(f"Updated active subscription details for {stripe_subscription_id}.")
+
+
+        # Handle successful invoice payment (useful for renewals)
+        elif event_type == 'invoice.payment_succeeded':
+            invoice = event_data
+            stripe_subscription_id = invoice.get('subscription')
+            stripe_customer_id = invoice.get('customer')
+
+            # Check if it's for a subscription renewal/cycle
+            if invoice.billing_reason == 'subscription_cycle' and stripe_subscription_id:
+                print(f"Subscription {stripe_subscription_id} renewed (invoice paid).")
+                # Retrieve subscription to update expiration date and ensure status is active
+                try:
+                    subscription = stripe.Subscription.retrieve(stripe_subscription_id)
+                    subscription_expires_ts = subscription.current_period_end
+                    subscription_expires_dt = datetime.fromtimestamp(subscription_expires_ts, tz=timezone.utc) if subscription_expires_ts else None
+                    subscription_status = subscription.status # Should be 'active' after successful payment
+
+                    update_result = users_collection.update_one(
+                        {"stripe_subscription_id": stripe_subscription_id},
+                        {"$set": {
+                            "subscription_status": subscription_status,
+                            "subscription_expires": subscription_expires_dt,
+                            "tier": "paid" # Ensure tier is set to paid on renewal
+                        }}
+                    )
+                    if update_result.matched_count > 0:
+                        print(f"Updated subscription expiration/status for user associated with {stripe_subscription_id}.")
+                    else:
+                        print(f"Webhook Warning: User not found for subscription {stripe_subscription_id} during renewal update.")
+
+                except stripe.error.StripeError as sub_err:
+                    print(f"Webhook Error: Failed to retrieve subscription {stripe_subscription_id} during renewal: {sub_err}")
+                    # Log error, but don't necessarily fail the webhook response
+                except Exception as e:
+                    print(f"Webhook Error: Unexpected error updating user after renewal: {e}")
+                    traceback.print_exc()
+                    # Log error
+
+        # Handle failed payments (optional but recommended)
+        elif event_type == 'invoice.payment_failed':
+            invoice = event_data
+            stripe_subscription_id = invoice.get('subscription')
+            if stripe_subscription_id:
+                print(f"Invoice payment failed for subscription {stripe_subscription_id}.")
+                # Update user status to reflect payment issue (e.g., 'past_due')
+                try:
+                    subscription = stripe.Subscription.retrieve(stripe_subscription_id)
+                    subscription_status = subscription.status # e.g., 'past_due'
+
+                    update_result = users_collection.update_one(
+                        {"stripe_subscription_id": stripe_subscription_id},
+                        {"$set": {"subscription_status": subscription_status}}
+                    )
+                    if update_result.matched_count > 0:
+                        print(f"Updated subscription status to '{subscription_status}' for user associated with {stripe_subscription_id}.")
+                    else:
+                        print(f"Webhook Warning: User not found for subscription {stripe_subscription_id} during payment failure update.")
+                except stripe.error.StripeError as sub_err:
+                     print(f"Webhook Error: Failed to retrieve subscription {stripe_subscription_id} after payment failure: {sub_err}")
+                except Exception as e:
+                     print(f"Webhook Error: Unexpected error updating user after payment failure: {e}")
+                     traceback.print_exc()
+
+
+        else:
+            print(f"Unhandled event type {event_type}")
+
+    except KeyError as e:
+        print(f"Webhook Error: Missing expected key in event data - {e}")
+        # Log the event data for debugging
+        print("Event Data:", json.dumps(event, indent=2))
+        return jsonify({'error': f'Missing key in event data: {e}'}), 400
+    except Exception as e:
+        print(f"Webhook Error: Error handling event {event.get('type', 'N/A')} - {e}")
+        traceback.print_exc()
+        # Return 500 but log the error; Stripe might retry.
+        return jsonify({'error': 'Internal server error handling webhook'}), 500
+
+
+    # Acknowledge receipt of the event
+    return jsonify({'success': True}), 200
+# --- End Stripe Webhook Endpoint ---
+
 
 if __name__ == '__main__':
     is_debug = os.getenv("FLASK_DEBUG", "False").lower() in ("true", "1", "t")
diff --git a/backend/college_transfer_ai/college_transfer_API.py b/backend/college_transfer_ai/college_transfer_API.py
index 5b4719b..0b6f955 100644
--- a/backend/college_transfer_ai/college_transfer_API.py
+++ b/backend/college_transfer_ai/college_transfer_API.py
@@ -9,7 +9,7 @@ class CollegeTransferAPI:
     def __init__(self):
         self.base_url = "https://assist.org/api/"
 
-    def get_academic_years(self):
+    def get_academic_year(self, id):
         url = self.base_url + "AcademicYears"
         response = requests.get(url)
         
@@ -26,8 +26,31 @@ def get_academic_years(self):
         for year in result_academic_years:
             academic_year = (str(year['FallYear'] - 1) + "-" + str(year['FallYear']))
             if academic_year == "2025-2026": continue
-            academic_years_dict[academic_year] = year['Id'] - 1   
+            academic_years_dict[year['Id'] - 1] = academic_year
         
+        return academic_years_dict[id] if id in academic_years_dict else None
+
+
+    def get_academic_years(self, sending_institution_id, receiving_institution_id):
+        url = f"{self.base_url}/institutions/{sending_institution_id}/agreements"
+        
+        response = requests.get(url)
+        
+        institutions_dict = {}
+        
+        academic_years_dict = {}
+        
+        if response.status_code == 200:
+            json_response = response.json()
+            institutions_dict = json_response
+        else:
+            raise Exception("Failed to fetch academic years")
+        
+        for institution in institutions_dict:
+            if institution["institutionParentId"] == receiving_institution_id:
+                for year_id in institution["receivingYearIds"]:
+                    academic_years_dict[self.get_academic_year(year_id)] = year_id
+            
         return academic_years_dict
 
     def get_college_from_id(self, id):
@@ -118,6 +141,8 @@ def get_major_from_key(self, key):
 
         result_json = {}
 
+        print("KEY AND URL: ",key, url)
+
         # Convert the response to JSON and write it to a file
         try:
             json_data = result.json()
@@ -177,6 +202,7 @@ def get_receiving_institutions(self, receiving_institution_id):
     
     
     def get_articulation_agreement(self, academic_year_id, sending_institution_id, receiving_institution_id, key):
+        print(f"Fetching articulation agreement for key: {key}")
         try: # Wrap more of the logic for better error handling
             college_name = self.get_college_from_id(sending_institution_id)
             receiving_name = self.get_college_from_id(receiving_institution_id)
@@ -215,8 +241,7 @@ def get_articulation_agreement(self, academic_year_id, sending_institution_id, r
 
             # --- Construct URL (same as before) ---
             viewBy = "major"
-            if "Department" in key:
-                viewBy = "dept" 
+             
 
             url = (
                 f"https://assist.org/transfer/results?year={academic_year_id}"
@@ -225,6 +250,25 @@ def get_articulation_agreement(self, academic_year_id, sending_institution_id, r
                 f"&agreementType=to&viewAgreementsOptions=true&view=agreement"
                 f"&viewBy={viewBy}&viewSendingAgreements=false&viewByKey={key}"
             )
+            
+            if "Department" in key:
+                viewBy = "dept"
+                if "SendingDepartment" in key:
+                    url = (
+                        f"https://assist.org/transfer/results?year={academic_year_id}"
+                        f"&institution={sending_institution_id}"
+                        f"&agreement={receiving_institution_id}"
+                        f"&agreementType=to&viewAgreementsOptions=true&view=agreement"
+                        f"&viewBy={viewBy}&viewByKey={key}&viewSendingAgreements=true"
+                    )
+                else:
+                    url = (
+                        f"https://assist.org/transfer/results?year={academic_year_id}"
+                        f"&institution={sending_institution_id}"
+                        f"&agreement={receiving_institution_id}"
+                        f"&agreementType=to&viewAgreementsOptions=true&view=agreement"
+                        f"&viewBy={viewBy}&viewByKey={key}"
+                    )
             print(f"Attempting to fetch PDF from URL: {url}")
 
             # --- Download PDF using Playwright (same as before) ---
diff --git a/package-lock.json b/package-lock.json
index 632ad80..7c13a1f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
       "version": "0.0.0",
       "dependencies": {
         "@react-oauth/google": "^0.12.1",
+        "@stripe/stripe-js": "^7.2.0",
         "dotenv": "^16.5.0",
         "jwt-decode": "^4.0.0",
         "react": "^19.0.0",
@@ -21,10 +22,13 @@
         "@types/react": "^19.0.10",
         "@types/react-dom": "^19.0.4",
         "@vitejs/plugin-react-swc": "^3.8.0",
+        "autoprefixer": "^10.4.21",
         "eslint": "^9.22.0",
         "eslint-plugin-react-hooks": "^5.2.0",
         "eslint-plugin-react-refresh": "^0.4.19",
         "globals": "^16.0.0",
+        "postcss": "^8.5.3",
+        "tailwindcss": "^4.1.4",
         "vite": "^6.3.2"
       }
     },
@@ -1071,6 +1075,15 @@
         "win32"
       ]
     },
+    "node_modules/@stripe/stripe-js": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@stripe/stripe-js/-/stripe-js-7.2.0.tgz",
+      "integrity": "sha512-BXlt6BsFE599yOATuz78FiW9z4SyipCH3j1SDyKWe/3OUBdhcOr/BWnBi1xrtcC2kfqrTJjgvfH2PTfMPRmbTw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.16"
+      }
+    },
     "node_modules/@swc/core": {
       "version": "1.11.21",
       "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.11.21.tgz",
@@ -1666,6 +1679,44 @@
       "dev": true,
       "license": "Python-2.0"
     },
+    "node_modules/autoprefixer": {
+      "version": "10.4.21",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.21.tgz",
+      "integrity": "sha512-O+A6LWV5LDHSJD3LjHYoNi4VLsj/Whi7k6zG12xTYaU4cQ8oxQGckXNX8cRHK5yOZ/ppVHe0ZBXGzSV9jXdVbQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "browserslist": "^4.24.4",
+        "caniuse-lite": "^1.0.30001702",
+        "fraction.js": "^4.3.7",
+        "normalize-range": "^0.1.2",
+        "picocolors": "^1.1.1",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "bin": {
+        "autoprefixer": "bin/autoprefixer"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -1684,6 +1735,39 @@
         "concat-map": "0.0.1"
       }
     },
+    "node_modules/browserslist": {
+      "version": "4.24.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
+      "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001688",
+        "electron-to-chromium": "^1.5.73",
+        "node-releases": "^2.0.19",
+        "update-browserslist-db": "^1.1.1"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
     "node_modules/callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -1694,6 +1778,27 @@
         "node": ">=6"
       }
     },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001715",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz",
+      "integrity": "sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "CC-BY-4.0"
+    },
     "node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -1908,6 +2013,13 @@
         "url": "https://dotenvx.com"
       }
     },
+    "node_modules/electron-to-chromium": {
+      "version": "1.5.143",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.143.tgz",
+      "integrity": "sha512-QqklJMOFBMqe46k8iIOwA9l2hz57V2OKMmP5eSWcUvwx+mASAsbU+wkF1pHjn9ZVSBPrsYWr4/W/95y5SwYg2g==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/esbuild": {
       "version": "0.25.2",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.2.tgz",
@@ -1949,6 +2061,16 @@
         "@esbuild/win32-x64": "0.25.2"
       }
     },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -2227,6 +2349,20 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/fraction.js": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
+      "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://github.com/sponsors/rawify"
+      }
+    },
     "node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
@@ -2481,6 +2617,23 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/node-releases": {
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/optionator": {
       "version": "0.9.4",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
@@ -2613,6 +2766,13 @@
         "node": "^10 || ^12 || >=14"
       }
     },
+    "node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -2819,6 +2979,13 @@
         "node": ">=8"
       }
     },
+    "node_modules/tailwindcss": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.4.tgz",
+      "integrity": "sha512-1ZIUqtPITFbv/DxRmDr5/agPqJwF69d24m9qmM1939TJehgY539CtzeZRjbLt5G6fSy/7YqqYsfvoTEw9xUI2A==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/tinyglobby": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz",
@@ -2849,6 +3016,37 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/update-browserslist-db": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
+      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.1"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
     "node_modules/uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
diff --git a/package.json b/package.json
index 71d8da3..dca7b92 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "@react-oauth/google": "^0.12.1",
+    "@stripe/stripe-js": "^7.2.0",
     "dotenv": "^16.5.0",
     "jwt-decode": "^4.0.0",
     "react": "^19.0.0",
@@ -23,10 +24,13 @@
     "@types/react": "^19.0.10",
     "@types/react-dom": "^19.0.4",
     "@vitejs/plugin-react-swc": "^3.8.0",
+    "autoprefixer": "^10.4.21",
     "eslint": "^9.22.0",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.19",
     "globals": "^16.0.0",
+    "postcss": "^8.5.3",
+    "tailwindcss": "^4.1.4",
     "vite": "^6.3.2"
   }
 }
diff --git a/requirements.txt b/requirements.txt
index 367bb48..f7217dc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,3 +9,4 @@ PyMuPDF
 openai
 dotenv
 google-generativeai
+stripe
\ No newline at end of file
diff --git a/src/App.jsx b/src/App.jsx
index 27c3761..c34f4a0 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,5 +1,4 @@
-import React, { useState } from 'react';
-// Import useNavigate
+import React, { useState, useEffect } from 'react'; // Add useEffect
 import { Routes, Route, useNavigate } from 'react-router-dom';
 import { GoogleLogin, googleLogout } from '@react-oauth/google';
 import { jwtDecode } from "jwt-decode";
@@ -7,12 +6,43 @@ import CollegeTransferForm from './components/CollegeTransferForm';
 import AgreementViewerPage from './components/AgreementViewerPage';
 import CourseMap from './components/CourseMap';
 import './App.css';
+import { fetchData } from './services/api'; // Import fetchData
+
+// --- Stripe Imports ---
+import { loadStripe } from '@stripe/stripe-js';
+
+// Load Stripe outside component to avoid recreating on render
+const stripePromise = loadStripe(import.meta.env.VITE_STRIPE_PUBLISHABLE_KEY);
+// --- End Stripe Imports ---
+
 
-// Define a key for localStorage
 const USER_STORAGE_KEY = 'collegeTransferUser';
 
+// --- Simple Payment Status Components ---
+const PaymentSuccess = () => {
+    // You could fetch session details here to show more info if needed
+    return (
+        <div style={{ padding: '20px', textAlign: 'center' }}>
+            <h2>Payment Successful!</h2>
+            <p>Your subscription is now active. Thank you!</p>
+            <a href="/">Go to Home</a>
+        </div>
+    );
+};
+
+const PaymentCancel = () => {
+    return (
+        <div style={{ padding: '20px', textAlign: 'center' }}>
+            <h2>Payment Cancelled</h2>
+            <p>Your payment process was cancelled. You can try again anytime.</p>
+            <a href="/">Go to Home</a>
+        </div>
+    );
+};
+// --- End Payment Status Components ---
+
+
 function App() {
-  // Initialize user state from localStorage on initial load
   const [user, setUser] = useState(() => {
     try {
       const storedUser = localStorage.getItem(USER_STORAGE_KEY);
@@ -47,9 +77,43 @@ function App() {
     return null; // Default to null
   });
 
-  const navigate = useNavigate(); // Get navigate function
+  // --- Add User Tier State ---
+  const [userTier, setUserTier] = useState('free'); // Default to free
+  const [isLoadingTier, setIsLoadingTier] = useState(false);
+  // --- End User Tier State ---
+
+  const navigate = useNavigate();
+
+  // --- Fetch User Status/Tier ---
+  useEffect(() => {
+      if (user && user.idToken) {
+          setIsLoadingTier(true);
+          fetchData('user-status', {
+              headers: { 'Authorization': `Bearer ${user.idToken}` }
+          })
+          .then(data => {
+              if (data && data.tier) {
+                  setUserTier(data.tier);
+                  console.log("User tier:", data.tier);
+              } else {
+                  console.warn("Could not fetch user tier:", data?.error);
+                  setUserTier('free'); // Fallback
+              }
+          })
+          .catch(err => {
+              console.error("Error fetching user status:", err);
+              setUserTier('free'); // Fallback on error
+          })
+          .finally(() => {
+              setIsLoadingTier(false);
+          });
+      } else {
+          setUserTier('free'); // Not logged in, definitely free tier
+      }
+  }, [user]); // Re-fetch when user logs in/out
+  // --- End Fetch User Status/Tier ---
+
 
-  // Function to handle successful login
   const handleLoginSuccess = (credentialResponse) => {
     console.log("Google Login Success:", credentialResponse);
     try {
@@ -76,15 +140,16 @@ function App() {
       setUser(null);
       localStorage.removeItem(USER_STORAGE_KEY); // Clear storage on error
     }
+    // User state update will trigger the useEffect to fetch tier
   };
 
   const handleLoginError = () => {
     console.error("Google Login Failed");
     setUser(null);
     localStorage.removeItem(USER_STORAGE_KEY); // Clear storage on login error
+    setUserTier('free'); // Reset tier on login error
   };
 
-  // Function to handle logout
   const handleLogout = () => {
     googleLogout(); // Clear Google session
     setUser(null); // Clear React state
@@ -99,8 +164,50 @@ function App() {
 
     console.log("User logged out");
     navigate('/');
+    setUserTier('free'); // Reset tier on logout
   };
 
+  // --- Handle Upgrade Click ---
+  const handleUpgradeClick = async () => {
+      if (!user || !user.idToken) {
+          alert("Please log in to upgrade.");
+          return;
+      }
+
+      try {
+          console.log("Requesting checkout session...");
+          // Call your backend to create the checkout session
+          const response = await fetchData('create-checkout-session', {
+              method: 'POST',
+              headers: {
+                  'Authorization': `Bearer ${user.idToken}`,
+                  'Content-Type': 'application/json' // Ensure content type is set if sending body (though not needed here)
+              },
+              // body: JSON.stringify({ priceId: 'YOUR_STRIPE_PRICE_ID' }) // If sending priceId from frontend
+          });
+
+          if (response && response.sessionId) {
+              console.log("Received session ID:", response.sessionId);
+              const stripe = await stripePromise;
+              const { error } = await stripe.redirectToCheckout({
+                  sessionId: response.sessionId,
+              });
+              // If `redirectToCheckout` fails due to browser blocking, display an error
+              if (error) {
+                  console.error("Stripe redirect failed:", error);
+                  alert(`Payment redirect failed: ${error.message}`);
+              }
+          } else {
+              throw new Error(response?.error || "Failed to get checkout session ID.");
+          }
+      } catch (error) {
+          console.error("Upgrade failed:", error);
+          alert(`Could not initiate payment: ${error.message}`);
+      }
+  };
+  // --- End Handle Upgrade Click ---
+
+
   return (
     <>
       {/* Navigation/Header remains the same */}
@@ -125,12 +232,25 @@ function App() {
         <div>
           {user ? (
             <>
-              <span style={{ marginRight: '10px', fontSize: '0.9em' }}>Welcome, {user.name || user.email}!</span>
-              {/* Style the logout button similarly */}
-              <button 
-                onClick={handleLogout}
-                className="btn btn-danger"
-              >
+              <span style={{ marginRight: '10px', fontSize: '0.9em' }}>
+                  Welcome, {user.name || user.email}!
+                  {/* Display Tier */}
+                  {!isLoadingTier && ` (Tier: ${userTier})`}
+                  {isLoadingTier && ` (Loading tier...)`}
+              </span>
+
+              {/* Conditionally show Upgrade Button */}
+              {userTier === 'free' && !isLoadingTier && (
+                  <button
+                      onClick={handleUpgradeClick}
+                      className="btn btn-success" // Use a different color for upgrade
+                      style={{ margin: '0 10px' }}
+                  >
+                      Upgrade to Paid
+                  </button>
+              )}
+
+              <button onClick={handleLogout} className="btn btn-danger">
                 Logout
               </button>
             </>
@@ -138,7 +258,6 @@ function App() {
             <GoogleLogin
               onSuccess={handleLoginSuccess}
               onError={handleLoginError}
-              // Note: Styling the GoogleLogin button directly might require specific props or wrapper elements
             />
           )}
         </div>
@@ -149,13 +268,17 @@ function App() {
         <Route path="/" element={<CollegeTransferForm />} />
         <Route
           path="/agreement/:sendingId/:receivingId/:yearId"
-          element={<AgreementViewerPage />}
+          // Pass user and tier to AgreementViewerPage
+          element={<AgreementViewerPage user={user} userTier={userTier} />}
         />
         <Route
           path="/course-map"
           // Always render CourseMap, pass user (null if not logged in)
           element={<CourseMap user={user} />}
         />
+        {/* Add routes for payment status */}
+        <Route path="/payment-success" element={<PaymentSuccess />} />
+        <Route path="/payment-cancel" element={<PaymentCancel />} />
       </Routes>
     </>
   );
diff --git a/src/components/AgreementViewerPage.jsx b/src/components/AgreementViewerPage.jsx
index f0ac100..5b28b5d 100644
--- a/src/components/AgreementViewerPage.jsx
+++ b/src/components/AgreementViewerPage.jsx
@@ -1,52 +1,162 @@
-import React, { useState, useEffect, useMemo, useRef, useCallback } from 'react';
-import { useParams } from 'react-router-dom';
-import { fetchData } from '../services/api';
+import React, { useState, useEffect, useRef, useCallback, useMemo } from 'react';
+import { useParams, useLocation } from 'react-router-dom'; // Import useLocation
 import PdfViewer from './PdfViewer';
 import ChatInterface from './ChatInterface';
+import { fetchData } from '../services/api';
 import '../App.css';
 
-// Constants remain the same
-const minColWidth = 150;
-const dividerWidth = 1;
-const fixedMajorsWidth = 300;
+// Helper function to format remaining time
+function formatRemainingTime(resetTimestamp) {
+    if (!resetTimestamp) return '';
+    const now = new Date();
+    const resetDate = new Date(resetTimestamp);
+    const diff = resetDate.getTime() - now.getTime();
+
+    if (diff <= 0) return 'Usage reset';
+
+    const hours = Math.floor(diff / (1000 * 60 * 60));
+    const minutes = Math.floor((diff % (1000 * 60 * 60)) / (1000 * 60));
+    const seconds = Math.floor((diff % (1000 * 60)) / 1000);
+
+    return `Resets in ${hours}h ${minutes}m ${seconds}s`;
+}
+
+
+function AgreementViewerPage({ user, userTier }) {
+    const { sendingId: initialSendingId, receivingId, yearId } = useParams(); // Get initial IDs from URL
+    const location = useLocation(); // Get location object
 
-function AgreementViewerPage({ user }) {
-    const { sendingId, receivingId, yearId } = useParams();
+    // Get the full list passed from the form, default to an array containing the initial one if state is missing
+    const allSelectedSendingInstitutions = useMemo(() => {
+        return location.state?.allSelectedSendingInstitutions || [{ id: initialSendingId, name: 'Unknown Sending Institution' }];
+    }, [location.state?.allSelectedSendingInstitutions, initialSendingId]);
 
-    // --- State for resizing ---
+    // --- State for resizing (remains the same) ---
     const [chatColumnWidth, setChatColumnWidth] = useState(400);
     const isResizingRef = useRef(false);
     const dividerRef = useRef(null);
     const containerRef = useRef(null);
 
-    // --- State for Majors Column Visibility ---
+    // Define minColWidth and dividerWidth as constants outside the component
+    const minColWidth = 150;
+    const dividerWidth = 1;
+    const fixedMajorsWidth = 300; // Revert to fixed width for majors
+
+    // --- State for Majors Column Visibility (remains the same) ---
     const [isMajorsVisible, setIsMajorsVisible] = useState(true);
     const isMajorsVisibleRef = useRef(isMajorsVisible);
 
-    // --- Effect to update the ref ---
+    // --- Update ref whenever visibility state changes ---
     useEffect(() => {
         isMajorsVisibleRef.current = isMajorsVisible;
     }, [isMajorsVisible]);
 
-    // --- Existing State ---
+    // --- State for Agreement Data ---
     const [selectedCategory, setSelectedCategory] = useState('major');
     const [majors, setMajors] = useState({});
     const [isLoadingMajors, setIsLoadingMajors] = useState(true);
-    const [error, setError] = useState(null);
-    const [pdfError, setPdfError] = useState(null);
+    const [error, setError] = useState(null); // General error
+    const [pdfError, setPdfError] = useState(null); // PDF/Image specific error
     const [selectedMajorKey, setSelectedMajorKey] = useState(null);
     const [selectedMajorName, setSelectedMajorName] = useState('');
-    const [selectedPdfFilename, setSelectedPdfFilename] = useState(null);
-    const [imageFilenames, setImageFilenames] = useState([]);
     const [isLoadingPdf, setIsLoadingPdf] = useState(false);
     const [majorSearchTerm, setMajorSearchTerm] = useState('');
     const [hasMajorsAvailable, setHasMajorsAvailable] = useState(true);
     const [hasDepartmentsAvailable, setHasDepartmentsAvailable] = useState(true);
     const [isLoadingAvailability, setIsLoadingAvailability] = useState(true);
 
-    // --- Existing Effects (Availability, Fetching Data, Cleanup) ---
+    // --- NEW State for Multiple PDFs/Tabs ---
+    const [agreementData, setAgreementData] = useState([]); // Array of { sendingId, sendingName, pdfFilename }
+    const [activeTabIndex, setActiveTabIndex] = useState(0); // Index of the currently viewed PDF/Tab
+    const [imagesForActivePdf, setImagesForActivePdf] = useState([]); // Renamed for clarity
+    const [allAgreementsImageFilenames, setAllAgreementsImageFilenames] = useState([]); // NEW: For initial chat analysis
+
+    // --- NEW State for User Usage Status ---
+    const [usageStatus, setUsageStatus] = useState({
+        usageCount: null,
+        usageLimit: null,
+        resetTime: null,
+        tier: userTier || null, // Initialize tier from prop
+        error: null,
+    });
+    const [countdown, setCountdown] = useState('');
+    // --- End Usage Status State ---
+
+    // --- Derived state for the currently active agreement ---
+    const currentAgreement = agreementData[activeTabIndex] || null;
+    const currentSendingId = currentAgreement?.sendingId || initialSendingId; // Fallback to URL param if needed initially
+    const currentPdfFilename = currentAgreement?.pdfFilename || null;
+
+    // --- Effect to Fetch User Usage Status ---
+    useEffect(() => {
+        // Update local tier state if prop changes (e.g., after successful payment webhook)
+        setUsageStatus(prev => ({ ...prev, tier: userTier }));
+
+        if (!user || !user.idToken) {
+            setUsageStatus({ usageCount: null, usageLimit: null, resetTime: null, tier: userTier, error: 'Not logged in' });
+            return;
+        }
+
+        const fetchStatus = async () => {
+            try {
+                const data = await fetchData('user-status', {
+                    headers: {
+                        'Authorization': `Bearer ${user.idToken}`
+                    }
+                });
+                if (data && data.usageLimit !== undefined) {
+                    setUsageStatus({
+                        usageCount: data.usageCount,
+                        usageLimit: data.usageLimit,
+                        resetTime: data.resetTime,
+                        tier: data.tier, // Use tier from API response
+                        error: null,
+                    });
+                } else {
+                    throw new Error(data?.error || 'Invalid status response');
+                }
+            } catch (err) {
+                console.error("Error fetching user status:", err);
+                // Keep tier from prop even if fetch fails? Or show error?
+                setUsageStatus(prev => ({ ...prev, tier: userTier, error: `Failed to load usage: ${err.message}` }));
+            }
+        };
+
+        fetchStatus();
+        // Optionally, refetch periodically if needed, but a single fetch on load/user change might be sufficient
+        // const intervalId = setInterval(fetchStatus, 60000); // Example: refetch every minute
+        // return () => clearInterval(intervalId);
+
+    }, [user, userTier]); // Re-fetch when user object changes
+
+    // --- Effect for Countdown Timer ---
+    useEffect(() => {
+        if (!usageStatus.resetTime) {
+            setCountdown('');
+            return;
+        }
+
+        const intervalId = setInterval(() => {
+            const remaining = formatRemainingTime(usageStatus.resetTime);
+            setCountdown(remaining);
+            if (remaining === 'Usage reset') {
+                clearInterval(intervalId);
+                // Optionally refetch status after reset?
+            }
+        }, 1000); // Update every second
+
+        // Initial calculation
+        setCountdown(formatRemainingTime(usageStatus.resetTime));
+
+        return () => clearInterval(intervalId); // Cleanup interval on unmount or resetTime change
+    }, [usageStatus.resetTime]);
+    // --- End Countdown Effect ---
+
+
+    // --- Existing Effects (Availability, Fetching Majors - adjust dependencies) ---
+    // Availability check might need adjustment if it depends on a single sendingId
     useEffect(() => {
-        if (!sendingId || !receivingId || !yearId) {
+        if (!initialSendingId || !receivingId || !yearId) {
             setIsLoadingAvailability(false);
             setHasMajorsAvailable(false);
             setHasDepartmentsAvailable(false);
@@ -58,7 +168,7 @@ function AgreementViewerPage({ user }) {
         setHasDepartmentsAvailable(false);
 
         const checkAvailability = async (category) => {
-            const cacheKey = `agreements-${category}-${sendingId}-${receivingId}-${yearId}`;
+            const cacheKey = `agreements-${category}-${initialSendingId}-${receivingId}-${yearId}`;
             try {
                 const storedData = localStorage.getItem(cacheKey);
                 if (storedData) {
@@ -73,7 +183,7 @@ function AgreementViewerPage({ user }) {
             }
 
             try {
-                const data = await fetchData(`majors?sendingInstitutionId=${sendingId}&receivingInstitutionId=${receivingId}&academicYearId=${yearId}&categoryCode=${category}`);
+                const data = await fetchData(`majors?sendingInstitutionId=${initialSendingId}&receivingInstitutionId=${receivingId}&academicYearId=${yearId}&categoryCode=${category}`);
                 return data && Object.keys(data).length > 0;
             } catch (err) {
                 console.error(`Error checking availability for ${category}:`, err);
@@ -99,11 +209,13 @@ function AgreementViewerPage({ user }) {
                 setIsLoadingAvailability(false);
             });
 
-    }, [sendingId, receivingId, yearId, selectedCategory]);
+    }, [initialSendingId, receivingId, yearId, selectedCategory]);
 
+    // Fetch Majors/Departments based on the *initial* sendingId from URL (or decide how to handle multiple)
+    // For now, let's assume majors are fetched based on the first sending institution shown
     useEffect(() => {
-        if (isLoadingAvailability || !sendingId || !receivingId || !yearId) {
-            if (!sendingId || !receivingId || !yearId) {
+        if (isLoadingAvailability || !initialSendingId || !receivingId || !yearId) {
+            if (!initialSendingId || !receivingId || !yearId) {
                 setError("Required institution or year information is missing in URL.");
                 setIsLoadingMajors(false);
                 setMajors({});
@@ -118,7 +230,7 @@ function AgreementViewerPage({ user }) {
             return;
         }
 
-        const cacheKey = `agreements-${selectedCategory}-${sendingId}-${receivingId}-${yearId}`;
+        const cacheKey = `agreements-${selectedCategory}-${initialSendingId}-${receivingId}-${yearId}`;
         let cachedData = null;
 
         try {
@@ -143,7 +255,7 @@ function AgreementViewerPage({ user }) {
 
         const fetchCategoryData = async () => {
             try {
-                const data = await fetchData(`majors?sendingInstitutionId=${sendingId}&receivingInstitutionId=${receivingId}&academicYearId=${yearId}&categoryCode=${selectedCategory}`);
+                const data = await fetchData(`majors?sendingInstitutionId=${initialSendingId}&receivingInstitutionId=${receivingId}&academicYearId=${yearId}&categoryCode=${selectedCategory}`);
                 console.log(`API response for ${selectedCategory}:`, data);
 
                 if (data && Object.keys(data).length > 0) {
@@ -174,9 +286,191 @@ function AgreementViewerPage({ user }) {
 
         fetchCategoryData();
 
-    }, [sendingId, receivingId, yearId, selectedCategory, isLoadingAvailability, hasMajorsAvailable, hasDepartmentsAvailable]);
+    }, [initialSendingId, receivingId, yearId, selectedCategory, isLoadingAvailability, hasMajorsAvailable, hasDepartmentsAvailable]);
+
+    // --- MODIFIED Effect to fetch agreement details AND ALL initial images ---
+    const fetchAgreementDetailsAndImages = useCallback(async () => {
+        if (!selectedMajorKey || allSelectedSendingInstitutions.length === 0 || !receivingId || !yearId) {
+            setAgreementData([]);
+            setAllAgreementsImageFilenames([]); // Clear all images
+            setImagesForActivePdf([]); // Clear active images
+            return;
+        }
+
+        setIsLoadingPdf(true); // Use this state for the overall loading
+        setPdfError(null);
+        setAgreementData([]);
+        setAllAgreementsImageFilenames([]);
+        setImagesForActivePdf([]);
+
+        let fetchedAgreements = []; // To store results from /articulation-agreements
 
-    const handleMouseMove = useCallback((e) => {
+        try {
+            // 1. Fetch PDF filenames for all agreements
+            const sendingIds = allSelectedSendingInstitutions.map(inst => inst.id);
+            console.log("Fetching agreements list for Sending IDs:", sendingIds, selectedMajorKey);
+            const response = await fetchData('/articulation-agreements', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ sending_ids: sendingIds, receiving_id: receivingId, year_id: yearId, major_key: selectedMajorKey })
+            });
+
+            if (!response || !Array.isArray(response.agreements)) {
+                throw new Error(response?.error || "Invalid response format from /articulation-agreements");
+            }
+
+            // Map response to include names
+            fetchedAgreements = response.agreements.map(agreement => {
+                const sendingInst = allSelectedSendingInstitutions.find(inst => inst.id === agreement.sendingId);
+                return { ...agreement, sendingName: sendingInst ? sendingInst.name : `Sending ID ${agreement.sendingId}` };
+            });
+            console.log("Received agreement list:", fetchedAgreements);
+            setAgreementData(fetchedAgreements);
+            setActiveTabIndex(0); // Set first tab active
+
+            // 2. Fetch image filenames for ALL valid PDFs in parallel
+            const imageFetchPromises = fetchedAgreements
+                .filter(agreement => agreement.pdfFilename) // Only fetch for those with a filename
+                .map(agreement =>
+                    fetchData(`pdf-images/${encodeURIComponent(agreement.pdfFilename)}`)
+                        .then(imgResponse => {
+                            if (imgResponse && imgResponse.image_filenames) {
+                                return { sendingId: agreement.sendingId, images: imgResponse.image_filenames };
+                            } else {
+                                console.warn(`No images found for ${agreement.pdfFilename}`);
+                                return { sendingId: agreement.sendingId, images: [] }; // Return empty array on failure/no images
+                            }
+                        })
+                        .catch(err => {
+                            console.error(`Error fetching images for ${agreement.pdfFilename}:`, err);
+                            return { sendingId: agreement.sendingId, images: [] }; // Return empty array on error
+                        })
+                );
+
+            const imageResults = await Promise.allSettled(imageFetchPromises);
+
+            const allImagesCombined = imageResults.reduce((acc, result) => {
+                if (result.status === 'fulfilled' && result.value.images.length > 0) {
+                    // Optionally add context comment for LLM?
+                    // acc.push(`--- Images for Sending ID ${result.value.sendingId} ---`);
+                    acc.push(...result.value.images);
+                }
+                return acc;
+            }, []);
+
+            console.log("Combined image filenames for initial analysis:", allImagesCombined);
+            setAllAgreementsImageFilenames(allImagesCombined);
+
+            // 3. Fetch images for the *initially active* PDF (tab 0) for the viewer
+            const firstAgreement = fetchedAgreements[0];
+            if (firstAgreement && firstAgreement.pdfFilename) {
+                // Find the corresponding images from the parallel fetch results
+                const firstAgreementImagesResult = imageResults.find(result => result.status === 'fulfilled' && result.value.sendingId === firstAgreement.sendingId);
+                if (firstAgreementImagesResult && firstAgreementImagesResult.value.images.length > 0) {
+                     setImagesForActivePdf(firstAgreementImagesResult.value.images);
+                } else {
+                     // Handle case where even the first PDF's images failed to load
+                     setPdfError(`Failed to load images for the initial agreement: ${firstAgreement.sendingName}`);
+                     setImagesForActivePdf([]);
+                }
+            } else if (fetchedAgreements.length > 0) {
+                setPdfError(`No PDF filename found for the initial agreement: ${fetchedAgreements[0].sendingName}.`);
+                setImagesForActivePdf([]);
+            } else {
+                setPdfError("No agreements found for the selected major and institutions.");
+                setImagesForActivePdf([]);
+            }
+
+        } catch (err) {
+            console.error("Error fetching agreement details and images:", err);
+            setPdfError(`Failed to load agreement details: ${err.message}`);
+            setAgreementData([]);
+            setAllAgreementsImageFilenames([]);
+            setImagesForActivePdf([]);
+        } finally {
+            setIsLoadingPdf(false);
+        }
+    }, [selectedMajorKey, allSelectedSendingInstitutions, receivingId, yearId]); // Dependencies
+
+    // --- Effect to fetch images ONLY for the ACTIVE PDF VIEWER when tab changes ---
+    const fetchImagesForActiveTab = useCallback(async () => {
+        const activeAgreement = agreementData[activeTabIndex];
+        if (!activeAgreement || !activeAgreement.pdfFilename) {
+            setImagesForActivePdf([]); // Clear if no active agreement or filename
+            if (activeAgreement) setPdfError(`No PDF available for ${activeAgreement.sendingName}.`);
+            return;
+        }
+
+        // Removed the check for tab 0 here - let's always fetch on tab change for simplicity now.
+
+        setIsLoadingPdf(true); // Show loading for tab switch
+        setPdfError(null);
+        setImagesForActivePdf([]); // Clear previous tab's images
+        console.log("Fetching images for active tab PDF:", activeAgreement.pdfFilename);
+        try {
+            const response = await fetchData(`pdf-images/${encodeURIComponent(activeAgreement.pdfFilename)}`);
+            if (response && response.image_filenames) {
+                console.log("Received images for active tab:", response.image_filenames);
+                setImagesForActivePdf(response.image_filenames);
+            } else {
+                throw new Error(response?.error || "No image filenames received for active tab");
+            }
+        } catch (err) {
+            console.error(`Error fetching images for ${activeAgreement.pdfFilename}:`, err);
+            setPdfError(`Failed to load images for ${activeAgreement.sendingName}: ${err.message}`);
+            setImagesForActivePdf([]);
+        } finally {
+            setIsLoadingPdf(false);
+        }
+    // MODIFIED Dependencies: Only depend on data needed to identify the active agreement
+    }, [activeTabIndex, agreementData]); // Dependencies
+
+    // Trigger initial fetch when major changes
+    useEffect(() => {
+        fetchAgreementDetailsAndImages();
+    }, [fetchAgreementDetailsAndImages]);
+
+    // Trigger active image fetch when active tab changes
+    useEffect(() => {
+        // Fetch whenever the active tab index changes, but only if agreementData is loaded.
+        // This prevents fetching when agreementData is initially empty.
+        // Also ensures it runs for tab 0 *after* the initial data load completes.
+        if (agreementData.length > 0) {
+             console.log(`Tab changed to ${activeTabIndex} or agreementData loaded, fetching images for active tab.`);
+             fetchImagesForActiveTab();
+        } else {
+             console.log("Skipping fetchImagesForActiveTab because agreementData is empty.");
+        }
+    // MODIFIED Dependencies: Remove imagesForActivePdf
+    }, [activeTabIndex, agreementData, fetchImagesForActiveTab]);
+
+    // --- Handlers ---
+    const handleMajorSelect = (majorKey, majorName) => {
+        console.log("Major selected:", majorKey, majorName);
+        setSelectedMajorKey(majorKey);
+        setSelectedMajorName(majorName);
+        // fetchAgreementDetails will be triggered by the useEffect dependency change
+    };
+
+    const handleCategoryChange = (event) => {
+        const newCategory = event.target.value;
+        console.log("Category changed to:", newCategory);
+        setSelectedCategory(newCategory);
+        // Reset major selection when category changes
+        setSelectedMajorKey(null);
+        setSelectedMajorName('');
+        setMajorSearchTerm(''); // Clear search term as well
+        // The useEffect for fetching majors/depts will re-run due to selectedCategory change
+    };
+
+    const handleTabClick = (index) => {
+        console.log("Tab clicked:", index);
+        setActiveTabIndex(index);
+        // Image fetch will be triggered by the useEffect dependency change
+    };
+
+    // --- Resizing Handlers (remain the same) ---
+    const handleMouseMove = useCallback((e) => { // Keep useCallback, but dependencies change
         if (!isResizingRef.current || !containerRef.current) {
             return;
         }
@@ -185,22 +479,27 @@ function AgreementViewerPage({ user }) {
         const mouseX = e.clientX;
         const containerLeft = containerRect.left;
         const totalWidth = containerRect.width;
-        const gapWidth = 16;
+        const gapWidth = 16; // Assumed 1em = 16px
 
+        // --- Read the *current* visibility from the ref ---
         const currentVisibility = isMajorsVisibleRef.current;
 
+        // Calculate the starting position of the chat column
         const majorsEffectiveWidth = currentVisibility ? fixedMajorsWidth : 0;
-        const gap1EffectiveWidth = currentVisibility ? gapWidth : 0;
+        const gap1EffectiveWidth = currentVisibility ? gapWidth : 0; // Gap between majors and chat
         const chatStartOffset = majorsEffectiveWidth + gap1EffectiveWidth;
 
+        // Calculate desired chat width based on mouse position relative to chat start
         let newChatWidth = mouseX - containerLeft - chatStartOffset;
 
+        // Constraints: ensure chat and PDF columns have minimum width
         const maxChatWidth = totalWidth - chatStartOffset - minColWidth - gapWidth - dividerWidth;
         newChatWidth = Math.max(minColWidth, Math.min(newChatWidth, maxChatWidth));
 
         setChatColumnWidth(newChatWidth);
 
-    }, []);
+    // --- Remove isMajorsVisible from dependencies, rely on the ref ---
+    }, []); // Empty dependency array is okay now because we use the ref
 
     const handleMouseUp = useCallback(() => {
         if (isResizingRef.current) {
@@ -221,78 +520,6 @@ function AgreementViewerPage({ user }) {
         };
     }, [handleMouseMove, handleMouseUp]);
 
-    const handleMajorSelect = async (majorKey, majorName) => {
-        if (!majorKey || isLoadingPdf) return;
-
-        setSelectedMajorKey(majorKey);
-        setSelectedMajorName(majorName);
-        setSelectedPdfFilename(null);
-        setImageFilenames([]);
-        setIsLoadingPdf(true);
-        setError(null);
-        setPdfError(null);
-
-        try {
-            const agreementData = await fetchData(`articulation-agreement?key=${majorKey}`);
-            if (agreementData && agreementData.pdf_filename) {
-                const pdfFilename = agreementData.pdf_filename;
-                setSelectedPdfFilename(pdfFilename);
-
-                const imageCacheKey = `pdf-images-${pdfFilename}`;
-                let fetchedFromCache = false;
-
-                try {
-                    const cachedImageData = localStorage.getItem(imageCacheKey);
-                    if (cachedImageData) {
-                        const parsedImageData = JSON.parse(cachedImageData);
-                        if (parsedImageData && parsedImageData.image_filenames) {
-                            console.log("Loaded images from cache:", imageCacheKey);
-                            setImageFilenames(parsedImageData.image_filenames);
-                            fetchedFromCache = true;
-                        } else {
-                            console.warn("Cached image data invalid, removing:", imageCacheKey);
-                            localStorage.removeItem(imageCacheKey);
-                        }
-                    }
-                } catch (e) {
-                    console.error("Failed to read or parse images cache:", e);
-                    localStorage.removeItem(imageCacheKey);
-                }
-
-                if (!fetchedFromCache) {
-                    console.log("Fetching images from API:", imageCacheKey);
-                    const imageData = await fetchData(`pdf-images/${pdfFilename}`);
-                    if (imageData && imageData.image_filenames) {
-                        setImageFilenames(imageData.image_filenames);
-                        try {
-                            localStorage.setItem(imageCacheKey, JSON.stringify(imageData));
-                            console.log("Saved images to cache:", imageCacheKey);
-                        } catch (e) {
-                            console.error("Failed to save images to cache:", e);
-                        }
-                    } else {
-                        throw new Error(imageData?.error || 'Failed to load image list for PDF');
-                    }
-                }
-            } else if (agreementData && agreementData.error) {
-                throw new Error(`Agreement Error: ${agreementData.error}`);
-            } else {
-                throw new Error('Received unexpected data or no PDF filename when fetching agreement.');
-            }
-        } catch (err) {
-            console.error("Error fetching agreement or images:", err);
-            setPdfError(err.message);
-            setSelectedPdfFilename(null);
-            setImageFilenames([]);
-        } finally {
-            setIsLoadingPdf(false);
-        }
-    };
-
-    
-
-    
-
     const handleMouseDown = useCallback((e) => {
         e.preventDefault();
         isResizingRef.current = true;
@@ -302,16 +529,7 @@ function AgreementViewerPage({ user }) {
         document.body.style.userSelect = 'none';
     }, [handleMouseMove, handleMouseUp]);
 
-    const handleCategoryChange = (event) => {
-        setSelectedCategory(event.target.value);
-        setSelectedMajorKey(null);
-        setSelectedMajorName('');
-        setSelectedPdfFilename(null);
-        setImageFilenames([]);
-        setPdfError(null);
-        setError(null);
-    };
-
+    // --- Toggle Majors Visibility (remains the same) ---
     const toggleMajorsVisibility = () => {
         const gapWidth = 16;
         setIsMajorsVisible(prevVisible => {
@@ -328,6 +546,7 @@ function AgreementViewerPage({ user }) {
         });
     };
 
+    // --- Calculate Layout (remains the same) ---
     const filteredMajors = useMemo(() => {
         const lowerCaseSearchTerm = majorSearchTerm.toLowerCase();
         if (typeof majors !== 'object' || majors === null) {
@@ -358,18 +577,47 @@ function AgreementViewerPage({ user }) {
                     padding: '0.5em',
                     boxSizing: 'border-box',
                     color: "#333",
+                    position: 'relative', // Needed for absolute positioning of usage status
                 }}>
 
+                {/* --- Usage Status Display --- */}
+                {user && (usageStatus.usageLimit !== null || usageStatus.error) && (
+                    <div style={{
+                        position: 'absolute',
+                        bottom: '10px',
+                        right: '20px',
+                        background: 'rgba(255, 255, 255, 0.8)',
+                        padding: '5px 10px',
+                        borderRadius: '4px',
+                        fontSize: '0.85em',
+                        color: usageStatus.error ? 'red' : '#555',
+                        border: '1px solid #ccc',
+                        zIndex: 10 // Ensure it's above other elements
+                    }}>
+                        {usageStatus.error ? (
+                            <span>{usageStatus.error}</span>
+                        ) : (
+                            <>
+                                <span>Tier: {usageStatus.tier || 'N/A'} | </span>
+                                <span>Usage: {usageStatus.usageCount ?? 'N/A'} / {usageStatus.usageLimit ?? 'N/A'} | </span>
+                                <span>{countdown || 'Calculating reset...'}</span>
+                            </>
+                        )}
+                    </div>
+                )}
+                {/* --- End Usage Status Display --- */}
+
+
                 {/* Left Column (Majors/Depts List) */}
                 {isMajorsVisible && (
                     <div style={{
                         flex: `0 0 ${currentMajorsFlexBasis}`,
                         display: 'flex',
                         flexDirection: 'column',
-                        minWidth: `${minColWidth}px`,
+                        minWidth: isMajorsVisible ? `${minColWidth}px` : '0px',
                         overflow: 'hidden',
                         transition: 'flex-basis 0.3s ease, min-width 0.3s ease',
-                        marginRight: '1em',
+                        marginRight: isMajorsVisible ? '1em' : '0',
                         position: 'relative',
                         paddingTop: '2.5em'
                     }}>
@@ -425,11 +673,15 @@ function AgreementViewerPage({ user }) {
                 <div style={{ flex: `0 0 ${currentChatFlexBasis}`, display: 'flex', flexDirection: 'column', minWidth: `${minColWidth}px` }}>
                     {/* Pass visibility state and toggle function */}
                     <ChatInterface
-                        imageFilenames={imageFilenames}
+                        imageFilenames={allAgreementsImageFilenames} // Pass the combined list
                         selectedMajorName={selectedMajorName}
                         userName={userName}
                         isMajorsVisible={isMajorsVisible}
                         toggleMajorsVisibility={toggleMajorsVisibility}
+                        sendingInstitutionId={currentSendingId}
+                        allSendingInstitutionIds={allSelectedSendingInstitutions.map(inst => inst.id)}
+                        receivingInstitutionId={receivingId}
+                        academicYearId={yearId}
                     />
                 </div>
 
@@ -438,7 +690,47 @@ function AgreementViewerPage({ user }) {
 
                 {/* Right Column (PDF Viewer) */}
                 <div style={{ flex: '1 1 0', display: 'flex', flexDirection: 'column', minWidth: `${minColWidth}px`, marginLeft: '1em' }}>
-                    <PdfViewer imageFilenames={imageFilenames} isLoading={isLoadingPdf} error={pdfError} filename={selectedPdfFilename} />
+                    {/* --- PDF Tabs --- */}
+                    {agreementData.length > 1 && (
+                        <div style={{ display: 'flex', borderBottom: '1px solid #ccc', flexShrink: 0, background: '#e9ecef' /* Light grey background for the tab bar */ }}>
+                            {agreementData.map((agreement, index) => (
+                                <button
+                                    key={agreement.sendingId}
+                                    onClick={() => handleTabClick(index)}
+                                    style={{
+                                        padding: '10px 15px',
+                                        border: 'none', // Remove default border
+                                        borderBottom: activeTabIndex === index ? '3px solid #0056b3' : '3px solid transparent', // Stronger blue for active border
+                                        background: activeTabIndex === index ? '#ffffff' : '#e9ecef', // White background for active, match bar background for inactive
+                                        color: activeTabIndex === index ? '#0056b3' : '#495057', // Darker text for inactive, blue for active
+                                        cursor: 'pointer',
+                                        fontWeight: activeTabIndex === index ? 'bold' : 'normal',
+                                        fontSize: '0.95em', // Slightly larger font
+                                        textAlign: 'center',
+                                        // Add subtle top/side borders for inactive tabs for definition
+                                        borderTop: activeTabIndex !== index ? '1px solid #dee2e6' : 'none',
+                                        borderLeft: activeTabIndex !== index ? '1px solid #dee2e6' : 'none',
+                                        borderRight: activeTabIndex !== index ? '1px solid #dee2e6' : 'none',
+                                        borderTopLeftRadius: '4px', // Slightly rounded top corners
+                                        borderTopRightRadius: '4px',
+                                        marginRight: '2px', // Small gap between tabs
+                                    }}
+                                    title={`View agreement from ${agreement.sendingName}`}
+                                >
+                                    {agreement.sendingName}
+                                </button>
+                            ))}
+                        </div>
+                    )}
+                    {/* --- End PDF Tabs --- */}
+
+                    {/* Pass data for the ACTIVE PDF */}
+                    <PdfViewer
+                        imageFilenames={imagesForActivePdf} // Use state for active PDF's images
+                        isLoading={isLoadingPdf && agreementData[activeTabIndex]?.pdfFilename === currentPdfFilename} // Only show loading for the active tab's fetch
+                        error={pdfError} // Show general PDF error
+                        filename={currentPdfFilename} // Pass the active filename
+                    />
                 </div>
             </div>
         </>
diff --git a/src/components/ChatInterface.jsx b/src/components/ChatInterface.jsx
index c09a4fd..740ec98 100644
--- a/src/components/ChatInterface.jsx
+++ b/src/components/ChatInterface.jsx
@@ -65,8 +65,19 @@ function formatText(text) {
    }
 }
 
-// Accept new props: isMajorsVisible, toggleMajorsVisibility
-function ChatInterface({ imageFilenames, selectedMajorName, userName, isMajorsVisible, toggleMajorsVisibility }) {
+// Accept new props for context
+function ChatInterface({
+    imageFilenames, // This now contains images from ALL agreements for the initial call
+    selectedMajorName,
+    userName, // Keep userName prop for display when logged in
+    isMajorsVisible,
+    toggleMajorsVisibility,
+    sendingInstitutionId, // ID for the currently viewed agreement (Current Context)
+    allSendingInstitutionIds, // Array of all selected sending IDs (Overall Context)
+    receivingInstitutionId,
+    academicYearId,
+    user // Add user prop
+}) {
     const [userInput, setUserInput] = useState('');
     const [messages, setMessages] = useState([]);
     const [isLoading, setIsLoading] = useState(false);
@@ -86,72 +97,108 @@ function ChatInterface({ imageFilenames, selectedMajorName, userName, isMajorsVi
         messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
     }, [messages]);
 
-    // Clear chat and reset flag when agreement context changes
+    // Clear chat and reset flag when agreement context changes OR user logs out
     useEffect(() => {
         setMessages([]);
         setUserInput('');
         setChatError(null);
-        initialAnalysisSentRef.current = false; // Reset flag for new agreement
-        console.log("Chat cleared due to new agreement context.");
-    }, [imageFilenames, selectedMajorName]);
+        initialAnalysisSentRef.current = false; // Reset flag
+        console.log("Chat cleared due to new context or user change.");
+    }, [imageFilenames, selectedMajorName, user]); // Add user dependency here
 
     // Effect to send initial analysis request when images are loaded
     useEffect(() => {
+        // --- Add user check at the beginning ---
+        if (!user) {
+            initialAnalysisSentRef.current = false; // Ensure flag is reset if user logs out
+            return; // Don't proceed if user is not logged in
+        }
+        // --- End user check ---
+
         // Run only if:
         // - We have image filenames.
         // - Analysis hasn't been sent for this context yet.
         // - We are not currently loading anything (prevents race conditions).
+        // - User is logged in (checked above)
         if (imageFilenames && imageFilenames.length > 0 && !initialAnalysisSentRef.current && !isLoading) {
 
             const sendInitialAnalysis = async () => {
+                // User/token check is still good practice here, though the outer effect also checks
+                if (!user || !user.idToken) {
+                    console.error("Cannot send initial analysis: User not logged in or token missing.");
+                    setChatError("Authentication error. Please log in again.");
+                    setMessages([{ type: 'system', text: "Authentication error. Please log in again." }]);
+                    initialAnalysisSentRef.current = false; // Allow retry if user logs in
+                    return; // Stop execution
+                }
+
                 console.log("Sending initial analysis request...");
                 setIsLoading(true);
                 setChatError(null);
                 initialAnalysisSentRef.current = true; // Mark as sent for this context
 
-                // --- Updated Initial Prompt ---
+                const currentContextInfo = `The user is viewing an articulation agreement for the academic year ${academicYearId || 'N/A'} between sending institution ID ${sendingInstitutionId || 'N/A'} (the 'current' agreement) and receiving institution ID ${receivingInstitutionId || 'N/A'}. The selected major/department is "${selectedMajorName || 'N/A'}".`;
+                const overallContextInfo = allSendingInstitutionIds && allSendingInstitutionIds.length > 1
+                    ? `Note: The user originally selected multiple sending institutions (IDs: ${allSendingInstitutionIds.join(', ')}). Images for all selected agreements have been provided.`
+                    : 'Only one sending institution was selected.';
+
+                // --- MODIFIED Initial Prompt ---
                 const initialPrompt = `You are a helpful, knowledgeable, and supportive college counselor specializing in helping community college students successfully transfer to four-year universities. Your guidance should be clear, encouraging, and personalized based on each student's academic goals, major, preferred universities, and career aspirations. You provide information about transfer requirements, application tips, deadlines, articulation agreements, financial aid, scholarships, and campus life insights. Always empower students with accurate, up-to-date information and a positive, motivating tone. If you don't know an answer, offer to help them find resources or suggest next steps.
 
-Analyze the provided agreement images thoroughly. In your response, **first provide a concise summary of the key details found in the agreement**, including articulated courses, non-articulated courses, requirements, and any important notes or conditions. After the summary, answer the user's potential implicit question based on the analysis (e.g., how many courses are not articulated, suggest next steps/institutions if applicable based on proximity or course needs).
+**Current Context:** ${currentContextInfo}
+${overallContextInfo ? `**Overall Context:** ${overallContextInfo}` : ''}
 
-**Please format key details, lists (like courses or requirements), and action items using bullet points (* or -). Use **bold** for emphasis on key terms or numbers, and \`italic\` for specific course codes or titles where appropriate.**
+Analyze the provided agreement images thoroughly. Perform the following steps:
+1.  **Focus on the Current Context:** Analyze the agreement for the major between the **current sending institution** and the receiving institution.
+2.  **Explicitly state the current context:** Start your response with: "Analyzing the agreement for the *[Major Name]* major between [Current Sending ID] (bold) and [Receiving ID] (bold) for the [Year] (bold) academic year."
+3.  **Provide a concise summary** of the key details for the **current** agreement (articulated courses, requirements, etc.). Identify any required courses for the major at the receiving institution that are **not articulated** by the current sending institution.
+4.  **Compare Articulation (If Applicable):** If you identified non-articulated courses in step 3 AND other sending institutions were selected (see Overall Context), examine the provided images for the **other** agreements (Sending IDs: ${allSendingInstitutionIds.filter(id => id !== sendingInstitutionId).join(', ') || 'None'}). For each non-articulated course from the current agreement, state whether it **is articulated** by any of the **other** sending institutions based on their respective agreements. Present this comparison clearly, perhaps in a separate section or list.
+5.  **Suggest Next Steps:** Conclude with relevant advice or next steps for the student based on the analysis and comparison.
 
-**Important:** If the user asks about the details of the agreement being discussed (like the major, institutions, or year), refer to the context provided or the summary you generated. Do not state that you lack personal information about the user in this case.`;
-                // --- End Updated Initial Prompt ---
+**Formatting:** Use bullet points (* or -) for lists, **bold** for emphasis, and \`italic\` for course codes/titles.`;
+                // --- End MODIFIED Initial Prompt ---
 
                 // Display a system message while analysis runs
-                setMessages([{ type: 'system', text: "Analyzing agreement and generating summary..." }]);
+                setMessages([{ type: 'system', text: "Analyzing agreements and generating summary..." }]);
 
                 const payload = {
                     new_message: initialPrompt,
                     history: [], // No history for the very first message
-                    image_filenames: imageFilenames // Send images with this first request
+                    image_filenames: imageFilenames // Send the combined list of images
                 };
 
                 try {
                     console.log("Sending initial analysis to /chat:", payload);
                     const response = await fetchData('chat', {
                         method: 'POST',
-                        headers: { 'Content-Type': 'application/json' },
+                        headers: {
+                            'Content-Type': 'application/json',
+                            'Authorization': `Bearer ${user.idToken}`
+                        },
                         body: JSON.stringify(payload)
                     });
 
                     if (response && response.reply) {
-                        // --- Removed cleaning to allow '*' for bullets ---
-                        // const cleanedReply = response.reply.replace(/[*`]/g, '');
-                        const replyText = response.reply; // Use raw reply
-                        // Replace "Analyzing..." message with the actual reply
+                        const replyText = response.reply;
+                        // Replace the "Analyzing..." message with the actual reply
                         setMessages([{ type: 'bot', text: replyText }]);
                     } else {
+                        // Check specifically for auth error from backend response if possible
+                        if (response?.error?.includes("Authorization")) {
+                            throw new Error("Authorization token missing or invalid");
+                        }
                         throw new Error(response?.error || "No reply received for initial analysis.");
                     }
                 } catch (err) {
                     console.error("Initial analysis API error:", err);
                     const errorMsg = `Failed initial analysis: ${err.message}`;
                     setChatError(errorMsg);
-                    // Replace "Analyzing..." message with an error message
+                    // Replace "Analyzing..." with error message
                     setMessages([{ type: 'system', text: `Error during analysis: ${err.message}` }]);
-                    // Keep initialAnalysisSentRef true to prevent retries on error for this context
+                    // Consider resetting initialAnalysisSentRef.current = false; if the error is auth-related
+                    if (err.message.includes("Authorization")) {
+                        initialAnalysisSentRef.current = false;
+                    }
                 } finally {
                     setIsLoading(false);
                 }
@@ -161,14 +208,21 @@ Analyze the provided agreement images thoroughly. In your response, **first prov
         }
         // This effect depends on imageFilenames to know when context is ready,
         // and isLoading to avoid running while another request is in progress.
-    }, [imageFilenames, isLoading]);
+        // Also depends on user to re-evaluate if user logs in/out
+    }, [imageFilenames, isLoading, selectedMajorName, sendingInstitutionId, allSendingInstitutionIds, receivingInstitutionId, academicYearId, user]);
 
 
     const handleSend = async () => {
-        // Guard: Check for input, loading state.
-        if (!userInput.trim() || isLoading) return;
-
-        // User can only send manually *after* the initial analysis is attempted.
+        // Guard: Check for input, loading state, and user login
+        if (!userInput.trim() || isLoading || !user) return;
+
+        // User/token check (redundant with the main guard but safe)
+        if (!user || !user.idToken) {
+            console.error("Cannot send message: User not logged in or token missing.");
+            setChatError("Authentication error. Please log in again.");
+            setMessages(prev => [...prev, { type: 'system', text: "Authentication error. Please log in again." }]);
+            return; // Stop execution
+        }
 
         const currentInput = userInput;
         const currentHistory = [...messages];
@@ -180,10 +234,12 @@ Analyze the provided agreement images thoroughly. In your response, **first prov
         setChatError(null);
 
         // Prepare history for API
-        const apiHistory = currentHistory.map(msg => ({
-            role: msg.type === 'bot' ? 'assistant' : msg.type,
-            content: msg.text
-        }));
+        const apiHistory = currentHistory
+            .filter(msg => msg.type === 'user' || msg.type === 'bot') // Only send user/bot messages as history
+            .map(msg => ({
+                role: msg.type === 'bot' ? 'assistant' : msg.type, // 'user' or 'assistant'
+                content: msg.text
+            }));
 
         // Payload for subsequent messages (no image_filenames needed)
         const payload = {
@@ -198,21 +254,25 @@ Analyze the provided agreement images thoroughly. In your response, **first prov
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
+                     'Authorization': `Bearer ${user.idToken}`
                 },
                 body: JSON.stringify(payload)
             });
 
             if (response && response.reply) {
-                 // --- Removed cleaning to allow '*' for bullets ---
-                 // const cleanedReply = response.reply.replace(/[*`]/g, '');
-                 const replyText = response.reply; // Use raw reply
+                 const replyText = response.reply;
                  setMessages(prev => [...prev, { type: 'bot', text: replyText }]);
             } else {
+                 // Check specifically for auth error from backend response if possible
+                 if (response?.error?.includes("Authorization")) {
+                     throw new Error("Authorization token missing or invalid");
+                 }
                  throw new Error(response?.error || "No reply received or unexpected response format.");
             }
         } catch (err) {
             console.error("Chat API error:", err);
             setChatError(`Failed to get response: ${err.message}`);
+            // Add error message back to chat, but don't re-add user input
             setMessages(prev => [...prev, { type: 'system', text: `Error: ${err.message}` }]);
         } finally {
             setIsLoading(false);
@@ -220,12 +280,16 @@ Analyze the provided agreement images thoroughly. In your response, **first prov
         // --- End Backend Call ---
     };
 
-    // Disable input/button if loading (covers initial analysis and subsequent messages)
-    const isSendDisabled = isLoading || !userInput.trim();
-    // Adjust placeholder based on loading state and if messages exist
-    const placeholderText = isLoading
-        ? (messages.length === 0 ? "Analyzing agreement..." : "Thinking...") // More specific loading text
-        : (messages.length === 0 ? "Select an agreement to start." : "Ask a follow-up question..."); // Default placeholder
+    // Disable input/button if loading OR if user is not logged in
+    const isInteractionDisabled = isLoading || !user;
+    const isSendDisabled = isInteractionDisabled || !userInput.trim();
+
+    // Adjust placeholder based on loading state, user state, and if messages exist
+    const placeholderText = !user
+        ? "Please sign in to use the chat feature."
+        : isLoading
+            ? (messages.length === 0 ? "Analyzing agreement..." : "Thinking...")
+            : (messages.length === 0 ? "Select an agreement to start." : "Ask a follow-up question...");
 
 
     return (
@@ -272,15 +336,25 @@ Analyze the provided agreement images thoroughly. In your response, **first prov
                 flex: '1 1 auto',
                 overflowY: 'auto',
                 padding: '10px',
-                minHeight: 0
+                minHeight: 0,
+                 // Add a subtle background change if user is not logged in
+                backgroundColor: !user ? '#e9ecef' : '#f9f9f9'
             }}>
-                {/* Display placeholder only if not loading and no messages */}
-                {messages.length === 0 && !isLoading && (
+                {/* --- Show Sign-in Prompt if user is not logged in --- */}
+                {!user && (
+                    <div style={{ textAlign: 'center', color: '#6c757d', marginTop: '30px', padding: '20px', fontSize: '1.1em' }}>
+                        Please sign in to analyze agreements and chat with the AI assistant.
+                    </div>
+                )}
+                {/* --- End Sign-in Prompt --- */}
+
+                {/* Display messages only if user is logged in */}
+                {user && messages.length === 0 && !isLoading && (
                     <div style={{ textAlign: 'center', color: '#888', marginTop: '20px' }}>
                         {placeholderText}
                     </div>
                 )}
-                {messages.map((msg, index) => (
+                {user && messages.map((msg, index) => (
                     <div key={index} style={{ marginBottom: '10px', display: 'flex', justifyContent: msg.type === 'user' ? 'flex-end' : 'flex-start' }}>
                         <span style={{
                             display: 'inline-block',
@@ -295,15 +369,16 @@ Analyze the provided agreement images thoroughly. In your response, **first prov
                         }}>
                             {/* Add Prefix based on type */}
                             {msg.type === 'bot' && <strong style={{ marginRight: '5px' }}>AI:</strong>}
-                            {msg.type === 'user' && <strong style={{ marginRight: '5px' }}>{userName}:</strong>}
+                            {/* Use userName prop if available, otherwise fallback */}
+                            {msg.type === 'user' && <strong style={{ marginRight: '5px' }}>{userName || 'You'}:</strong>}
                             {/* Render formatted text */}
                             {formatText(msg.text)}
                         </span>
                     </div>
                 ))}
                 <div ref={messagesEndRef} />
-                {/* Error Indicator */}
-                {chatError && !isLoading && <p style={{ color: 'red', textAlign: 'center', fontWeight: 'bold' }}>{chatError}</p>}
+                {/* Error Indicator (only show if user is logged in) */}
+                {user && chatError && !isLoading && <p style={{ color: 'red', textAlign: 'center', fontWeight: 'bold' }}>{chatError}</p>}
             </div>
 
             {/* Input Area */}
@@ -315,12 +390,20 @@ Analyze the provided agreement images thoroughly. In your response, **first prov
                     onKeyDown={(e) => e.key === 'Enter' && !isSendDisabled && handleSend()}
                     placeholder={placeholderText}
                     style={{ flexGrow: 1, marginRight: '10px', padding: '10px', borderRadius: '20px', border: '1px solid #ccc' }}
-                    disabled={isLoading} // Only disable when loading
+                    disabled={isInteractionDisabled} // Disable if loading OR not logged in
                 />
                 <button
                     onClick={handleSend}
-                    disabled={isSendDisabled}
-                    style={{ padding: '10px 15px', borderRadius: '20px', border: 'none', backgroundColor: '#007bff', color: 'white', cursor: isSendDisabled ? 'not-allowed' : 'pointer' }}
+                    disabled={isSendDisabled} // Disable if loading OR not logged in OR no input
+                    style={{
+                        padding: '10px 15px',
+                        borderRadius: '20px',
+                        border: 'none',
+                        backgroundColor: '#007bff',
+                        color: 'white',
+                        cursor: isSendDisabled ? 'not-allowed' : 'pointer',
+                        opacity: isSendDisabled ? 0.6 : 1 // Visual cue for disabled state
+                    }}
                 >
                     Send
                 </button>
diff --git a/src/components/CollegeTransferForm.jsx b/src/components/CollegeTransferForm.jsx
index 68825a6..bf90117 100644
--- a/src/components/CollegeTransferForm.jsx
+++ b/src/components/CollegeTransferForm.jsx
@@ -7,8 +7,8 @@ const CollegeTransferForm = () => {
     const navigate = useNavigate();
 
     // --- State for fetched data ---
-    const [institutions, setInstitutions] = useState({});
-    const [receivingInstitutions, setReceivingInstitutions] = useState({});
+    const [institutions, setInstitutions] = useState({}); // All institutions (for sending dropdown)
+    const [availableReceivingInstitutions, setAvailableReceivingInstitutions] = useState({}); // NEW: Institutions available for the selected sender(s)
     const [academicYears, setAcademicYears] = useState({});
 
     // --- State for input values and selections ---
@@ -16,8 +16,8 @@ const CollegeTransferForm = () => {
     const [receivingInputValue, setReceivingInputValue] = useState('');
     const [yearInputValue, setYearInputValue] = useState('');
 
-    const [selectedSendingId, setSelectedSendingId] = useState(null);
-    const [selectedReceivingId, setSelectedReceivingId] = useState(null);
+    const [selectedSendingInstitutions, setSelectedSendingInstitutions] = useState([]); // Array for multiple sending
+    const [selectedReceivingId, setSelectedReceivingId] = useState(null); // Single receiving ID
     const [selectedYearId, setSelectedYearId] = useState(null);
 
     // --- State for dropdown visibility and filtered options ---
@@ -25,33 +25,36 @@ const CollegeTransferForm = () => {
     const [showReceivingDropdown, setShowReceivingDropdown] = useState(false);
     const [showYearDropdown, setShowYearDropdown] = useState(false);
 
-    const [filteredInstitutions, setFilteredInstitutions] = useState([]);
-    const [filteredReceiving, setFilteredReceiving] = useState([]);
+    // const [filteredInstitutions, setFilteredInstitutions] = useState([]); // No longer needed?
+    const [filteredSending, setFilteredSending] = useState([]); // Options for the *current* sending input
+    const [filteredReceiving, setFilteredReceiving] = useState([]); // Options for receiving input
     const [filteredYears, setFilteredYears] = useState([]);
 
     // --- State for loading and results ---
-    const [isLoading] = useState(false); // Keep for initial loads if needed
+    const [isLoading] = useState(false); // Consider separate loading states if needed
     const [error, setError] = useState(null);
-
-    // --- Helper Functions ---
-    useCallback(() => {
-        setSendingInputValue('');
-        setReceivingInputValue('');
-        setYearInputValue('');
-        setSelectedSendingId(null);
-        setSelectedReceivingId(null);
-        setSelectedYearId(null);
-        setReceivingInstitutions({});
-        setFilteredInstitutions([]);
-        setFilteredReceiving([]);
-        setFilteredYears([]);
-        setShowSendingDropdown(false);
-        setShowReceivingDropdown(false);
-        setShowYearDropdown(false);
-        setError(null);
-    }, []);
-
-    // --- Effects for Initial Data Loading ---
+    const [isLoadingReceiving, setIsLoadingReceiving] = useState(false);
+    const [isLoadingYears, setIsLoadingYears] = useState(false); // New state for loading years
+
+    // --- Helper Functions (resetForm - adjust state clearing) ---
+    // const resetForm = useCallback(() => {
+    //     setSendingInputValue('');
+    //     setReceivingInputValue('');
+    //     setYearInputValue('');
+    //     setSelectedSendingInstitutions([]); // Clear array
+    //     setSelectedReceivingId(null); // Clear single ID
+    //     setSelectedYearId(null);
+    //     setAvailableReceivingInstitutions({}); // Clear available receiving
+    //     setFilteredSending([]);
+    //     setFilteredReceiving([]);
+    //     setFilteredYears([]);
+    //     setShowSendingDropdown(false);
+    //     setShowReceivingDropdown(false);
+    //     setShowYearDropdown(false);
+    //     setError(null);
+    // }, []);
+
+    // --- Effects for Initial Data Loading (Institutions, Years) ---
     useEffect(() => {
         const cacheInstitutionsKey = "instutions"
         let cachedInstitutions = null
@@ -86,83 +89,329 @@ const CollegeTransferForm = () => {
     }, []);
 
     useEffect(() => {
+        // Only proceed if we have at least one sending institution AND a receiving institution selected
+        if (selectedSendingInstitutions.length > 0 && selectedReceivingId) {
+            const firstSendingId = selectedSendingInstitutions[0].id; // Use the first selected sender for the API call
+            const cacheAcademicYearsKey = `academic-years-${firstSendingId}-${selectedReceivingId}`;
+            let cachedAcademicYears = null;
+
+            console.log(`Attempting to load/fetch academic years for S=${firstSendingId}, R=${selectedReceivingId}`);
+
+            // --- Check Cache ---
+            try {
+                const cachedData = localStorage.getItem(cacheAcademicYearsKey);
+                if (cachedData) {
+                    cachedAcademicYears = JSON.parse(cachedData);
+                    console.log("Loaded academic years from cache:", cacheAcademicYearsKey);
+                    setAcademicYears(cachedAcademicYears);
+                    setError(null); // Clear previous errors if loaded from cache
+                    return; // Exit early if loaded from cache
+                }
+            } catch (e) {
+                console.error("Error loading academic years from cache:", e);
+                localStorage.removeItem(cacheAcademicYearsKey); // Clear potentially corrupted cache
+            }
 
-        const cacheAcademicYearsKey = "academic-years"
-        let cachedAcademicYears = null
+            // --- Fetch from API ---
+            // Add loading state if desired: setIsLoadingYears(true);
+            setError(null); // Clear previous errors before fetching
+            fetchData(`academic-years?sendingId=${firstSendingId}&receivingId=${selectedReceivingId}`)
+                .then(data => {
+                    if (data && Object.keys(data).length > 0) {
+                        setAcademicYears(data);
+                        // --- Cache Result ---
+                        try {
+                            localStorage.setItem(cacheAcademicYearsKey, JSON.stringify(data));
+                            console.log("Academic Years cached successfully:", cacheAcademicYearsKey);
+                        } catch (e) {
+                            console.error("Error caching academic years:", e);
+                        }
+                    } else {
+                        // Handle case where API returns no years for the combination
+                        setAcademicYears({});
+                        setError(`No academic years found for the selected combination.`);
+                        console.log("No academic years found from API.");
+                    }
+                })
+                .catch(err => {
+                    setError(`Failed to load academic years: ${err.message}`);
+                    setAcademicYears({}); // Clear years on fetch error
+                })
+                .finally(() => {
+                    // Add loading state if desired: setIsLoadingYears(false);
+                });
 
-        try {
-            const cachedData = localStorage.getItem(cacheAcademicYearsKey);
-            if (cachedData) {
-                cachedAcademicYears = JSON.parse(cachedData);
-                console.log("Loaded academic years from cache:", cacheAcademicYearsKey);
-                setAcademicYears(cachedAcademicYears);
-                setError(null);
-                return;
-            }
-        } catch (e) {
-            console.error("Error loading academic years from cache:", e);
-            localStorage.removeItem(cacheAcademicYearsKey); // Clear cache on error
+        } else {
+            // If sending or receiving is not selected, clear academic years data
+            console.log("Clearing academic years because sending/receiving is not fully selected.");
+            setAcademicYears({});
+            // Optionally clear year input value as well, though it's handled elsewhere too
+            // setYearInputValue('');
+            // setSelectedYearId(null);
         }
+        // Dependencies: Run this effect when the selected sending institutions OR the selected receiving ID changes.
+    }, [selectedSendingInstitutions, selectedReceivingId]);
 
-        fetchData('academic-years')
-            .then(data => {
-                setAcademicYears(data)
-                try {
-                    localStorage.setItem(cacheAcademicYearsKey, JSON.stringify(data));
-                    console.log("Academic Years cached successfully:", cacheAcademicYearsKey);
-                } catch (e) {
-                    console.error("Error caching academic years:", e);
-                }
-            })
-            .catch(err => setError(`Failed to load academic years: ${err.message}`));
-    }, []);
-
-    // --- Effects for Dependent Data Loading ---
+    // --- MODIFIED Effect for Fetching Receiving Institutions based on ALL Senders ---
     useEffect(() => {
+        // Clear previous receiving selections and data whenever sending institutions change
         setReceivingInputValue('');
         setSelectedReceivingId(null);
-        setReceivingInstitutions({});
+        // ALSO CLEAR YEAR SELECTION when sending institutions change
+        setYearInputValue('');
+        setSelectedYearId(null);
+        setAvailableReceivingInstitutions({});
         setFilteredReceiving([]);
+        setError(null); // Clear previous errors
 
-        const cacheReceivingInstitutionsKey = `receiving-instutions-${selectedSendingId}`
-        let cachedReceivingInstitutions = null
+        const fetchAndIntersectReceiving = async () => {
+            if (selectedSendingInstitutions.length === 0) {
+                setAvailableReceivingInstitutions({}); // No senders, no receivers
+                return;
+            }
 
-        try {
-            const cachedData = localStorage.getItem(cacheReceivingInstitutionsKey);
-            if (cachedData) {
-                cachedReceivingInstitutions = JSON.parse(cachedData);
-                console.log("Loaded receiving institutions from cache:", cacheReceivingInstitutionsKey);
-                setReceivingInstitutions(cachedReceivingInstitutions);
-                setError(null);
+            setIsLoadingReceiving(true); // Start loading
+            setError(null);
+
+            try {
+                if (selectedSendingInstitutions.length === 1) {
+                    // --- Fetch for a single sender ---
+                    const firstSendingId = selectedSendingInstitutions[0].id;
+                    console.log("Fetching receiving for single sender:", firstSendingId);
+                    const data = await fetchData(`receiving-institutions?sendingId=${firstSendingId}`);
+                    if (data && Object.keys(data).length > 0) {
+                        setAvailableReceivingInstitutions(data);
+                    } else {
+                        setAvailableReceivingInstitutions({});
+                        setError(`No receiving institutions found with agreements for ${selectedSendingInstitutions[0].name}.`);
+                    }
+                } else {
+                    // --- Fetch for multiple senders and find intersection ---
+                    console.log("Fetching receiving for multiple senders:", selectedSendingInstitutions.map(s => s.id));
+                    const promises = selectedSendingInstitutions.map(sender =>
+                        fetchData(`receiving-institutions?sendingId=${sender.id}`)
+                            .catch(err => {
+                                // Handle individual fetch errors gracefully, maybe return empty object
+                                console.error(`Failed to fetch receiving for ${sender.name} (${sender.id}):`, err);
+                                return {}; // Return empty object on error for this sender
+                            })
+                    );
+
+                    const results = await Promise.all(promises);
+                    console.log("Raw results from multiple fetches:", results);
+
+                    // Check if any fetch failed completely (returned null/undefined instead of {})
+                    if (results.some(res => res === null || typeof res === 'undefined')) {
+                         throw new Error("One or more requests for receiving institutions failed.");
+                    }
+
+                    // Calculate intersection based on IDs
+                    if (results.length > 0) {
+                        // Get IDs from the first result as the starting point
+                        let commonIds = new Set(Object.values(results[0]));
+
+                        // Intersect with IDs from subsequent results
+                        for (let i = 1; i < results.length; i++) {
+                            const currentIds = new Set(Object.values(results[i]));
+                            commonIds = new Set([...commonIds].filter(id => currentIds.has(id)));
+                        }
+
+                        console.log("Common receiving institution IDs:", commonIds);
+
+                        // Rebuild the availableReceivingInstitutions object using common IDs
+                        // We need a way to map IDs back to names. We can use the first result
+                        // (or any result that isn't empty) that contains the common IDs.
+                        const intersection = {};
+                        let nameMapSource = results.find(res => Object.keys(res).length > 0) || {};
+                        // Create a reverse map (id -> name) from a source result for efficiency
+                        const idToNameMap = Object.entries(nameMapSource).reduce((acc, [name, id]) => {
+                            acc[id] = name;
+                            return acc;
+                        }, {});
+
+
+                        commonIds.forEach(id => {
+                            // Find the name corresponding to the common ID
+                            const name = idToNameMap[id];
+                            if (name) { // Ensure we found a name
+                                intersection[name] = id;
+                            } else {
+                                console.warn(`Could not find name for common receiving ID: ${id}. This might happen if the ID exists in later results but not the first.`);
+                                // As a fallback, you could try searching other results, but this indicates potential data inconsistency.
+                            }
+                        });
+
+
+                        if (Object.keys(intersection).length > 0) {
+                            setAvailableReceivingInstitutions(intersection);
+                            console.log("Intersection result:", intersection);
+                        } else {
+                            setAvailableReceivingInstitutions({});
+                            setError("No common receiving institutions found for the selected sending institutions.");
+                        }
+                    } else {
+                        // Should not happen if selectedSendingInstitutions.length > 1, but handle defensively
+                        setAvailableReceivingInstitutions({});
+                    }
+                }
+            } catch (err) {
+                console.error("Error processing receiving institutions:", err);
+                setError(`Failed to load or process receiving institutions: ${err.message}`);
+                setAvailableReceivingInstitutions({}); // Clear on error
+            } finally {
+                setIsLoadingReceiving(false); // Stop loading
+            }
+        };
+
+        fetchAndIntersectReceiving();
+
+    }, [selectedSendingInstitutions]); // Re-run when the list of selected senders changes
+
+    // --- MODIFIED Effect for Fetching Academic Years ---
+    useEffect(() => {
+        // Clear previous year selections and data whenever sending/receiving changes
+        setYearInputValue('');
+        setSelectedYearId(null);
+        setAcademicYears({});
+        setFilteredYears([]);
+        setError(null); // Clear previous errors related to years
+
+        const fetchAndIntersectYears = async () => {
+            // Only proceed if we have at least one sending institution AND a receiving institution selected
+            if (selectedSendingInstitutions.length === 0 || !selectedReceivingId) {
+                setAcademicYears({}); // Clear years if selections are incomplete
                 return;
             }
-        } catch (e) {
-            console.error("Error loading receiving institutions from cache:", e);
-            localStorage.removeItem(cacheReceivingInstitutionsKey); // Clear cache on error
-        }
 
+            setIsLoadingYears(true); // Start loading years
+            setError(null);
 
-        if (selectedSendingId) {
-            fetchData(`receiving-institutions?sendingInstitutionId=${selectedSendingId}`)
-                .then(data => {
-                    setReceivingInstitutions(data)
+            try {
+                if (selectedSendingInstitutions.length === 1) {
+                    // --- Fetch for a single sender ---
+                    const firstSendingId = selectedSendingInstitutions[0].id;
+                    console.log(`Fetching years for single sender S=${firstSendingId}, R=${selectedReceivingId}`);
+                    const cacheKey = `academic-years-${firstSendingId}-${selectedReceivingId}`;
+                    let cachedYears = null;
+
+                    // Check Cache
                     try {
-                        localStorage.setItem(cacheReceivingInstitutionsKey, JSON.stringify(data));
-                        console.log("Receiving institutions cached successfully:", cacheReceivingInstitutionsKey);
+                        const cachedData = localStorage.getItem(cacheKey);
+                        if (cachedData) {
+                            cachedYears = JSON.parse(cachedData);
+                            console.log("Loaded academic years from cache:", cacheKey);
+                            setAcademicYears(cachedYears);
+                            setIsLoadingYears(false); // Stop loading
+                            return;
+                        }
                     } catch (e) {
-                        console.error("Error caching receiving institutions:", e);
+                        console.error("Error loading academic years from cache:", e);
+                        localStorage.removeItem(cacheKey);
                     }
-                })
-                .catch(err => setError(`Failed to load receiving institutions: ${err.message}`));
-        }
-    }, [selectedSendingId]);
+
+                    // Fetch from API
+                    const data = await fetchData(`academic-years?sendingId=${firstSendingId}&receivingId=${selectedReceivingId}`);
+                    if (data && Object.keys(data).length > 0) {
+                        setAcademicYears(data);
+                        // Cache Result
+                        try {
+                            localStorage.setItem(cacheKey, JSON.stringify(data));
+                            console.log("Academic Years cached successfully:", cacheKey);
+                        } catch (e) {
+                            console.error("Error caching academic years:", e);
+                        }
+                    } else {
+                        setAcademicYears({});
+                        setError(`No academic years found for ${selectedSendingInstitutions[0].name} and the selected receiving institution.`);
+                    }
+                } else {
+                    // --- Fetch for multiple senders and find intersection ---
+                    console.log(`Fetching years for multiple senders (Count: ${selectedSendingInstitutions.length}), R=${selectedReceivingId}`);
+                    const promises = selectedSendingInstitutions.map(sender =>
+                        fetchData(`academic-years?sendingId=${sender.id}&receivingId=${selectedReceivingId}`)
+                            .catch(err => {
+                                console.error(`Failed to fetch years for S=${sender.id}, R=${selectedReceivingId}:`, err);
+                                return {}; // Return empty object on error for this sender/receiver pair
+                            })
+                    );
+
+                    const results = await Promise.all(promises);
+                    console.log("Raw year results from multiple fetches:", results);
+
+                    // Check if any fetch failed completely
+                    if (results.some(res => res === null || typeof res === 'undefined')) {
+                        throw new Error("One or more requests for academic years failed.");
+                    }
+
+                    // Calculate intersection based on IDs
+                    if (results.length > 0 && results.every(res => typeof res === 'object' && res !== null)) {
+                        // Get IDs from the first valid result as the starting point
+                        let commonIds = new Set(Object.values(results[0]));
+
+                        // Intersect with IDs from subsequent results
+                        for (let i = 1; i < results.length; i++) {
+                            const currentIds = new Set(Object.values(results[i]));
+                            commonIds = new Set([...commonIds].filter(id => currentIds.has(id)));
+                        }
+
+                        console.log("Common academic year IDs:", commonIds);
+
+                        // Rebuild the academicYears object using common IDs
+                        const intersection = {};
+                        let nameMapSource = results.find(res => Object.keys(res).length > 0) || {};
+                        const idToNameMap = Object.entries(nameMapSource).reduce((acc, [name, id]) => {
+                            acc[id] = name;
+                            return acc;
+                        }, {});
+
+                        commonIds.forEach(id => {
+                            const name = idToNameMap[id];
+                            if (name) {
+                                intersection[name] = id;
+                            } else {
+                                console.warn(`Could not find name for common academic year ID: ${id}.`);
+                            }
+                        });
+
+                        if (Object.keys(intersection).length > 0) {
+                            setAcademicYears(intersection);
+                            console.log("Intersection year result:", intersection);
+                        } else {
+                            setAcademicYears({});
+                            setError("No common academic years found for the selected combination of institutions.");
+                        }
+                    } else {
+                        setAcademicYears({}); // Clear if results are invalid
+                        if (results.length > 0) { // Only set error if we expected results
+                           setError("Could not process academic years from one or more sources.");
+                        }
+                    }
+                }
+            } catch (err) {
+                console.error("Error processing academic years:", err);
+                setError(`Failed to load or process academic years: ${err.message}`);
+                setAcademicYears({}); // Clear on error
+            } finally {
+                setIsLoadingYears(false); // Stop loading
+            }
+        };
+
+        fetchAndIntersectYears();
+
+        // Cleanup function to potentially cancel fetches if component unmounts or dependencies change quickly
+        // return () => { /* Add cleanup logic if using AbortController */ };
+
+    }, [selectedSendingInstitutions, selectedReceivingId]); // Re-run when senders or receiver changes
 
     // --- Effects for Filtering Dropdowns ---
     const filter = useCallback(
-            ((value, data, setFiltered, setShowDropdown) => {
+        ((value, data, setFiltered, setShowDropdown, excludeIds = []) => {
             const lowerCaseValue = value.toLowerCase();
             const filtered = Object.entries(data)
-                .filter(([name]) => name.toLowerCase().includes(lowerCaseValue))
+                .filter(([name, id]) =>
+                    !excludeIds.includes(id) &&
+                    name.toLowerCase().includes(lowerCaseValue)
+                )
                 .map(([name, id]) => ({ name, id }));
             setFiltered(filtered);
             setShowDropdown(true);
@@ -170,39 +419,55 @@ const CollegeTransferForm = () => {
         []
     );
 
+    // Modified useEffect for sending dropdown
     useEffect(() => {
+        const alreadySelectedIds = selectedSendingInstitutions.map(inst => inst.id);
         if (sendingInputValue) {
-            filter(sendingInputValue, institutions, setFilteredInstitutions, setShowSendingDropdown);
+            filter(sendingInputValue, institutions, setFilteredSending, setShowSendingDropdown, alreadySelectedIds);
         } else {
-            // Keep dropdown open on focus, hide on blur or empty
-             if (!document.activeElement || document.activeElement.id !== 'searchInstitution') {
-                 setShowSendingDropdown(false);
-             }
-             setFilteredInstitutions(Object.entries(institutions).map(([name, id]) => ({ name, id }))); // Show all on empty/focus
+            // Show all available (not already selected) options on focus/empty
+            const allAvailable = Object.entries(institutions)
+                .filter(([, id]) => !alreadySelectedIds.includes(id))
+                .map(([name, id]) => ({ name, id }));
+            setFilteredSending(allAvailable);
+            if (!document.activeElement || document.activeElement.id !== 'searchInstitution') {
+                setShowSendingDropdown(false);
+            }
         }
-    }, [sendingInputValue, institutions, filter]);
+    }, [sendingInputValue, institutions, selectedSendingInstitutions, filter]); // Add selectedSendingInstitutions
 
+    // --- MODIFIED useEffect for receiving dropdown filtering ---
     useEffect(() => {
-        if (receivingInputValue && selectedSendingId) {
-            filter(receivingInputValue, receivingInstitutions, setFilteredReceiving, setShowReceivingDropdown);
+        const sourceData = availableReceivingInstitutions;
+        const excludeIds = []; // No need to exclude senders here
+
+        if (receivingInputValue) {
+            filter(receivingInputValue, sourceData, setFilteredReceiving, setShowReceivingDropdown, excludeIds);
         } else {
+             const allAvailable = Object.entries(sourceData)
+                .map(([name, id]) => ({ name, id }));
+             setFilteredReceiving(allAvailable);
              if (!document.activeElement || document.activeElement.id !== 'receivingInstitution') {
                  setShowReceivingDropdown(false);
              }
-             setFilteredReceiving(Object.entries(receivingInstitutions).map(([name, id]) => ({ name, id }))); // Show all on empty/focus
         }
-    }, [receivingInputValue, receivingInstitutions, selectedSendingId, filter]);
+    // Depend on the potentially updated availableReceivingInstitutions
+    }, [receivingInputValue, availableReceivingInstitutions, filter]);
 
+    // --- MODIFIED useEffect for year dropdown filtering ---
     useEffect(() => {
-        if (yearInputValue) {
+        // Only filter if year input is enabled
+        const isYearInputEnabled = selectedSendingInstitutions.length > 0 && selectedReceivingId;
+        if (yearInputValue && isYearInputEnabled) {
             filter(yearInputValue, academicYears, setFilteredYears, setShowYearDropdown);
         } else {
              if (!document.activeElement || document.activeElement.id !== 'academicYears') {
                  setShowYearDropdown(false);
              }
-             setFilteredYears(Object.entries(academicYears).map(([name, id]) => ({ name, id })).reverse()); // Show all on empty/focus
+             // Only set filtered years if input is enabled, otherwise keep it empty
+             setFilteredYears(isYearInputEnabled ? Object.entries(academicYears).map(([name, id]) => ({ name, id })).reverse() : []);
         }
-    }, [yearInputValue, academicYears, filter]);
+    }, [yearInputValue, academicYears, filter, selectedSendingInstitutions, selectedReceivingId]); // Add dependencies
 
     // --- Event Handlers ---
     const handleInputChange = (e, setInputValue) => {
@@ -210,41 +475,66 @@ const CollegeTransferForm = () => {
         setError(null);
     };
 
+    // Modified handleDropdownSelect
     const handleDropdownSelect = (item, inputId) => {
         setError(null);
         switch (inputId) {
             case 'sending':
-                setSendingInputValue(item.name);
-                setSelectedSendingId(item.id);
+                // Add to the array, clear input
+                setSelectedSendingInstitutions(prev => [...prev, item]);
+                setSendingInputValue(''); // Clear input after selection
                 setShowSendingDropdown(false);
-                setFilteredInstitutions([]); // Clear filter on select
+                setFilteredSending([]);
                 break;
             case 'receiving':
+                // Set single receiving ID and value
                 setReceivingInputValue(item.name);
                 setSelectedReceivingId(item.id);
+                // Clear year selection if receiving institution changes
+                setYearInputValue('');
+                setSelectedYearId(null);
+                // Also clear existing academic years data as it's now invalid
+                setAcademicYears({});
                 setShowReceivingDropdown(false);
-                setFilteredReceiving([]); // Clear filter on select
+                setFilteredReceiving([]);
                 break;
             case 'year':
                 setYearInputValue(item.name);
                 setSelectedYearId(item.id);
                 setShowYearDropdown(false);
-                setFilteredYears([]); // Clear filter on select
+                setFilteredYears([]);
                 break;
-            // REMOVED: case 'major'
             default:
                 break;
         }
     };
 
-    const handleViewMajors = () => { // Keep name or rename to handleViewAgreements
-        if (!selectedSendingId || !selectedReceivingId || !selectedYearId) {
-            setError("Please select sending institution, receiving institution, and academic year first.");
+    // NEW: Handler to remove a selected sending institution
+    const handleRemoveSending = (idToRemove) => {
+        setSelectedSendingInstitutions(prev => prev.filter(inst => inst.id !== idToRemove));
+    };
+
+    // Modified handleViewMajors
+    const handleViewMajors = () => {
+        if (selectedSendingInstitutions.length === 0) {
+            setError("Please select at least one sending institution.");
+            return;
+        }
+        if (!selectedReceivingId || !selectedYearId) {
+            setError("Please select receiving institution and academic year.");
             return;
         }
         setError(null);
-        // Navigate to the new combined agreement viewer page
-        navigate(`/agreement/${selectedSendingId}/${selectedReceivingId}/${selectedYearId}`);
+        // Use the FIRST selected sending institution for the initial URL path
+        const firstSendingId = selectedSendingInstitutions[0].id;
+
+        // Navigate, passing the full list of selected sending institutions in state
+        navigate(`/agreement/${firstSendingId}/${selectedReceivingId}/${selectedYearId}`, {
+            state: {
+                // Pass the full array of selected sending institutions objects
+                allSelectedSendingInstitutions: selectedSendingInstitutions
+            }
+        });
     };
 
     // --- Render Dropdown ---
@@ -272,44 +562,78 @@ const CollegeTransferForm = () => {
             <h1>College Transfer AI</h1>
             {error && <div style={{ color: 'red', marginBottom: '1em' }}>Error: {error}</div>}
 
-            {/* Sending Institution */}
+            {/* Sending Institution Section */}
             <div className="form-group">
-                <label htmlFor="searchInstitutions">Sending Institution:</label>
+                <label htmlFor="searchInstitution">Sending Institution(s):</label>
+
+                {/* Display Selected Institutions as Tags */}
+                <div style={{ marginBottom: selectedSendingInstitutions.length > 0 ? '0.5em' : '0', display: 'flex', flexWrap: 'wrap', gap: '0.5em' }}>
+                    {selectedSendingInstitutions.map(inst => (
+                        <span key={inst.id} className="tag" style={{ display: 'inline-flex', alignItems: 'center', background: '#e0e0e0', padding: '3px 8px', borderRadius: '12px', fontSize: '0.9em' }}>
+                            {inst.name}
+                            <button
+                                onClick={() => handleRemoveSending(inst.id)}
+                                style={{ marginLeft: '5px', border: 'none', background: 'none', color: '#888', cursor: 'pointer', fontSize: '1.1em', padding: '0 2px', lineHeight: '1' }}
+                                title={`Remove ${inst.name}`}
+                            >
+                                &times;
+                            </button>
+                        </span>
+                    ))}
+                </div>
+
+                {/* Input for adding next sending institution */}
                 <input
                     type="text"
-                    id="searchInstitution"
-                    placeholder="Type to search..."
+                    id="searchInstitution" // Keep ID for focus logic if needed
+                    placeholder="Type to search and add..."
                     value={sendingInputValue}
                     onChange={(e) => handleInputChange(e, setSendingInputValue)}
                     onFocus={() => {
-                        const allOptions = Object.entries(institutions).map(([name, id]) => ({ name, id }));
-                        setFilteredInstitutions(allOptions);
+                        const alreadySelectedIds = selectedSendingInstitutions.map(inst => inst.id);
+                        const allAvailable = Object.entries(institutions)
+                            .filter(([, id]) => !alreadySelectedIds.includes(id))
+                            .map(([name, id]) => ({ name, id }));
+                        setFilteredSending(allAvailable);
                         setShowSendingDropdown(true);
                     }}
-                    onBlur={() =>  setShowSendingDropdown(false)} 
+                    onBlur={() => setShowSendingDropdown(false)}
                     autoComplete="off"
                 />
-                {renderDropdown(filteredInstitutions, showSendingDropdown, 'sending')}
+                {renderDropdown(filteredSending, showSendingDropdown, 'sending')}
             </div>
 
-            {/* Receiving Institution */}
+            {/* Receiving Institution Section (Single Selection) */}
             <div className="form-group">
-                <label htmlFor="receivingInstitutions">Receiving Institution:</label>
+                <label htmlFor="receivingInstitution">Receiving Institution:</label>
                 <input
                     type="text"
                     id="receivingInstitution"
-                    placeholder="Select sending institution first..."
+                    // Update placeholder based on loading state and availability
+                    placeholder={
+                        isLoadingReceiving ? "Loading common institutions..." :
+                        selectedSendingInstitutions.length === 0 ? "Select sending institution(s) first..." :
+                        Object.keys(availableReceivingInstitutions).length === 0 && !error ? "No common institutions found..." :
+                        "Type to search common institutions..."
+                    }
                     value={receivingInputValue}
                     onChange={(e) => handleInputChange(e, setReceivingInputValue)}
                     onFocus={() => {
-                        const allOptions = Object.entries(receivingInstitutions).map(([name, id]) => ({ name, id }));
-                        setFilteredReceiving(allOptions);
-                        setShowReceivingDropdown(true);
+                        // Populate dropdown from 'availableReceivingInstitutions' on focus
+                        if (!isLoadingReceiving && selectedSendingInstitutions.length > 0) {
+                            const sourceData = availableReceivingInstitutions;
+                            const allAvailable = Object.entries(sourceData)
+                                .map(([name, id]) => ({ name, id }));
+                            setFilteredReceiving(allAvailable);
+                            setShowReceivingDropdown(true);
+                        }
                     }}
                     onBlur={() => setShowReceivingDropdown(false)}
-                    disabled={!selectedSendingId}
+                    // Disable if loading, no senders selected, or (after loading) no common institutions available
+                    disabled={isLoadingReceiving || selectedSendingInstitutions.length === 0 || (!isLoadingReceiving && Object.keys(availableReceivingInstitutions).length === 0)}
                     autoComplete="off"
                 />
+                {/* Uses 'filteredReceiving' for display */}
                 {renderDropdown(filteredReceiving, showReceivingDropdown, 'receiving')}
             </div>
 
@@ -319,28 +643,49 @@ const CollegeTransferForm = () => {
                 <input
                     type="text"
                     id="academicYears"
-                    placeholder="Type to search..."
+                    placeholder={
+                        isLoadingYears ? "Loading common years..." :
+                        selectedSendingInstitutions.length === 0 || !selectedReceivingId
+                            ? "Select sending & receiving institutions first..."
+                            : Object.keys(academicYears).length === 0 && !error ? "No common years found..."
+                            : "Type to search common years..."
+                    }
                     value={yearInputValue}
                     onChange={(e) => handleInputChange(e, setYearInputValue)}
                     onFocus={() => {
-                        const allOptions = Object.entries(academicYears)
-                            .map(([name, id]) => ({ name, id }))
-                            .reverse();
-                        setFilteredYears(allOptions);
-                        setShowYearDropdown(true);
+                        // Only show dropdown if input is enabled and not loading
+                        if (!isLoadingYears && selectedSendingInstitutions.length > 0 && selectedReceivingId) {
+                            const allOptions = Object.entries(academicYears)
+                                .map(([name, id]) => ({ name, id }))
+                                .sort((a, b) => b.name.localeCompare(a.name)); // Sort descending
+                            setFilteredYears(allOptions);
+                            setShowYearDropdown(true);
+                        }
                     }}
                     onBlur={() => setShowYearDropdown(false)}
+                    // Disable if loading years, or sending/receiving not selected, or (after loading) no years available
+                    disabled={isLoadingYears || selectedSendingInstitutions.length === 0 || !selectedReceivingId || (!isLoadingYears && Object.keys(academicYears).length === 0)}
                     autoComplete="off"
                 />
-                {renderDropdown(filteredYears, showYearDropdown, 'year')}
+                {/* Render dropdown only if input is enabled and not loading */}
+                {(!isLoadingYears && selectedSendingInstitutions.length > 0 && selectedReceivingId) &&
+                    renderDropdown(filteredYears, showYearDropdown, 'year')}
             </div>
 
-            {/* MODIFIED: Button */}
+            {/* MODIFIED: Button - Adjust disabled logic */}
             <button
-                onClick={handleViewMajors} // Use the updated handler
-                disabled={!selectedSendingId || !selectedReceivingId || !selectedYearId || isLoading}
+                onClick={handleViewMajors}
+                // Disable if loading anything, or basic selections missing
+                disabled={isLoadingYears || isLoadingReceiving || selectedSendingInstitutions.length === 0 || !selectedReceivingId || !selectedYearId || isLoading}
+                title={
+                    isLoadingYears ? "Loading common academic years..." :
+                    isLoadingReceiving ? "Loading common institutions..." :
+                    selectedSendingInstitutions.length === 0 ? "Select at least one sending institution" :
+                    !selectedReceivingId ? "Select a receiving institution" :
+                    !selectedYearId ? "Select an academic year" : ""
+                }
             >
-                {isLoading ? 'Loading...' : 'View Agreements'} {/* Updated text */}
+                {isLoadingYears ? 'Loading Years...' : isLoading ? 'Loading...' : 'View Agreements'}
             </button>
         </div>
     );

From c903dff12cbac8c55413a538bbf45621cbe6f67a Mon Sep 17 00:00:00 2001
From: Ahmon <107814419+Ahmonemb@users.noreply.github.com>
Date: Mon, 28 Apr 2025 10:53:24 -0700
Subject: [PATCH 05/16] Update README.md

---
 README.md | 84 +------------------------------------------------------
 1 file changed, 1 insertion(+), 83 deletions(-)

diff --git a/README.md b/README.md
index 9e33f6b..c085f99 100644
--- a/README.md
+++ b/README.md
@@ -1,83 +1 @@
-# 🎓 College Transfer AI
-
-**College Transfer AI** is an intelligent planning tool that helps California Community College students generate a personalized PDF report showing transferable courses to selected University of California (UC) campuses for a chosen major and transfer year. If a required course is not offered at the primary community college, the system searches other CCCs for articulated equivalents. It even includes an AI counselor that provides tailored academic advice based on the report.
-
----
-
-## 🚀 Features
-
-- ✅ Input your:
-  - Target UC campuses (e.g., UC Berkeley, UC San Diego)
-  - Major (e.g., Computer Science)
-  - Transfer year (e.g., Fall 2026)
-  - Primary CCC (e.g., Diablo Valley College)
-
-- 📄 Outputs a PDF for each selected UC campus:
-  - Lists all transferable courses needed for the selected major.
-  - Maps CCC equivalents with course name, unit count, and originating college.
-  - Indicates if a course is not offered at your CCC and shows an alternative from another CCC (if available).
-  - Clearly notes any courses that must be taken at the UC post-transfer.
-
-- 💬 Includes an AI guidance counselor:
-  - Reads the PDF and user input.
-  - Recommends a personalized education plan.
-  - Provides helpful advice and strategies for successful transfer.
-
----
-
-## 📥 Getting Started
-
-```bash
-# Clone the repository
-git clone https://github.com/your-username/college-transfer-ai.git
-cd college-transfer-ai
-
-# (Optional) Create a virtual environment
-python -m venv venv
-source venv/bin/activate  # or venv\Scripts\activate on Windows
-
-# Install dependencies
-pip install -r requirements.txt
-
-# Run the script
-python -m college_transfer_ai.app
-```
-## 📌 Example
-
-For a student transferring **Computer Science** from **Los Medanos College** and **Diablo Valley College** to **UC Berkeley**, the system generates a PDF showing:
-
-- Required UC courses (e.g., CS 61A, Math 1B)
-- Equivalent CCC courses (e.g., COMSC 132 at LMC)
-- Notes if a course must be taken after transfer or is unavailable at any CCC
-- Multiple CCCs where required courses may be completed
-
-Each PDF starts with the name of the UC campus, followed by the list of CCCs where articulated classes can be taken. If no CCC offers a transferable course, the PDF clearly states that.
-
----
-
-## 🤖 Coming Soon
-
-- Web interface for input/output
-- Full integration with AI academic advisor
-- Export education plan to calendar/schedule
-
----
-
-## 📄 License
-
-This project is licensed under the MIT License.
-
----
-
-## 🤝 Contributing
-
-Contributions are welcome! Open an issue to discuss your idea or submit a pull request.
-
----
-
-## 📬 Contact
-
-Made by [Ahmon Embaye]
-
-For questions or support, reach out at [ahmonembaye@example.com] or via GitHub Issues.
-
+Still in development. Testing phase coming soon.

From e31f340f2ab8a6499f201c7cb2c4d97723f999ee Mon Sep 17 00:00:00 2001
From: Ahmon <ahmonembaye@gmail.com>
Date: Mon, 28 Apr 2025 18:55:46 -0700
Subject: [PATCH 06/16] feat(fullstack): Build structured backend, integrate
 APIs, Auth, Stripe & Gemini

Refactored backend into a structured Flask application:
- Uses app factory pattern (`create_app`)
- Organizes routes into Blueprints (`agreement`, `user`, `course_map`, `stripe`) with `/api` prefix
- Centralized config loading (`config.py`) and DB/GridFS setup (`database.py`)
- Added utility functions for Google Auth, user management, and usage tracking (`utils.py`)

Implemented Core API Endpoints:
- Agreements: Fetch institutions, years, majors; download PDFs; generate/serve PDF images.
- Chat: Integrated Gemini 1.5 Pro for analysis and conversation, including image processing, history, auth, and rate limiting.
- User: `/user-status` endpoint to provide tier and usage info.
- Course Maps: Full CRUD operations for user-specific course maps.
- Stripe: `/create-checkout-session` and `/stripe-webhook` for subscription management and tier updates.

Frontend Enhancements:
- Improved user tier fetching and display logic in App.jsx.
- Enhanced ChatInterface UX based on login status and context.
- Fixed API parameters and countdown timer in AgreementViewerPage.
- Corrected Vite proxy configuration.
- Minor UI text updates and cleanups.
---
 backend/college_transfer_ai/__init__.py       |   70 ++
 backend/college_transfer_ai/app.py            | 1081 -----------------
 .../college_transfer_API.py                   |   28 +-
 backend/college_transfer_ai/config.py         |   37 +
 backend/college_transfer_ai/database.py       |   51 +
 .../college_transfer_ai/routes/__init__.py    |    1 +
 .../routes/agreement_routes.py                |  394 ++++++
 .../routes/course_map_routes.py               |  290 +++++
 .../routes/stripe_routes.py                   |  349 ++++++
 .../college_transfer_ai/routes/user_routes.py |   68 ++
 backend/college_transfer_ai/utils.py          |  183 +++
 backend/run.py                                |   51 +
 src/App.jsx                                   |   73 +-
 src/components/AgreementViewerPage.jsx        |   33 +-
 src/components/ChatInterface.jsx              |   16 +-
 src/components/PdfViewer.jsx                  |    6 +-
 vite.config.js                                |    3 -
 17 files changed, 1585 insertions(+), 1149 deletions(-)
 create mode 100644 backend/college_transfer_ai/__init__.py
 delete mode 100644 backend/college_transfer_ai/app.py
 create mode 100644 backend/college_transfer_ai/config.py
 create mode 100644 backend/college_transfer_ai/database.py
 create mode 100644 backend/college_transfer_ai/routes/__init__.py
 create mode 100644 backend/college_transfer_ai/routes/agreement_routes.py
 create mode 100644 backend/college_transfer_ai/routes/course_map_routes.py
 create mode 100644 backend/college_transfer_ai/routes/stripe_routes.py
 create mode 100644 backend/college_transfer_ai/routes/user_routes.py
 create mode 100644 backend/college_transfer_ai/utils.py
 create mode 100644 backend/run.py

diff --git a/backend/college_transfer_ai/__init__.py b/backend/college_transfer_ai/__init__.py
new file mode 100644
index 0000000..9386344
--- /dev/null
+++ b/backend/college_transfer_ai/__init__.py
@@ -0,0 +1,70 @@
+import os
+import traceback
+from flask import Flask
+from flask_cors import CORS
+
+# Import configuration, database setup, and blueprints
+from .config import load_configuration
+from .database import init_db
+from .routes.stripe_routes import stripe_bp
+from .routes.agreement_routes import agreement_bp, init_gemini # Import init_gemini
+from .routes.course_map_routes import course_map_bp
+from .routes.user_routes import user_bp
+
+def create_app():
+    """Flask application factory."""
+    app = Flask(__name__)
+
+    print("--- Creating Flask App ---")
+
+    try:
+        # Load configuration
+        config = load_configuration()
+        app.config['APP_CONFIG'] = config # Store config for access in blueprints
+    except Exception as config_err:
+        print(f"!!! CRITICAL: Failed to load configuration: {config_err}")
+        traceback.print_exc()
+        # Exit if config is essential and failed to load
+        exit(1)
+
+    # Initialize CORS
+    # Be more specific with origins in production
+    cors_origins = config.get("FRONTEND_URL", "*") # Default to '*' if not set
+    CORS(app, resources={r"/*": {"origins": cors_origins}})
+    print(f"--- CORS Initialized (Origins: {cors_origins}) ---")
+
+    # Initialize Database
+    try:
+        init_db(config.get('MONGO_URI'))
+    except ConnectionError as db_err:
+        print(f"!!! CRITICAL: Could not connect to database on startup: {db_err}")
+        # Depending on requirements, you might exit or continue with DB unavailable
+        exit(1) # Example: Exit if DB is essential
+    except Exception as general_db_err:
+        print(f"!!! CRITICAL: Unexpected error initializing database: {general_db_err}")
+        traceback.print_exc()
+        exit(1)
+
+
+    # Initialize Gemini (if using GOOGLE_API_KEY)
+    try:
+        init_gemini(config.get('GOOGLE_API_KEY'))
+    except Exception as gemini_err:
+        print(f"!!! WARNING: Failed to initialize Gemini: {gemini_err}")
+        # App can likely continue without Gemini, just log the warning
+
+    # Register Blueprints with optional API prefix
+    api_prefix = '/api' # Example prefix, adjust as needed or remove if using '/'
+    app.register_blueprint(stripe_bp, url_prefix=api_prefix)
+    app.register_blueprint(agreement_bp, url_prefix=api_prefix)
+    app.register_blueprint(course_map_bp, url_prefix=api_prefix)
+    app.register_blueprint(user_bp, url_prefix=api_prefix)
+    print(f"--- Blueprints Registered (Prefix: {api_prefix}) ---")
+
+    # Optional: Add a simple root route for health check or basic info
+    @app.route('/')
+    def index():
+        return "College Transfer AI Backend is running."
+
+    print("--- Flask App Creation Complete ---")
+    return app
diff --git a/backend/college_transfer_ai/app.py b/backend/college_transfer_ai/app.py
deleted file mode 100644
index 72af869..0000000
--- a/backend/college_transfer_ai/app.py
+++ /dev/null
@@ -1,1081 +0,0 @@
-import os
-import base64
-import traceback
-import uuid # Import uuid for map IDs
-# Use datetime from datetime module consistently
-from datetime import datetime, timedelta, time, timezone # Add timezone
-from flask import Flask, jsonify, request, Response, redirect # Add redirect
-from flask_cors import CORS
-from .college_transfer_API import CollegeTransferAPI # Use a leading dot
-import gridfs
-from pymongo import MongoClient
-from bson.objectid import ObjectId # Import ObjectId
-import fitz
-from openai import OpenAI
-from dotenv import load_dotenv
-import stripe # Import stripe
-import json # Import json for webhook parsing
-import io # Import io for image processing
-from PIL import Image # Import Image for image processing
-
-# --- Google Auth Imports ---
-from google.oauth2 import id_token
-from google.auth.transport import requests as google_requests
-# --- End Google Auth Imports ---
-
-# --- Google AI Imports ---
-import google.generativeai as genai
-from google.generativeai.types import HarmCategory, HarmBlockThreshold
-# --- End Google AI Imports ---
-
-print("--- Flask app.py loading ---")
-load_dotenv()
-
-# --- Config Vars ---
-openai_api_key = os.getenv("OPENAI_API_KEY")
-MONGO_URI = os.getenv("MONGO_URI")
-GOOGLE_CLIENT_ID = os.getenv("GOOGLE_CLIENT_ID")
-GOOGLE_API_KEY = os.getenv("GOOGLE_API_KEY")
-
-# --- Stripe Config ---
-stripe.api_key = os.getenv("STRIPE_SECRET_KEY")
-STRIPE_PRICE_ID = os.getenv("STRIPE_PRICE_ID")
-STRIPE_WEBHOOK_SECRET = os.getenv("STRIPE_WEBHOOK_SECRET")
-FRONTEND_URL = os.getenv("FRONTEND_URL", "http://localhost:5173") # Default if not set
-# --- End Stripe Config ---
-
-# --- Rate Limits (Example: Daily) ---
-FREE_TIER_DAILY_LIMIT = 10
-PAID_TIER_DAILY_LIMIT = 200 # Example limit for paid users
-
-# --- Add this print statement ---
-print(f"--- Attempting to configure Google AI with Key: '{GOOGLE_API_KEY}' ---")
-# --- End print statement ---
-
-# Google AI Client Setup
-if not GOOGLE_API_KEY:
-    print("Warning; GOOGLE_API_KEY not set. Google AI chat will fail.")
-else:
-    try:
-        genai.configure(api_key=GOOGLE_API_KEY)
-        print("Google AI client configured successfully.")
-    except Exception as e:
-        print(f"CRITICAL: Failed to configure Google AI client: {e}")
-# --- End Google AI Client Setup ---
-
-# --- Client Setups ---
-if not openai_api_key: print("Warning: OPENAI_API_KEY not set.")
-openai_client = OpenAI(api_key=openai_api_key) if openai_api_key else None
-
-if not MONGO_URI: print("CRITICAL: MONGO_URI not set.")
-try:
-    client = MongoClient(MONGO_URI)
-    client.admin.command('ping')
-    print("MongoDB connection successful.")
-    db = client["CollegeTransferAICluster"]
-    fs = gridfs.GridFS(db)
-    course_maps_collection = db["course_maps"] # Collection for course maps
-    users_collection = db["users"] # NEW: Collection for user data and tiers
-
-    # Ensure index on google_user_id and map_id for course maps
-    course_maps_collection.create_index([("google_user_id", 1)])
-    course_maps_collection.create_index([("google_user_id", 1), ("map_id", 1)], unique=True)
-
-    # NEW: Ensure index on google_user_id for users collection (unique)
-    users_collection.create_index([("google_user_id", 1)], unique=True)
-    print("MongoDB collections and indexes configured.")
-
-except Exception as e:
-    print(f"CRITICAL: Failed to connect to MongoDB or configure collections/indexes: {e}")
-    # exit(1) # Consider if you want the app to stop if DB fails
-
-if not GOOGLE_CLIENT_ID:
-    print("Warning: GOOGLE_CLIENT_ID not set. Google Sign-In endpoints will fail.")
-# --- End Client Setups ---
-
-
-BASE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-app = Flask(__name__, template_folder=os.path.join(BASE_DIR, 'templates'), static_folder=os.path.join(BASE_DIR, 'static'))
-CORS(app, supports_credentials=True, origins=["http://localhost:5173"])
-app.config['MAX_CONTENT_LENGTH'] = 16 * 1024 * 1024
-
-api = CollegeTransferAPI()
-
-# --- Helper: Verify Google Token (remains the same) ---
-def verify_google_token(token):
-    """Verifies Google ID token and returns user info."""
-    if not GOOGLE_CLIENT_ID:
-        raise ValueError("Google Client ID not configured on backend.")
-    try:
-        idinfo = id_token.verify_oauth2_token(
-            token, google_requests.Request(), GOOGLE_CLIENT_ID
-        )
-        # Minimal check for required fields
-        if 'sub' not in idinfo:
-             raise ValueError("Token verification failed: Missing 'sub' (user ID).")
-        print(f"Token verified for user: {idinfo['sub']}")
-        return idinfo
-    except ValueError as e:
-        print(f"Token verification failed: {e}")
-        raise ValueError(f"Invalid Google token: {e}")
-    except Exception as e:
-        print(f"An unexpected error occurred during token verification: {e}")
-        raise ValueError(f"Token verification error: {e}")
-# --- End Helper ---
-
-# --- NEW Helper: Get or Create User ---
-# Modify get_or_create_user to include Stripe fields if they don't exist
-def get_or_create_user(idinfo):
-    """
-    Finds a user by google_user_id or creates a new one with default free tier.
-    Ensures Stripe-related fields exist.
-    Returns the user document from MongoDB.
-    """
-    google_user_id = idinfo.get('sub')
-    if not google_user_id:
-        raise ValueError("Missing 'sub' (user ID) in token info.")
-
-    user = users_collection.find_one({'google_user_id': google_user_id})
-
-    if not user:
-        print(f"User {google_user_id} not found. Creating new user.")
-        new_user_data = {
-            'google_user_id': google_user_id,
-            'email': idinfo.get('email'),
-            'name': idinfo.get('name'),
-            'tier': 'free', # Default tier
-            'requests_used_this_period': 0,
-            'period_start_date': datetime.utcnow(),
-            'created_at': datetime.utcnow(),
-            'last_login': datetime.utcnow(),
-            # Add Stripe fields with defaults
-            "stripe_customer_id": None,
-            "stripe_subscription_id": None,
-            "subscription_status": None,
-            "subscription_expires": None
-        }
-        try:
-            users_collection.insert_one(new_user_data)
-            print(f"Successfully created new user: {google_user_id}")
-            user = users_collection.find_one({'google_user_id': google_user_id})
-            if not user:
-                 raise Exception(f"Failed to retrieve newly created user {google_user_id}")
-        except Exception as e:
-            print(f"Error creating user {google_user_id}: {e}")
-            raise Exception(f"Database error creating user: {e}")
-    else:
-        # Ensure Stripe fields exist for older users & update last_login
-        update_needed = False
-        update_query = {'last_login': datetime.utcnow()} # Always update last login
-        if 'stripe_customer_id' not in user:
-            update_query['stripe_customer_id'] = None
-            update_needed = True
-        if 'stripe_subscription_id' not in user:
-            update_query['stripe_subscription_id'] = None
-            update_needed = True
-        if 'subscription_status' not in user:
-            update_query['subscription_status'] = None
-            update_needed = True
-        if 'subscription_expires' not in user:
-            update_query['subscription_expires'] = None
-            update_needed = True
-
-        users_collection.update_one(
-            {'google_user_id': google_user_id},
-            {'$set': update_query}
-        )
-        if update_needed:
-             # Re-fetch user data after update if fields were added
-             user = users_collection.find_one({"google_user_id": google_user_id})
-
-        print(f"Found existing user: {google_user_id}, Tier: {user.get('tier')}")
-
-    return user
-# --- End NEW Helper ---
-
-# --- Helper: Check and Update Usage ---
-def check_and_update_usage(user_data):
-    """
-    Checks if the user is within their daily limit.
-    Resets the count if a new day has started.
-    Increments the count if the request proceeds.
-    Returns True if the user is within limits, False otherwise.
-    Raises Exception on database error.
-    """
-    user_id = user_data['google_user_id']
-    tier = user_data.get('tier', 'free')
-    requests_used = user_data.get('requests_used_this_period', 0)
-    period_start = user_data.get('period_start_date')
-
-    limit = PAID_TIER_DAILY_LIMIT if tier == 'paid' else FREE_TIER_DAILY_LIMIT
-
-    now = datetime.utcnow()
-    reset_usage = False
-
-    # Check if period_start exists and is a datetime object
-    if period_start and isinstance(period_start, datetime):
-        # Check if the period start date is before today (UTC)
-        if period_start.date() < now.date():
-            print(f"New day detected for user {user_id}. Resetting usage count.")
-            requests_used = 0
-            period_start = now # Start the new period today
-            reset_usage = True
-        # else: # Period started today, continue counting
-            # print(f"Usage period started today for user {user_id}.")
-    else:
-        # If period_start is missing or invalid, start a new period now
-        print(f"Period start date missing or invalid for user {user_id}. Starting new period.")
-        requests_used = 0
-        period_start = now
-        reset_usage = True
-
-    # Check if limit is exceeded
-    if requests_used >= limit:
-        print(f"User {user_id} (Tier: {tier}) has reached daily limit of {limit}.")
-        return False # Limit exceeded
-
-    # --- If limit is not exceeded, increment count ---
-    try:
-        update_fields = {
-            '$inc': {'requests_used_this_period': 1},
-            '$set': {'last_request_timestamp': now} # Optional: track last request time
-        }
-        # Only update period_start_date if it was reset
-        if reset_usage:
-            update_fields['$set']['period_start_date'] = period_start
-            update_fields['$set']['requests_used_this_period'] = 1 # Start count at 1 for the new period
-
-        result = users_collection.update_one(
-            {'google_user_id': user_id},
-            update_fields
-        )
-        if result.modified_count == 0 and not reset_usage:
-             # This might happen if the user doc was deleted between fetch and update
-             # Or if the increment somehow failed. Handle defensively.
-             print(f"Warning: Failed to increment usage count for user {user_id}. Proceeding anyway.")
-             # Optionally raise an error or retry
-        elif reset_usage:
-             print(f"Usage reset and incremented to 1 for user {user_id} for new period starting {period_start.date()}.")
-        else:
-             print(f"Usage incremented for user {user_id}. New count: {requests_used + 1}/{limit}")
-
-        return True # Within limit, usage incremented
-
-    except Exception as e:
-        print(f"Database error updating usage for user {user_id}: {e}")
-        # Decide if you want to let the request proceed or block it on DB error
-        raise Exception(f"Failed to update usage count: {e}")
-
-# --- End Helper ---
-
-# --- Existing Endpoints (Home, Institutions, PDF/Image handling, Chat etc. remain the same) ---
-@app.route('/')
-def home(): return "College Transfer AI API is running."
-# ... /institutions, /receiving-institutions, /academic-years, /majors ...
-# ... /articulation-agreement, /pdf-images, /image ...
-# ... /chat ...
-# (Keep all existing endpoints as they were)
-# Endpoint to get all institutions
-@app.route('/institutions', methods=['GET'])
-def get_institutions():
-    try:
-        institutions = api.get_sending_institutions()
-        return jsonify(institutions)
-    except Exception as e:
-        print(f"Error in /institutions: {e}")
-        return jsonify({"error": str(e)}), 500
-
-# Endpoint to get receiving institutions
-@app.route('/receiving-institutions', methods=['GET'])
-def get_receiving_institutions():
-    sending_institution_id = request.args.get('sendingId')
-    if not sending_institution_id:
-        return jsonify({"error": "Missing sendingInstitutionId parameter"}), 400
-    try:
-        non_ccs = api.get_receiving_institutions(sending_institution_id)
-        return jsonify(non_ccs)
-    except Exception as e:
-        print(f"Error in /receiving-institutions: {e}")
-        return jsonify({"error": str(e)}), 500
-
-# Endpoint to get academic years
-@app.route('/academic-years', methods=['GET'])
-def get_academic_years():
-    sending_institution_id = request.args.get('sendingId')
-    receiving_institution_id = request.args.get('receivingId')
-    print(f"Received sendingId: {sending_institution_id}, receivingId: {receiving_institution_id}")
-    try:
-        academic_years = api.get_academic_years(int(sending_institution_id),int(receiving_institution_id))
-        return jsonify(academic_years)
-    except Exception as e:
-        print(f"Error in /academic-years: {e}")
-        return jsonify({"error": str(e)}), 500
-
-# Endpoint to get majors
-@app.route('/majors', methods=['GET'])
-def get_all_majors():
-    sending_institution_id = request.args.get('sendingInstitutionId')
-    receiving_institution_id = request.args.get('receivingInstitutionId')
-    academic_year_id = request.args.get('academicYearId')
-    category_code = request.args.get('categoryCode')
-    if not all([sending_institution_id, receiving_institution_id, academic_year_id, category_code]):
-        return jsonify({"error": "Missing required parameters (sendingInstitutionId, receivingInstitutionId, academicYearId, categoryCode)"}), 400
-    try:
-        majors = api.get_all_majors(sending_institution_id, receiving_institution_id, academic_year_id, category_code)
-        return jsonify(majors)
-    except Exception as e:
-        print(f"Error in /majors: {e}")
-        return jsonify({"error": str(e)}), 500
-
-# REMOVE or COMMENT OUT old endpoint:
-# @app.route('/articulation-agreement', methods=['GET'])
-# def get_articulation_agreement(): ...
-
-# NEW Endpoint to get multiple articulation agreement PDF filenames
-@app.route('/articulation-agreements', methods=['POST']) # Changed to POST
-def get_multiple_articulation_agreements():
-    print("Received request for multiple articulation agreements.")
-    
-    try:
-        data = request.get_json()
-        if not data:
-            return jsonify({"error": "Invalid JSON payload"}), 400
-
-        sending_ids = data.get('sending_ids')
-        print(f"Received sending_ids: {sending_ids}")
-        receiving_id = data.get('receiving_id')
-        year_id = data.get('year_id')
-        major_key = data.get('major_key') # Key like 'Major/fc50cced...' or 'Department/...'
-
-        key_components = major_key.split('/')
-        major_id = key_components[-1] if len(key_components) > 1 else None
-        category_code = key_components[4] if len(key_components) > 0 else None
-        print(f"Extracted major_id: {major_id} from major_key: {major_key} \n")
-        if not all([sending_ids, receiving_id, year_id, major_key]) or not isinstance(sending_ids, list):
-            return jsonify({"error": "Missing or invalid parameters (sending_ids list, receiving_id, year_id, major_key required)"}), 400
-
-        print(f"Received request for agreements: Sending={sending_ids}, Receiving={receiving_id}, Year={year_id}, MajorKey={major_key}")
-
-        results = []
-        for sending_id in sending_ids:
-            try:
-                # Construct the 'key' needed by the underlying API function
-                # Assumes major_key is like 'Major/...' or 'Department/...'
-                # Adjust if your major_key format is different
-                constructed_key = f"{year_id}/{sending_id}/to/{receiving_id}/{category_code}/{major_id}"
-                print(f"Calling api.get_articulation_agreement for key: {constructed_key}")
-
-                # Call the original function for each sending ID
-                pdf_filename = api.get_articulation_agreement(
-                    int(year_id),
-                    int(sending_id),
-                    int(receiving_id),
-                    constructed_key # Pass the constructed key
-                )
-                results.append({
-                    "sendingId": sending_id, # Return string ID to match frontend state
-                    "pdfFilename": pdf_filename
-                })
-            except ValueError:
-                 print(f"Warning: Invalid numeric value for sending_id {sending_id}, skipping.")
-                 results.append({"sendingId": sending_id, "pdfFilename": None, "error": "Invalid ID format"})
-            except Exception as single_err:
-                # Log error for this specific agreement but continue with others
-                print(f"Error fetching agreement for sending_id {sending_id}: {single_err}")
-                # Optionally include error in response for frontend to display
-                results.append({"sendingId": sending_id, "pdfFilename": None, "error": str(single_err)})
-
-        return jsonify({"agreements": results})
-
-    except Exception as e:
-        print(f"Error in /articulation-agreements: {e}")
-        traceback.print_exc()
-        return jsonify({"error": f"Failed to process agreement request: {str(e)}"}), 500
-
-# Endpoint to get image filenames for a PDF (extracts if needed)
-@app.route('/pdf-images/<filename>')
-def get_pdf_images(filename):
-    try:
-        pdf_file = fs.find_one({"filename": filename})
-        if not pdf_file:
-            return jsonify({"error": "PDF not found"}), 404
-
-        pdf_bytes = pdf_file.read()
-        doc = fitz.open("pdf", pdf_bytes)
-        image_filenames = []
-
-        # Check cache
-        first_image_name = f"{filename}_page_0.png"
-        if fs.exists({"filename": first_image_name}):
-             for page_num in range(len(doc)):
-                 img_filename = f"{filename}_page_{page_num}.png"
-                 if fs.exists({"filename": img_filename}):
-                     image_filenames.append(img_filename)
-                 else:
-                     print(f"Cache incomplete, image {img_filename} missing. Regenerating.")
-                     image_filenames = []
-                     break
-             if image_filenames:
-                 print(f"All images for {filename} found in cache.")
-                 doc.close()
-                 return jsonify({"image_filenames": image_filenames})
-
-        # If not fully cached, extract/save
-        print(f"Generating images for {filename}...")
-        image_filenames = []
-        for page_num in range(len(doc)):
-            page = doc.load_page(page_num)
-            pix = page.get_pixmap(dpi=150)
-            img_bytes = pix.tobytes("png")
-            img_filename = f"{filename}_page_{page_num}.png"
-            existing_file = fs.find_one({"filename": img_filename})
-            if existing_file: fs.delete(existing_file._id)
-            fs.put(img_bytes, filename=img_filename, contentType='image/png')
-            image_filenames.append(img_filename)
-            print(f"Saved image {img_filename}")
-
-        doc.close()
-        return jsonify({"image_filenames": image_filenames})
-
-    except Exception as e:
-        print(f"Error extracting images for {filename}: {e}")
-        traceback.print_exc() # Print full traceback for debugging
-        return jsonify({"error": f"Failed to extract images: {str(e)}"}), 500
-
-# Endpoint to serve a single image
-@app.route('/image/<image_filename>')
-def serve_image(image_filename):
-    try:
-        grid_out = fs.find_one({"filename": image_filename})
-        if not grid_out: return "Image not found", 404
-        response = Response(grid_out.read(), mimetype=getattr(grid_out, 'contentType', 'image/png'))
-        return response
-    except Exception as e:
-        print(f"Error serving image {image_filename}: {e}")
-        return jsonify({"error": f"Failed to serve image: {str(e)}"}), 500
-
-# Chat Endpoint (remains the same, does not use Google Auth)
-@app.route('/chat', methods=['POST'])
-def chat_with_agreement():
-    if not GOOGLE_API_KEY: # Check if Google AI is configured
-        return jsonify({"error": "Google AI client not configured."}), 500
-
-    # --- Authentication and User Retrieval ---
-    try:
-        auth_header = request.headers.get('Authorization')
-        if not auth_header or not auth_header.startswith('Bearer '):
-            return jsonify({"error": "Authorization token missing or invalid"}), 401
-        token = auth_header.split(' ')[1]
-        user_info = verify_google_token(token)
-        user_data = get_or_create_user(user_info) # Get/Create user record
-        user_tier = user_data.get('tier', 'free')
-        google_user_id = user_data['google_user_id']
-        print(f"[/chat] Request received from user {google_user_id} (Tier: {user_tier})")
-
-    except ValueError as auth_err:
-         print(f"[/chat] Authentication error: {auth_err}")
-         return jsonify({"error": str(auth_err)}), 401
-    except Exception as e:
-        print(f"[/chat] Error during user retrieval: {e}")
-        traceback.print_exc()
-        return jsonify({"error": f"Failed to retrieve user data: {str(e)}"}), 500
-    # --- End Authentication ---
-
-    # --- Rate Limiting Check ---
-    try:
-        # Check usage *before* processing the request
-        # The helper function will increment the count if within limits
-        if not check_and_update_usage(user_data):
-            limit = PAID_TIER_DAILY_LIMIT if user_tier == 'paid' else FREE_TIER_DAILY_LIMIT
-            return jsonify({
-                "error": f"Daily request limit ({limit}) reached for your tier ({user_tier}). Please try again tomorrow or upgrade for more requests."
-            }), 429 # Too Many Requests
-    except Exception as usage_err:
-        # Handle DB errors during usage check/update
-        print(f"[/chat] Error checking/updating usage for user {google_user_id}: {usage_err}")
-        traceback.print_exc()
-        # Decide if you want to block the request or proceed cautiously
-        return jsonify({"error": "Could not verify usage limits. Please try again later."}), 500
-    # --- End Rate Limiting Check ---
-
-    # --- Proceed with Chat Logic (if within limits) ---
-    try:
-        data = request.get_json()
-        if not data:
-            return jsonify({"error": "Missing JSON payload"}), 400
-
-        new_user_message_text = data.get('new_message')
-        history = data.get('history', [])
-        image_filenames = data.get('image_filenames', []) # Expecting list of filenames
-
-        if not new_user_message_text:
-            return jsonify({"error": "Missing 'new_message' in request"}), 400
-        if not isinstance(history, list):
-             return jsonify({"error": "'history' must be a list"}), 400
-        if not isinstance(image_filenames, list):
-             return jsonify({"error": "'image_filenames' must be a list"}), 400
-
-        # --- Prepare Input for Gemini ---
-        prompt_parts = []
-        # Image processing
-        if image_filenames:
-            print(f"Processing {len(image_filenames)} image(s)...")
-            for img_filename in image_filenames:
-                try:
-                    grid_out = fs.find_one({"filename": img_filename})
-                    if not grid_out:
-                        print(f"Warning: Image '{img_filename}' not found in GridFS.")
-                        continue # Skip missing images
-                    image_bytes = grid_out.read()
-                    prompt_parts.append(Image.open(io.BytesIO(image_bytes)))
-                except Exception as img_err:
-                    print(f"Error processing image {img_filename}: {img_err}")
-                    # Decide if you want to fail the request or just skip the image
-                    # return jsonify({"error": f"Failed to process image {img_filename}"}), 500
-
-        # Add text message
-        prompt_parts.append(new_user_message_text)
-
-        # History conversion
-        gemini_history = []
-        for msg in history:
-            role = "user" if msg.get("role") == "user" else "model"
-            text = msg.get("text")
-            if text: # Ensure text exists
-                 gemini_history.append({'role': role, 'parts': [text]})
-            else:
-                 print(f"Warning: Skipping history message with no text: {msg}")
-
-
-        # --- Model Selection based on Tier ---
-        if user_tier == 'paid':
-            model_name = 'gemini-1.5-pro' # Or your preferred paid model
-            print(f"Using PAID tier model: {model_name}")
-        else: # Default to free tier model
-            model_name = 'gemini-1.5-flash-latest' # Or your preferred free model
-            print(f"Using FREE tier model: {model_name}")
-        # --- End Model Selection ---
-
-        # --- Initialize Gemini Model and Chat ---
-        safety_settings = { # Define your safety settings
-             HarmCategory.HARM_CATEGORY_HARASSMENT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
-             # ... other categories ...
-        }
-        model = genai.GenerativeModel(model_name, safety_settings=safety_settings)
-        chat = model.start_chat(history=gemini_history)
-
-        print(f"Sending request to Gemini ({model_name}) with {len(prompt_parts)} parts...")
-        response = chat.send_message(prompt_parts)
-        assistant_reply = response.text
-        print("Received reply from Gemini.")
-
-        # --- Usage count was already incremented by check_and_update_usage ---
-
-        return jsonify({"reply": assistant_reply})
-
-    except Exception as e:
-        print(f"[/chat] Error during chat processing for user {google_user_id}: {e}")
-        traceback.print_exc()
-        # Note: Usage count might have been incremented even if this part fails.
-        # Consider adding logic to decrement if a failure occurs *after* the increment,
-        # though this adds complexity.
-        return jsonify({"error": f"An error occurred processing your request: {str(e)}"}), 500
-# --- End Chat Endpoint ---
-
-
-# --- Course Map Endpoints ---
-
-# GET /api/course-maps - List all maps for the user
-@app.route('/course-maps', methods=['GET'])
-def list_course_maps():
-    try:
-        auth_header = request.headers.get('Authorization')
-        if not auth_header or not auth_header.startswith('Bearer '):
-            return jsonify({"error": "Authorization token missing or invalid"}), 401
-        token = auth_header.split(' ')[1]
-        user_info = verify_google_token(token) # Verify token first
-        user_data = get_or_create_user(user_info) # Get/Create user record
-        google_user_id = user_data['google_user_id'] # Use ID from user_data
-
-        # Find maps for the user, projecting only necessary fields
-        maps_cursor = course_maps_collection.find(
-            {'google_user_id': google_user_id},
-            {'_id': 0, 'map_id': 1, 'map_name': 1, 'last_updated': 1} # Project fields
-        ).sort('last_updated', -1) # Sort by most recently updated
-
-        map_list = list(maps_cursor)
-        print(f"Found {len(map_list)} maps for user {google_user_id} (Tier: {user_data.get('tier')})")
-        return jsonify(map_list), 200
-
-    except ValueError as auth_err:
-         return jsonify({"error": str(auth_err)}), 401
-    except Exception as e:
-        print(f"Error listing course maps: {e}")
-        traceback.print_exc()
-        return jsonify({"error": f"Failed to list course maps: {str(e)}"}), 500
-
-# GET /api/course-map/<map_id> - Load a specific map
-@app.route('/course-map/<map_id>', methods=['GET'])
-def load_specific_course_map(map_id):
-    try:
-        auth_header = request.headers.get('Authorization')
-        if not auth_header or not auth_header.startswith('Bearer '):
-            return jsonify({"error": "Authorization token missing or invalid"}), 401
-        token = auth_header.split(' ')[1]
-        user_info = verify_google_token(token)
-        user_data = get_or_create_user(user_info) # Get/Create user record
-        google_user_id = user_data['google_user_id']
-
-        # Find the specific map for the user
-        map_data = course_maps_collection.find_one(
-            {'google_user_id': google_user_id, 'map_id': map_id},
-            {'_id': 0} # Exclude MongoDB ID
-        )
-
-        if map_data:
-            print(f"Loaded map {map_id} for user {google_user_id}")
-            return jsonify(map_data), 200
-        else:
-            print(f"Map {map_id} not found for user {google_user_id}")
-            return jsonify({"error": "Map not found"}), 404
-
-    except ValueError as auth_err:
-         return jsonify({"error": str(auth_err)}), 401
-    except Exception as e:
-        print(f"Error loading course map {map_id}: {e}")
-        traceback.print_exc()
-        return jsonify({"error": f"Failed to load course map: {str(e)}"}), 500
-
-# POST /api/course-map - Save/Update a map
-@app.route('/course-map', methods=['POST'])
-def save_or_update_course_map():
-    try:
-        auth_header = request.headers.get('Authorization')
-        if not auth_header or not auth_header.startswith('Bearer '):
-            return jsonify({"error": "Authorization token missing or invalid"}), 401
-        token = auth_header.split(' ')[1]
-        user_info = verify_google_token(token)
-        user_data = get_or_create_user(user_info) # Get/Create user record
-        google_user_id = user_data['google_user_id']
-
-        data = request.get_json()
-        if not data or 'nodes' not in data or 'edges' not in data:
-            return jsonify({"error": "Invalid payload: 'nodes' and 'edges' required"}), 400
-
-        nodes = data['nodes']
-        edges = data['edges']
-        map_id = data.get('map_id') # Get map_id if provided (for updates)
-        map_name = data.get('map_name', 'Untitled Map') # Get name or use default
-
-        current_time = datetime.utcnow()
-
-        if map_id: # Update existing map
-            print(f"Updating map {map_id} for user {google_user_id}")
-            result = course_maps_collection.update_one(
-                {'google_user_id': google_user_id, 'map_id': map_id},
-                {'$set': {
-                    'map_name': map_name,
-                    'nodes': nodes,
-                    'edges': edges,
-                    'last_updated': current_time
-                }}
-            )
-            if result.matched_count == 0:
-                return jsonify({"error": "Map not found or permission denied"}), 404
-            saved_map_id = map_id
-            message = "Course map updated successfully"
-        else: # Create new map
-            new_map_id = str(uuid.uuid4()) # Generate a new unique ID
-            print(f"Creating new map {new_map_id} for user {google_user_id}")
-            map_document = {
-                'google_user_id': google_user_id,
-                'map_id': new_map_id,
-                'map_name': map_name,
-                'nodes': nodes,
-                'edges': edges,
-                'created_at': current_time, # Add created timestamp
-                'last_updated': current_time
-            }
-            result = course_maps_collection.insert_one(map_document)
-            saved_map_id = new_map_id
-            message = "Course map created successfully"
-
-        return jsonify({"message": message, "map_id": saved_map_id}), 200 # Return the map_id
-
-    except ValueError as auth_err:
-         return jsonify({"error": str(auth_err)}), 401
-    except Exception as e:
-        print(f"Error saving/updating course map: {e}")
-        traceback.print_exc()
-        return jsonify({"error": f"Failed to save course map: {str(e)}"}), 500
-
-# DELETE /api/course-map/<map_id> - Delete a specific map
-@app.route('/course-map/<map_id>', methods=['DELETE'])
-def delete_specific_course_map(map_id):
-    try:
-        auth_header = request.headers.get('Authorization')
-        if not auth_header or not auth_header.startswith('Bearer '):
-            return jsonify({"error": "Authorization token missing or invalid"}), 401
-        token = auth_header.split(' ')[1]
-        user_info = verify_google_token(token)
-        user_data = get_or_create_user(user_info) # Get/Create user record
-        google_user_id = user_data['google_user_id']
-
-        # --- Add Logging ---
-        print(f"[Delete Request] Received Map ID: {map_id}, User ID from Token: {google_user_id}")
-        # --- End Logging ---
-
-        # Delete the specific map for the user
-        result = course_maps_collection.delete_one(
-            {'google_user_id': google_user_id, 'map_id': map_id}
-        )
-
-        # --- Add Logging ---
-        print(f"[Delete Result] Deleted: {result.deleted_count}")
-        # --- End Logging ---
-
-        if result.deleted_count > 0:
-            print(f"Deleted map {map_id} for user {google_user_id}")
-            # ... remove cache key if needed ...
-            return jsonify({"message": "Map deleted successfully"}), 200
-        else:
-            print(f"Map {map_id} not found for deletion for user {google_user_id}")
-            return jsonify({"error": "Map not found or permission denied"}), 404
-
-    except ValueError as auth_err:
-         return jsonify({"error": str(auth_err)}), 401
-    except Exception as e:
-        print(f"Error deleting course map {map_id}: {e}")
-        traceback.print_exc()
-        return jsonify({"error": f"Failed to delete course map: {str(e)}"}), 500
-# --- End Course Map Endpoints ---
-
-# --- NEW Endpoint: Get User Status ---
-@app.route('/user-status', methods=['GET'])
-def get_user_status():
-    try:
-        auth_header = request.headers.get('Authorization')
-        if not auth_header or not auth_header.startswith('Bearer '):
-            return jsonify({"error": "Authorization token missing or invalid"}), 401
-        token = auth_header.split(' ')[1]
-        user_info = verify_google_token(token)
-        user_data = get_or_create_user(user_info)
-        google_user_id = user_data['google_user_id']
-
-        tier = user_data.get('tier', 'free')
-        requests_used = user_data.get('requests_used_this_period', 0)
-        period_start = user_data.get('period_start_date')
-
-        limit = PAID_TIER_DAILY_LIMIT if tier == 'paid' else FREE_TIER_DAILY_LIMIT
-
-        now = datetime.utcnow()
-        reset_time = None
-
-        # Calculate reset time (assuming daily reset at UTC midnight)
-        # Find the start of the next day in UTC
-        tomorrow_midnight = datetime.combine(now.date() + timedelta(days=1), time(0, 0), tzinfo=now.tzinfo)
-        reset_time = tomorrow_midnight.isoformat() + "Z" # Format as ISO string with Z for UTC
-
-        # Check if usage needs reset (if period_start is before today)
-        # This ensures the returned 'requests_used' is accurate for today
-        if period_start and isinstance(period_start, datetime) and period_start.date() < now.date():
-            requests_used = 0 # Report 0 if the period hasn't been reset yet by a request
-
-        print(f"User status requested for {google_user_id}: Used={requests_used}, Limit={limit}, Tier={tier}, Resets={reset_time}")
-
-        return jsonify({
-            "tier": tier,
-            "usageCount": requests_used,
-            "usageLimit": limit,
-            "resetTime": reset_time # ISO 8601 format string (UTC)
-        }), 200
-
-    except ValueError as auth_err:
-         return jsonify({"error": str(auth_err)}), 401
-    except Exception as e:
-        print(f"Error getting user status: {e}")
-        traceback.print_exc()
-        return jsonify({"error": f"Failed to get user status: {str(e)}"}), 500
-# --- End NEW Endpoint ---
-
-# --- NEW: Stripe Checkout Session Endpoint ---
-@app.route('/create-checkout-session', methods=['POST'])
-def create_checkout_session():
-    try:
-        # 1. Authenticate User
-        auth_header = request.headers.get('Authorization')
-        if not auth_header or not auth_header.startswith('Bearer '):
-            return jsonify({"error": "Authorization token missing or invalid"}), 401
-        token = auth_header.split(' ')[1]
-        user_info = verify_google_token(token)
-        user_data = get_or_create_user(user_info)
-        google_user_id = user_data['google_user_id']
-        mongo_user_id = str(user_data['_id']) # Use MongoDB _id as client_reference_id
-
-        print(f"Creating checkout session for user: {google_user_id} (Mongo ID: {mongo_user_id})")
-
-        # 2. Create Stripe Checkout Session
-        checkout_session = stripe.checkout.Session.create(
-            line_items=[
-                {
-                    'price': STRIPE_PRICE_ID, # Price ID from .env
-                    'quantity': 1,
-                },
-            ],
-            mode='subscription',
-            success_url=f'{FRONTEND_URL}/payment-success?session_id={{CHECKOUT_SESSION_ID}}',
-            cancel_url=f'{FRONTEND_URL}/payment-cancel',
-            # Link session to your internal user ID
-            client_reference_id=mongo_user_id,
-            # Optionally prefill email
-            customer_email=user_data.get('email'),
-            # If user already has a stripe_customer_id, use it
-            customer=user_data.get('stripe_customer_id') if user_data.get('stripe_customer_id') else None,
-            # If creating a new customer, attach metadata
-            customer_creation='always' if not user_data.get('stripe_customer_id') else None, # Create if not exists
-            customer_update={'name': 'auto', 'address': 'auto'} if user_data.get('stripe_customer_id') else None, # Update if exists
-            subscription_data={
-                'metadata': {
-                    'mongo_user_id': mongo_user_id,
-                    'google_user_id': google_user_id
-                }
-            } if not user_data.get('stripe_customer_id') else None, # Add metadata only if creating sub with new customer
-        )
-        print(f"Stripe session created: {checkout_session.id}")
-        return jsonify({'sessionId': checkout_session.id})
-
-    except ValueError as auth_err:
-        print(f"[/create-checkout-session] Authentication error: {auth_err}")
-        return jsonify({"error": str(auth_err)}), 401
-    except stripe.error.StripeError as e:
-        print(f"Stripe error creating checkout session: {e}")
-        return jsonify({'error': f'Stripe error: {str(e)}'}), 500
-    except Exception as e:
-        print(f"Error creating checkout session: {e}")
-        traceback.print_exc()
-        return jsonify({'error': f'Internal server error: {str(e)}'}), 500
-
-# --- NEW: Stripe Webhook Endpoint ---
-@app.route('/stripe-webhook', methods=['POST'])
-def stripe_webhook():
-    payload = request.data
-    sig_header = request.headers.get('Stripe-Signature')
-    event = None
-
-    if not STRIPE_WEBHOOK_SECRET:
-        print("Webhook Error: STRIPE_WEBHOOK_SECRET not set.")
-        return jsonify({'error': 'Webhook secret not configured'}), 500
-
-    print("\n--- Stripe Webhook Received ---")
-
-    try:
-        event = stripe.Webhook.construct_event(
-            payload, sig_header, STRIPE_WEBHOOK_SECRET
-        )
-        print(f"Webhook Event Type: {event['type']}")
-    except ValueError as e:
-        # Invalid payload
-        print(f"Webhook Error: Invalid payload - {e}")
-        return jsonify({'error': 'Invalid payload'}), 400
-    except stripe.error.SignatureVerificationError as e:
-        # Invalid signature
-        print(f"Webhook Error: Invalid signature - {e}")
-        return jsonify({'error': 'Invalid signature'}), 400
-    except Exception as e:
-        print(f"Webhook Error: Unexpected error constructing event - {e}")
-        return jsonify({'error': 'Webhook construction error'}), 500
-
-    # --- Handle the event ---
-    try:
-        event_type = event['type']
-        event_data = event['data']['object']
-
-        # Handle the checkout.session.completed event
-        if event_type == 'checkout.session.completed':
-            session = event_data
-            mongo_user_id = session.get('client_reference_id')
-            stripe_customer_id = session.get('customer')
-            stripe_subscription_id = session.get('subscription')
-
-            print(f"Checkout session completed for Mongo User ID: {mongo_user_id}")
-            print(f"  Stripe Customer ID: {stripe_customer_id}")
-            print(f"  Stripe Subscription ID: {stripe_subscription_id}")
-
-            if not mongo_user_id or not stripe_customer_id or not stripe_subscription_id:
-                 print("Webhook Error: Missing required data in checkout.session.completed event.")
-                 return jsonify({'error': 'Missing data in event'}), 400
-
-            # Retrieve subscription details to get status and period end
-            try:
-                subscription = stripe.Subscription.retrieve(stripe_subscription_id)
-                subscription_status = subscription.status
-                # Convert Unix timestamp to datetime (UTC)
-                subscription_expires_ts = subscription.current_period_end
-                subscription_expires_dt = datetime.fromtimestamp(subscription_expires_ts, tz=timezone.utc) if subscription_expires_ts else None
-
-                print(f"  Subscription Status: {subscription_status}")
-                print(f"  Subscription Expires: {subscription_expires_dt}")
-
-                # Update user document in MongoDB
-                update_result = users_collection.update_one(
-                    {"_id": ObjectId(mongo_user_id)}, # Use ObjectId to find user
-                    {"$set": {
-                        "tier": "paid",
-                        "stripe_customer_id": stripe_customer_id,
-                        "stripe_subscription_id": stripe_subscription_id,
-                        "subscription_status": subscription_status,
-                        "subscription_expires": subscription_expires_dt,
-                        # Reset usage count upon successful upgrade
-                        "requests_used_this_period": 0,
-                        "period_start_date": datetime.utcnow() # Reset period start
-                    }}
-                )
-                if update_result.matched_count == 0:
-                     print(f"Webhook Error: User not found for Mongo ID: {mongo_user_id}")
-                     # Consider logging this error more formally
-                else:
-                     print(f"User {mongo_user_id} updated to paid tier.")
-
-            except stripe.error.StripeError as sub_err:
-                print(f"Webhook Error: Failed to retrieve subscription {stripe_subscription_id}: {sub_err}")
-                # Decide how to handle - maybe retry later or log for manual check
-                return jsonify({'error': 'Failed to retrieve subscription details'}), 500
-            except Exception as e:
-                print(f"Webhook Error: Unexpected error updating user after checkout: {e}")
-                traceback.print_exc()
-                return jsonify({'error': 'Internal server error updating user'}), 500
-
-
-        # Handle subscription deleted (canceled immediately or at period end)
-        elif event_type in ['customer.subscription.deleted', 'customer.subscription.updated']:
-            subscription = event_data
-            stripe_subscription_id = subscription.id
-            subscription_status = subscription.status # 'canceled', 'active', 'past_due', etc.
-            cancel_at_period_end = subscription.cancel_at_period_end
-
-            print(f"Subscription update/deleted event for Sub ID: {stripe_subscription_id}")
-            print(f"  Status: {subscription_status}, Cancel at Period End: {cancel_at_period_end}")
-
-            # Downgrade if the subscription is truly canceled or set to cancel at period end
-            # We only downgrade if the status becomes 'canceled' or if cancel_at_period_end is true
-            # We don't want to downgrade for other updates (e.g., payment method change)
-            if subscription_status == 'canceled' or cancel_at_period_end:
-                print(f"Downgrading user associated with subscription {stripe_subscription_id}")
-                # Find user by subscription ID
-                update_result = users_collection.update_one(
-                    {"stripe_subscription_id": stripe_subscription_id},
-                    {"$set": {
-                        "tier": "free",
-                        "subscription_status": "canceled" if subscription_status == 'canceled' else "ending", # Indicate if it's ending soon
-                        # Keep stripe_subscription_id for history? Or clear? Let's keep it for now.
-                        # "stripe_subscription_id": None,
-                        "subscription_expires": None # Clear expiration as it's no longer active/renewing
-                    }}
-                )
-                if update_result.matched_count == 0:
-                     print(f"Webhook Warning: No user found for subscription ID {stripe_subscription_id} during downgrade.")
-                else:
-                     print(f"User associated with {stripe_subscription_id} downgraded/marked as ending.")
-            elif subscription_status == 'active' and not cancel_at_period_end:
-                 # Handle case where subscription was updated but remains active (e.g., plan change, payment update)
-                 # Update expiration date and status just in case
-                 subscription_expires_ts = subscription.current_period_end
-                 subscription_expires_dt = datetime.fromtimestamp(subscription_expires_ts, tz=timezone.utc) if subscription_expires_ts else None
-                 update_result = users_collection.update_one(
-                    {"stripe_subscription_id": stripe_subscription_id},
-                    {"$set": {
-                        "subscription_status": subscription_status,
-                        "subscription_expires": subscription_expires_dt
-                    }}
-                 )
-                 if update_result.matched_count > 0:
-                     print(f"Updated active subscription details for {stripe_subscription_id}.")
-
-
-        # Handle successful invoice payment (useful for renewals)
-        elif event_type == 'invoice.payment_succeeded':
-            invoice = event_data
-            stripe_subscription_id = invoice.get('subscription')
-            stripe_customer_id = invoice.get('customer')
-
-            # Check if it's for a subscription renewal/cycle
-            if invoice.billing_reason == 'subscription_cycle' and stripe_subscription_id:
-                print(f"Subscription {stripe_subscription_id} renewed (invoice paid).")
-                # Retrieve subscription to update expiration date and ensure status is active
-                try:
-                    subscription = stripe.Subscription.retrieve(stripe_subscription_id)
-                    subscription_expires_ts = subscription.current_period_end
-                    subscription_expires_dt = datetime.fromtimestamp(subscription_expires_ts, tz=timezone.utc) if subscription_expires_ts else None
-                    subscription_status = subscription.status # Should be 'active' after successful payment
-
-                    update_result = users_collection.update_one(
-                        {"stripe_subscription_id": stripe_subscription_id},
-                        {"$set": {
-                            "subscription_status": subscription_status,
-                            "subscription_expires": subscription_expires_dt,
-                            "tier": "paid" # Ensure tier is set to paid on renewal
-                        }}
-                    )
-                    if update_result.matched_count > 0:
-                        print(f"Updated subscription expiration/status for user associated with {stripe_subscription_id}.")
-                    else:
-                        print(f"Webhook Warning: User not found for subscription {stripe_subscription_id} during renewal update.")
-
-                except stripe.error.StripeError as sub_err:
-                    print(f"Webhook Error: Failed to retrieve subscription {stripe_subscription_id} during renewal: {sub_err}")
-                    # Log error, but don't necessarily fail the webhook response
-                except Exception as e:
-                    print(f"Webhook Error: Unexpected error updating user after renewal: {e}")
-                    traceback.print_exc()
-                    # Log error
-
-        # Handle failed payments (optional but recommended)
-        elif event_type == 'invoice.payment_failed':
-            invoice = event_data
-            stripe_subscription_id = invoice.get('subscription')
-            if stripe_subscription_id:
-                print(f"Invoice payment failed for subscription {stripe_subscription_id}.")
-                # Update user status to reflect payment issue (e.g., 'past_due')
-                try:
-                    subscription = stripe.Subscription.retrieve(stripe_subscription_id)
-                    subscription_status = subscription.status # e.g., 'past_due'
-
-                    update_result = users_collection.update_one(
-                        {"stripe_subscription_id": stripe_subscription_id},
-                        {"$set": {"subscription_status": subscription_status}}
-                    )
-                    if update_result.matched_count > 0:
-                        print(f"Updated subscription status to '{subscription_status}' for user associated with {stripe_subscription_id}.")
-                    else:
-                        print(f"Webhook Warning: User not found for subscription {stripe_subscription_id} during payment failure update.")
-                except stripe.error.StripeError as sub_err:
-                     print(f"Webhook Error: Failed to retrieve subscription {stripe_subscription_id} after payment failure: {sub_err}")
-                except Exception as e:
-                     print(f"Webhook Error: Unexpected error updating user after payment failure: {e}")
-                     traceback.print_exc()
-
-
-        else:
-            print(f"Unhandled event type {event_type}")
-
-    except KeyError as e:
-        print(f"Webhook Error: Missing expected key in event data - {e}")
-        # Log the event data for debugging
-        print("Event Data:", json.dumps(event, indent=2))
-        return jsonify({'error': f'Missing key in event data: {e}'}), 400
-    except Exception as e:
-        print(f"Webhook Error: Error handling event {event.get('type', 'N/A')} - {e}")
-        traceback.print_exc()
-        # Return 500 but log the error; Stripe might retry.
-        return jsonify({'error': 'Internal server error handling webhook'}), 500
-
-
-    # Acknowledge receipt of the event
-    return jsonify({'success': True}), 200
-# --- End Stripe Webhook Endpoint ---
-
-
-if __name__ == '__main__':
-    is_debug = os.getenv("FLASK_DEBUG", "False").lower() in ("true", "1", "t")
-    print(f"Running Flask app with debug={is_debug}")
-    app.run(host='0.0.0.0', port=5000, debug=is_debug)
\ No newline at end of file
diff --git a/backend/college_transfer_ai/college_transfer_API.py b/backend/college_transfer_ai/college_transfer_API.py
index 0b6f955..b51dec6 100644
--- a/backend/college_transfer_ai/college_transfer_API.py
+++ b/backend/college_transfer_ai/college_transfer_API.py
@@ -46,14 +46,15 @@ def get_academic_years(self, sending_institution_id, receiving_institution_id):
         else:
             raise Exception("Failed to fetch academic years")
         
+        
         for institution in institutions_dict:
             if institution["institutionParentId"] == receiving_institution_id:
                 for year_id in institution["receivingYearIds"]:
                     academic_years_dict[self.get_academic_year(year_id)] = year_id
-            
+         
         return academic_years_dict
 
-    def get_college_from_id(self, id):
+    def get_institution_name(self, id):
         url = "https://assist.org/api/institutions"
 
         result = requests.get(url)
@@ -87,7 +88,7 @@ def get_year_from_id(self, id):
                 if idx == "Id" and value == id:
                     return str(k["FallYear"]) + "-" + str(k["FallYear"] + 1)
                 
-    def get_all_majors(self, sending_institution_id, receiving_institution_id, academic_year_id, category_code):
+    def get_majors_or_departments(self, sending_institution_id, receiving_institution_id, academic_year_id, category_code):
         # Define the parameters
         # sending_institution_id = 61
         # receiving_institution_id = 79
@@ -204,8 +205,11 @@ def get_receiving_institutions(self, receiving_institution_id):
     def get_articulation_agreement(self, academic_year_id, sending_institution_id, receiving_institution_id, key):
         print(f"Fetching articulation agreement for key: {key}")
         try: # Wrap more of the logic for better error handling
-            college_name = self.get_college_from_id(sending_institution_id)
-            receiving_name = self.get_college_from_id(receiving_institution_id)
+            
+            print(f"Academic Year ID: {academic_year_id}, Sending Institution ID: {sending_institution_id}, Receiving Institution ID: {receiving_institution_id}")
+            
+            college_name = self.get_institution_name(sending_institution_id)
+            receiving_name = self.get_institution_name(receiving_institution_id)
             major_name = self.get_major_from_key(key)
             year_name = self.get_year_from_id(academic_year_id)
 
@@ -269,6 +273,7 @@ def get_articulation_agreement(self, academic_year_id, sending_institution_id, r
                         f"&agreementType=to&viewAgreementsOptions=true&view=agreement"
                         f"&viewBy={viewBy}&viewByKey={key}"
                     )
+            
             print(f"Attempting to fetch PDF from URL: {url}")
 
             # --- Download PDF using Playwright (same as before) ---
@@ -292,17 +297,6 @@ def get_articulation_agreement(self, academic_year_id, sending_institution_id, r
 
             # --- Save PDF Locally ---
             if pdf_bytes:
-                # local_pdf_path = f"./{filename}" # Save in the current directory where the script runs
-                # try:
-                #     with open(local_pdf_path, "wb") as f_local: # Open in binary write mode
-                #         f_local.write(pdf_bytes)
-                #     print(f"Successfully saved PDF locally to: {local_pdf_path}")
-                # except Exception as local_save_err:
-                #     print(f"Error saving PDF locally to {local_pdf_path}: {local_save_err}")
-                #     # Decide if you still want to proceed with GridFS or return failure
-                #     client.close()
-                #     return None # Indicate failure if local save fails
-
                 # --- Save to GridFS (Optional - keep or remove) ---
                 try:
                     fs.put(pdf_bytes, filename=filename, contentType='application/pdf')
@@ -327,5 +321,3 @@ def get_articulation_agreement(self, academic_year_id, sending_institution_id, r
             if 'client' in locals() and client:
                  client.close()
             return None # Indicate failure
-
-api = CollegeTransferAPI()
\ No newline at end of file
diff --git a/backend/college_transfer_ai/config.py b/backend/college_transfer_ai/config.py
new file mode 100644
index 0000000..c65c7f8
--- /dev/null
+++ b/backend/college_transfer_ai/config.py
@@ -0,0 +1,37 @@
+import os
+from dotenv import load_dotenv
+
+def load_configuration():
+    """Loads environment variables and returns them in a dictionary."""
+    # Assuming .env is at the project root (two levels up from this file's directory)
+    dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
+    load_dotenv(dotenv_path=dotenv_path)
+
+    config = {
+        "MONGO_URI": os.getenv("MONGO_URI"),
+        "GOOGLE_CLIENT_ID": os.getenv("GOOGLE_CLIENT_ID"),
+        "GOOGLE_API_KEY": os.getenv("GOOGLE_API_KEY"), # For Gemini if needed
+        "OPENAI_API_KEY": os.getenv("OPENAI_API_KEY"), # If still used
+        "STRIPE_SECRET_KEY": os.getenv("STRIPE_SECRET_KEY"),
+        "STRIPE_PRICE_ID": os.getenv("STRIPE_PRICE_ID"),
+        "STRIPE_WEBHOOK_SECRET": os.getenv("STRIPE_WEBHOOK_SECRET"),
+        "FRONTEND_URL": os.getenv("FRONTEND_URL", "http://localhost:5173"),
+        # Add other config variables as needed
+    }
+    # Basic validation
+    if not config["MONGO_URI"]:
+        raise ValueError("MONGO_URI not set in environment variables.")
+    if not config["GOOGLE_CLIENT_ID"]:
+        raise ValueError("GOOGLE_CLIENT_ID not set in environment variables.")
+    # Add more checks as needed
+
+    print("--- Configuration Loaded ---")
+    # Print loaded values for debugging (consider removing sensitive keys in production logs)
+    # print(f"MONGO_URI: {'Set' if config['MONGO_URI'] else 'Not Set'}")
+    # print(f"GOOGLE_CLIENT_ID: {'Set' if config['GOOGLE_CLIENT_ID'] else 'Not Set'}")
+    # print(f"STRIPE_SECRET_KEY: {'Set' if config['STRIPE_SECRET_KEY'] else 'Not Set'}")
+    # print(f"STRIPE_WEBHOOK_SECRET: {'Set' if config['STRIPE_WEBHOOK_SECRET'] else 'Not Set'}")
+    # print(f"FRONTEND_URL: {config['FRONTEND_URL']}")
+    return config
+
+# config = load_configuration() # Optionally load here if needed globally at import time
diff --git a/backend/college_transfer_ai/database.py b/backend/college_transfer_ai/database.py
new file mode 100644
index 0000000..b35b7ce
--- /dev/null
+++ b/backend/college_transfer_ai/database.py
@@ -0,0 +1,51 @@
+from pymongo import MongoClient
+import gridfs
+
+mongo_client = None
+db = None
+fs = None
+users_collection = None
+course_maps_collection = None
+
+def init_db(mongo_uri):
+    """Initializes MongoDB connection, database, GridFS, and collections."""
+    global mongo_client, db, fs, users_collection, course_maps_collection
+    if not mongo_uri:
+        raise ConnectionError("MongoDB URI not provided in configuration.")
+    try:
+        print(f"Connecting to MongoDB...") # Hide URI from logs
+        mongo_client = MongoClient(mongo_uri)
+        # Use the database name specified in the connection string if available,
+        # otherwise default to 'CollegeTransferAI_DB'
+        db_name = mongo_client.get_database().name
+        db = mongo_client[db_name] # Access the database
+        fs = gridfs.GridFS(db)
+        users_collection = db.users
+        course_maps_collection = db.course_maps
+        # Test connection
+        mongo_client.admin.command('ping')
+        print(f"--- MongoDB Connected Successfully (DB: {db_name}) ---")
+    except Exception as e:
+        print(f"!!! MongoDB Connection Error: {e}")
+        raise ConnectionError(f"Failed to connect to MongoDB: {e}")
+
+# Optional helper functions to access db objects if avoiding globals
+def get_db():
+    if db is None:
+        raise Exception("Database not initialized.")
+    return db
+
+def get_gridfs():
+    if fs is None:
+        raise Exception("GridFS not initialized.")
+    return fs
+
+def get_users_collection():
+    if users_collection is None:
+        raise Exception("Users collection not initialized.")
+    return users_collection
+
+def get_course_maps_collection():
+     if course_maps_collection is None:
+         raise Exception("Course maps collection not initialized.")
+     return course_maps_collection
diff --git a/backend/college_transfer_ai/routes/__init__.py b/backend/college_transfer_ai/routes/__init__.py
new file mode 100644
index 0000000..2f65f73
--- /dev/null
+++ b/backend/college_transfer_ai/routes/__init__.py
@@ -0,0 +1 @@
+# This file makes the routes directory a Python package
\ No newline at end of file
diff --git a/backend/college_transfer_ai/routes/agreement_routes.py b/backend/college_transfer_ai/routes/agreement_routes.py
new file mode 100644
index 0000000..6f56c44
--- /dev/null
+++ b/backend/college_transfer_ai/routes/agreement_routes.py
@@ -0,0 +1,394 @@
+import traceback
+import base64
+import io
+import fitz # PyMuPDF
+from PIL import Image
+from flask import Blueprint, jsonify, request, Response, current_app
+from bson.objectid import ObjectId
+# Remove OpenAI import if not used
+# from openai import OpenAI
+
+# Import necessary functions/objects from other modules
+from ..utils import verify_google_token, get_or_create_user, check_and_update_usage
+from ..database import get_db, get_gridfs # Use getter functions
+from ..college_transfer_API import CollegeTransferAPI
+
+# --- Google AI Imports ---
+import google.generativeai as genai
+from google.generativeai.types import HarmCategory, HarmBlockThreshold
+# --- End Google AI Imports ---
+
+FREE_TIER_LIMIT = 10
+PREMIUM_TIER_LIMIT = 200 # Example limit for paid users
+
+agreement_bp = Blueprint('agreement_bp', __name__)
+
+# --- Initialize Gemini ---
+# Store model in app context instead of global? For now, global is simpler.
+gemini_model = None
+def init_gemini(api_key):
+    global gemini_model
+    if not api_key:
+        print("Warning: GOOGLE_API_KEY not set. Gemini features will be disabled.")
+        return
+    try:
+        genai.configure(api_key=api_key)
+        # Consider making model name configurable
+        gemini_model = genai.GenerativeModel('gemini-1.5-pro')
+        print("--- Gemini Initialized Successfully ---")
+    except Exception as e:
+        print(f"!!! Gemini Initialization Error: {e}")
+        gemini_model = None # Ensure it's None if init fails
+
+# --- API Instance ---
+# Initialize CollegeTransferAPI here or in create_app if needed globally
+api = CollegeTransferAPI()
+
+# --- Routes ---
+@agreement_bp.route('/', methods=['GET'])
+def home():
+    # This might conflict if other blueprints also define '/', consider removing or using a specific path like '/api'
+    return jsonify({"message": "Welcome to the College Transfer AI Backend (Agreement Routes)!"})
+
+@agreement_bp.route('/institutions', methods=['GET'])
+def get_institutions():
+    try:
+        institutions = api.get_sending_institutions()
+        return jsonify(institutions)
+    except Exception as e:
+        print(f"Error fetching institutions: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Failed to fetch institutions"}), 500
+
+@agreement_bp.route('/receiving-institutions', methods=['GET'])
+def get_receiving_institutions():
+    sending_institution_id = request.args.get('sendingId')
+    if not sending_institution_id:
+        return jsonify({"error": "Missing sendingId parameter"}), 400
+    try:
+        institutions = api.get_receiving_institutions(sending_institution_id)
+        return jsonify(institutions)
+    except Exception as e:
+        print(f"Error fetching receiving institutions for {sending_institution_id}: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Failed to fetch receiving institutions"}), 500
+
+@agreement_bp.route('/academic-years', methods=['GET'])
+def get_academic_years():
+    sending_institution_id = request.args.get('sendingId')
+    receiving_institution_id = request.args.get('receivingId')
+    print(f"Received sendingId: {sending_institution_id}, receivingId: {receiving_institution_id}")
+    if not sending_institution_id or not receiving_institution_id:
+        return jsonify({"error": "Missing sendingInstitutionId or receivingInstitutionId parameter"}), 400
+    try:
+        years = api.get_academic_years(int(sending_institution_id), int(receiving_institution_id))
+        return jsonify(years)
+    except Exception as e:
+        print(f"Error fetching academic years for {sending_institution_id} -> {receiving_institution_id}: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Failed to fetch academic years"}), 500
+
+@agreement_bp.route('/majors', methods=['GET'])
+def get_majors():
+    sending_institution_id = request.args.get('sendingId')
+    receiving_institution_id = request.args.get('receivingId')
+    academic_year_id = request.args.get('academicYearId')
+    category_code = request.args.get('categoryCode', 'major') # Default to major
+
+    if not sending_institution_id or not receiving_institution_id or not academic_year_id:
+        return jsonify({"error": "Missing required parameters (sending, receiving, year)"}), 400
+
+    try:
+        majors = api.get_majors_or_departments(
+            sending_institution_id,
+            receiving_institution_id,
+            academic_year_id,
+            category_code
+        )
+        return jsonify(majors)
+    except Exception as e:
+        print(f"Error fetching {category_code}s: {e}")
+        traceback.print_exc()
+        return jsonify({"error": f"Failed to fetch {category_code}s"}), 500
+
+@agreement_bp.route('/articulation-agreements', methods=['POST'])
+def get_articulation_agreements():
+    data = request.get_json()
+    sending_ids = data.get('sending_ids') # Expecting a list
+    receiving_id = data.get('receiving_id')
+    year_id = data.get('year_id')
+    major_key = data.get('major_key')
+
+    if not sending_ids or not isinstance(sending_ids, list) or not receiving_id or not year_id or not major_key:
+        return jsonify({"error": "Missing or invalid parameters (sending_ids list, receiving_id, year_id, major_key)"}), 400
+
+    results = []
+    errors = []
+
+    for sending_id in sending_ids:
+        sending_name = f"ID {sending_id}" # Default name
+        try:
+            # Fetch name first (assuming it's less likely to fail than PDF fetch)
+            try:
+                 sending_name = api.get_institution_name(sending_id) # Hypothetical method
+            except Exception as name_err:
+                 print(f"Warning: Could not fetch name for sending ID {sending_id}: {name_err}")
+
+            pdf_filename = api.get_articulation_agreement(year_id, sending_id, receiving_id, major_key)
+
+            results.append({
+                 "sendingId": sending_id,
+                 "sendingName": sending_name,
+                 "pdfFilename": pdf_filename # Will be None if not found
+            })
+            if not pdf_filename:
+                 print(f"No agreement PDF found for Sending ID {sending_id} / Major {major_key}.")
+                 # No need to add to errors list if it's just 'not found'
+
+        except Exception as e:
+            error_msg = f"Error fetching agreement for Sending ID {sending_id}: {e}"
+            print(error_msg)
+            traceback.print_exc()
+            errors.append(error_msg)
+            # Add entry with error status? Or just rely on errors list?
+            # For now, just add to errors list. The loop continues.
+            # Ensure name is included even on error
+            results.append({
+                 "sendingId": sending_id,
+                 "sendingName": sending_name,
+                 "pdfFilename": None,
+                 "error": str(e) # Add error detail to the specific item
+            })
+
+
+    if not results and errors:
+         # If only errors occurred across all attempts
+         return jsonify({"error": "Failed to fetch any agreements.", "details": errors}), 500
+    elif errors:
+         # If some succeeded and some failed
+         print(f"Partial success fetching agreements. Errors: {errors}")
+         # Return the results including those with errors, plus a general warning
+         return jsonify({"agreements": results, "warnings": errors}), 207 # Multi-Status
+    elif not any(item.get('pdfFilename') for item in results):
+         # If no errors but also no PDFs found for any sending ID
+         return jsonify({"agreements": results, "message": "No articulation agreements found for the selected criteria."}), 200 # Or 404? 200 is okay.
+    else:
+         # At least one PDF found, potentially with other non-PDF results or errors handled above
+         return jsonify({"agreements": results}), 200
+
+
+@agreement_bp.route('/pdf-images/<path:filename>', methods=['GET'])
+def get_pdf_images(filename):
+    """
+    Checks if images for a PDF exist in GridFS. If not, generates, stores,
+    and returns them. If they exist, returns the existing filenames.
+    """
+    fs = get_gridfs() # Get GridFS instance
+
+    try:
+        # Check if images already exist (using metadata)
+        existing_images = list(fs.find({"metadata.original_pdf": filename, "contentType": "image/png"}))
+
+        if existing_images:
+            image_filenames = [img.filename for img in existing_images]
+            # Sort filenames numerically based on page number in metadata
+            try:
+                image_filenames.sort(key=lambda f: fs.find_one({"filename": f}).metadata.get("page_number", float('inf')))
+            except Exception as sort_err:
+                print(f"Warning: Could not sort images by page number metadata for {filename}: {sort_err}. Using alphabetical sort.")
+                image_filenames.sort() # Fallback sort
+
+            print(f"Found {len(image_filenames)} existing images for {filename}")
+            return jsonify({"image_filenames": image_filenames})
+
+        # If images don't exist, generate them
+        print(f"Generating images for {filename}...")
+        # 1. Retrieve PDF from GridFS
+        grid_out = fs.find_one({"filename": filename})
+        if not grid_out:
+            return jsonify({"error": f"PDF file '{filename}' not found in storage."}), 404
+
+        pdf_data = grid_out.read()
+
+        # 2. Generate images using PyMuPDF
+        doc = fitz.open(stream=pdf_data, filetype="pdf")
+        image_filenames = []
+        zoom = 2 # Increase zoom for higher resolution (2 = 200%)
+        mat = fitz.Matrix(zoom, zoom)
+        generated_files_metadata = [] # Store metadata for sorting later
+
+        for i, page in enumerate(doc):
+            try:
+                pix = page.get_pixmap(matrix=mat)
+                img_bytes = pix.tobytes("png") # Output as PNG
+
+                # Create a unique filename for the image page
+                image_filename = f"{filename}_page_{i}.png"
+
+                # Store image in GridFS with metadata linking to original PDF
+                fs.put(
+                    img_bytes,
+                    filename=image_filename,
+                    contentType="image/png",
+                    metadata={"original_pdf": filename, "page_number": i}
+                )
+                generated_files_metadata.append({"filename": image_filename, "page_number": i})
+            except Exception as page_err:
+                 print(f"Error processing page {i} for {filename}: {page_err}")
+                 # Decide if you want to skip the page or fail the whole process
+                 # For now, skip the page and continue
+                 # return jsonify({"error": f"Failed to process page {i} of PDF '{filename}'"}), 500
+
+        doc.close()
+        # Sort the generated filenames based on page number
+        generated_files_metadata.sort(key=lambda x: x["page_number"])
+        image_filenames = [item["filename"] for item in generated_files_metadata]
+
+        print(f"Stored {len(image_filenames)} images for {filename}")
+        return jsonify({"image_filenames": image_filenames})
+
+    except Exception as e:
+        print(f"Error getting/generating images for {filename}: {e}")
+        traceback.print_exc()
+        return jsonify({"error": f"Failed to process PDF '{filename}': {str(e)}"}), 500
+
+@agreement_bp.route('/image/<path:filename>', methods=['GET'])
+def get_image(filename):
+    """Serves an image file directly from GridFS."""
+    fs = get_gridfs() # Get GridFS instance
+    try:
+        grid_out = fs.find_one({"filename": filename})
+        if not grid_out:
+            return jsonify({"error": "Image not found"}), 404
+
+        response = Response(grid_out.read(), mimetype=grid_out.contentType)
+        # Optional: Add cache headers
+        # response.headers['Cache-Control'] = 'public, max-age=3600' # Cache for 1 hour
+        return response
+    except Exception as e:
+        print(f"Error serving image {filename}: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Failed to serve image"}), 500
+
+# --- Chat Endpoint ---
+@agreement_bp.route('/chat', methods=['POST'])
+def chat_endpoint():
+    config = current_app.config['APP_CONFIG']
+    GOOGLE_CLIENT_ID = config.get('GOOGLE_CLIENT_ID')
+    # GOOGLE_API_KEY is implicitly used by genai.configure in init_gemini
+
+    if not GOOGLE_CLIENT_ID:
+         return jsonify({"error": "Google Client ID not configured."}), 500
+    if not gemini_model: # Check if Gemini was initialized
+         return jsonify({"error": "Chat feature disabled: Gemini model not available."}), 503 # Service Unavailable
+
+    fs = get_gridfs() # Get GridFS instance
+
+    # 1. Authentication & Authorization
+    try:
+        auth_header = request.headers.get('Authorization')
+        if not auth_header or not auth_header.startswith('Bearer '):
+            return jsonify({"error": "Authorization token missing or invalid"}), 401
+        token = auth_header.split(' ')[1]
+        user_info = verify_google_token(token, GOOGLE_CLIENT_ID)
+        user_data = get_or_create_user(user_info)
+
+        # 2. Rate Limiting / Usage Check
+        if not check_and_update_usage(user_data):
+            # Prepare message about limit exceeded, including reset time
+            from datetime import datetime, timedelta, time, timezone # Ensure imports
+            now = datetime.now(timezone.utc)
+            tomorrow = now.date() + timedelta(days=1)
+            tomorrow_midnight_utc = datetime.combine(tomorrow, time(0, 0), tzinfo=timezone.utc)
+            reset_time_str = tomorrow_midnight_utc.strftime('%Y-%m-%d %H:%M:%S %Z')
+            limit = PREMIUM_TIER_LIMIT if user_data.get('tier') == 'premium' else FREE_TIER_LIMIT
+            return jsonify({
+                "error": f"Usage limit ({limit} requests/day) exceeded for your tier ('{user_data.get('tier')}'). Please try again after {reset_time_str}."
+            }), 429 # Too Many Requests
+
+    except ValueError as auth_err:
+        return jsonify({"error": str(auth_err)}), 401
+    except Exception as usage_err:
+        # Handle potential errors from check_and_update_usage (e.g., DB error)
+        print(f"Error during usage check: {usage_err}")
+        traceback.print_exc()
+        return jsonify({"error": "Could not verify usage limits."}), 500
+
+    # 3. Process Request Data
+    data = request.get_json()
+    if not data or 'new_message' not in data:
+        return jsonify({"error": "Missing 'new_message' in request body"}), 400
+
+    new_message_text = data['new_message']
+    history = data.get('history', []) # List of {'role': 'user'/'assistant', 'content': '...'}
+    image_filenames = data.get('image_filenames', []) # Only expected for initial analysis
+
+    # 4. Prepare Content for Gemini
+    prompt_parts = []
+
+    # Add image data if provided (for initial analysis)
+    if image_filenames:
+        print(f"Processing {len(image_filenames)} images for chat...")
+        image_mime_type = "image/png" # Assuming PNG from our generation step
+        for img_filename in image_filenames:
+            try:
+                grid_out = fs.find_one({"filename": img_filename})
+                if grid_out:
+                    image_data = grid_out.read()
+                    prompt_parts.append({"mime_type": image_mime_type, "data": image_data})
+                else:
+                    print(f"Warning: Image '{img_filename}' not found in GridFS.")
+            except Exception as img_err:
+                print(f"Error reading image '{img_filename}' from GridFS: {img_err}")
+                # Decide how to handle missing images - skip or return error?
+                # For now, just skip the missing image
+                # return jsonify({"error": f"Failed to load image {img_filename}"}), 500
+
+    # Add the latest user message text
+    prompt_parts.append(new_message_text)
+
+    # 5. Call Gemini API
+    try:
+        print("Sending request to Gemini...")
+        # Construct conversation history for the API
+        api_history = []
+        for msg in history:
+             # Map 'assistant' role from frontend/db to 'model' for Gemini API
+             role = 'model' if msg.get('role') == 'assistant' else msg.get('role')
+             # Ensure role is valid and content exists
+             if role in ['user', 'model'] and msg.get('content'):
+                 api_history.append({'role': role, 'parts': [msg['content']]})
+
+        # Start chat session if history exists
+        chat_session = gemini_model.start_chat(history=api_history)
+        response = chat_session.send_message(
+            prompt_parts,
+            stream=False, # Set to True for streaming response
+            safety_settings={ # Adjust safety settings as needed
+                HarmCategory.HARM_CATEGORY_HARASSMENT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
+                HarmCategory.HARM_CATEGORY_HATE_SPEECH: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
+                HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
+                HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
+            }
+        )
+
+        # Check for safety blocks or empty response
+        if not response.parts:
+             # Investigate response.prompt_feedback if needed
+             print("Gemini response blocked or empty. Feedback:", response.prompt_feedback)
+             try:
+                 # Attempt to access safety ratings safely
+                 safety_feedback = response.prompt_feedback.safety_ratings if response.prompt_feedback else "No feedback available."
+             except Exception as feedback_err:
+                 safety_feedback = f"Error accessing feedback: {feedback_err}"
+             return jsonify({"error": "Response blocked due to safety settings or empty response.", "details": str(safety_feedback)}), 400
+
+        reply_text = response.text
+        print("Received reply from Gemini.")
+        return jsonify({"reply": reply_text})
+
+    except Exception as e:
+        print(f"Error calling Gemini API: {e}")
+        traceback.print_exc()
+        # Provide a more generic error to the user
+        return jsonify({"error": "Failed to get response from AI assistant."}), 500
diff --git a/backend/college_transfer_ai/routes/course_map_routes.py b/backend/college_transfer_ai/routes/course_map_routes.py
new file mode 100644
index 0000000..f481722
--- /dev/null
+++ b/backend/college_transfer_ai/routes/course_map_routes.py
@@ -0,0 +1,290 @@
+import uuid
+import traceback
+from flask import Blueprint, jsonify, request, current_app
+from bson.objectid import ObjectId
+from datetime import datetime, timezone # Import timezone
+
+# Import necessary functions/objects from other modules
+from ..utils import verify_google_token, get_or_create_user # Removed check_and_update_usage if not used here
+from ..database import get_course_maps_collection # Use getter
+
+course_map_bp = Blueprint('course_map_bp', __name__)
+
+@course_map_bp.route('/course-maps', methods=['POST'])
+def save_course_map():
+    config = current_app.config['APP_CONFIG']
+    GOOGLE_CLIENT_ID = config.get('GOOGLE_CLIENT_ID')
+    if not GOOGLE_CLIENT_ID:
+         return jsonify({"error": "Google Client ID not configured."}), 500
+
+    course_maps_collection = get_course_maps_collection() # Get collection
+
+    # 1. Authentication
+    try:
+        auth_header = request.headers.get('Authorization')
+        if not auth_header or not auth_header.startswith('Bearer '):
+            return jsonify({"error": "Authorization token missing or invalid"}), 401
+        token = auth_header.split(' ')[1]
+        user_info = verify_google_token(token, GOOGLE_CLIENT_ID)
+        user_data = get_or_create_user(user_info) # Ensure user exists
+        google_user_id = user_data['google_user_id']
+
+        # 2. Rate Limiting (Optional - decide if saving maps counts towards usage)
+        # Consider if saving maps should be rate-limited. If so, uncomment below.
+        # if not check_and_update_usage(user_data):
+        #     return jsonify({"error": "Usage limit exceeded"}), 429
+
+    except ValueError as auth_err:
+        return jsonify({"error": str(auth_err)}), 401
+    except Exception as usage_err: # Catch general exceptions from get_or_create_user too
+        print(f"Error during auth/user check for saving map: {usage_err}")
+        traceback.print_exc()
+        return jsonify({"error": "Could not verify user or usage limits."}), 500
+
+    # 3. Get Map Data
+    data = request.get_json()
+    nodes = data.get('nodes')
+    edges = data.get('edges')
+    map_name = data.get('name', 'Untitled Course Map') # Default name
+
+    if nodes is None or edges is None:
+        return jsonify({"error": "Missing 'nodes' or 'edges' in request body"}), 400
+
+    # 4. Save to Database
+    try:
+        map_id = str(uuid.uuid4()) # Generate a unique ID for the map
+        map_document = {
+            "_id": map_id, # Use the generated UUID as the primary key
+            "google_user_id": google_user_id,
+            "name": map_name,
+            "nodes": nodes,
+            "edges": edges,
+            "created_at": datetime.now(timezone.utc), # Use timezone-aware
+            "updated_at": datetime.now(timezone.utc)  # Use timezone-aware
+        }
+        course_maps_collection.insert_one(map_document)
+        print(f"Course map '{map_name}' ({map_id}) saved for user {google_user_id}")
+        return jsonify({"message": "Course map saved successfully", "map_id": map_id}), 201
+
+    except Exception as e:
+        print(f"Error saving course map for user {google_user_id}: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Failed to save course map"}), 500
+
+@course_map_bp.route('/course-maps', methods=['GET'])
+def get_user_course_maps():
+    config = current_app.config['APP_CONFIG']
+    GOOGLE_CLIENT_ID = config.get('GOOGLE_CLIENT_ID')
+    if not GOOGLE_CLIENT_ID:
+         return jsonify({"error": "Google Client ID not configured."}), 500
+
+    course_maps_collection = get_course_maps_collection() # Get collection
+
+    # 1. Authentication
+    try:
+        auth_header = request.headers.get('Authorization')
+        if not auth_header or not auth_header.startswith('Bearer '):
+            return jsonify({"error": "Authorization token missing or invalid"}), 401
+        token = auth_header.split(' ')[1]
+        user_info = verify_google_token(token, GOOGLE_CLIENT_ID)
+        google_user_id = user_info['sub']
+
+    except ValueError as auth_err:
+        return jsonify({"error": str(auth_err)}), 401
+    except Exception as e:
+        print(f"Error during authentication for getting maps: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Authentication failed."}), 500
+
+    # 2. Fetch Maps from Database
+    try:
+        # Find maps by google_user_id, exclude nodes/edges, sort by updated_at descending
+        user_maps = list(course_maps_collection.find(
+            {"google_user_id": google_user_id},
+            {"nodes": 0, "edges": 0} # Exclude nodes/edges from the list view
+        ).sort("updated_at", -1)) # Sort by most recently updated
+
+        # _id is already a string UUID, no conversion needed
+
+        print(f"Found {len(user_maps)} course maps for user {google_user_id}")
+        return jsonify(user_maps), 200
+
+    except Exception as e:
+        print(f"Error fetching course maps for user {google_user_id}: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Failed to fetch course maps"}), 500
+
+
+@course_map_bp.route('/course-map/<map_id>', methods=['GET'])
+def get_course_map_details(map_id):
+    config = current_app.config['APP_CONFIG']
+    GOOGLE_CLIENT_ID = config.get('GOOGLE_CLIENT_ID')
+    if not GOOGLE_CLIENT_ID:
+         return jsonify({"error": "Google Client ID not configured."}), 500
+
+    course_maps_collection = get_course_maps_collection() # Get collection
+
+    # 1. Authentication
+    try:
+        auth_header = request.headers.get('Authorization')
+        if not auth_header or not auth_header.startswith('Bearer '):
+            return jsonify({"error": "Authorization token missing or invalid"}), 401
+        token = auth_header.split(' ')[1]
+        user_info = verify_google_token(token, GOOGLE_CLIENT_ID)
+        google_user_id = user_info['sub']
+
+    except ValueError as auth_err:
+        return jsonify({"error": str(auth_err)}), 401
+    except Exception as e:
+        print(f"Error during authentication for getting map details: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Authentication failed."}), 500
+
+    # 2. Fetch Specific Map from Database
+    try:
+        # Find map by its custom _id (which is a string UUID)
+        course_map = course_maps_collection.find_one({"_id": map_id})
+
+        if not course_map:
+            return jsonify({"error": "Course map not found"}), 404
+
+        # 3. Authorization Check: Ensure the map belongs to the authenticated user
+        if course_map.get("google_user_id") != google_user_id:
+            print(f"Authorization failed: User {google_user_id} tried to access map {map_id} owned by {course_map.get('google_user_id')}")
+            return jsonify({"error": "Not authorized to access this course map"}), 403 # Forbidden
+
+        print(f"Fetched details for course map {map_id}")
+        # _id is already a string UUID, no conversion needed
+        return jsonify(course_map), 200
+
+    except Exception as e:
+        print(f"Error fetching course map details for map {map_id}: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Failed to fetch course map details"}), 500
+
+# --- Add PUT endpoint for updating maps ---
+@course_map_bp.route('/course-map/<map_id>', methods=['PUT'])
+def update_course_map(map_id):
+    config = current_app.config['APP_CONFIG']
+    GOOGLE_CLIENT_ID = config.get('GOOGLE_CLIENT_ID')
+    if not GOOGLE_CLIENT_ID:
+         return jsonify({"error": "Google Client ID not configured."}), 500
+
+    course_maps_collection = get_course_maps_collection() # Get collection
+
+    # 1. Authentication
+    try:
+        auth_header = request.headers.get('Authorization')
+        if not auth_header or not auth_header.startswith('Bearer '):
+            return jsonify({"error": "Authorization token missing or invalid"}), 401
+        token = auth_header.split(' ')[1]
+        user_info = verify_google_token(token, GOOGLE_CLIENT_ID)
+        google_user_id = user_info['sub']
+
+    except ValueError as auth_err:
+        return jsonify({"error": str(auth_err)}), 401
+    except Exception as e:
+        print(f"Error during authentication for updating map: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Authentication failed."}), 500
+
+    # 2. Get Update Data
+    data = request.get_json()
+    nodes = data.get('nodes')
+    edges = data.get('edges')
+    map_name = data.get('name') # Optional: allow renaming
+
+    if nodes is None and edges is None and map_name is None:
+        return jsonify({"error": "No update data provided (nodes, edges, or name)"}), 400
+
+    # 3. Fetch Map and Authorize
+    try:
+        existing_map = course_maps_collection.find_one({"_id": map_id})
+        if not existing_map:
+            return jsonify({"error": "Course map not found"}), 404
+        if existing_map.get("google_user_id") != google_user_id:
+            return jsonify({"error": "Not authorized to update this course map"}), 403
+
+    except Exception as e:
+        print(f"Error finding map {map_id} for update: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Failed to find course map for update"}), 500
+
+    # 4. Perform Update
+    try:
+        update_fields = {"updated_at": datetime.now(timezone.utc)}
+        if nodes is not None: update_fields["nodes"] = nodes
+        if edges is not None: update_fields["edges"] = edges
+        if map_name is not None: update_fields["name"] = map_name
+
+        result = course_maps_collection.update_one(
+            {"_id": map_id},
+            {"$set": update_fields}
+        )
+
+        if result.matched_count == 0:
+             # Should have been caught above, but double-check
+             return jsonify({"error": "Course map not found during update"}), 404
+
+        print(f"Course map {map_id} updated successfully by user {google_user_id}")
+        return jsonify({"message": "Course map updated successfully"}), 200
+
+    except Exception as e:
+        print(f"Error updating course map {map_id}: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Failed to update course map"}), 500
+
+# --- Add DELETE endpoint for deleting maps ---
+@course_map_bp.route('/course-map/<map_id>', methods=['DELETE'])
+def delete_course_map(map_id):
+    config = current_app.config['APP_CONFIG']
+    GOOGLE_CLIENT_ID = config.get('GOOGLE_CLIENT_ID')
+    if not GOOGLE_CLIENT_ID:
+         return jsonify({"error": "Google Client ID not configured."}), 500
+
+    course_maps_collection = get_course_maps_collection() # Get collection
+
+    # 1. Authentication
+    try:
+        auth_header = request.headers.get('Authorization')
+        if not auth_header or not auth_header.startswith('Bearer '):
+            return jsonify({"error": "Authorization token missing or invalid"}), 401
+        token = auth_header.split(' ')[1]
+        user_info = verify_google_token(token, GOOGLE_CLIENT_ID)
+        google_user_id = user_info['sub']
+
+    except ValueError as auth_err:
+        return jsonify({"error": str(auth_err)}), 401
+    except Exception as e:
+        print(f"Error during authentication for deleting map: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Authentication failed."}), 500
+
+    # 2. Fetch Map and Authorize
+    try:
+        existing_map = course_maps_collection.find_one({"_id": map_id})
+        if not existing_map:
+            return jsonify({"error": "Course map not found"}), 404
+        if existing_map.get("google_user_id") != google_user_id:
+            return jsonify({"error": "Not authorized to delete this course map"}), 403
+
+    except Exception as e:
+        print(f"Error finding map {map_id} for deletion: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Failed to find course map for deletion"}), 500
+
+    # 3. Perform Deletion
+    try:
+        result = course_maps_collection.delete_one({"_id": map_id})
+
+        if result.deleted_count == 0:
+            # Should have been caught above, but double-check
+            return jsonify({"error": "Course map not found during deletion"}), 404
+
+        print(f"Course map {map_id} deleted successfully by user {google_user_id}")
+        return jsonify({"message": "Course map deleted successfully"}), 200 # Or 204 No Content
+
+    except Exception as e:
+        print(f"Error deleting course map {map_id}: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Failed to delete course map"}), 500
diff --git a/backend/college_transfer_ai/routes/stripe_routes.py b/backend/college_transfer_ai/routes/stripe_routes.py
new file mode 100644
index 0000000..d819c8c
--- /dev/null
+++ b/backend/college_transfer_ai/routes/stripe_routes.py
@@ -0,0 +1,349 @@
+import stripe
+import traceback
+from flask import Blueprint, jsonify, request, current_app
+from bson.objectid import ObjectId
+from datetime import datetime, timezone
+
+# Import necessary functions/objects from other modules
+from ..utils import verify_google_token, get_or_create_user
+from ..database import get_users_collection # Use getter function
+
+stripe_bp = Blueprint('stripe_bp', __name__)
+
+@stripe_bp.route('/create-checkout-session', methods=['POST'])
+def create_checkout_session():
+    # Access config from the current app context
+    config = current_app.config['APP_CONFIG']
+    STRIPE_PRICE_ID = config.get('STRIPE_PRICE_ID')
+    FRONTEND_URL = config.get('FRONTEND_URL')
+    GOOGLE_CLIENT_ID = config.get('GOOGLE_CLIENT_ID')
+    STRIPE_SECRET_KEY = config.get('STRIPE_SECRET_KEY')
+
+    if not STRIPE_PRICE_ID:
+        return jsonify({"error": "Stripe Price ID not configured on backend."}), 500
+    if not FRONTEND_URL:
+        return jsonify({"error": "Frontend URL not configured on backend."}), 500
+    if not GOOGLE_CLIENT_ID:
+         return jsonify({"error": "Google Client ID not configured."}), 500
+    if not STRIPE_SECRET_KEY:
+         return jsonify({"error": "Stripe Secret Key not configured."}), 500
+
+    # Initialize stripe API key for this request context
+    stripe.api_key = STRIPE_SECRET_KEY
+
+    try:
+        # 1. Authenticate User
+        auth_header = request.headers.get('Authorization')
+        if not auth_header or not auth_header.startswith('Bearer '):
+            return jsonify({"error": "Authorization token missing or invalid"}), 401
+        token = auth_header.split(' ')[1]
+        user_info = verify_google_token(token, GOOGLE_CLIENT_ID)
+        user_data = get_or_create_user(user_info)
+        google_user_id = user_data['google_user_id']
+        mongo_user_id = str(user_data['_id']) # Use MongoDB _id as client_reference_id
+
+        print(f"Creating checkout session for user: {google_user_id} (Mongo ID: {mongo_user_id})")
+        print(f'Frontend url: {FRONTEND_URL}')
+
+        # --- Refactored Parameter Logic ---
+        checkout_session_params = {
+            'line_items': [
+                {
+                    'price': STRIPE_PRICE_ID, # Price ID from .env
+                    'quantity': 1,
+                },
+            ],
+            'mode': 'subscription',
+            'success_url': f'{FRONTEND_URL}/payment-success?session_id={{CHECKOUT_SESSION_ID}}',
+            'cancel_url': f'{FRONTEND_URL}/payment-cancel',
+            'client_reference_id': mongo_user_id,
+            'customer_email': user_data.get('email'),
+        }
+
+        stripe_customer_id = user_data.get('stripe_customer_id')
+
+        if stripe_customer_id:
+            checkout_session_params['customer'] = stripe_customer_id
+            checkout_session_params['customer_update'] = {'name': 'auto', 'address': 'auto'}
+        else:
+            checkout_session_params['subscription_data'] = {
+                'metadata': {
+                    'mongo_user_id': mongo_user_id,
+                    'google_user_id': google_user_id
+                }
+            }
+        # --- End Refactored Parameter Logic ---
+
+        checkout_session = stripe.checkout.Session.create(**checkout_session_params)
+
+        print(f"Stripe session created: {checkout_session.id}")
+        return jsonify({'sessionId': checkout_session.id})
+
+    except ValueError as auth_err:
+        print(f"[/create-checkout-session] Authentication error: {auth_err}")
+        return jsonify({"error": str(auth_err)}), 401
+    except stripe.error.StripeError as e:
+        print(f"Stripe error creating checkout session: {e}")
+        # Check if the error has a user-friendly message
+        user_message = getattr(e, 'user_message', str(e))
+        return jsonify({'error': f'Stripe error: {user_message}'}), e.http_status or 500
+    except Exception as e:
+        print(f"Error creating checkout session: {e}")
+        traceback.print_exc()
+        return jsonify({'error': f'Internal server error: {str(e)}'}), 500
+
+@stripe_bp.route('/stripe-webhook', methods=['POST'])
+def stripe_webhook():
+    config = current_app.config['APP_CONFIG']
+    STRIPE_WEBHOOK_SECRET = config.get('STRIPE_WEBHOOK_SECRET')
+    STRIPE_SECRET_KEY = config.get('STRIPE_SECRET_KEY')
+
+    if not STRIPE_WEBHOOK_SECRET:
+        print("Webhook Error: STRIPE_WEBHOOK_SECRET not set.")
+        return jsonify({'error': 'Webhook secret not configured'}), 500
+    if not STRIPE_SECRET_KEY:
+        print("Webhook Error: STRIPE_SECRET_KEY not set.")
+        return jsonify({'error': 'Stripe secret key not configured'}), 500
+
+    # Set API key for potential Stripe calls within the handler
+    stripe.api_key = STRIPE_SECRET_KEY
+    users_collection = get_users_collection() # Get collection
+
+    payload = request.data
+    sig_header = request.headers.get('Stripe-Signature')
+    event = None
+
+    print("--- Stripe Webhook Received ---")
+
+    try:
+        event = stripe.Webhook.construct_event(
+            payload, sig_header, STRIPE_WEBHOOK_SECRET
+        )
+        print(f"Webhook Event Type: {event['type']}")
+    except ValueError as e:
+        print(f"Webhook Error: Invalid payload - {e}")
+        return jsonify({'error': 'Invalid payload'}), 400
+    except stripe.error.SignatureVerificationError as e:
+        print(f"Webhook Error: Invalid signature - {e}")
+        return jsonify({'error': 'Invalid signature'}), 400
+    except Exception as e:
+        print(f"Webhook Error: Unexpected error constructing event - {e}")
+        return jsonify({'error': 'Webhook construction error'}), 500
+
+    # --- Handle the event ---
+    try:
+        event_type = event['type']
+        event_data = event['data']['object']
+
+        if event_type == 'checkout.session.completed':
+            session = event_data
+            mongo_user_id = session.get('client_reference_id')
+            stripe_customer_id = session.get('customer')
+            stripe_subscription_id = session.get('subscription')
+
+            print(f"Checkout session completed for Mongo User ID: {mongo_user_id}")
+            print(f"  Stripe Customer ID: {stripe_customer_id}")
+            print(f"  Stripe Subscription ID: {stripe_subscription_id}")
+
+            if not mongo_user_id or not stripe_customer_id or not stripe_subscription_id:
+                 print("Webhook Error: Missing required data in checkout.session.completed event.")
+                 return jsonify({'error': 'Missing data in event'}), 400
+
+            try:
+                update_result = users_collection.update_one(
+                    {"_id": ObjectId(mongo_user_id)},
+                    {"$set": {
+                        "stripe_customer_id": stripe_customer_id,
+                        "stripe_subscription_id": stripe_subscription_id,
+                        "subscription_status": "processing" # Indicate checkout complete but not fully active yet
+                    }}
+                )
+                if update_result.matched_count == 0:
+                     print(f"Webhook Error: User not found for Mongo ID: {mongo_user_id} during checkout completion.")
+                else:
+                     print(f"User {mongo_user_id} linked with Stripe IDs (status: processing).")
+            except Exception as e:
+                 print(f"Webhook Error: DB error linking Stripe IDs for user {mongo_user_id}: {e}")
+                 traceback.print_exc()
+                 return jsonify({'error': 'Internal server error linking user'}), 500
+
+        elif event_type in ['customer.subscription.deleted', 'customer.subscription.updated']:
+            subscription = event_data
+            stripe_subscription_id = subscription.id
+            subscription_status = subscription.status
+            cancel_at_period_end = subscription.cancel_at_period_end
+
+            print(f"Subscription update/deleted event for Sub ID: {stripe_subscription_id}")
+            print(f"  Status: {subscription_status}, Cancel at Period End: {cancel_at_period_end}")
+
+            update_data = {
+                "subscription_status": subscription_status,
+            }
+            if subscription_status == 'canceled' or cancel_at_period_end:
+                print(f"Downgrading user associated with subscription {stripe_subscription_id}")
+                update_data["tier"] = "free"
+                update_data["subscription_expires"] = None
+                if subscription_status != 'canceled': # Mark as ending if not fully canceled yet
+                    update_data["subscription_status"] = "ending"
+            elif subscription_status == 'active' and not cancel_at_period_end:
+                 subscription_expires_ts = subscription.current_period_end
+                 subscription_expires_dt = datetime.fromtimestamp(subscription_expires_ts, tz=timezone.utc) if subscription_expires_ts else None
+                 update_data["subscription_expires"] = subscription_expires_dt
+                 # Ensure tier is premium if subscription becomes active again
+                 update_data["tier"] = "premium"
+
+            update_result = users_collection.update_one(
+                {"stripe_subscription_id": stripe_subscription_id},
+                {"$set": update_data}
+            )
+            if update_result.matched_count == 0:
+                 print(f"Webhook Warning: No user found for subscription ID {stripe_subscription_id} during update/delete.")
+            else:
+                 print(f"User associated with {stripe_subscription_id} status updated.")
+
+
+        elif event_type == 'invoice.payment_succeeded':
+            print("Invoice payment succeeded event received.")
+            invoice = event_data
+            # --- Get Customer ID and Billing Reason ---
+            stripe_customer_id = invoice.get('customer')
+            billing_reason = invoice.billing_reason
+
+            print("Invoice details:")
+            print(f"  Customer ID (from invoice): {stripe_customer_id}")
+            print(f"  Billing Reason: {billing_reason}")
+
+            # --- Proceed only if we have the Customer ID ---
+            if stripe_customer_id:
+                print(f"Attempting to find user by Stripe Customer ID: {stripe_customer_id}")
+                try:
+                    # Find the user document using the customer ID from the invoice
+                    user_doc = users_collection.find_one({"stripe_customer_id": stripe_customer_id})
+
+                    if user_doc:
+                        # User found, now check if subscription ID is linked
+                        stripe_subscription_id = user_doc.get('stripe_subscription_id')
+
+                        if stripe_subscription_id:
+                            # --- Subscription ID found in DB - Proceed with upgrade ---
+                            print(f"  User found (Mongo ID: {user_doc['_id']}) with linked Sub ID: {stripe_subscription_id}.")
+                            try:
+                                # Retrieve subscription object to get expiration and confirm status
+                                print(f"    Retrieving subscription details for {stripe_subscription_id}...")
+                                subscription = stripe.Subscription.retrieve(stripe_subscription_id)
+                                print(f"    Retrieved subscription object: {subscription}") # Log the full object for inspection
+
+                               # --- Get period end from the first subscription item ---
+                                subscription_expires_ts = None
+                                subscription_status = subscription.get('status', 'unknown') # Get status first
+
+                                if subscription.get('items') and subscription['items'].get('data'):
+                                    first_item = subscription['items']['data'][0]
+                                    subscription_expires_ts = first_item.get('current_period_end')
+                                # --- End getting period end ---
+
+                                if subscription_expires_ts is None:
+                                     print(f"    Webhook Warning: 'current_period_end' not found on first subscription item for {stripe_subscription_id}. Cannot set expiration.")
+                                     subscription_expires_dt = None # Handle missing timestamp
+                                else:
+                                     subscription_expires_dt = datetime.fromtimestamp(subscription_expires_ts, tz=timezone.utc)
+
+                                print(f"    Subscription Status: {subscription_status}, Expires TS: {subscription_expires_ts}")
+
+
+
+                                update_data = {
+                                    "subscription_status": subscription_status,
+                                    "subscription_expires": subscription_expires_dt, # Will be None if timestamp was missing
+                                    "tier": "premium" # Set/confirm premium tier
+                                }
+
+                                # Reset usage on initial creation or renewal
+                                if billing_reason in ['subscription_create', 'subscription_cycle']:
+                                    print(f"  Subscription payment ({billing_reason}). Resetting usage.")
+                                    update_data["requests_used_this_period"] = 0
+                                    update_data["period_start_date"] = datetime.now(timezone.utc)
+
+                                # Update the user document
+                                update_result = users_collection.update_one(
+                                    {"stripe_subscription_id": stripe_subscription_id}, # Find user by subscription ID
+                                    {"$set": update_data}
+                                )
+                                if update_result.matched_count > 0:
+                                    print(f"  Successfully updated subscription details/tier for user associated with {stripe_subscription_id}.")
+                                    # Success - return 200
+                                    # return jsonify({'success': True}), 200 # This will be handled by the final return
+                                else:
+                                    print(f"Webhook Warning: User update failed for subscription {stripe_subscription_id} during {billing_reason} update, even after finding user.")
+                                    # Return 500 as something went wrong during update
+                                    return jsonify({'error': 'Internal server error updating user'}), 500
+
+                            except stripe.error.StripeError as sub_err:
+                                print(f"Webhook Error: Failed to retrieve Stripe subscription {stripe_subscription_id} during {billing_reason}: {sub_err}")
+                                return jsonify({'error': 'Stripe API error retrieving subscription'}), 500
+                            except Exception as e:
+                                print(f"Webhook Error: Unexpected error updating user after {billing_reason} for sub {stripe_subscription_id}: {e}")
+                                traceback.print_exc()
+                                return jsonify({'error': 'Internal server error processing subscription'}), 500
+                        else:
+                            # --- User found BUT Subscription ID NOT linked yet ---
+                            print(f"Webhook Info: User found for customer {stripe_customer_id}, but stripe_subscription_id not linked yet. Requesting retry.")
+                            # Return 503 to ask Stripe to retry later
+                            return jsonify({'error': 'Subscription data not ready, please retry'}), 503
+                    else:
+                        # --- User NOT found by Customer ID ---
+                        print(f"Webhook Info: No user found in DB for Stripe Customer ID: {stripe_customer_id}. Checkout session likely not processed yet. Requesting retry.")
+                        # Return 503 to ask Stripe to retry later
+                        return jsonify({'error': 'User data not ready, please retry'}), 503
+
+                except Exception as db_err:
+                    print(f"Webhook Error: Database error finding user by customer ID {stripe_customer_id}: {db_err}")
+                    traceback.print_exc()
+                    # Return 500 to indicate a server error during DB lookup
+                    return jsonify({'error': 'Internal server error finding user'}), 500
+            else:
+                # Log if the customer ID wasn't on the invoice object itself (highly unlikely)
+                print(f"Webhook Error: Skipping invoice.payment_succeeded because 'customer' ID was missing from the invoice object.")
+                # Return 400 Bad Request as the event data is incomplete
+                return jsonify({'error': 'Missing customer ID in invoice event'}), 400
+
+        elif event_type == 'invoice.payment_failed':
+            invoice = event_data
+            stripe_subscription_id = invoice.get('subscription')
+            if stripe_subscription_id:
+                print(f"Invoice payment failed for subscription {stripe_subscription_id}.")
+                try:
+                    # Retrieve subscription to get the latest status (e.g., 'past_due')
+                    subscription = stripe.Subscription.retrieve(stripe_subscription_id)
+                    subscription_status = subscription.status
+                    update_result = users_collection.update_one(
+                        {"stripe_subscription_id": stripe_subscription_id},
+                        {"$set": {"subscription_status": subscription_status}} # Update status, don't change tier yet
+                    )
+                    if update_result.matched_count > 0:
+                        print(f"Updated subscription status to '{subscription_status}' for user associated with {stripe_subscription_id}.")
+                    else:
+                        print(f"Webhook Warning: User not found for subscription {stripe_subscription_id} during payment failure update.")
+                except stripe.error.StripeError as sub_err:
+                     print(f"Webhook Error: Failed to retrieve subscription {stripe_subscription_id} after payment failure: {sub_err}")
+                except Exception as e:
+                     print(f"Webhook Error: Unexpected error updating user after payment failure: {e}")
+                     traceback.print_exc()
+
+        else:
+            # Optional: Log other events if needed for debugging
+            # print(f"Unhandled event type {event_type}")
+            pass # Ignore other event types silently
+
+    except KeyError as e:
+        print(f"Webhook Error: Missing expected key in event data - {e}")
+        return jsonify({'error': f'Missing key in event data: {e}'}), 400
+    except Exception as e:
+        print(f"Webhook Error: Error handling event {event.get('type', 'N/A')} - {e}")
+        traceback.print_exc()
+        # Return 500 but let Stripe retry if possible
+        return jsonify({'error': 'Internal server error handling webhook'}), 500
+
+    # Acknowledge receipt of the event if no error response was sent earlier
+    print("Webhook processing complete, acknowledging event.")
+    return jsonify({'success': True}), 200
diff --git a/backend/college_transfer_ai/routes/user_routes.py b/backend/college_transfer_ai/routes/user_routes.py
new file mode 100644
index 0000000..feda92a
--- /dev/null
+++ b/backend/college_transfer_ai/routes/user_routes.py
@@ -0,0 +1,68 @@
+from flask import Blueprint, jsonify, request, current_app
+from datetime import datetime, timedelta, time, timezone
+import traceback
+
+# Import necessary functions/objects from other modules
+from ..utils import verify_google_token, get_or_create_user, FREE_TIER_LIMIT, PREMIUM_TIER_LIMIT
+
+user_bp = Blueprint('user_bp', __name__)
+
+@user_bp.route('/user-status', methods=['GET'])
+def get_user_status():
+    print("--- !!! GET /api/user-status endpoint hit !!! ---") # Add this line
+    config = current_app.config['APP_CONFIG']
+    GOOGLE_CLIENT_ID = config.get('GOOGLE_CLIENT_ID')
+    if not GOOGLE_CLIENT_ID:
+         return jsonify({"error": "Google Client ID not configured."}), 500
+
+    try:
+        auth_header = request.headers.get('Authorization')
+        if not auth_header or not auth_header.startswith('Bearer '):
+            return jsonify({"error": "Authorization token missing or invalid"}), 401
+        token = auth_header.split(' ')[1]
+
+        user_info = verify_google_token(token, GOOGLE_CLIENT_ID)
+        user_data = get_or_create_user(user_info)
+
+        tier = user_data.get('tier', 'free')
+        limit = PREMIUM_TIER_LIMIT if tier == 'premium' else FREE_TIER_LIMIT
+        requests_used = user_data.get('requests_used_this_period', 0)
+        period_start = user_data.get('period_start_date')
+
+        now = datetime.now(timezone.utc) # Use timezone-aware
+        reset_time_iso = None
+
+        # Calculate reset time (assuming daily reset at UTC midnight)
+        try:
+            tomorrow = now.date() + timedelta(days=1)
+            tomorrow_midnight_utc = datetime.combine(tomorrow, time(0, 0), tzinfo=timezone.utc)
+            reset_time_iso = tomorrow_midnight_utc.isoformat(timespec='seconds') # Use ISO format with seconds
+        except Exception as time_err:
+            print(f"Error calculating reset time: {time_err}")
+            reset_time_iso = "Error calculating reset time"
+
+
+        # Check if usage needs reset for display purposes (doesn't update DB here)
+        display_requests_used = requests_used
+        if period_start and isinstance(period_start, datetime):
+             if period_start.tzinfo is None:
+                 period_start = period_start.replace(tzinfo=timezone.utc)
+             if period_start.date() < now.date():
+                 display_requests_used = 0 # Display as 0 if period has reset
+
+        print(f"User status requested for {user_data.get('google_user_id')}: Used={display_requests_used}, Limit={limit}, Tier={tier}, Resets={reset_time_iso}")
+
+        return jsonify({
+            "tier": tier,
+            "usageCount": display_requests_used,
+            "usageLimit": limit,
+            "resetTime": reset_time_iso # ISO 8601 format string (UTC)
+        }), 200
+
+    except ValueError as auth_err:
+        print(f"[/user-status] Authentication error: {auth_err}")
+        return jsonify({"error": str(auth_err)}), 401
+    except Exception as e:
+        print(f"Error getting user status: {e}")
+        traceback.print_exc()
+        return jsonify({"error": f"Internal server error: {str(e)}"}), 500
diff --git a/backend/college_transfer_ai/utils.py b/backend/college_transfer_ai/utils.py
new file mode 100644
index 0000000..71c297a
--- /dev/null
+++ b/backend/college_transfer_ai/utils.py
@@ -0,0 +1,183 @@
+import os
+import traceback
+from datetime import datetime, timedelta, time, timezone
+from google.oauth2 import id_token
+from google.auth.transport import requests as google_requests
+from bson.objectid import ObjectId
+# Import collection getter functions instead of direct collection objects
+from .database import get_users_collection
+
+# --- Rate Limits (Example: Daily) ---
+FREE_TIER_LIMIT = 10
+PREMIUM_TIER_LIMIT = 100 # Example limit for paid users
+
+# --- Helper: Verify Google Token ---
+def verify_google_token(token, client_id):
+    """Verifies Google ID token and returns user info."""
+    if not client_id:
+        raise ValueError("Google Client ID not configured for verification.")
+    try:
+        idinfo = id_token.verify_oauth2_token(
+            token, google_requests.Request(), client_id
+        )
+        print(f"Token verified for user: {idinfo.get('sub')}")
+        return idinfo
+    except ValueError as e:
+        print(f"Token verification failed: {e}")
+        raise ValueError(f"Invalid token: {e}")
+    except Exception as e:
+        print(f"Unexpected error during token verification: {e}")
+        raise Exception(f"Token verification error: {e}")
+
+# --- Helper: Get or Create User ---
+def get_or_create_user(idinfo):
+    """
+    Finds a user by google_user_id or creates a new one with default free tier.
+    Ensures Stripe-related fields exist.
+    Returns the user document from MongoDB.
+    """
+    users_collection = get_users_collection() # Get collection via function
+
+    google_user_id = idinfo.get('sub')
+    if not google_user_id:
+        raise ValueError("Missing 'sub' (user ID) in token info.")
+
+    user = users_collection.find_one({'google_user_id': google_user_id})
+
+    if not user:
+        print(f"User {google_user_id} not found. Creating new user.")
+        new_user_data = {
+            'google_user_id': google_user_id,
+            'email': idinfo.get('email'),
+            'name': idinfo.get('name'),
+            'tier': 'free', # Default tier
+            'requests_used_this_period': 0,
+            'period_start_date': datetime.now(timezone.utc), # Use timezone-aware
+            'created_at': datetime.now(timezone.utc), # Use timezone-aware
+            'last_login': datetime.now(timezone.utc), # Use timezone-aware
+            # Add Stripe fields with defaults
+            "stripe_customer_id": None,
+            "stripe_subscription_id": None,
+            "subscription_status": None,
+            "subscription_expires": None
+        }
+        try:
+            insert_result = users_collection.insert_one(new_user_data)
+            print(f"Successfully created new user: {google_user_id} with ID: {insert_result.inserted_id}")
+            # Fetch the newly created user to return it
+            user = users_collection.find_one({'_id': insert_result.inserted_id})
+            if not user:
+                 raise Exception(f"Failed to retrieve newly created user {google_user_id}")
+        except Exception as e:
+            print(f"Error creating user {google_user_id}: {e}")
+            raise Exception(f"Database error creating user: {e}")
+    else:
+        # Ensure essential fields exist for older users & update last_login
+        update_query = {'last_login': datetime.now(timezone.utc)} # Use timezone-aware
+        set_fields = {}
+        if 'tier' not in user: set_fields['tier'] = 'free'
+        if 'requests_used_this_period' not in user: set_fields['requests_used_this_period'] = 0
+        if 'period_start_date' not in user: set_fields['period_start_date'] = datetime.now(timezone.utc)
+        if 'stripe_customer_id' not in user: set_fields['stripe_customer_id'] = None
+        if 'stripe_subscription_id' not in user: set_fields['stripe_subscription_id'] = None
+        if 'subscription_status' not in user: set_fields['subscription_status'] = None
+        if 'subscription_expires' not in user: set_fields['subscription_expires'] = None
+
+        if set_fields: # Only update if fields were missing
+             update_query.update(set_fields)
+             users_collection.update_one(
+                 {'google_user_id': google_user_id},
+                 {'$set': update_query}
+             )
+             # Re-fetch user data after update if fields were added
+             user = users_collection.find_one({"google_user_id": google_user_id})
+        else: # Just update last_login if no fields were missing
+             users_collection.update_one(
+                 {'google_user_id': google_user_id},
+                 {'$set': {'last_login': update_query['last_login']}}
+             )
+
+
+        print(f"Found existing user: {google_user_id}, Tier: {user.get('tier')}")
+
+    return user
+
+# --- Helper: Check and Update Usage ---
+def check_and_update_usage(user_data):
+    """
+    Checks if the user is within their usage limit based on tier.
+    Resets daily usage if necessary. Increments usage count if within limit.
+    Returns True if usage is allowed, False otherwise.
+    Raises Exception on database error.
+    """
+    users_collection = get_users_collection() # Get collection via function
+
+    tier = user_data.get('tier', 'free')
+    limit = PREMIUM_TIER_LIMIT if tier == 'premium' else FREE_TIER_LIMIT
+    requests_used = user_data.get('requests_used_this_period', 0)
+    period_start = user_data.get('period_start_date')
+    google_user_id = user_data.get('google_user_id')
+
+    now = datetime.now(timezone.utc) # Use timezone-aware
+    reset_usage = False
+
+    # --- Check if usage period needs reset (daily reset logic) ---
+    if period_start and isinstance(period_start, datetime):
+        # Ensure period_start is timezone-aware for comparison
+        if period_start.tzinfo is None:
+             period_start = period_start.replace(tzinfo=timezone.utc)
+
+        if period_start.date() < now.date():
+            print(f"Resetting daily usage for user {google_user_id}")
+            requests_used = 0
+            period_start = now # Use timezone-aware now
+            reset_usage = True
+    else:
+        # If period_start is missing or invalid, reset it
+        print(f"Initializing/Resetting usage period for user {google_user_id}")
+        requests_used = 0
+        period_start = now # Use timezone-aware now
+        reset_usage = True
+
+    # --- Check if limit is exceeded ---
+    if requests_used >= limit:
+        print(f"Usage limit exceeded for user {google_user_id} (Tier: {tier}, Used: {requests_used}, Limit: {limit})")
+        return False # Limit exceeded
+
+    # --- If limit is not exceeded, increment count ---
+    try:
+        # Construct update_fields based on whether usage is being reset
+        if reset_usage:
+            # If resetting, SET the count to 1 and update the start date
+            update_fields = {
+                '$set': {
+                    'requests_used_this_period': 1,
+                    'period_start_date': period_start, # Use timezone-aware period_start
+                    'last_request_timestamp': now # Use timezone-aware now
+                }
+            }
+            print(f"  Applying reset update for user {google_user_id}") # Debugging print
+        else:
+            # If not resetting, just INCREMENT the count and update the timestamp
+            update_fields = {
+                '$inc': {'requests_used_this_period': 1},
+                '$set': {'last_request_timestamp': now} # Use timezone-aware now
+            }
+            print(f"  Applying increment update for user {google_user_id}") # Debugging print
+
+
+        result = users_collection.update_one(
+            {'google_user_id': google_user_id},
+            update_fields
+        )
+        if result.matched_count == 0:
+             # This case should ideally not happen if get_or_create_user worked
+             raise Exception(f"User {google_user_id} not found during usage update.")
+
+        print(f"Usage updated for user {google_user_id}: {requests_used + 1}/{limit}")
+        return True # Usage allowed and updated
+    except Exception as e:
+        print(f"Error updating usage count for user {google_user_id}: {e}")
+        # Add traceback here if it's not already in the calling function's handler
+        traceback.print_exc()
+        raise Exception(f"Failed to update usage count: {e}")
diff --git a/backend/run.py b/backend/run.py
new file mode 100644
index 0000000..8d50190
--- /dev/null
+++ b/backend/run.py
@@ -0,0 +1,51 @@
+import os
+import traceback
+# Ensure the college_transfer_ai package is importable
+# This might require adjusting PYTHONPATH or running from the correct directory
+try:
+    from college_transfer_ai import create_app
+except ImportError as e:
+    print(f"ImportError: {e}")
+    print("Ensure you are running this script from the 'backend' directory or that the project root is in your PYTHONPATH.")
+    exit(1)
+
+
+try:
+    app = create_app()
+except Exception as app_create_err:
+    print(f"!!! CRITICAL: Failed to create Flask app: {app_create_err}")
+    traceback.print_exc()
+    exit(1)
+
+
+if __name__ == '__main__':
+    # Use environment variables for host, port, and debug mode is recommended
+    host = os.environ.get('FLASK_RUN_HOST', '0.0.0.0')
+    # Default port to 5000 if not set
+    port = int(os.environ.get('FLASK_RUN_PORT', os.environ.get('PORT', 5000)))
+    # Default debug to True if FLASK_DEBUG is not 'false' or '0'
+    debug_str = os.environ.get('FLASK_DEBUG', 'True').lower()
+    debug = debug_str not in ['false', '0', 'f']
+
+    print(f"--- Starting Flask Server ---")
+    print(f"Host: {host}")
+    print(f"Port: {port}")
+    print(f"Debug Mode: {debug}")
+
+    try:
+        # Use waitress or gunicorn in production instead of app.run
+        if debug:
+            app.run(debug=True, host=host, port=port)
+        else:
+            # Example using waitress (install waitress first: pip install waitress)
+            try:
+                from waitress import serve
+                print("Running in production mode using waitress...")
+                serve(app, host=host, port=port)
+            except ImportError:
+                print("Waitress not found. Running with Flask's built-in server (NOT recommended for production).")
+                app.run(debug=False, host=host, port=port)
+
+    except Exception as run_err:
+        print(f"!!! ERROR starting Flask server: {run_err}")
+        traceback.print_exc()
diff --git a/src/App.jsx b/src/App.jsx
index c34f4a0..6c0da65 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -86,31 +86,52 @@ function App() {
 
   // --- Fetch User Status/Tier ---
   useEffect(() => {
-      if (user && user.idToken) {
-          setIsLoadingTier(true);
-          fetchData('user-status', {
-              headers: { 'Authorization': `Bearer ${user.idToken}` }
-          })
-          .then(data => {
-              if (data && data.tier) {
-                  setUserTier(data.tier);
-                  console.log("User tier:", data.tier);
-              } else {
-                  console.warn("Could not fetch user tier:", data?.error);
-                  setUserTier('free'); // Fallback
-              }
-          })
-          .catch(err => {
-              console.error("Error fetching user status:", err);
-              setUserTier('free'); // Fallback on error
-          })
-          .finally(() => {
-              setIsLoadingTier(false);
-          });
-      } else {
-          setUserTier('free'); // Not logged in, definitely free tier
-      }
-  }, [user]); // Re-fetch when user logs in/out
+    // Function to fetch status
+    const fetchUserStatus = () => {
+        if (user && user.idToken) {
+            setIsLoadingTier(true);
+            fetchData('user-status', {
+                headers: { 'Authorization': `Bearer ${user.idToken}` }
+            })
+            .then(data => {
+                if (data && data.tier) {
+                    setUserTier(data.tier);
+                    console.log("User tier updated:", data.tier); // Log update
+                } else {
+                    console.warn("Could not fetch user tier:", data?.error);
+                    setUserTier('free'); // Fallback
+                }
+            })
+            .catch(err => {
+                console.error("Error fetching user status:", err);
+                setUserTier('free'); // Fallback on error
+            })
+            .finally(() => {
+                setIsLoadingTier(false);
+            });
+        } else {
+            // If no user, ensure tier is reset to free and not loading
+            setUserTier('free');
+            setIsLoadingTier(false);
+        }
+    };
+
+    // Call fetchUserStatus immediately when the effect runs
+    fetchUserStatus();
+
+    // OPTIONAL: Add a listener to refetch when the window gains focus
+    // This helps if the user switches tabs and comes back after the webhook has processed
+    window.addEventListener('focus', fetchUserStatus);
+
+    // Cleanup listener on unmount or when user changes
+    return () => {
+        window.removeEventListener('focus', fetchUserStatus);
+    };
+
+  // Re-run this effect ONLY when the user object (specifically idToken) changes.
+  // The fetchUserStatus function itself will handle the logic based on the current user state.
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [user?.idToken]); // Depend only on user.idToken
   // --- End Fetch User Status/Tier ---
 
 
@@ -246,7 +267,7 @@ function App() {
                       className="btn btn-success" // Use a different color for upgrade
                       style={{ margin: '0 10px' }}
                   >
-                      Upgrade to Paid
+                      Upgrade to Premium
                   </button>
               )}
 
diff --git a/src/components/AgreementViewerPage.jsx b/src/components/AgreementViewerPage.jsx
index 5b28b5d..1f30d7b 100644
--- a/src/components/AgreementViewerPage.jsx
+++ b/src/components/AgreementViewerPage.jsx
@@ -131,25 +131,39 @@ function AgreementViewerPage({ user, userTier }) {
 
     // --- Effect for Countdown Timer ---
     useEffect(() => {
-        if (!usageStatus.resetTime) {
-            setCountdown('');
+        if (!usageStatus.resetTime || agreementData.length === 0 || isLoadingPdf) {
+            setCountdown(''); // Clear countdown if conditions aren't met
+            return; // Exit effect
+        }
+        console.log("Starting countdown timer as agreement is loaded."); // Add log
+
+        // Calculate initial remaining time immediately
+        const initialRemaining = formatRemainingTime(usageStatus.resetTime);
+        setCountdown(initialRemaining);
+
+        // If already reset, don't start interval
+        if (initialRemaining === 'Usage reset') {
             return;
         }
 
+        // Start the interval to update every second
         const intervalId = setInterval(() => {
             const remaining = formatRemainingTime(usageStatus.resetTime);
             setCountdown(remaining);
             if (remaining === 'Usage reset') {
                 clearInterval(intervalId);
                 // Optionally refetch status after reset?
+                // fetchStatus(); // You might need to define fetchStatus outside its effect or pass it down
             }
         }, 1000); // Update every second
 
-        // Initial calculation
-        setCountdown(formatRemainingTime(usageStatus.resetTime));
-
-        return () => clearInterval(intervalId); // Cleanup interval on unmount or resetTime change
-    }, [usageStatus.resetTime]);
+        // Cleanup interval on unmount or when dependencies change causing the effect to re-run
+        return () => {
+            console.log("Clearing countdown interval."); // Add log for cleanup
+            clearInterval(intervalId);
+        }
+    // Add agreementData and isLoadingPdf as dependencies
+    }, [usageStatus.resetTime, agreementData, isLoadingPdf]);
     // --- End Countdown Effect ---
 
 
@@ -183,7 +197,7 @@ function AgreementViewerPage({ user, userTier }) {
             }
 
             try {
-                const data = await fetchData(`majors?sendingInstitutionId=${initialSendingId}&receivingInstitutionId=${receivingId}&academicYearId=${yearId}&categoryCode=${category}`);
+                const data = await fetchData(`majors?sendingId=${initialSendingId}&receivingId=${receivingId}&academicYearId=${yearId}&categoryCode=${category}`);
                 return data && Object.keys(data).length > 0;
             } catch (err) {
                 console.error(`Error checking availability for ${category}:`, err);
@@ -255,7 +269,7 @@ function AgreementViewerPage({ user, userTier }) {
 
         const fetchCategoryData = async () => {
             try {
-                const data = await fetchData(`majors?sendingInstitutionId=${initialSendingId}&receivingInstitutionId=${receivingId}&academicYearId=${yearId}&categoryCode=${selectedCategory}`);
+                const data = await fetchData(`majors?sendingId=${initialSendingId}&receivingId=${receivingId}&academicYearId=${yearId}&categoryCode=${selectedCategory}`);
                 console.log(`API response for ${selectedCategory}:`, data);
 
                 if (data && Object.keys(data).length > 0) {
@@ -682,6 +696,7 @@ function AgreementViewerPage({ user, userTier }) {
                         allSendingInstitutionIds={allSelectedSendingInstitutions.map(inst => inst.id)}
                         receivingInstitutionId={receivingId}
                         academicYearId={yearId}
+                        user={user}
                     />
                 </div>
 
diff --git a/src/components/ChatInterface.jsx b/src/components/ChatInterface.jsx
index 740ec98..a045d96 100644
--- a/src/components/ChatInterface.jsx
+++ b/src/components/ChatInterface.jsx
@@ -150,7 +150,7 @@ ${overallContextInfo ? `**Overall Context:** ${overallContextInfo}` : ''}
 
 Analyze the provided agreement images thoroughly. Perform the following steps:
 1.  **Focus on the Current Context:** Analyze the agreement for the major between the **current sending institution** and the receiving institution.
-2.  **Explicitly state the current context:** Start your response with: "Analyzing the agreement for the *[Major Name]* major between [Current Sending ID] (bold) and [Receiving ID] (bold) for the [Year] (bold) academic year."
+2.  **Explicitly state the current context:** Start your response with: "Analyzing the agreement for the [Major Name] (bold) major between [Current Sending Instituion Name] (bold) and [Receiving Institution Name] (bold) for the [academic year name] (bold) academic year."
 3.  **Provide a concise summary** of the key details for the **current** agreement (articulated courses, requirements, etc.). Identify any required courses for the major at the receiving institution that are **not articulated** by the current sending institution.
 4.  **Compare Articulation (If Applicable):** If you identified non-articulated courses in step 3 AND other sending institutions were selected (see Overall Context), examine the provided images for the **other** agreements (Sending IDs: ${allSendingInstitutionIds.filter(id => id !== sendingInstitutionId).join(', ') || 'None'}). For each non-articulated course from the current agreement, state whether it **is articulated** by any of the **other** sending institutions based on their respective agreements. Present this comparison clearly, perhaps in a separate section or list.
 5.  **Suggest Next Steps:** Conclude with relevant advice or next steps for the student based on the analysis and comparison.
@@ -281,15 +281,17 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
     };
 
     // Disable input/button if loading OR if user is not logged in
-    const isInteractionDisabled = isLoading || !user;
+    const isInteractionDisabled = isLoading || !user || !imageFilenames || imageFilenames.length === 0;
     const isSendDisabled = isInteractionDisabled || !userInput.trim();
 
-    // Adjust placeholder based on loading state, user state, and if messages exist
+    // Adjust placeholder based on loading state, user state, and agreement context
     const placeholderText = !user
         ? "Please sign in to use the chat feature."
-        : isLoading
-            ? (messages.length === 0 ? "Analyzing agreement..." : "Thinking...")
-            : (messages.length === 0 ? "Select an agreement to start." : "Ask a follow-up question...");
+        : (!imageFilenames || imageFilenames.length === 0)
+            ? "Select a major/department to chat." // New placeholder for logged-in user without context
+            : isLoading
+                ? (messages.length === 0 ? "Analyzing agreement..." : "Thinking...")
+                : "Ask a follow-up question..."; // Placeholder when ready
 
 
     return (
@@ -343,7 +345,7 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
                 {/* --- Show Sign-in Prompt if user is not logged in --- */}
                 {!user && (
                     <div style={{ textAlign: 'center', color: '#6c757d', marginTop: '30px', padding: '20px', fontSize: '1.1em' }}>
-                        Please sign in to analyze agreements and chat with the AI assistant.
+                        Please sign in to analyze agreements and chat with the AI counselor.
                     </div>
                 )}
                 {/* --- End Sign-in Prompt --- */}
diff --git a/src/components/PdfViewer.jsx b/src/components/PdfViewer.jsx
index 6e321da..18682dd 100644
--- a/src/components/PdfViewer.jsx
+++ b/src/components/PdfViewer.jsx
@@ -3,14 +3,11 @@ import React from 'react';
 // Accept imageFilenames directly as a prop
 function PdfViewer({ imageFilenames, isLoading, error, filename }) { // Added isLoading, error, filename for context messages
 
-  // Log props on every render
-  console.log("PdfViewer Render - isLoading:", isLoading, "error:", error, "filename:", filename, "imageFilenames:", imageFilenames);
-
   // Render content based on props
   return (
     <div style={{ height: '100%', display: 'flex', flexDirection: 'column' }}>
       {/* Show messages passed from parent */}
-      {!filename && <p style={{ textAlign: 'center', marginTop: '2em' }}>Select a major to view the agreement.</p>}
+      {!filename && <p style={{ textAlign: 'center', marginTop: '2em' }}>Select a major/department to view the agreement.</p>}
       {isLoading && <p>Loading agreement images...</p>}
       {error && <p style={{ color: 'red' }}>Error loading agreement: {error}</p>}
 
@@ -28,7 +25,6 @@ function PdfViewer({ imageFilenames, isLoading, error, filename }) { // Added is
             padding: '5px'
           }}
         >
-          {console.log("PdfViewer: Conditions met, attempting to map imageFilenames:", imageFilenames)} {/* <-- UPDATED LOG */}
           {imageFilenames.map((imgFilename) => {
             const imageUrl = `/api/image/${imgFilename}`;
             // console.log("Rendering image:", imageUrl); // Keep this if needed
diff --git a/vite.config.js b/vite.config.js
index 3bb44ec..a5d1c29 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -29,9 +29,6 @@ export default defineConfig(({ mode }) => {
           target: 'http://127.0.0.1:5000', // Your Flask backend address
           changeOrigin: true, // Recommended for virtual hosted sites
           secure: false, // Set to true if your backend uses HTTPS with a valid cert
-          // --- Add rewrite rule ---
-          rewrite: (path) => path.replace(/^\/api/, ''), // Remove /api prefix
-          // --- End rewrite rule ---
         },
       },
     },

From 0bfffe6ef6a8fc319fd11c13c40ee8d7affac4ec Mon Sep 17 00:00:00 2001
From: Ahmon <ahmonembaye@gmail.com>
Date: Mon, 28 Apr 2025 18:56:38 -0700
Subject: [PATCH 07/16] deleted codeowners

---
 CODEOWNERS | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 CODEOWNERS

diff --git a/CODEOWNERS b/CODEOWNERS
deleted file mode 100644
index 5653b7d..0000000
--- a/CODEOWNERS
+++ /dev/null
@@ -1 +0,0 @@
-@Ahmonemb

From 34b5d16ad37afb015f456047f17359107db8d9ae Mon Sep 17 00:00:00 2001
From: Ahmon <ahmonembaye@gmail.com>
Date: Tue, 29 Apr 2025 23:13:13 -0700
Subject: [PATCH 08/16] fix: Using gemini-2.5-flash and ensure countdown runs
 continuously

- Updated backend Gemini model name to 'gemini-2.5-flash-preview-04-17' to resolve initialization errors.
- Refactored frontend countdown timer in AgreementViewerPage to prevent interruptions from unrelated state changes (e.g., PDF loading), ensuring it runs continuously until reset.
---
 .../routes/agreement_routes.py                |  2 +-
 src/components/AgreementViewerPage.jsx        | 57 ++++++++++++-------
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/backend/college_transfer_ai/routes/agreement_routes.py b/backend/college_transfer_ai/routes/agreement_routes.py
index 6f56c44..7361f93 100644
--- a/backend/college_transfer_ai/routes/agreement_routes.py
+++ b/backend/college_transfer_ai/routes/agreement_routes.py
@@ -34,7 +34,7 @@ def init_gemini(api_key):
     try:
         genai.configure(api_key=api_key)
         # Consider making model name configurable
-        gemini_model = genai.GenerativeModel('gemini-1.5-pro')
+        gemini_model = genai.GenerativeModel('gemini-2.5-flash-preview-04-17')
         print("--- Gemini Initialized Successfully ---")
     except Exception as e:
         print(f"!!! Gemini Initialization Error: {e}")
diff --git a/src/components/AgreementViewerPage.jsx b/src/components/AgreementViewerPage.jsx
index 1f30d7b..dc53cfe 100644
--- a/src/components/AgreementViewerPage.jsx
+++ b/src/components/AgreementViewerPage.jsx
@@ -129,42 +129,57 @@ function AgreementViewerPage({ user, userTier }) {
 
     }, [user, userTier]); // Re-fetch when user object changes
 
-    // --- Effect for Countdown Timer ---
+    // --- Effect to SET Initial Countdown Value ---
     useEffect(() => {
-        if (!usageStatus.resetTime || agreementData.length === 0 || isLoadingPdf) {
-            setCountdown(''); // Clear countdown if conditions aren't met
-            return; // Exit effect
+        // Set the initial display value only when all conditions are met
+        if (usageStatus.resetTime && agreementData.length > 0 && !isLoadingPdf) {
+            const initialRemaining = formatRemainingTime(usageStatus.resetTime);
+            setCountdown(initialRemaining);
+            console.log("Setting initial countdown display:", initialRemaining);
+        } else {
+            // Clear the display if conditions aren't met (e.g., loading, no reset time)
+            setCountdown('');
+            console.log("Clearing countdown display because conditions not met.");
         }
-        console.log("Starting countdown timer as agreement is loaded."); // Add log
+    // This effect runs when the conditions required to *start* the display change
+    }, [usageStatus.resetTime, agreementData, isLoadingPdf]);
 
-        // Calculate initial remaining time immediately
-        const initialRemaining = formatRemainingTime(usageStatus.resetTime);
-        setCountdown(initialRemaining);
+    // --- Effect to RUN the Countdown Interval ---
+    useEffect(() => {
+        // Only manage the interval based on the existence of a reset time
+        if (!usageStatus.resetTime) {
+            setCountdown(''); // Ensure countdown is cleared if resetTime becomes invalid/null
+            return; // Don't start interval if no reset time
+        }
 
-        // If already reset, don't start interval
-        if (initialRemaining === 'Usage reset') {
-            return;
+        // Check if already reset initially when this effect runs
+        const initialCheck = formatRemainingTime(usageStatus.resetTime);
+        if (initialCheck === 'Usage reset') {
+            setCountdown(initialCheck); // Ensure display shows 'Usage reset'
+            return; // Don't start interval if already reset
         }
 
-        // Start the interval to update every second
+        console.log("Starting countdown interval timer.");
         const intervalId = setInterval(() => {
             const remaining = formatRemainingTime(usageStatus.resetTime);
-            setCountdown(remaining);
+            setCountdown(remaining); // Update display every second
+
             if (remaining === 'Usage reset') {
+                console.log("Countdown reached reset time, clearing interval.");
                 clearInterval(intervalId);
-                // Optionally refetch status after reset?
-                // fetchStatus(); // You might need to define fetchStatus outside its effect or pass it down
+                // Optionally refetch status here if needed after reset
+                // fetchStatus(); // Make sure fetchStatus is accessible if you uncomment this
             }
         }, 1000); // Update every second
 
-        // Cleanup interval on unmount or when dependencies change causing the effect to re-run
+        // Cleanup interval ONLY when the component unmounts or resetTime changes
         return () => {
-            console.log("Clearing countdown interval."); // Add log for cleanup
+            console.log("Clearing countdown interval due to unmount or resetTime change.");
             clearInterval(intervalId);
-        }
-    // Add agreementData and isLoadingPdf as dependencies
-    }, [usageStatus.resetTime, agreementData, isLoadingPdf]);
-    // --- End Countdown Effect ---
+        };
+    }, [usageStatus.resetTime]); // Only depend on resetTime for the interval itself
+
+    // --- End Countdown Effects ---
 
 
     // --- Existing Effects (Availability, Fetching Majors - adjust dependencies) ---

From 2d0d6be0bb62e46d4d86c3f9fa695681175c33d0 Mon Sep 17 00:00:00 2001
From: Ahmon <ahmonembaye@gmail.com>
Date: Wed, 30 Apr 2025 22:21:20 -0700
Subject: [PATCH 09/16] feat: Integrate LLM service, add IGETC support, and
 enhance backend/frontend

Backend:
- Created llm_service.py abstracting Gemini API calls.
- Refactored /chat route to use llm_service, always passing image context (majors + IGETC).
- Added /igetc-agreement route to fetch IGETC PDF filenames.
- Improved /pdf-images route with metadata-based checking and sorting by page number.
- Implemented caching in CollegeTransferAPI for institutions, years, majors.
- Enhanced error handling, filename sanitization, and client closing in API methods.

Frontend (AgreementViewerPage & ChatInterface):
- Added IGETC tab with dedicated PDF/image fetching logic.
- Combined major and IGETC image filenames (`allContextImageFilenames`).
- Passed combined image list to ChatInterface for all messages.
- Updated initial chat prompt for detailed analysis, comparison, and education plan offer.
- Refactored tab switching and data/image loading logic for agreements and IGETC.
- Improved usage countdown timer display logic.
---
 .../college_transfer_API.py                   | 305 +++++++++---
 backend/college_transfer_ai/database.py       |   4 +-
 backend/college_transfer_ai/llm_service.py    | 165 +++++++
 .../routes/agreement_routes.py                | 247 +++++-----
 src/components/AgreementViewerPage.jsx        | 442 ++++++++++++------
 src/components/ChatInterface.jsx              |  35 +-
 6 files changed, 834 insertions(+), 364 deletions(-)
 create mode 100644 backend/college_transfer_ai/llm_service.py

diff --git a/backend/college_transfer_ai/college_transfer_API.py b/backend/college_transfer_ai/college_transfer_API.py
index b51dec6..9a9a868 100644
--- a/backend/college_transfer_ai/college_transfer_API.py
+++ b/backend/college_transfer_ai/college_transfer_API.py
@@ -4,57 +4,109 @@
 import gridfs
 import json
 import os
+import traceback # Ensure traceback is imported
+import datetime
+# Consider adding background task queue like Celery or RQ if processing is slow
+# from some_background_task_library import enqueue_task
+
+# --- MongoDB Connection Helper (Example) ---
+def get_mongo_client():
+    MONGO_URI = os.getenv("MONGO_URI")
+    if not MONGO_URI:
+        raise ValueError("MONGO_URI environment variable not set.")
+    return MongoClient(MONGO_URI)
+
+# --- Removed Placeholder for PDF Processing Logic ---
+# def process_and_store_agreement_context(filename, pdf_bytes):
+#     """
+#     Placeholder function to extract text, summarize/structure, and store context.
+#     This should ideally run asynchronously (e.g., in a background task).
+#     """
+#     print(f"Initiating context processing for: {filename}")
+#     client = None
+#     try:
+#         client = get_mongo_client()
+#         db = client["CollegeTransferAICluster"]
+#         context_collection = db["agreement_context"] # Or agreement_summaries
+#
+#         # Check if context already exists
+#         if context_collection.find_one({"_id": filename}):
+#             print(f"Context already exists for {filename}. Skipping processing.")
+#             return
+#
+#         # ... (rest of the removed function) ...
+#
+#     except Exception as e:
+#         print(f"Error processing context for {filename}: {e}")
+#         traceback.print_exc()
+#     finally:
+#         if client:
+#             client.close()
+# --- End Removed Placeholder ---
+
 
 class CollegeTransferAPI:
     def __init__(self):
         self.base_url = "https://assist.org/api/"
+        # --- Simple In-Memory Cache ---
+        self._institution_name_cache = {}
+        self._year_id_cache = {}
+        self._majors_cache = {} # Cache key could be f"{send_id}-{recv_id}-{year_id}-{cat}"
+        # Consider using a more robust caching library like cachetools for TTL etc.
+        # --- End Cache ---
 
     def get_academic_year(self, id):
         url = self.base_url + "AcademicYears"
         response = requests.get(url)
-        
+
         result_academic_years = {}
-        
+
         academic_years_dict = {}
-        
+
         if response.status_code == 200:
             academic_years = response.json()
             result_academic_years = academic_years
         else:
             raise Exception("Failed to fetch academic years")
-        
+
         for year in result_academic_years:
             academic_year = (str(year['FallYear'] - 1) + "-" + str(year['FallYear']))
             if academic_year == "2025-2026": continue
             academic_years_dict[year['Id'] - 1] = academic_year
-        
+
         return academic_years_dict[id] if id in academic_years_dict else None
 
 
     def get_academic_years(self, sending_institution_id, receiving_institution_id):
         url = f"{self.base_url}/institutions/{sending_institution_id}/agreements"
-        
+
         response = requests.get(url)
-        
+
         institutions_dict = {}
-        
+
         academic_years_dict = {}
-        
+
         if response.status_code == 200:
             json_response = response.json()
             institutions_dict = json_response
         else:
             raise Exception("Failed to fetch academic years")
-        
-        
+
+
         for institution in institutions_dict:
             if institution["institutionParentId"] == receiving_institution_id:
                 for year_id in institution["receivingYearIds"]:
                     academic_years_dict[self.get_academic_year(year_id)] = year_id
-         
+
         return academic_years_dict
 
     def get_institution_name(self, id):
+        # Check cache first
+        if id in self._institution_name_cache:
+            # print(f"Cache HIT for institution name: {id}")
+            return self._institution_name_cache[id]
+
+        # print(f"Cache MISS for institution name: {id}. Fetching from API...")
         url = "https://assist.org/api/institutions"
 
         result = requests.get(url)
@@ -64,14 +116,27 @@ def get_institution_name(self, id):
             result_json = json_data
         except ValueError:
             print("Request failed")
-        
+
         institutions_dict = {str(item["id"]): item for item in result_json if "id" in item}
-        
+
+        name_to_return = None
         for k,v in institutions_dict.items():
             if k == str(id):
-                return v['names'][0]['name'].replace(" ", "_")      
-    
+                # Store in cache before returning
+                # name_to_return = v['names'][0]['name'].replace(" ", "_") # Removed replace
+                name_to_return = v['names'][0]['name'] # Keep original name
+                self._institution_name_cache[id] = name_to_return
+                break # Found it, no need to continue loop
+
+        return name_to_return # Return the found name or None
+
     def get_year_from_id(self, id):
+        # Check cache first
+        if id in self._year_id_cache:
+            # print(f"Cache HIT for year ID: {id}")
+            return self._year_id_cache[id]
+
+        # print(f"Cache MISS for year ID: {id}. Fetching from API...")
         url = "https://assist.org/api/AcademicYears"
 
         result = requests.get(url)
@@ -81,27 +146,33 @@ def get_year_from_id(self, id):
             result_json = json_data
         except ValueError:
             print("Request failed")
-        
 
+        year_str_to_return = None
         for k in result_json:
             for idx, value in k.items():
                 if idx == "Id" and value == id:
-                    return str(k["FallYear"]) + "-" + str(k["FallYear"] + 1)
-                
-    def get_majors_or_departments(self, sending_institution_id, receiving_institution_id, academic_year_id, category_code):
-        # Define the parameters
-        # sending_institution_id = 61
-        # receiving_institution_id = 79
-        # academic_year_id = 75
+                    # year_str_to_return = str(k["FallYear"]) + "-" + str(k["FallYear"] + 1) # Removed +1
+                    year_str_to_return = str(k["FallYear"] - 1) + "-" + str(k["FallYear"]) # Correct year range
+                    # Store in cache before returning
+                    self._year_id_cache[id] = year_str_to_return
+                    break # Found it
+            if year_str_to_return: break # Exit outer loop too
 
-        # Define the API endpoint and parameters
+        return year_str_to_return
+
+    def get_majors_or_departments(self, sending_institution_id, receiving_institution_id, academic_year_id, category_code):
+        cache_key = f"{sending_institution_id}-{receiving_institution_id}-{academic_year_id}-{category_code}"
+        if cache_key in self._majors_cache:
+            # print(f"Cache HIT for majors/depts: {cache_key}")
+            return self._majors_cache[cache_key]
 
+        # print(f"Cache MISS for majors/depts: {cache_key}. Fetching from API...")
         url = f"https://assist.org/api/agreements?receivingInstitutionId={receiving_institution_id}&sendingInstitutionId={sending_institution_id}&academicYearId={academic_year_id}&categoryCode={category_code}"
 
         result = requests.get(url)
 
         result_json = {}
-        
+
         majors_dict = {}
 
         # Convert the response to JSON and write it to a file
@@ -110,11 +181,13 @@ def get_majors_or_departments(self, sending_institution_id, receiving_institutio
             result_json = json_data
         except ValueError:
             print("Request failed")
-        
+
         for n,v in result_json.items():
             for major in v:
                   majors_dict[major["label"]] = major["key"]
-        
+
+        # Store in cache
+        self._majors_cache[cache_key] = majors_dict
         return majors_dict
 
     def get_major_from_key(self, key):
@@ -123,11 +196,11 @@ def get_major_from_key(self, key):
         # receiving_institution_id = 79
         # academic_year_id = 75
         # category_code = "major"
-        
+
         # Define the API endpoint and parameters
 
         keyArray = key.split("/")
-    
+
         sending_institution_id = int(keyArray[1])
         receiving_institution_id = int(keyArray[3])
         academic_year_id = int(keyArray[0])
@@ -150,12 +223,13 @@ def get_major_from_key(self, key):
             result_json = json_data
         except ValueError:
             print("Request failed")
-        
+
         for _, c in result_json.items():
             for i in c:
                 for l, j in i.items():
                     if l == "key" and j == key:
-                        return i["label"].replace(" ", "_")
+                        # return i["label"].replace(" ", "_") # Removed replace
+                        return i["label"] # Keep original name
         
         return "Key Not Found", key
 
@@ -174,11 +248,11 @@ def get_sending_institutions(self):
             result_json = json_data
         except ValueError:
             print("Something went wrong when getting colleges")
-            
+
         for institution in result_json:
             for name in institution["names"]:
                 result_dict_colleges[name["name"]] = institution["id"]
-        
+
         return result_dict_colleges
 
     def get_receiving_institutions(self, receiving_institution_id):
@@ -195,19 +269,20 @@ def get_receiving_institutions(self, receiving_institution_id):
             result_json = json_data
         except ValueError:
             print("Something went wrong when getting colleges")
-            
+
         for institution in result_json:
             result_dict_non_ccs[institution["institutionName"]] = institution["institutionParentId"]
-        
+
         return result_dict_non_ccs
-    
-    
+
+
     def get_articulation_agreement(self, academic_year_id, sending_institution_id, receiving_institution_id, key):
         print(f"Fetching articulation agreement for key: {key}")
+        client = None # Initialize client to None
         try: # Wrap more of the logic for better error handling
-            
+
             print(f"Academic Year ID: {academic_year_id}, Sending Institution ID: {sending_institution_id}, Receiving Institution ID: {receiving_institution_id}")
-            
+
             college_name = self.get_institution_name(sending_institution_id)
             receiving_name = self.get_institution_name(receiving_institution_id)
             major_name = self.get_major_from_key(key)
@@ -221,31 +296,36 @@ def get_articulation_agreement(self, academic_year_id, sending_institution_id, r
                  major_name = major_name or f"major_{key.split('/')[-1]}" # Use last part of key
                  year_name = year_name or f"year_{academic_year_id}"
 
+            # Sanitize names for filename
+            college_name_safe = college_name.replace(" ", "_").replace("/", "_")
+            receiving_name_safe = receiving_name.replace(" ", "_").replace("/", "_")
+            major_name_safe = major_name.replace(" ", "_").replace("/", "_")
+            year_name_safe = year_name.replace(" ", "_").replace("/", "_")
+
+
             filename = (
-                f"{college_name}_to_"
-                f"{receiving_name}_"
-                f"{major_name}_"
-                f"{year_name}.pdf"
+                f"{college_name_safe}_to_"
+                f"{receiving_name_safe}_"
+                f"{major_name_safe}_"
+                f"{year_name_safe}.pdf"
             )
-            # Basic sanitization
+            # Basic sanitization (already done above, but keep for safety)
             filename = filename.replace('/', '_').replace('\\', '_')
             print(f"Generated filename: {filename}")
 
-            # --- Check if already exists in GridFS (Optional, keep if you still want GridFS check) ---
-            MONGO_URI = os.getenv("MONGO_URI")
-            if not MONGO_URI:
-                raise ValueError("MONGO_URI environment variable not set.")
-            client = MongoClient(MONGO_URI)
-            db = client["CollegeTransferAICluster"]
+            # --- Check if already exists in GridFS ---
+            client = get_mongo_client() # Get client connection
+            db = client["CollegeTransferAICluster"] # Use correct DB name if needed
             fs = gridfs.GridFS(db)
             if fs.find_one({"filename": filename}):
                 print(f"PDF '{filename}' already exists in GridFS. Skipping download.")
+                # --- Removed context processing call ---
                 client.close()
                 return filename # Return existing filename if found
 
             # --- Construct URL (same as before) ---
             viewBy = "major"
-             
+
 
             url = (
                 f"https://assist.org/transfer/results?year={academic_year_id}"
@@ -254,7 +334,7 @@ def get_articulation_agreement(self, academic_year_id, sending_institution_id, r
                 f"&agreementType=to&viewAgreementsOptions=true&view=agreement"
                 f"&viewBy={viewBy}&viewSendingAgreements=false&viewByKey={key}"
             )
-            
+
             if "Department" in key:
                 viewBy = "dept"
                 if "SendingDepartment" in key:
@@ -273,51 +353,140 @@ def get_articulation_agreement(self, academic_year_id, sending_institution_id, r
                         f"&agreementType=to&viewAgreementsOptions=true&view=agreement"
                         f"&viewBy={viewBy}&viewByKey={key}"
                     )
-            
+
             print(f"Attempting to fetch PDF from URL: {url}")
 
-            # --- Download PDF using Playwright (same as before) ---
             pdf_bytes = None
             with sync_playwright() as p:
                 browser = None
                 try:
                     browser = p.chromium.launch(headless=True)
                     page = browser.new_page()
-                    page.goto(url, wait_until="networkidle", timeout=60000) # Increased timeout
-                    page.wait_for_timeout(2000) # Small delay
+                    page.goto(url, wait_until="networkidle", timeout=60000)
+                    page.wait_for_timeout(2000)
                     pdf_bytes = page.pdf(format="A4")
                     print(f"Successfully downloaded PDF bytes (size: {len(pdf_bytes)} bytes)")
                 except Exception as playwright_err:
                      print(f"Playwright error fetching PDF from {url}: {playwright_err}")
-                     if browser: browser.close() # Ensure browser closes on error
-                     client.close() # Ensure mongo client closes
-                     return None # Indicate failure
+                     if browser: browser.close()
+                     client.close()
+                     return None
                 finally:
                     if browser: browser.close()
 
-            # --- Save PDF Locally ---
             if pdf_bytes:
-                # --- Save to GridFS (Optional - keep or remove) ---
                 try:
                     fs.put(pdf_bytes, filename=filename, contentType='application/pdf')
                     print(f"Successfully saved PDF '{filename}' to GridFS.")
+                    # --- Removed context processing call ---
                 except Exception as gridfs_err:
                     print(f"Error saving PDF '{filename}' to GridFS: {gridfs_err}")
-                    # Handle GridFS save error if needed
-
+                    # Don't process context if save failed
             else:
                  print("Failed to obtain PDF bytes, cannot save.")
                  client.close()
-                 return None # Indicate failure
+                 return None
 
             client.close()
-            return filename # Return the filename on success
+            return filename
 
         except Exception as e:
             print(f"General error in get_articulation_agreement for key {key}: {e}")
             import traceback
             traceback.print_exc()
-            # Ensure client is closed if it was opened
             if 'client' in locals() and client:
                  client.close()
-            return None # Indicate failure
+            return None
+        finally:
+            if client: # Close client if it was opened
+                client.close()
+
+    def get_igetc_courses(self, academic_year_id, sending_institution_id):
+        print("Fetching IGETC agreement for")
+        client = None # Initialize client to None
+        try:
+
+            college_name = self.get_institution_name(sending_institution_id)
+            year_name = self.get_year_from_id(academic_year_id)
+
+            if not all([college_name, year_name]):
+                 college_name = college_name or f"sending_{sending_institution_id}"
+                 year_name = year_name or f"year_{academic_year_id}"
+
+            # Sanitize names for filename
+            college_name_safe = college_name.replace(" ", "_").replace("/", "_")
+            year_name_safe = year_name.replace(" ", "_").replace("/", "_")
+
+
+            filename = (
+                f"{college_name_safe}_IGETC_" # Added IGETC identifier
+                f"{year_name_safe}.pdf"
+            )
+            filename = filename.replace('/', '_').replace('\\', '_')
+            print(f"Generated filename: {filename}")
+
+            client = get_mongo_client() # Get client connection
+            db = client["CollegeTransferAICluster"] # Use correct DB name if needed
+            fs = gridfs.GridFS(db)
+            if fs.find_one({"filename": filename}):
+                print(f"PDF '{filename}' already exists in GridFS. Skipping download.")
+                # --- Removed context processing call ---
+                client.close()
+                return filename
+
+            url = (
+                f"https://assist.org/transfer/results?year={academic_year_id}"
+                f"&institution={sending_institution_id}"
+                f"&type=IGETC&view=transferability&viewBy=igetcArea"
+                f"&viewSendingAgreements=false&viewByKey=all"
+
+            )
+
+
+            print(f"Attempting to fetch IGETC from URL: {url}")
+
+            pdf_bytes = None
+            with sync_playwright() as p:
+                browser = None
+                try:
+                    browser = p.chromium.launch(headless=True)
+                    page = browser.new_page()
+                    page.goto(url, wait_until="networkidle", timeout=60000)
+                    page.wait_for_timeout(2000)
+                    pdf_bytes = page.pdf(format="A4")
+                    print(f"Successfully downloaded PDF bytes (size: {len(pdf_bytes)} bytes)")
+                except Exception as playwright_err:
+                     print(f"Playwright error fetching PDF from {url}: {playwright_err}")
+                     if browser: browser.close()
+                     client.close()
+                     return None
+                finally:
+                    if browser: browser.close()
+
+            if pdf_bytes:
+                try:
+                    fs.put(pdf_bytes, filename=filename, contentType='application/pdf')
+                    print(f"Successfully saved PDF '{filename}' to GridFS.")
+                    # --- Removed context processing call ---
+                except Exception as gridfs_err:
+                    print(f"Error saving PDF '{filename}' to GridFS: {gridfs_err}")
+            else:
+                 print("Failed to obtain PDF bytes, cannot save.")
+                 client.close()
+                 return None
+
+            client.close()
+            return filename
+
+        except Exception as e:
+            print(f"General error in get_igetc_courses: {e}")
+            import traceback
+            traceback.print_exc()
+            if 'client' in locals() and client:
+                 client.close()
+            return None
+        finally: # Ensure client is closed even on error
+             if client:
+                 client.close()
+
+api = CollegeTransferAPI()
diff --git a/backend/college_transfer_ai/database.py b/backend/college_transfer_ai/database.py
index b35b7ce..c09ddb2 100644
--- a/backend/college_transfer_ai/database.py
+++ b/backend/college_transfer_ai/database.py
@@ -6,10 +6,11 @@
 fs = None
 users_collection = None
 course_maps_collection = None
+agreement_summaries_collection = None # Add collection for summaries
 
 def init_db(mongo_uri):
     """Initializes MongoDB connection, database, GridFS, and collections."""
-    global mongo_client, db, fs, users_collection, course_maps_collection
+    global mongo_client, db, fs, users_collection, course_maps_collection, agreement_summaries_collection # Add global
     if not mongo_uri:
         raise ConnectionError("MongoDB URI not provided in configuration.")
     try:
@@ -22,6 +23,7 @@ def init_db(mongo_uri):
         fs = gridfs.GridFS(db)
         users_collection = db.users
         course_maps_collection = db.course_maps
+        agreement_summaries_collection = db.agreement_summaries # Initialize collection
         # Test connection
         mongo_client.admin.command('ping')
         print(f"--- MongoDB Connected Successfully (DB: {db_name}) ---")
diff --git a/backend/college_transfer_ai/llm_service.py b/backend/college_transfer_ai/llm_service.py
new file mode 100644
index 0000000..24113b6
--- /dev/null
+++ b/backend/college_transfer_ai/llm_service.py
@@ -0,0 +1,165 @@
+\
+import google.generativeai as genai
+import os
+from PIL import Image
+import io
+import traceback
+from .database import get_gridfs # Import GridFS getter
+
+# --- Global Model Variable ---
+gemini_model = None
+
+# --- Safety and Generation Config ---
+# Define safety settings - adjust as needed
+safety_settings = [
+    {"category": "HARM_CATEGORY_HARASSMENT", "threshold": "BLOCK_MEDIUM_AND_ABOVE"},
+    {"category": "HARM_CATEGORY_HATE_SPEECH", "threshold": "BLOCK_MEDIUM_AND_ABOVE"},
+    {"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT", "threshold": "BLOCK_MEDIUM_AND_ABOVE"},
+    {"category": "HARM_CATEGORY_DANGEROUS_CONTENT", "threshold": "BLOCK_MEDIUM_AND_ABOVE"},
+]
+
+# Define generation config - adjust as needed
+generation_config = genai.types.GenerationConfig(
+    # candidate_count=1, # Default is 1
+    # stop_sequences=["\n"], # Example stop sequence
+    max_output_tokens=8192, # Maximize output tokens for detailed analysis
+    temperature=0.7, # Adjust creativity/determinism (0.0-1.0)
+    # top_p=0.9, # Nucleus sampling
+    # top_k=40 # Top-k sampling
+)
+
+# --- Initialization Function ---
+def init_llm():
+    """Initializes the Gemini LLM client."""
+    global gemini_model
+    if gemini_model is None:
+        try:
+            google_api_key = os.getenv("GOOGLE_API_KEY")
+            if not google_api_key:
+                raise ValueError("GOOGLE_API_KEY environment variable not set.")
+            genai.configure(api_key=google_api_key)
+            # Use the latest flash model for speed and cost-effectiveness
+            gemini_model = genai.GenerativeModel(
+                'gemini-1.5-flash-latest',
+                # generation_config=generation_config, # Apply config here if not using start_chat
+                # safety_settings=safety_settings # Apply safety here if not using start_chat
+            )
+            print("Gemini LLM initialized successfully.")
+        except Exception as e:
+            print(f"Error initializing Gemini LLM: {e}")
+            traceback.print_exc()
+            gemini_model = None # Ensure it's None on failure
+
+# --- Chat Response Generation ---
+def generate_chat_response(prompt, history, image_filenames=None):
+    """
+    Generates a chat response using the Gemini LLM, optionally including images.
+
+    Args:
+        prompt (str): The user's latest message/prompt.
+        history (list): A list of previous messages in the format
+                        [{'role': 'user'/'model', 'parts': ['message text']}, ...].
+                        Note: 'model' corresponds to 'assistant' in some contexts.
+        image_filenames (list, optional): A list of filenames for images stored in GridFS
+                                          to be included in the prompt. Defaults to None.
+
+    Returns:
+        str: The generated text response from the LLM, or None if an error occurs.
+    """
+    global gemini_model
+    if gemini_model is None:
+        init_llm()
+        if gemini_model is None: # Check if initialization failed
+            print("LLM initialization failed. Cannot generate response.")
+            return None
+
+    fs = None
+    try:
+        # --- Construct Content List ---
+        content_parts = []
+
+        # 1. Add Images (if provided)
+        if image_filenames:
+            print(f"Processing {len(image_filenames)} image(s) for LLM...")
+            fs = get_gridfs() # Get GridFS instance
+            if not fs:
+                 print("Error: Could not get GridFS instance.")
+                 return None
+
+            for filename in image_filenames:
+                try:
+                    grid_out = fs.find_one({"filename": filename})
+                    if grid_out:
+                        image_bytes = grid_out.read()
+                        img = Image.open(io.BytesIO(image_bytes))
+                        # Ensure image format is supported (e.g., PNG, JPEG)
+                        if img.format in ["PNG", "JPEG", "WEBP"]:
+                             content_parts.append(img)
+                             print(f"Added image '{filename}' to LLM content.")
+                        else:
+                             print(f"Warning: Skipping image '{filename}' due to unsupported format: {img.format}")
+                    else:
+                        print(f"Warning: Image '{filename}' not found in GridFS.")
+                except Exception as img_err:
+                    print(f"Error processing image '{filename}': {img_err}")
+                    # Decide whether to continue or fail if an image fails
+                    # continue
+
+        # 2. Add Text Prompt
+        content_parts.append(prompt)
+        print("Added text prompt to LLM content.")
+
+        # --- Format History for Gemini API ---
+        # Gemini expects history as [{'role': 'user'/'model', 'parts': [text]}, ...]
+        formatted_history = []
+        for msg in history:
+            # Map 'bot' or 'assistant' to 'model'
+            role = 'model' if msg.get('role') in ['bot', 'assistant'] else 'user'
+            # Ensure 'content' exists and create the 'parts' list
+            text_content = msg.get('content', '')
+            formatted_history.append({'role': role, 'parts': [text_content]})
+
+        # --- Start Chat and Send Message ---
+        print("Starting LLM chat session...")
+        chat = gemini_model.start_chat(history=formatted_history)
+
+        print("Sending message to LLM...")
+        # Pass safety settings and config to send_message
+        response = chat.send_message(
+            content_parts,
+            generation_config=generation_config,
+            safety_settings=safety_settings,
+            stream=False # Set to False for a single response object
+        )
+
+        print("Received response from LLM.")
+        # --- Process Response ---
+        # Handle potential blocks or empty responses
+        if response.parts:
+            # Check for finish_reason if needed (e.g., SAFETY, RECITATION)
+            # print(f"LLM Finish Reason: {response.prompt_feedback}") # or response.candidates[0].finish_reason
+            return response.text
+        else:
+            print("Warning: LLM response was empty or blocked.")
+            # You might want to inspect response.prompt_feedback or response.candidates[0].finish_reason
+            print(f"Prompt Feedback: {response.prompt_feedback}")
+            if response.candidates and response.candidates[0].finish_reason:
+                 print(f"Finish Reason: {response.candidates[0].finish_reason}")
+                 print(f"Safety Ratings: {response.candidates[0].safety_ratings}")
+
+            # Return a specific message or None based on the block reason
+            block_reason = "Unknown"
+            if response.prompt_feedback and response.prompt_feedback.block_reason:
+                 block_reason = response.prompt_feedback.block_reason.name
+            return f"[LLM response blocked due to: {block_reason}]"
+
+
+    except Exception as e:
+        print(f"LLM generation error: {e}")
+        traceback.print_exc()
+        return None # Indicate failure
+    finally:
+        # Note: GridFS connection closing is handled by the context manager in get_gridfs if implemented that way,
+        # or needs explicit closing if not. Assuming get_gridfs handles it or connection pooling is used.
+        pass
+
diff --git a/backend/college_transfer_ai/routes/agreement_routes.py b/backend/college_transfer_ai/routes/agreement_routes.py
index 7361f93..8a72982 100644
--- a/backend/college_transfer_ai/routes/agreement_routes.py
+++ b/backend/college_transfer_ai/routes/agreement_routes.py
@@ -5,40 +5,38 @@
 from PIL import Image
 from flask import Blueprint, jsonify, request, Response, current_app
 from bson.objectid import ObjectId
+from datetime import datetime, timezone # Import datetime
 # Remove OpenAI import if not used
 # from openai import OpenAI
 
 # Import necessary functions/objects from other modules
 from ..utils import verify_google_token, get_or_create_user, check_and_update_usage
-from ..database import get_db, get_gridfs # Use getter functions
+# Use getter functions for all collections now
+# from ..database import get_db, get_gridfs, get_agreement_summaries_collection # Removed get_agreement_summaries_collection
+from ..database import get_db, get_gridfs # Updated import
 from ..college_transfer_API import CollegeTransferAPI
+# Import LLM service functions
+from ..llm_service import generate_chat_response as llm_generate_chat_response, init_llm as llm_init_llm
 
-# --- Google AI Imports ---
-import google.generativeai as genai
-from google.generativeai.types import HarmCategory, HarmBlockThreshold
-# --- End Google AI Imports ---
+# --- Remove Gemini-specific imports ---
+# import google.generativeai as genai # Removed
+# from PIL import Image # Keep PIL if used elsewhere (e.g., image processing)
+# import io # Keep io if used elsewhere (e.g., image processing)
+# --- End Remove Gemini-specific imports ---
 
 FREE_TIER_LIMIT = 10
 PREMIUM_TIER_LIMIT = 200 # Example limit for paid users
 
 agreement_bp = Blueprint('agreement_bp', __name__)
 
-# --- Initialize Gemini ---
-# Store model in app context instead of global? For now, global is simpler.
-gemini_model = None
-def init_gemini(api_key):
-    global gemini_model
-    if not api_key:
-        print("Warning: GOOGLE_API_KEY not set. Gemini features will be disabled.")
-        return
-    try:
-        genai.configure(api_key=api_key)
-        # Consider making model name configurable
-        gemini_model = genai.GenerativeModel('gemini-2.5-flash-preview-04-17')
-        print("--- Gemini Initialized Successfully ---")
-    except Exception as e:
-        print(f"!!! Gemini Initialization Error: {e}")
-        gemini_model = None # Ensure it's None if init fails
+# --- Remove Gemini Initialization ---
+# gemini_model = None # Removed
+# safety_settings = [...] # Removed
+# generation_config = ... # Removed
+# def init_gemini(): # Removed
+#     global gemini_model
+#     # ... removed initialization logic ...
+# --- End Remove Gemini Initialization ---
 
 # --- API Instance ---
 # Initialize CollegeTransferAPI here or in create_app if needed globally
@@ -114,13 +112,18 @@ def get_majors():
 @agreement_bp.route('/articulation-agreements', methods=['POST'])
 def get_articulation_agreements():
     data = request.get_json()
-    sending_ids = data.get('sending_ids') # Expecting a list
-    receiving_id = data.get('receiving_id')
-    year_id = data.get('year_id')
-    major_key = data.get('major_key')
+    # sending_ids = data.get('sending_ids') # Expecting a list - Changed key name
+    sending_ids = data.get('sendingInstitutionIds') # Match frontend key
+    # receiving_id = data.get('receiving_id') # Changed key name
+    receiving_id = data.get('receivingInstitutionId') # Match frontend key
+    # year_id = data.get('year_id') # Changed key name
+    year_id = data.get('academicYearId') # Match frontend key
+    major_key = data.get('majorKey') # Match frontend key
 
     if not sending_ids or not isinstance(sending_ids, list) or not receiving_id or not year_id or not major_key:
-        return jsonify({"error": "Missing or invalid parameters (sending_ids list, receiving_id, year_id, major_key)"}), 400
+        # return jsonify({"error": "Missing or invalid parameters (sending_ids list, receiving_id, year_id, major_key)"}), 400
+        return jsonify({"error": "Missing or invalid parameters (sendingInstitutionIds list, receivingInstitutionId, academicYearId, majorKey)"}), 400
+
 
     results = []
     errors = []
@@ -130,14 +133,17 @@ def get_articulation_agreements():
         try:
             # Fetch name first (assuming it's less likely to fail than PDF fetch)
             try:
-                 sending_name = api.get_institution_name(sending_id) # Hypothetical method
+                 # Ensure ID is integer if API expects it
+                 sending_name = api.get_institution_name(int(sending_id)) or sending_name
             except Exception as name_err:
                  print(f"Warning: Could not fetch name for sending ID {sending_id}: {name_err}")
 
-            pdf_filename = api.get_articulation_agreement(year_id, sending_id, receiving_id, major_key)
+            # Ensure IDs are integers if API expects it
+            pdf_filename = api.get_articulation_agreement(int(year_id), int(sending_id), int(receiving_id), major_key)
+
 
             results.append({
-                 "sendingId": sending_id,
+                 "sendingId": sending_id, # Keep original ID format from request
                  "sendingName": sending_name,
                  "pdfFilename": pdf_filename # Will be None if not found
             })
@@ -154,7 +160,7 @@ def get_articulation_agreements():
             # For now, just add to errors list. The loop continues.
             # Ensure name is included even on error
             results.append({
-                 "sendingId": sending_id,
+                 "sendingId": sending_id, # Keep original ID format from request
                  "sendingName": sending_name,
                  "pdfFilename": None,
                  "error": str(e) # Add error detail to the specific item
@@ -176,6 +182,41 @@ def get_articulation_agreements():
          # At least one PDF found, potentially with other non-PDF results or errors handled above
          return jsonify({"agreements": results}), 200
 
+# --- NEW IGETC Route ---
+@agreement_bp.route('/igetc-agreement', methods=['GET'])
+def get_igetc_agreement_route():
+    """
+    Fetches the IGETC agreement PDF filename for a given sending institution and year.
+    """
+    academic_year_id = request.args.get('academicYearId')
+    sending_institution_id = request.args.get('sendingId')
+
+    if not academic_year_id or not sending_institution_id:
+        return jsonify({"error": "Missing required parameters (academicYearId, sendingId)"}), 400
+
+    try:
+        # Convert IDs to integers if necessary (depends on your API method)
+        year_id = int(academic_year_id)
+        sending_id = int(sending_institution_id)
+
+        print(f"Fetching IGETC agreement for Sending ID: {sending_id}, Year ID: {year_id}")
+        pdf_filename = api.get_igetc_courses(year_id, sending_id)
+
+        if pdf_filename:
+            print(f"Found/Generated IGETC PDF: {pdf_filename}")
+            return jsonify({"pdfFilename": pdf_filename}), 200
+        else:
+            print(f"Could not find or generate IGETC PDF for Sending ID: {sending_id}, Year ID: {year_id}")
+            return jsonify({"error": "IGETC agreement not found or could not be generated."}), 404
+
+    except ValueError:
+        return jsonify({"error": "Invalid ID format. IDs must be integers."}), 400
+    except Exception as e:
+        error_msg = f"Error fetching IGETC agreement for Sending ID {sending_institution_id}: {e}"
+        print(error_msg)
+        traceback.print_exc()
+        return jsonify({"error": "Failed to fetch IGETC agreement.", "details": str(e)}), 500
+# --- End NEW IGETC Route ---
 
 @agreement_bp.route('/pdf-images/<path:filename>', methods=['GET'])
 def get_pdf_images(filename):
@@ -272,123 +313,49 @@ def get_image(filename):
 
 # --- Chat Endpoint ---
 @agreement_bp.route('/chat', methods=['POST'])
-def chat_endpoint():
-    config = current_app.config['APP_CONFIG']
-    GOOGLE_CLIENT_ID = config.get('GOOGLE_CLIENT_ID')
-    # GOOGLE_API_KEY is implicitly used by genai.configure in init_gemini
+@verify_google_token
+def handle_chat(user_info):
+    llm_init_llm()
 
-    if not GOOGLE_CLIENT_ID:
-         return jsonify({"error": "Google Client ID not configured."}), 500
-    if not gemini_model: # Check if Gemini was initialized
-         return jsonify({"error": "Chat feature disabled: Gemini model not available."}), 503 # Service Unavailable
+    data = request.get_json()
+    new_message = data.get('new_message')
+    history = data.get('history', [])
+    # Always try to get image_filenames from the request
+    image_filenames = data.get('image_filenames') # Could be None or []
 
-    fs = get_gridfs() # Get GridFS instance
+    if not new_message:
+        return jsonify({"error": "No message provided"}), 400
 
-    # 1. Authentication & Authorization
-    try:
-        auth_header = request.headers.get('Authorization')
-        if not auth_header or not auth_header.startswith('Bearer '):
-            return jsonify({"error": "Authorization token missing or invalid"}), 401
-        token = auth_header.split(' ')[1]
-        user_info = verify_google_token(token, GOOGLE_CLIENT_ID)
-        user_data = get_or_create_user(user_info)
-
-        # 2. Rate Limiting / Usage Check
-        if not check_and_update_usage(user_data):
-            # Prepare message about limit exceeded, including reset time
-            from datetime import datetime, timedelta, time, timezone # Ensure imports
-            now = datetime.now(timezone.utc)
-            tomorrow = now.date() + timedelta(days=1)
-            tomorrow_midnight_utc = datetime.combine(tomorrow, time(0, 0), tzinfo=timezone.utc)
-            reset_time_str = tomorrow_midnight_utc.strftime('%Y-%m-%d %H:%M:%S %Z')
-            limit = PREMIUM_TIER_LIMIT if user_data.get('tier') == 'premium' else FREE_TIER_LIMIT
-            return jsonify({
-                "error": f"Usage limit ({limit} requests/day) exceeded for your tier ('{user_data.get('tier')}'). Please try again after {reset_time_str}."
-            }), 429 # Too Many Requests
-
-    except ValueError as auth_err:
-        return jsonify({"error": str(auth_err)}), 401
-    except Exception as usage_err:
-        # Handle potential errors from check_and_update_usage (e.g., DB error)
-        print(f"Error during usage check: {usage_err}")
-        traceback.print_exc()
-        return jsonify({"error": "Could not verify usage limits."}), 500
+    user_id = user_info.get('user_id')
+    if not user_id:
+         return jsonify({"error": "User ID not found in token"}), 401
 
-    # 3. Process Request Data
-    data = request.get_json()
-    if not data or 'new_message' not in data:
-        return jsonify({"error": "Missing 'new_message' in request body"}), 400
-
-    new_message_text = data['new_message']
-    history = data.get('history', []) # List of {'role': 'user'/'assistant', 'content': '...'}
-    image_filenames = data.get('image_filenames', []) # Only expected for initial analysis
+    usage_allowed, usage_message = check_and_update_usage(user_id)
+    if not usage_allowed:
+        return jsonify({"error": usage_message}), 429
 
-    # 4. Prepare Content for Gemini
-    prompt_parts = []
+    # --- Simplified Logic ---
+    # No longer need to distinguish initial vs. follow-up for image handling here
+    print(f"Handling chat message. Including {len(image_filenames) if image_filenames else 0} images.")
 
-    # Add image data if provided (for initial analysis)
-    if image_filenames:
-        print(f"Processing {len(image_filenames)} images for chat...")
-        image_mime_type = "image/png" # Assuming PNG from our generation step
-        for img_filename in image_filenames:
-            try:
-                grid_out = fs.find_one({"filename": img_filename})
-                if grid_out:
-                    image_data = grid_out.read()
-                    prompt_parts.append({"mime_type": image_mime_type, "data": image_data})
-                else:
-                    print(f"Warning: Image '{img_filename}' not found in GridFS.")
-            except Exception as img_err:
-                print(f"Error reading image '{img_filename}' from GridFS: {img_err}")
-                # Decide how to handle missing images - skip or return error?
-                # For now, just skip the missing image
-                # return jsonify({"error": f"Failed to load image {img_filename}"}), 500
-
-    # Add the latest user message text
-    prompt_parts.append(new_message_text)
-
-    # 5. Call Gemini API
     try:
-        print("Sending request to Gemini...")
-        # Construct conversation history for the API
-        api_history = []
-        for msg in history:
-             # Map 'assistant' role from frontend/db to 'model' for Gemini API
-             role = 'model' if msg.get('role') == 'assistant' else msg.get('role')
-             # Ensure role is valid and content exists
-             if role in ['user', 'model'] and msg.get('content'):
-                 api_history.append({'role': role, 'parts': [msg['content']]})
-
-        # Start chat session if history exists
-        chat_session = gemini_model.start_chat(history=api_history)
-        response = chat_session.send_message(
-            prompt_parts,
-            stream=False, # Set to True for streaming response
-            safety_settings={ # Adjust safety settings as needed
-                HarmCategory.HARM_CATEGORY_HARASSMENT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
-                HarmCategory.HARM_CATEGORY_HATE_SPEECH: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
-                HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
-                HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
-            }
-        )
-
-        # Check for safety blocks or empty response
-        if not response.parts:
-             # Investigate response.prompt_feedback if needed
-             print("Gemini response blocked or empty. Feedback:", response.prompt_feedback)
-             try:
-                 # Attempt to access safety ratings safely
-                 safety_feedback = response.prompt_feedback.safety_ratings if response.prompt_feedback else "No feedback available."
-             except Exception as feedback_err:
-                 safety_feedback = f"Error accessing feedback: {feedback_err}"
-             return jsonify({"error": "Response blocked due to safety settings or empty response.", "details": str(safety_feedback)}), 400
-
-        reply_text = response.text
-        print("Received reply from Gemini.")
-        return jsonify({"reply": reply_text})
+        # Call the imported LLM function, always passing image_filenames
+        # The llm_service function will handle if image_filenames is None or empty
+        llm_reply = llm_generate_chat_response(new_message, history, image_filenames)
+
+        if llm_reply and not llm_reply.startswith("[LLM response blocked"):
+            return jsonify({"reply": llm_reply})
+        elif llm_reply: # Handle block message
+             print(f"LLM response blocked: {llm_reply}")
+             # Return a user-friendly error, maybe masking the specific block reason
+             return jsonify({"error": "Failed to get response due to content restrictions."}), 500
+             # Or return the specific block message if desired:
+             # return jsonify({"error": f"Failed to get response: {llm_reply}"}), 500
+        else:
+            # Handle LLM generation failure (returned None)
+            return jsonify({"error": "Failed to get response from LLM."}), 500
 
     except Exception as e:
-        print(f"Error calling Gemini API: {e}")
+        print(f"Error during chat processing: {e}")
         traceback.print_exc()
-        # Provide a more generic error to the user
-        return jsonify({"error": "Failed to get response from AI assistant."}), 500
+        return jsonify({"error": f"Server error during chat: {e}"}), 500
diff --git a/src/components/AgreementViewerPage.jsx b/src/components/AgreementViewerPage.jsx
index dc53cfe..547e52e 100644
--- a/src/components/AgreementViewerPage.jsx
+++ b/src/components/AgreementViewerPage.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useRef, useCallback, useMemo } from 'react';
-import { useParams, useLocation } from 'react-router-dom'; // Import useLocation
+import { useParams, useLocation } from 'react-router-dom';
 import PdfViewer from './PdfViewer';
 import ChatInterface from './ChatInterface';
 import { fetchData } from '../services/api';
@@ -65,13 +65,20 @@ function AgreementViewerPage({ user, userTier }) {
     const [hasDepartmentsAvailable, setHasDepartmentsAvailable] = useState(true);
     const [isLoadingAvailability, setIsLoadingAvailability] = useState(true);
 
-    // --- NEW State for Multiple PDFs/Tabs ---
-    const [agreementData, setAgreementData] = useState([]); // Array of { sendingId, sendingName, pdfFilename }
-    const [activeTabIndex, setActiveTabIndex] = useState(0); // Index of the currently viewed PDF/Tab
-    const [imagesForActivePdf, setImagesForActivePdf] = useState([]); // Renamed for clarity
-    const [allAgreementsImageFilenames, setAllAgreementsImageFilenames] = useState([]); // NEW: For initial chat analysis
+    // --- MODIFIED State for Multiple PDFs/Tabs ---
+    const [agreementData, setAgreementData] = useState([]);
+    // START WITH IGETC TAB ACTIVE
+    const [activeTabIndex, setActiveTabIndex] = useState(-1); // Index for agreements, -1 for IGETC
+    const [imagesForActivePdf, setImagesForActivePdf] = useState([]);
+    const [allAgreementsImageFilenames, setAllAgreementsImageFilenames] = useState([]);
 
-    // --- NEW State for User Usage Status ---
+    // --- NEW State for IGETC ---
+    const [igetcPdfFilename, setIgetcPdfFilename] = useState(null);
+    const [isLoadingIgetc, setIsLoadingIgetc] = useState(false);
+    const [igetcImageFilenames, setIgetcImageFilenames] = useState([]); // <-- ADDED: State for IGETC images
+    // --- End IGETC State ---
+
+    // --- State for User Usage Status ---
     const [usageStatus, setUsageStatus] = useState({
         usageCount: null,
         usageLimit: null,
@@ -82,10 +89,12 @@ function AgreementViewerPage({ user, userTier }) {
     const [countdown, setCountdown] = useState('');
     // --- End Usage Status State ---
 
-    // --- Derived state for the currently active agreement ---
-    const currentAgreement = agreementData[activeTabIndex] || null;
-    const currentSendingId = currentAgreement?.sendingId || initialSendingId; // Fallback to URL param if needed initially
-    const currentPdfFilename = currentAgreement?.pdfFilename || null;
+    // --- Derived state for the currently active agreement/view ---
+    const isIgetcActive = activeTabIndex === -1;
+    const currentAgreement = !isIgetcActive ? (agreementData[activeTabIndex] || null) : null;
+    // Use the *first* sending institution for IGETC context, or the current agreement's
+    const contextSendingId = isIgetcActive ? (allSelectedSendingInstitutions[0]?.id || initialSendingId) : (currentAgreement?.sendingId || initialSendingId);
+    const currentPdfFilename = isIgetcActive ? igetcPdfFilename : (currentAgreement?.pdfFilename || null);
 
     // --- Effect to Fetch User Usage Status ---
     useEffect(() => {
@@ -142,7 +151,7 @@ function AgreementViewerPage({ user, userTier }) {
             console.log("Clearing countdown display because conditions not met.");
         }
     // This effect runs when the conditions required to *start* the display change
-    }, [usageStatus.resetTime, agreementData, isLoadingPdf]);
+    }, [usageStatus.resetTime, agreementData, isLoadingPdf, isIgetcActive]); // Added isIgetcActive
 
     // --- Effect to RUN the Countdown Interval ---
     useEffect(() => {
@@ -317,125 +326,132 @@ function AgreementViewerPage({ user, userTier }) {
 
     }, [initialSendingId, receivingId, yearId, selectedCategory, isLoadingAvailability, hasMajorsAvailable, hasDepartmentsAvailable]);
 
-    // --- MODIFIED Effect to fetch agreement details AND ALL initial images ---
+    // --- MODIFIED Effect to fetch agreement details AND initial images ---
     const fetchAgreementDetailsAndImages = useCallback(async () => {
+        // REMOVED: setIgetcPdfFilename(null); // Keep IGETC data persistent
+        // REMOVED: if (isIgetcActive) setActiveTabIndex(0); // Don't switch here
+
         if (!selectedMajorKey || allSelectedSendingInstitutions.length === 0 || !receivingId || !yearId) {
+            // Clear only agreement-specific data if no major is selected
             setAgreementData([]);
-            setAllAgreementsImageFilenames([]); // Clear all images
-            setImagesForActivePdf([]); // Clear active images
+            setAllAgreementsImageFilenames([]);
+            // Don't clear imagesForActivePdf if IGETC might be active
+            if (!isIgetcActive) {
+                setImagesForActivePdf([]);
+            }
             return;
         }
 
-        setIsLoadingPdf(true); // Use this state for the overall loading
+        setIsLoadingPdf(true);
         setPdfError(null);
-        setAgreementData([]);
+        setAgreementData([]); // Clear previous agreements
         setAllAgreementsImageFilenames([]);
-        setImagesForActivePdf([]);
+        // Don't clear imagesForActivePdf yet, wait until fetch completes or fails
 
-        let fetchedAgreements = []; // To store results from /articulation-agreements
+        let fetchedAgreements = [];
 
         try {
-            // 1. Fetch PDF filenames for all agreements
             const sendingIds = allSelectedSendingInstitutions.map(inst => inst.id);
             console.log("Fetching agreements list for Sending IDs:", sendingIds, selectedMajorKey);
+            // Assuming the API endpoint takes sendingIds, receivingId, yearId, majorKey
             const response = await fetchData('/articulation-agreements', {
-                method: 'POST',
+                method: 'POST', // Or GET with query params, adjust as needed
                 headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ sending_ids: sendingIds, receiving_id: receivingId, year_id: yearId, major_key: selectedMajorKey })
+                body: JSON.stringify({
+                    sendingInstitutionIds: sendingIds,
+                    receivingInstitutionId: receivingId,
+                    academicYearId: yearId,
+                    majorKey: selectedMajorKey,
+                    categoryCode: selectedCategory // Pass category if needed by backend
+                })
             });
 
             if (!response || !Array.isArray(response.agreements)) {
-                throw new Error(response?.error || "Invalid response format from /articulation-agreements");
+                throw new Error(response?.error || 'Invalid response format for agreements');
             }
 
-            // Map response to include names
+            // Map response agreements and add sending institution names
             fetchedAgreements = response.agreements.map(agreement => {
                 const sendingInst = allSelectedSendingInstitutions.find(inst => inst.id === agreement.sendingId);
-                return { ...agreement, sendingName: sendingInst ? sendingInst.name : `Sending ID ${agreement.sendingId}` };
+                return {
+                    ...agreement, // Spread existing agreement properties (like pdfFilename, sendingId)
+                    sendingName: sendingInst ? sendingInst.name : 'Unknown Sending Institution'
+                };
             });
-            console.log("Received agreement list:", fetchedAgreements);
-            setAgreementData(fetchedAgreements);
-            setActiveTabIndex(0); // Set first tab active
-
-            // 2. Fetch image filenames for ALL valid PDFs in parallel
-            const imageFetchPromises = fetchedAgreements
-                .filter(agreement => agreement.pdfFilename) // Only fetch for those with a filename
-                .map(agreement =>
-                    fetchData(`pdf-images/${encodeURIComponent(agreement.pdfFilename)}`)
-                        .then(imgResponse => {
-                            if (imgResponse && imgResponse.image_filenames) {
-                                return { sendingId: agreement.sendingId, images: imgResponse.image_filenames };
-                            } else {
-                                console.warn(`No images found for ${agreement.pdfFilename}`);
-                                return { sendingId: agreement.sendingId, images: [] }; // Return empty array on failure/no images
-                            }
-                        })
-                        .catch(err => {
-                            console.error(`Error fetching images for ${agreement.pdfFilename}:`, err);
-                            return { sendingId: agreement.sendingId, images: [] }; // Return empty array on error
-                        })
-                );
-
+            setAgreementData(fetchedAgreements); // Set the fetched agreements
+
+            // --- Fetch all images in parallel ---
+            // Filter out agreements without a pdfFilename before attempting to fetch images
+            const agreementsWithPdfs = fetchedAgreements.filter(agreement => agreement.pdfFilename);
+            const imageFetchPromises = agreementsWithPdfs.map(agreement =>
+                fetchData(`pdf-images/${encodeURIComponent(agreement.pdfFilename)}`)
+                    .then(imageResponse => ({
+                        sendingId: agreement.sendingId, // Keep track of which agreement these images belong to
+                        images: imageResponse?.image_filenames || [],
+                        error: imageResponse?.error
+                    }))
+                    .catch(err => ({ // Catch fetch errors for individual image sets
+                        sendingId: agreement.sendingId,
+                        images: [],
+                        error: `Failed to fetch images for ${agreement.sendingName}: ${err.message}`
+                    }))
+            );
             const imageResults = await Promise.allSettled(imageFetchPromises);
-
-            const allImagesCombined = imageResults.reduce((acc, result) => {
-                if (result.status === 'fulfilled' && result.value.images.length > 0) {
-                    // Optionally add context comment for LLM?
-                    // acc.push(`--- Images for Sending ID ${result.value.sendingId} ---`);
-                    acc.push(...result.value.images);
-                }
-                return acc;
-            }, []);
-
-            console.log("Combined image filenames for initial analysis:", allImagesCombined);
+            const allImagesCombined = imageResults.reduce(/* ... */); // Existing logic
             setAllAgreementsImageFilenames(allImagesCombined);
 
-            // 3. Fetch images for the *initially active* PDF (tab 0) for the viewer
+            // --- Set images for the first agreement tab (index 0) ---
             const firstAgreement = fetchedAgreements[0];
+            let firstAgreementImages = [];
             if (firstAgreement && firstAgreement.pdfFilename) {
-                // Find the corresponding images from the parallel fetch results
-                const firstAgreementImagesResult = imageResults.find(result => result.status === 'fulfilled' && result.value.sendingId === firstAgreement.sendingId);
+                const firstAgreementImagesResult = imageResults.find(/* ... */); // Existing logic to find images for first agreement
                 if (firstAgreementImagesResult && firstAgreementImagesResult.value.images.length > 0) {
-                     setImagesForActivePdf(firstAgreementImagesResult.value.images);
+                    firstAgreementImages = firstAgreementImagesResult.value.images;
                 } else {
-                     // Handle case where even the first PDF's images failed to load
-                     setPdfError(`Failed to load images for the initial agreement: ${firstAgreement.sendingName}`);
-                     setImagesForActivePdf([]);
+                    console.warn(`No images loaded for the first agreement: ${firstAgreement.sendingName}`);
                 }
-            } else if (fetchedAgreements.length > 0) {
-                setPdfError(`No PDF filename found for the initial agreement: ${fetchedAgreements[0].sendingName}.`);
-                setImagesForActivePdf([]);
-            } else {
-                setPdfError("No agreements found for the selected major and institutions.");
-                setImagesForActivePdf([]);
             }
 
+            // --- NOW switch to the first agreement tab and set its images ---
+            setActiveTabIndex(0);
+            setImagesForActivePdf(firstAgreementImages);
+            if (firstAgreementImages.length === 0 && firstAgreement) {
+                 setPdfError(`No PDF or images found for ${firstAgreement.sendingName}.`);
+            } else if (!firstAgreement) {
+                 setPdfError("No agreements found for the selected major.");
+            }
+
+
         } catch (err) {
             console.error("Error fetching agreement details and images:", err);
             setPdfError(`Failed to load agreement details: ${err.message}`);
             setAgreementData([]);
             setAllAgreementsImageFilenames([]);
             setImagesForActivePdf([]);
+            // Optionally switch back to IGETC or show an error state?
+            // setActiveTabIndex(-1); // Or keep it on the (now empty) agreement tab?
         } finally {
             setIsLoadingPdf(false);
         }
-    }, [selectedMajorKey, allSelectedSendingInstitutions, receivingId, yearId]); // Dependencies
 
-    // --- Effect to fetch images ONLY for the ACTIVE PDF VIEWER when tab changes ---
-    const fetchImagesForActiveTab = useCallback(async () => {
+    }, [selectedMajorKey, allSelectedSendingInstitutions, receivingId, yearId, selectedCategory, isIgetcActive]); // Added missing dependencies
+
+    // --- MODIFIED Effect to fetch images for the ACTIVE PDF VIEWER (Agreement Tab) ---
+    const fetchImagesForActiveAgreementTab = useCallback(async () => {
+        if (isIgetcActive) return; // Don't run if IGETC is active
+
         const activeAgreement = agreementData[activeTabIndex];
         if (!activeAgreement || !activeAgreement.pdfFilename) {
-            setImagesForActivePdf([]); // Clear if no active agreement or filename
+            setImagesForActivePdf([]);
             if (activeAgreement) setPdfError(`No PDF available for ${activeAgreement.sendingName}.`);
             return;
         }
-
-        // Removed the check for tab 0 here - let's always fetch on tab change for simplicity now.
-
-        setIsLoadingPdf(true); // Show loading for tab switch
+        // ... (rest of the existing logic inside this function remains the same) ...
+        // Set loading, clear error/images, fetch images, handle response/error, set loading false.
+        setIsLoadingPdf(true);
         setPdfError(null);
-        setImagesForActivePdf([]); // Clear previous tab's images
-        console.log("Fetching images for active tab PDF:", activeAgreement.pdfFilename);
+        setImagesForActivePdf([]);
+        console.log("Fetching images for active agreement tab PDF:", activeAgreement.pdfFilename);
         try {
             const response = await fetchData(`pdf-images/${encodeURIComponent(activeAgreement.pdfFilename)}`);
             if (response && response.image_filenames) {
@@ -451,27 +467,99 @@ function AgreementViewerPage({ user, userTier }) {
         } finally {
             setIsLoadingPdf(false);
         }
-    // MODIFIED Dependencies: Only depend on data needed to identify the active agreement
-    }, [activeTabIndex, agreementData]); // Dependencies
+
+    }, [activeTabIndex, agreementData, isIgetcActive]); // Added isIgetcActive
+
+    // --- NEW Effect to fetch IGETC agreement and images ---
+    const fetchIgetcAgreementAndImages = useCallback(async () => {
+        if (!isIgetcActive) return; // Only run if IGETC tab is active
+
+        // Use the first sending institution ID for IGETC
+        const igetcSendingId = allSelectedSendingInstitutions[0]?.id;
+        if (!igetcSendingId || !yearId) {
+            setPdfError("Missing sending institution or year ID for IGETC.");
+            setImagesForActivePdf([]);
+            setIgetcPdfFilename(null);
+            return;
+        }
+
+        // Reset IGETC specific states
+        setIgetcPdfFilename(null);
+        setIgetcImageFilenames([]); // <-- Reset IGETC image state
+        // Also reset active images if IGETC is active
+        if (isIgetcActive) {
+            setImagesForActivePdf([]);
+        }
+
+        setIsLoadingIgetc(true); // Use separate loading state for IGETC fetch
+        setIsLoadingPdf(true); // Also set general PDF loading true
+        setPdfError(null);
+
+        try {
+            // 1. Fetch IGETC PDF filename
+            console.log(`Fetching IGETC agreement for Sending ID: ${igetcSendingId}, Year ID: ${yearId}`);
+            const igetcResponse = await fetchData(`/igetc-agreement?sendingId=${igetcSendingId}&academicYearId=${yearId}`);
+
+            if (!igetcResponse || !igetcResponse.pdfFilename) {
+                throw new Error(igetcResponse?.error || "Failed to get IGETC PDF filename.");
+            }
+            const filename = igetcResponse.pdfFilename;
+            setIgetcPdfFilename(filename);
+            console.log("Received IGETC PDF filename:", filename);
+
+            // 2. Fetch images for the IGETC PDF
+            console.log("Fetching images for IGETC PDF:", filename);
+            const imageResponse = await fetchData(`pdf-images/${encodeURIComponent(filename)}`);
+            if (imageResponse && imageResponse.image_filenames) {
+                console.log("Received images for IGETC tab:", imageResponse.image_filenames);
+                setIgetcImageFilenames(imageResponse.image_filenames); // <-- SET IGETC image state
+                // If IGETC is the currently active tab, also update imagesForActivePdf
+                if (isIgetcActive) {
+                    setImagesForActivePdf(imageResponse.image_filenames);
+                }
+            } else {
+                throw new Error(imageResponse?.error || "No image filenames received for IGETC tab");
+            }
+
+        } catch (err) {
+            console.error("Error fetching IGETC agreement/images:", err);
+            setPdfError(`Failed to load IGETC details: ${err.message}`);
+            setIgetcImageFilenames([]); // <-- Clear on error
+            setIgetcPdfFilename(null);
+            if (isIgetcActive) {
+                setImagesForActivePdf([]); // Clear active images on error if IGETC is active
+            }
+        } finally {
+            setIsLoadingIgetc(false);
+            // Only set general loading false if IGETC is the active view being loaded
+            if (isIgetcActive) {
+                setIsLoadingPdf(false);
+            }
+        }
+    }, [isIgetcActive, allSelectedSendingInstitutions, yearId]); // Dependencies
 
     // Trigger initial fetch when major changes
     useEffect(() => {
         fetchAgreementDetailsAndImages();
     }, [fetchAgreementDetailsAndImages]);
 
-    // Trigger active image fetch when active tab changes
+    // Trigger active image/data fetch when active tab changes OR agreement data loads
     useEffect(() => {
-        // Fetch whenever the active tab index changes, but only if agreementData is loaded.
-        // This prevents fetching when agreementData is initially empty.
-        // Also ensures it runs for tab 0 *after* the initial data load completes.
-        if (agreementData.length > 0) {
-             console.log(`Tab changed to ${activeTabIndex} or agreementData loaded, fetching images for active tab.`);
-             fetchImagesForActiveTab();
+        if (isIgetcActive) {
+            // Fetch IGETC data if IGETC tab is active
+            console.log("IGETC tab active, fetching IGETC data...");
+            fetchIgetcAgreementAndImages();
+        } else if (activeTabIndex >= 0 && agreementData.length > 0) {
+            // Fetch agreement images ONLY if an agreement tab is active AND agreementData has been loaded
+            console.log(`Agreement tab ${activeTabIndex} active, fetching images...`);
+            fetchImagesForActiveAgreementTab();
+        } else if (activeTabIndex >= 0 && agreementData.length === 0 && selectedMajorKey) {
+             console.log(`Agreement tab ${activeTabIndex} active, but agreement data not yet loaded. Waiting...`);
         } else {
-             console.log("Skipping fetchImagesForActiveTab because agreementData is empty.");
+            console.log("Skipping active tab fetch: Conditions not met (e.g., no major selected for agreement tabs, or initial state before IGETC fetch).");
         }
-    // MODIFIED Dependencies: Remove imagesForActivePdf
-    }, [activeTabIndex, agreementData, fetchImagesForActiveTab]);
+    // Ensure all necessary functions and state variables are included
+    }, [activeTabIndex, agreementData, isIgetcActive, selectedMajorKey, fetchIgetcAgreementAndImages, fetchImagesForActiveAgreementTab]); // Keep dependencies
 
     // --- Handlers ---
     const handleMajorSelect = (majorKey, majorName) => {
@@ -492,10 +580,11 @@ function AgreementViewerPage({ user, userTier }) {
         // The useEffect for fetching majors/depts will re-run due to selectedCategory change
     };
 
+    // MODIFIED Tab Click Handler
     const handleTabClick = (index) => {
         console.log("Tab clicked:", index);
-        setActiveTabIndex(index);
-        // Image fetch will be triggered by the useEffect dependency change
+        setActiveTabIndex(index); // index will be -1 for IGETC
+        // Image/Data fetch will be triggered by the useEffect dependency change on activeTabIndex
     };
 
     // --- Resizing Handlers (remain the same) ---
@@ -593,6 +682,20 @@ function AgreementViewerPage({ user, userTier }) {
     // Adjust height calculation - remove buttonBarHeight
     const mainContentHeight = `calc(90vh - 53px)`; // Assuming nav is 60px
 
+    // Combine all available image filenames for the chat context
+    const allContextImageFilenames = useMemo(() => {
+        // Use a Set to automatically handle duplicates if any filename appears in both lists
+        const combined = new Set([
+            ...allAgreementsImageFilenames, // Images from all major agreements
+            ...igetcImageFilenames       // Images from IGETC agreement
+        ]);
+        return Array.from(combined); // Convert back to an array
+    }, [allAgreementsImageFilenames, igetcImageFilenames]); // Dependencies
+
+    // Determine images for chat context (This might be redundant now, review usage)
+    // const chatContextImages = isIgetcActive ? imagesForActivePdf : allAgreementsImageFilenames; // OLD
+    const chatContextMajorName = isIgetcActive ? "IGETC Requirements" : selectedMajorName;
+
     return (
         <>
             {/* --- Removed Button Bar --- */}
@@ -638,7 +741,7 @@ function AgreementViewerPage({ user, userTier }) {
 
 
                 {/* Left Column (Majors/Depts List) */}
-                {isMajorsVisible && (
+                {!isIgetcActive && isMajorsVisible && (
                     <div style={{
                         flex: `0 0 ${currentMajorsFlexBasis}`,
                         display: 'flex',
@@ -697,69 +800,124 @@ function AgreementViewerPage({ user, userTier }) {
                         {!isLoadingMajors && !isLoadingAvailability && !hasMajorsAvailable && !hasDepartmentsAvailable && ( <p>No majors or departments found for this combination.</p> )}
                     </div>
                 )}
+                 {/* Show Majors Button (only if majors column is hidden AND IGETC is NOT active) */}
+                 {!isMajorsVisible && !isIgetcActive && (
+                    <button
+                        onClick={toggleMajorsVisibility}
+                        style={{
+                            position: 'absolute',
+                            top: '0.5em',
+                            left: '0.5em',
+                            zIndex: 1,
+                            padding: '4px 8px',
+                            fontSize: '0.85em'
+                        }}
+                        className="btn btn-sm btn-outline-secondary"
+                    >
+                        Show Majors
+                    </button>
+                 )}
 
                 {/* Middle Column (Chat Interface) */}
-                <div style={{ flex: `0 0 ${currentChatFlexBasis}`, display: 'flex', flexDirection: 'column', minWidth: `${minColWidth}px` }}>
-                    {/* Pass visibility state and toggle function */}
+                <div style={{
+                     flex: `0 0 ${(!isIgetcActive && isMajorsVisible) ? currentChatFlexBasis : (isIgetcActive ? '400px' : `calc(${currentChatFlexBasis} + ${fixedMajorsWidth}px + 1em)`) }`, // Adjust width calculation
+                     display: 'flex',
+                     flexDirection: 'column',
+                     minWidth: `${minColWidth}px`,
+                     marginRight: (!isIgetcActive && isMajorsVisible) ? '0' : '1em' // Add margin if majors are hidden or IGETC active
+                 }}>
                     <ChatInterface
-                        imageFilenames={allAgreementsImageFilenames} // Pass the combined list
-                        selectedMajorName={selectedMajorName}
+                        // Pass the COMBINED list for the payload
+                        allContextImageFilenames={allContextImageFilenames} // <-- NEW PROP
+
+                        // Keep these if needed for the initial prompt logic specifically
+                        imageFilenames={imagesForActivePdf} // Active images for display/context hints?
+                        allAgreementsImageFilenames={allAgreementsImageFilenames} // Major agreement images
+
+                        selectedMajorName={chatContextMajorName} // Pass appropriate name
                         userName={userName}
-                        isMajorsVisible={isMajorsVisible}
+                        isMajorsVisible={!isIgetcActive && isMajorsVisible} // Only relevant if not IGETC
                         toggleMajorsVisibility={toggleMajorsVisibility}
-                        sendingInstitutionId={currentSendingId}
+                        sendingInstitutionId={contextSendingId} // Pass context-aware ID
                         allSendingInstitutionIds={allSelectedSendingInstitutions.map(inst => inst.id)}
                         receivingInstitutionId={receivingId}
                         academicYearId={yearId}
                         user={user}
+                        // isIgetcMode={isIgetcActive} // Pass flag if needed by ChatInterface display logic
                     />
                 </div>
 
-                {/* Draggable Divider */}
-                <div ref={dividerRef} style={{ width: `${dividerWidth}px`, cursor: 'col-resize', backgroundColor: '#e0e0e0', borderLeft: '1px solid #ccc', borderRight: '1px solid #ccc', alignSelf: 'stretch', flexShrink: 0, marginLeft: isMajorsVisible ? '1em' : '0' }} onMouseDown={handleMouseDown} />
+                {/* Draggable Divider (Conditionally render or adjust margin) */}
+                {!isIgetcActive && isMajorsVisible && (
+                    <div ref={dividerRef} style={{ width: `${dividerWidth}px`, cursor: 'col-resize', backgroundColor: '#e0e0e0', borderLeft: '1px solid #ccc', borderRight: '1px solid #ccc', alignSelf: 'stretch', flexShrink: 0, marginLeft: isMajorsVisible ? '1em' : '0' }} onMouseDown={handleMouseDown} />
+                )}
 
                 {/* Right Column (PDF Viewer) */}
-                <div style={{ flex: '1 1 0', display: 'flex', flexDirection: 'column', minWidth: `${minColWidth}px`, marginLeft: '1em' }}>
+                <div style={{
+                    flex: '1 1 0',
+                    display: 'flex',
+                    flexDirection: 'column',
+                    minWidth: `${minColWidth}px`,
+                    marginLeft: (!isIgetcActive && isMajorsVisible) ? '1em' : '0' // Adjust margin
+                 }}>
                     {/* --- PDF Tabs --- */}
-                    {agreementData.length > 1 && (
-                        <div style={{ display: 'flex', borderBottom: '1px solid #ccc', flexShrink: 0, background: '#e9ecef' /* Light grey background for the tab bar */ }}>
-                            {agreementData.map((agreement, index) => (
-                                <button
-                                    key={agreement.sendingId}
-                                    onClick={() => handleTabClick(index)}
-                                    style={{
-                                        padding: '10px 15px',
-                                        border: 'none', // Remove default border
-                                        borderBottom: activeTabIndex === index ? '3px solid #0056b3' : '3px solid transparent', // Stronger blue for active border
-                                        background: activeTabIndex === index ? '#ffffff' : '#e9ecef', // White background for active, match bar background for inactive
-                                        color: activeTabIndex === index ? '#0056b3' : '#495057', // Darker text for inactive, blue for active
-                                        cursor: 'pointer',
-                                        fontWeight: activeTabIndex === index ? 'bold' : 'normal',
-                                        fontSize: '0.95em', // Slightly larger font
-                                        textAlign: 'center',
-                                        // Add subtle top/side borders for inactive tabs for definition
-                                        borderTop: activeTabIndex !== index ? '1px solid #dee2e6' : 'none',
-                                        borderLeft: activeTabIndex !== index ? '1px solid #dee2e6' : 'none',
-                                        borderRight: activeTabIndex !== index ? '1px solid #dee2e6' : 'none',
-                                        borderTopLeftRadius: '4px', // Slightly rounded top corners
-                                        borderTopRightRadius: '4px',
-                                        marginRight: '2px', // Small gap between tabs
-                                    }}
-                                    title={`View agreement from ${agreement.sendingName}`}
-                                >
-                                    {agreement.sendingName}
-                                </button>
-                            ))}
-                        </div>
-                    )}
+                    <div style={{ display: 'flex', borderBottom: '1px solid #ccc', flexShrink: 0, background: '#e9ecef' }}>
+                        {/* IGETC Tab */}
+                        <button
+                            key="igetc-tab"
+                            onClick={() => handleTabClick(-1)} // Use -1 index
+                            style={{
+                                // ... (copy styling from agreement tabs) ...
+                                padding: '10px 15px', border: 'none',
+                                borderBottom: isIgetcActive ? '3px solid #0056b3' : '3px solid transparent',
+                                background: isIgetcActive ? '#ffffff' : '#e9ecef',
+                                color: isIgetcActive ? '#0056b3' : '#495057',
+                                cursor: 'pointer', fontWeight: isIgetcActive ? 'bold' : 'normal',
+                                fontSize: '0.95em', textAlign: 'center',
+                                borderTop: !isIgetcActive ? '1px solid #dee2e6' : 'none',
+                                borderLeft: !isIgetcActive ? '1px solid #dee2e6' : 'none',
+                                borderRight: !isIgetcActive ? '1px solid #dee2e6' : 'none',
+                                borderTopLeftRadius: '4px', borderTopRightRadius: '4px',
+                                marginRight: '2px',
+                            }}
+                            title="View IGETC Requirements"
+                        >
+                            IGETC {isLoadingIgetc && <span style={{ marginLeft: '5px', fontStyle: 'italic' }}>(Loading...)</span>}
+                        </button>
+
+                        {/* Agreement Tabs (only if agreements exist) */}
+                        {agreementData.map((agreement, index) => (
+                            <button
+                                key={agreement.sendingId}
+                                onClick={() => handleTabClick(index)}
+                                style={{
+                                    // ... (existing styling) ...
+                                    padding: '10px 15px', border: 'none',
+                                    borderBottom: activeTabIndex === index ? '3px solid #0056b3' : '3px solid transparent',
+                                    background: activeTabIndex === index ? '#ffffff' : '#e9ecef',
+                                    color: activeTabIndex === index ? '#0056b3' : '#495057',
+                                    cursor: 'pointer', fontWeight: activeTabIndex === index ? 'bold' : 'normal',
+                                    fontSize: '0.95em', textAlign: 'center',
+                                    borderTop: activeTabIndex !== index ? '1px solid #dee2e6' : 'none',
+                                    borderLeft: activeTabIndex !== index ? '1px solid #dee2e6' : 'none',
+                                    borderRight: activeTabIndex !== index ? '1px solid #dee2e6' : 'none',
+                                    borderTopLeftRadius: '4px', borderTopRightRadius: '4px',
+                                    marginRight: '2px',
+                                }}
+                                title={`View agreement from ${agreement.sendingName}`}
+                            >
+                                {agreement.sendingName}
+                            </button>
+                        ))}
+                    </div>
                     {/* --- End PDF Tabs --- */}
 
-                    {/* Pass data for the ACTIVE PDF */}
+                    {/* PDF Viewer */}
                     <PdfViewer
-                        imageFilenames={imagesForActivePdf} // Use state for active PDF's images
-                        isLoading={isLoadingPdf && agreementData[activeTabIndex]?.pdfFilename === currentPdfFilename} // Only show loading for the active tab's fetch
-                        error={pdfError} // Show general PDF error
-                        filename={currentPdfFilename} // Pass the active filename
+                        imageFilenames={imagesForActivePdf}
+                        isLoading={isLoadingPdf} // Use general loading state
+                        error={pdfError}
+                        filename={currentPdfFilename} // Pass the active/IGETC filename
                     />
                 </div>
             </div>
diff --git a/src/components/ChatInterface.jsx b/src/components/ChatInterface.jsx
index a045d96..a00b0ca 100644
--- a/src/components/ChatInterface.jsx
+++ b/src/components/ChatInterface.jsx
@@ -67,7 +67,9 @@ function formatText(text) {
 
 // Accept new props for context
 function ChatInterface({
-    imageFilenames, // This now contains images from ALL agreements for the initial call
+    allContextImageFilenames, // <-- NEW: Combined list for payload
+    imageFilenames, // Keep if needed for display logic or initial prompt details
+    // allAgreementsImageFilenames, // Keep if needed for initial prompt details
     selectedMajorName,
     userName, // Keep userName prop for display when logged in
     isMajorsVisible,
@@ -120,7 +122,7 @@ function ChatInterface({
         // - Analysis hasn't been sent for this context yet.
         // - We are not currently loading anything (prevents race conditions).
         // - User is logged in (checked above)
-        if (imageFilenames && imageFilenames.length > 0 && !initialAnalysisSentRef.current && !isLoading) {
+        if (allContextImageFilenames && allContextImageFilenames.length > 0 && !initialAnalysisSentRef.current && !isLoading) {
 
             const sendInitialAnalysis = async () => {
                 // User/token check is still good practice here, though the outer effect also checks
@@ -150,12 +152,17 @@ ${overallContextInfo ? `**Overall Context:** ${overallContextInfo}` : ''}
 
 Analyze the provided agreement images thoroughly. Perform the following steps:
 1.  **Focus on the Current Context:** Analyze the agreement for the major between the **current sending institution** and the receiving institution.
-2.  **Explicitly state the current context:** Start your response with: "Analyzing the agreement for the [Major Name] (bold) major between [Current Sending Instituion Name] (bold) and [Receiving Institution Name] (bold) for the [academic year name] (bold) academic year."
-3.  **Provide a concise summary** of the key details for the **current** agreement (articulated courses, requirements, etc.). Identify any required courses for the major at the receiving institution that are **not articulated** by the current sending institution.
-4.  **Compare Articulation (If Applicable):** If you identified non-articulated courses in step 3 AND other sending institutions were selected (see Overall Context), examine the provided images for the **other** agreements (Sending IDs: ${allSendingInstitutionIds.filter(id => id !== sendingInstitutionId).join(', ') || 'None'}). For each non-articulated course from the current agreement, state whether it **is articulated** by any of the **other** sending institutions based on their respective agreements. Present this comparison clearly, perhaps in a separate section or list.
+2.  **Explicitly state the current context:** Start your response with: "Analyzing the agreement for the **[Major Name]** major between **[Current Sending Institution Name]** and **[Receiving Institution Name]** for the **[academic year name]** academic year." (Replace bracketed placeholders with actual names/year).
+3.  **Provide a detailed, accurate, yet concise summary** of the key details for the **current** agreement. This summary should include:
+    *   All articulated courses (sending course -> receiving course).
+    *   Any specific GPA requirements mentioned.
+    *   Any other critical requirements or notes from the agreement.
+    *   Crucially, identify any required courses for the major at the receiving institution that are **not articulated** by the current sending institution according to this agreement. List these clearly.
+4.  **Compare Articulation (If Applicable):** If you identified non-articulated courses in step 3 AND other sending institutions were selected (see Overall Context), examine the provided images for the **other** agreements (Sending IDs: ${allSendingInstitutionIds.filter(id => id !== sendingInstitutionId).join(', ') || 'None'}). For each non-articulated course from the current agreement, state whether it **is articulated** by any of the **other** sending institutions based on their respective agreements. Present this comparison clearly, perhaps in a separate section or list (e.g., "Comparison with Other Selected Colleges:").
 5.  **Suggest Next Steps:** Conclude with relevant advice or next steps for the student based on the analysis and comparison.
+6.  **Offer Education Plan:** After providing the analysis and next steps, ask the user: "Would you like me to generate a potential 2-year education plan based on this information? This plan would outline courses semester-by-semester (Fall, Spring, Summer) aiming for approximately 4 classes per Fall/Spring semester and 2 classes during the Summer, incorporating courses from the [Sending Institution(s) names](bold) to meet the requirements for the [Receiving Institution name] (bold)."
 
-**Formatting:** Use bullet points (* or -) for lists, **bold** for emphasis, and \`italic\` for course codes/titles.`;
+**Formatting:** Use bullet points (* or -) for lists, **bold** for emphasis (especially names and key terms), and \`italic\` for course codes/titles. Ensure the summary in step 3 is well-organized and easy to read.`;
                 // --- End MODIFIED Initial Prompt ---
 
                 // Display a system message while analysis runs
@@ -164,7 +171,7 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
                 const payload = {
                     new_message: initialPrompt,
                     history: [], // No history for the very first message
-                    image_filenames: imageFilenames // Send the combined list of images
+                    image_filenames: allContextImageFilenames // <-- USE COMBINED LIST
                 };
 
                 try {
@@ -209,7 +216,7 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
         // This effect depends on imageFilenames to know when context is ready,
         // and isLoading to avoid running while another request is in progress.
         // Also depends on user to re-evaluate if user logs in/out
-    }, [imageFilenames, isLoading, selectedMajorName, sendingInstitutionId, allSendingInstitutionIds, receivingInstitutionId, academicYearId, user]);
+    }, [allContextImageFilenames, isLoading, selectedMajorName, sendingInstitutionId, allSendingInstitutionIds, receivingInstitutionId, academicYearId, user]);
 
 
     const handleSend = async () => {
@@ -241,10 +248,12 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
                 content: msg.text
             }));
 
-        // Payload for subsequent messages (no image_filenames needed)
+        // Payload for subsequent messages - NOW INCLUDES ACTIVE image_filenames
         const payload = {
             new_message: currentInput,
-            history: apiHistory
+            history: apiHistory,
+            // Send the filenames relevant to the currently active view
+            image_filenames: allContextImageFilenames // <-- USE COMBINED LIST
         };
 
         // --- Backend Call ---
@@ -281,14 +290,14 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
     };
 
     // Disable input/button if loading OR if user is not logged in
-    const isInteractionDisabled = isLoading || !user || !imageFilenames || imageFilenames.length === 0;
+    const isInteractionDisabled = isLoading || !user || !allContextImageFilenames || allContextImageFilenames.length === 0;
     const isSendDisabled = isInteractionDisabled || !userInput.trim();
 
     // Adjust placeholder based on loading state, user state, and agreement context
     const placeholderText = !user
         ? "Please sign in to use the chat feature."
-        : (!imageFilenames || imageFilenames.length === 0)
-            ? "Select a major/department to chat." // New placeholder for logged-in user without context
+        : (!allContextImageFilenames || allContextImageFilenames.length === 0)
+            ? "Select a major/department to load agreements and chat." // Updated placeholder
             : isLoading
                 ? (messages.length === 0 ? "Analyzing agreement..." : "Thinking...")
                 : "Ask a follow-up question..."; // Placeholder when ready

From bbd59fac1ba83bdc1be4819c5369769fa8fc0a76 Mon Sep 17 00:00:00 2001
From: Ahmon <ahmonembaye@gmail.com>
Date: Fri, 2 May 2025 21:57:20 -0700
Subject: [PATCH 10/16] feat: Implement web search for prerequisites via
 function calling

Backend (llm_service.py):
- Defined `find_course_prerequisites` function declaration and tool for Gemini.
- Initialized Gemini model with the search tool.
- Implemented `perform_web_search` using Google Custom Search API to fetch prerequisite information.
- Modified `generate_chat_response` to handle the full function calling flow:
    - Detect function call requests from Gemini.
    - Execute `perform_web_search` with extracted arguments.
    - Send search results back to Gemini as a function response.
    - Process the final LLM response incorporating search results.
- Added checks for search API keys and engine ID in `init_llm`.

Frontend (ChatInterface.jsx):
- Updated initial system prompt to inform the LLM it can use web search for prerequisites when generating the education plan.

Environment (.env):
- Added GOOGLE_SEARCH_API_KEY and GOOGLE_SEARCH_ENGINE_ID variables.
---
 backend/college_transfer_ai/llm_service.py | 240 +++++++++++++++------
 src/components/ChatInterface.jsx           |   2 +-
 2 files changed, 178 insertions(+), 64 deletions(-)

diff --git a/backend/college_transfer_ai/llm_service.py b/backend/college_transfer_ai/llm_service.py
index 24113b6..f77ae23 100644
--- a/backend/college_transfer_ai/llm_service.py
+++ b/backend/college_transfer_ai/llm_service.py
@@ -1,11 +1,33 @@
-\
 import google.generativeai as genai
 import os
 from PIL import Image
 import io
 import traceback
+import requests # <-- Add requests import
+import json     # <-- Add json import
 from .database import get_gridfs # Import GridFS getter
 
+# --- Tool Definition ---
+from google.ai.generativelanguage import FunctionDeclaration, Tool, Part
+# Import necessary types for function response
+from google.protobuf.struct_pb2 import Struct
+
+find_prereq_func = FunctionDeclaration(
+    name="find_course_prerequisites",
+    description="Search the web to find prerequisites for a specific college course at a given institution. Only use if the information is not readily available in the provided documents or general knowledge.",
+    parameters={
+        "type_": "OBJECT",
+        "properties": {
+            "course_code": {"type_": "STRING", "description": "The course code (e.g., 'MATH 101', 'CS 50')."},
+            "institution_name": {"type_": "STRING", "description": "The full name of the college or university."},
+        },
+        "required": ["course_code", "institution_name"],
+    },
+)
+
+search_tool = Tool(function_declarations=[find_prereq_func])
+# --- End Tool Definition ---
+
 # --- Global Model Variable ---
 gemini_model = None
 
@@ -30,136 +52,228 @@
 
 # --- Initialization Function ---
 def init_llm():
-    """Initializes the Gemini LLM client."""
+    """Initializes the Gemini LLM client and checks for search API keys."""
     global gemini_model
-    if gemini_model is None:
+    if (gemini_model is None):
         try:
             google_api_key = os.getenv("GOOGLE_API_KEY")
+            google_search_api_key = os.getenv("GOOGLE_SEARCH_API_KEY") # Check search key
+            google_search_engine_id = os.getenv("GOOGLE_SEARCH_ENGINE_ID") # Check search engine ID
+
             if not google_api_key:
                 raise ValueError("GOOGLE_API_KEY environment variable not set.")
+            # Add warnings if search keys are missing, as search function will fail
+            if not google_search_api_key:
+                print("Warning: GOOGLE_SEARCH_API_KEY environment variable not set. Web search function will fail.")
+            if not google_search_engine_id:
+                print("Warning: GOOGLE_SEARCH_ENGINE_ID environment variable not set. Web search function will fail.")
+
             genai.configure(api_key=google_api_key)
-            # Use the latest flash model for speed and cost-effectiveness
+            # Initialize the model with the tool
             gemini_model = genai.GenerativeModel(
-                'gemini-1.5-flash-latest',
-                # generation_config=generation_config, # Apply config here if not using start_chat
-                # safety_settings=safety_settings # Apply safety here if not using start_chat
+                'gemini-1.5-pro-preview',
+                tools=[search_tool] # Pass the tool definition
             )
-            print("Gemini LLM initialized successfully.")
+            print("Gemini LLM initialized successfully with search tool.")
         except Exception as e:
             print(f"Error initializing Gemini LLM: {e}")
             traceback.print_exc()
             gemini_model = None # Ensure it's None on failure
 
-# --- Chat Response Generation ---
+# --- Real Web Search Function ---
+def perform_web_search(course_code, institution_name):
+    """
+    Performs a web search using Google Custom Search API to find prerequisites.
+    """
+    print(f"--- Performing REAL WEB SEARCH for '{course_code}' at '{institution_name}' ---")
+    api_key = os.getenv("GOOGLE_SEARCH_API_KEY")
+    search_engine_id = os.getenv("GOOGLE_SEARCH_ENGINE_ID")
+
+    if not api_key or not search_engine_id:
+        print("Error: Google Search API Key or Search Engine ID not configured.")
+        return "Search could not be performed due to missing configuration."
+
+    # Construct search query
+    query = f'"{institution_name}" "{course_code}" prerequisites OR requirements'
+    print(f"  Search Query: {query}")
+
+    # Google Custom Search API endpoint
+    url = f"https://www.googleapis.com/customsearch/v1"
+    params = {
+        'key': api_key,
+        'cx': search_engine_id,
+        'q': query,
+        'num': 3 # Request top 3 results
+    }
+
+    try:
+        response = requests.get(url, params=params, timeout=10) # Add timeout
+        response.raise_for_status() # Raise HTTPError for bad responses (4xx or 5xx)
+
+        search_results = response.json()
+
+        # Extract relevant snippets
+        snippets = []
+        if 'items' in search_results and search_results['items']:
+            for item in search_results['items']:
+                title = item.get('title', 'No Title')
+                snippet = item.get('snippet', 'No Snippet').replace('\n', ' ') # Clean snippet
+                link = item.get('link', '#')
+                snippets.append(f"Title: {title}\nSnippet: {snippet}\nLink: {link}")
+
+            if snippets:
+                print(f"  Found {len(snippets)} relevant results.")
+                # Combine snippets into a single string for the LLM
+                return "Web search results:\n\n" + "\n---\n".join(snippets)
+            else:
+                print("  No relevant items found in search results.")
+                return f"Web search did not find specific prerequisite information for '{course_code}' at '{institution_name}'."
+        else:
+            print("  No items found in search results.")
+            return f"Web search returned no results for prerequisites of '{course_code}' at '{institution_name}'."
+
+    except requests.exceptions.RequestException as e:
+        print(f"Error during Google Search API request: {e}")
+        return f"Web search failed due to a network or API error: {e}"
+    except json.JSONDecodeError as e:
+         print(f"Error decoding Google Search API response: {e}")
+         return "Web search failed due to invalid API response format."
+    except Exception as e:
+        print(f"An unexpected error occurred during web search: {e}")
+        traceback.print_exc()
+        return "An unexpected error occurred during web search."
+    # --- End Real Web Search ---
+
+
+# --- Chat Response Generation (Modified for Tool Use) ---
 def generate_chat_response(prompt, history, image_filenames=None):
     """
-    Generates a chat response using the Gemini LLM, optionally including images.
-
-    Args:
-        prompt (str): The user's latest message/prompt.
-        history (list): A list of previous messages in the format
-                        [{'role': 'user'/'model', 'parts': ['message text']}, ...].
-                        Note: 'model' corresponds to 'assistant' in some contexts.
-        image_filenames (list, optional): A list of filenames for images stored in GridFS
-                                          to be included in the prompt. Defaults to None.
-
-    Returns:
-        str: The generated text response from the LLM, or None if an error occurs.
+    Generates a chat response using the Gemini LLM, handling potential function calls for web search.
     """
     global gemini_model
-    if gemini_model is None:
+    if (gemini_model is None):
         init_llm()
-        if gemini_model is None: # Check if initialization failed
+        if (gemini_model is None):
             print("LLM initialization failed. Cannot generate response.")
             return None
 
     fs = None
     try:
-        # --- Construct Content List ---
+        # --- Construct Content List (Images + Prompt) ---
         content_parts = []
-
-        # 1. Add Images (if provided)
         if image_filenames:
             print(f"Processing {len(image_filenames)} image(s) for LLM...")
-            fs = get_gridfs() # Get GridFS instance
+            fs = get_gridfs()
             if not fs:
-                 print("Error: Could not get GridFS instance.")
-                 return None
-
+                print("Error: Could not get GridFS instance.")
+                return None
             for filename in image_filenames:
                 try:
                     grid_out = fs.find_one({"filename": filename})
                     if grid_out:
                         image_bytes = grid_out.read()
                         img = Image.open(io.BytesIO(image_bytes))
-                        # Ensure image format is supported (e.g., PNG, JPEG)
                         if img.format in ["PNG", "JPEG", "WEBP"]:
-                             content_parts.append(img)
-                             print(f"Added image '{filename}' to LLM content.")
+                            content_parts.append(img)
+                            # print(f"Added image '{filename}' to LLM content.") # Less verbose
                         else:
-                             print(f"Warning: Skipping image '{filename}' due to unsupported format: {img.format}")
+                            print(f"Warning: Skipping image '{filename}' due to unsupported format: {img.format}")
                     else:
                         print(f"Warning: Image '{filename}' not found in GridFS.")
                 except Exception as img_err:
                     print(f"Error processing image '{filename}': {img_err}")
-                    # Decide whether to continue or fail if an image fails
-                    # continue
-
-        # 2. Add Text Prompt
         content_parts.append(prompt)
-        print("Added text prompt to LLM content.")
+        # print("Added text prompt to LLM content.") # Less verbose
 
-        # --- Format History for Gemini API ---
-        # Gemini expects history as [{'role': 'user'/'model', 'parts': [text]}, ...]
+        # --- Format History ---
         formatted_history = []
         for msg in history:
-            # Map 'bot' or 'assistant' to 'model'
             role = 'model' if msg.get('role') in ['bot', 'assistant'] else 'user'
-            # Ensure 'content' exists and create the 'parts' list
             text_content = msg.get('content', '')
+            # Handle potential previous function calls/responses in history if needed
+            # For simplicity, assuming history only contains user/model text for now
             formatted_history.append({'role': role, 'parts': [text_content]})
 
         # --- Start Chat and Send Message ---
         print("Starting LLM chat session...")
         chat = gemini_model.start_chat(history=formatted_history)
 
-        print("Sending message to LLM...")
-        # Pass safety settings and config to send_message
+        print("Sending message to LLM (potential function call)...")
         response = chat.send_message(
             content_parts,
             generation_config=generation_config,
             safety_settings=safety_settings,
-            stream=False # Set to False for a single response object
+            stream=False
         )
 
-        print("Received response from LLM.")
-        # --- Process Response ---
-        # Handle potential blocks or empty responses
+        # --- Handle Function Call ---
+        # Check if the response contains a function call request
+        if response.candidates and response.candidates[0].content.parts:
+            first_part = response.candidates[0].content.parts[0]
+            if hasattr(first_part, 'function_call') and first_part.function_call:
+                function_call = first_part.function_call
+                print(f"LLM requested function call: {function_call.name}")
+
+                if function_call.name == "find_course_prerequisites":
+                    # Extract arguments
+                    args = function_call.args
+                    course = args.get('course_code')
+                    institution = args.get('institution_name')
+                    print(f"  Arguments: course='{course}', institution='{institution}'")
+
+                    if course and institution:
+                        # Execute the REAL search
+                        search_result_text = perform_web_search(course, institution) # Calls the new function
+                        print(f"  Web search result snippet: {search_result_text[:200]}...") # Log snippet
+
+                        # --- Send Function Response back to LLM ---
+                        # Create the Struct for the function response content
+                        response_data = Struct()
+                        response_data.update({"result": search_result_text})
+
+                        function_response = Part(
+                            function_response={
+                                "name": "find_course_prerequisites",
+                                "response": response_data,
+                            }
+                        )
+
+                        print("Sending function response back to LLM...")
+                        # Send the function response to continue the conversation
+                        response = chat.send_message(
+                            function_response,
+                            stream=False
+                        )
+                        # The final response should now be in this new 'response' object
+                    else:
+                        print("Error: Missing arguments for function call.")
+                        # Handle error - maybe send back an error message to LLM?
+                        # For now, just proceed without calling function
+                        pass # Fall through to process the (likely incomplete) response
+                else:
+                    print(f"Warning: Received unhandled function call request: {function_call.name}")
+                    # Handle other function calls if defined, or ignore
+
+        # --- Process Final Response (after potential function call) ---
+        print("Processing final LLM response.")
         if response.parts:
-            # Check for finish_reason if needed (e.g., SAFETY, RECITATION)
-            # print(f"LLM Finish Reason: {response.prompt_feedback}") # or response.candidates[0].finish_reason
             return response.text
         else:
-            print("Warning: LLM response was empty or blocked.")
-            # You might want to inspect response.prompt_feedback or response.candidates[0].finish_reason
+            # Handle blocks or empty responses as before
+            print("Warning: Final LLM response was empty or blocked.")
             print(f"Prompt Feedback: {response.prompt_feedback}")
             if response.candidates and response.candidates[0].finish_reason:
-                 print(f"Finish Reason: {response.candidates[0].finish_reason}")
-                 print(f"Safety Ratings: {response.candidates[0].safety_ratings}")
-
-            # Return a specific message or None based on the block reason
+                print(f"Finish Reason: {response.candidates[0].finish_reason}")
+                print(f"Safety Ratings: {response.candidates[0].safety_ratings}")
             block_reason = "Unknown"
             if response.prompt_feedback and response.prompt_feedback.block_reason:
-                 block_reason = response.prompt_feedback.block_reason.name
+                block_reason = response.prompt_feedback.block_reason.name
             return f"[LLM response blocked due to: {block_reason}]"
 
-
     except Exception as e:
         print(f"LLM generation error: {e}")
         traceback.print_exc()
-        return None # Indicate failure
+        return None
     finally:
-        # Note: GridFS connection closing is handled by the context manager in get_gridfs if implemented that way,
-        # or needs explicit closing if not. Assuming get_gridfs handles it or connection pooling is used.
-        pass
+        pass # GridFS connection managed elsewhere
 
diff --git a/src/components/ChatInterface.jsx b/src/components/ChatInterface.jsx
index a00b0ca..5c2525a 100644
--- a/src/components/ChatInterface.jsx
+++ b/src/components/ChatInterface.jsx
@@ -160,7 +160,7 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
     *   Crucially, identify any required courses for the major at the receiving institution that are **not articulated** by the current sending institution according to this agreement. List these clearly.
 4.  **Compare Articulation (If Applicable):** If you identified non-articulated courses in step 3 AND other sending institutions were selected (see Overall Context), examine the provided images for the **other** agreements (Sending IDs: ${allSendingInstitutionIds.filter(id => id !== sendingInstitutionId).join(', ') || 'None'}). For each non-articulated course from the current agreement, state whether it **is articulated** by any of the **other** sending institutions based on their respective agreements. Present this comparison clearly, perhaps in a separate section or list (e.g., "Comparison with Other Selected Colleges:").
 5.  **Suggest Next Steps:** Conclude with relevant advice or next steps for the student based on the analysis and comparison.
-6.  **Offer Education Plan:** After providing the analysis and next steps, ask the user: "Would you like me to generate a potential 2-year education plan based on this information? This plan would outline courses semester-by-semester (Fall, Spring, Summer) aiming for approximately 4 classes per Fall/Spring semester and 2 classes during the Summer, incorporating courses from the [Sending Institution(s) names](bold) to meet the requirements for the [Receiving Institution name] (bold)."
+6.  **Offer Education Plan:** After providing the analysis and next steps, ask the user: "Would you like me to generate a potential 2-year education plan based on this information? If yes, I will outline courses semester-by-semester (Year 1 Fall, Year 1 Spring, Year 1 Summer, Year 2 Fall, Year 2 Spring, Year 2 Summer) aiming for approximately 4 classes per Fall/Spring semester and 2 classes during the Summer. This plan will incorporate courses from the **[Sending Institution(s) names]** to meet the requirements for the **[Receiving Institution name]**. For each course, I will include its *unit count* and *check for common prerequisites* using my knowledge base. If the prerequisite information isn't readily available, I can perform a web search to find it. Importantly, I will ensure that any identified prerequisite course is placed in a semester *before* the course that requires it."
 
 **Formatting:** Use bullet points (* or -) for lists, **bold** for emphasis (especially names and key terms), and \`italic\` for course codes/titles. Ensure the summary in step 3 is well-organized and easy to read.`;
                 // --- End MODIFIED Initial Prompt ---

From 611ccff4af2190003f8a5bb5016855ebf950fafa Mon Sep 17 00:00:00 2001
From: Ahmon <ahmonembaye@gmail.com>
Date: Sun, 4 May 2025 10:33:30 -0700
Subject: [PATCH 11/16] Revert "fix: Using gemini-2.5-flash and ensure
 countdown runs continuously"

This reverts commit 34b5d16ad37afb015f456047f17359107db8d9ae.
---
 backend/college_transfer_ai/__init__.py       |  68 +--
 backend/college_transfer_ai/config.py         |  38 +-
 backend/college_transfer_ai/database.py       |  13 +
 backend/college_transfer_ai/llm_service.py    | 317 +++++++------
 .../routes/agreement_routes.py                | 247 +++++-----
 .../college_transfer_ai/routes/user_routes.py |  94 ++--
 backend/college_transfer_ai/utils.py          |  68 ++-
 src/components/AgreementViewerPage.jsx        | 442 ++++++------------
 src/components/ChatInterface.jsx              |  37 +-
 9 files changed, 651 insertions(+), 673 deletions(-)

diff --git a/backend/college_transfer_ai/__init__.py b/backend/college_transfer_ai/__init__.py
index 9386344..49c7694 100644
--- a/backend/college_transfer_ai/__init__.py
+++ b/backend/college_transfer_ai/__init__.py
@@ -1,57 +1,59 @@
 import os
 import traceback
-from flask import Flask
+from flask import Flask, jsonify, request
 from flask_cors import CORS
 
 # Import configuration, database setup, and blueprints
 from .config import load_configuration
-from .database import init_db
+from .database import init_db, close_db
 from .routes.stripe_routes import stripe_bp
-from .routes.agreement_routes import agreement_bp, init_gemini # Import init_gemini
+# Remove init_gemini import from agreement_routes
+# from .routes.agreement_routes import agreement_bp, init_gemini # Import init_gemini
+from .routes.agreement_routes import agreement_bp
 from .routes.course_map_routes import course_map_bp
 from .routes.user_routes import user_bp
+# Import the correct init function from llm_service
+from .llm_service import init_llm
 
 def create_app():
     """Flask application factory."""
     app = Flask(__name__)
-
     print("--- Creating Flask App ---")
 
+    config = None # Initialize config variable
     try:
         # Load configuration
         config = load_configuration()
-        app.config['APP_CONFIG'] = config # Store config for access in blueprints
+        app.config['APP_CONFIG'] = config # Store config for access in blueprints if needed
     except Exception as config_err:
         print(f"!!! CRITICAL: Failed to load configuration: {config_err}")
-        traceback.print_exc()
-        # Exit if config is essential and failed to load
-        exit(1)
+        # Decide if the app should exit or continue with defaults/limited functionality
+        # For now, let it continue, but LLM/DB might fail later
+        config = {} # Use an empty config to avoid None errors later
 
-    # Initialize CORS
-    # Be more specific with origins in production
-    cors_origins = config.get("FRONTEND_URL", "*") # Default to '*' if not set
-    CORS(app, resources={r"/*": {"origins": cors_origins}})
-    print(f"--- CORS Initialized (Origins: {cors_origins}) ---")
+    # Initialize CORS (using config)
+    frontend_url = config.get("FRONTEND_URL", "http://localhost:5173") # Default if missing
+    CORS(app, resources={r"/api/*": {"origins": frontend_url}}, supports_credentials=True)
+    print(f"--- CORS Initialized (Origins: {frontend_url}) ---")
 
-    # Initialize Database
+    # Initialize Database (using config)
     try:
-        init_db(config.get('MONGO_URI'))
-    except ConnectionError as db_err:
-        print(f"!!! CRITICAL: Could not connect to database on startup: {db_err}")
-        # Depending on requirements, you might exit or continue with DB unavailable
-        exit(1) # Example: Exit if DB is essential
-    except Exception as general_db_err:
-        print(f"!!! CRITICAL: Unexpected error initializing database: {general_db_err}")
-        traceback.print_exc()
-        exit(1)
-
+        mongo_uri = config.get("MONGO_URI")
+        if not mongo_uri:
+            raise ValueError("MONGO_URI not found in configuration.")
+        init_db(mongo_uri)
+    except Exception as db_err:
+        print(f"!!! CRITICAL: Failed to initialize Database: {db_err}")
+        # Decide if the app should exit
 
-    # Initialize Gemini (if using GOOGLE_API_KEY)
+    # Initialize LLM Service (passing config)
     try:
-        init_gemini(config.get('GOOGLE_API_KEY'))
-    except Exception as gemini_err:
-        print(f"!!! WARNING: Failed to initialize Gemini: {gemini_err}")
-        # App can likely continue without Gemini, just log the warning
+        print("Initializing LLM Service...")
+        init_llm(config) # <-- Pass the loaded config dictionary
+    except Exception as llm_err:
+        print(f"!!! WARNING: Failed to initialize LLM Service: {llm_err}")
+        traceback.print_exc()
+        # App can likely continue without LLM, just log the warning
 
     # Register Blueprints with optional API prefix
     api_prefix = '/api' # Example prefix, adjust as needed or remove if using '/'
@@ -67,4 +69,12 @@ def index():
         return "College Transfer AI Backend is running."
 
     print("--- Flask App Creation Complete ---")
+
     return app
+
+if __name__ == '__main__':
+    app = create_app()
+    print("--- Starting Flask Server ---")
+    # Use host/port from config or defaults
+    debug_mode = True # Or get from config/env
+    app.run(host='0.0.0.0', port=5000, debug=debug_mode)
\ No newline at end of file
diff --git a/backend/college_transfer_ai/config.py b/backend/college_transfer_ai/config.py
index c65c7f8..8b285e3 100644
--- a/backend/college_transfer_ai/config.py
+++ b/backend/college_transfer_ai/config.py
@@ -1,22 +1,41 @@
-import os
 from dotenv import load_dotenv
+import os
 
 def load_configuration():
     """Loads environment variables and returns them in a dictionary."""
+    print("--- Attempting to load configuration ---")
     # Assuming .env is at the project root (two levels up from this file's directory)
-    dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
-    load_dotenv(dotenv_path=dotenv_path)
+    config_dir = os.path.dirname(__file__)
+    project_root = os.path.abspath(os.path.join(config_dir, '..', '..'))
+    dotenv_path = os.path.join(project_root, '.env')
+
+    print(f"Config directory: {config_dir}")
+    print(f"Project root guess: {project_root}")
+    print(f"Calculated .env path: {dotenv_path}")
+    print(f"Does .env exist at path? {os.path.exists(dotenv_path)}")
+
+    # Load the .env file
+    loaded_ok = load_dotenv(dotenv_path=dotenv_path, verbose=True) # Add verbose=True
+    print(f"load_dotenv successful? {loaded_ok}")
+
+    # Check the key IMMEDIATELY after loading
+    google_api_key_after_load = os.getenv("GOOGLE_API_KEY")
+    print(f"GOOGLE_API_KEY immediately after load_dotenv: {'Set' if google_api_key_after_load else 'Not Set'}")
+    if google_api_key_after_load:
+         # Print a few chars to confirm it's not empty (avoid printing full key)
+         print(f"  (Starts with: {google_api_key_after_load[:4]}...)")
+
 
     config = {
         "MONGO_URI": os.getenv("MONGO_URI"),
         "GOOGLE_CLIENT_ID": os.getenv("GOOGLE_CLIENT_ID"),
-        "GOOGLE_API_KEY": os.getenv("GOOGLE_API_KEY"), # For Gemini if needed
-        "OPENAI_API_KEY": os.getenv("OPENAI_API_KEY"), # If still used
+        "GOOGLE_API_KEY": google_api_key_after_load, # Use the value we just checked
+        "OPENAI_API_KEY": os.getenv("OPENAI_API_KEY"),
         "STRIPE_SECRET_KEY": os.getenv("STRIPE_SECRET_KEY"),
         "STRIPE_PRICE_ID": os.getenv("STRIPE_PRICE_ID"),
         "STRIPE_WEBHOOK_SECRET": os.getenv("STRIPE_WEBHOOK_SECRET"),
         "FRONTEND_URL": os.getenv("FRONTEND_URL", "http://localhost:5173"),
-        # Add other config variables as needed
+        "PERPLEXITY_API_KEY": os.getenv("PERPLEXITY_API_KEY"),
     }
     # Basic validation
     if not config["MONGO_URI"]:
@@ -26,12 +45,5 @@ def load_configuration():
     # Add more checks as needed
 
     print("--- Configuration Loaded ---")
-    # Print loaded values for debugging (consider removing sensitive keys in production logs)
-    # print(f"MONGO_URI: {'Set' if config['MONGO_URI'] else 'Not Set'}")
-    # print(f"GOOGLE_CLIENT_ID: {'Set' if config['GOOGLE_CLIENT_ID'] else 'Not Set'}")
-    # print(f"STRIPE_SECRET_KEY: {'Set' if config['STRIPE_SECRET_KEY'] else 'Not Set'}")
-    # print(f"STRIPE_WEBHOOK_SECRET: {'Set' if config['STRIPE_WEBHOOK_SECRET'] else 'Not Set'}")
-    # print(f"FRONTEND_URL: {config['FRONTEND_URL']}")
     return config
 
-# config = load_configuration() # Optionally load here if needed globally at import time
diff --git a/backend/college_transfer_ai/database.py b/backend/college_transfer_ai/database.py
index c09ddb2..75d56f0 100644
--- a/backend/college_transfer_ai/database.py
+++ b/backend/college_transfer_ai/database.py
@@ -51,3 +51,16 @@ def get_course_maps_collection():
      if course_maps_collection is None:
          raise Exception("Course maps collection not initialized.")
      return course_maps_collection
+
+def get_agreement_summaries_collection(): # Add getter for summaries
+    if agreement_summaries_collection is None:
+        raise Exception("Agreement summaries collection not initialized.")
+    return agreement_summaries_collection
+
+def close_db(exception=None):
+    """Closes the MongoDB connection."""
+    global mongo_client
+    if mongo_client:
+        print("--- Closing MongoDB Connection ---")
+        mongo_client.close()
+        mongo_client = None # Optional: Reset global variable
diff --git a/backend/college_transfer_ai/llm_service.py b/backend/college_transfer_ai/llm_service.py
index f77ae23..e8e93b3 100644
--- a/backend/college_transfer_ai/llm_service.py
+++ b/backend/college_transfer_ai/llm_service.py
@@ -1,17 +1,22 @@
-import google.generativeai as genai
 import os
-from PIL import Image
-import io
 import traceback
-import requests # <-- Add requests import
-import json     # <-- Add json import
-from .database import get_gridfs # Import GridFS getter
+import requests
+import json
 
-# --- Tool Definition ---
+# --- Restore Google Gemini Imports ---
+import google.generativeai as genai
 from google.ai.generativelanguage import FunctionDeclaration, Tool, Part
-# Import necessary types for function response
 from google.protobuf.struct_pb2 import Struct
+# --- Restore Image/GridFS Imports ---
+from PIL import Image
+import io
+from .database import get_gridfs # Import GridFS getter
+
+# --- Perplexity API Configuration (for search function) ---
+PERPLEXITY_API_URL = "https://api.perplexity.ai/chat/completions"
+PERPLEXITY_MODEL = "sonar-medium-online" # Use an online model for search
 
+# --- Restore Google Tool Definition ---
 find_prereq_func = FunctionDeclaration(
     name="find_course_prerequisites",
     description="Search the web to find prerequisites for a specific college course at a given institution. Only use if the information is not readily available in the provided documents or general knowledge.",
@@ -24,212 +29,219 @@
         "required": ["course_code", "institution_name"],
     },
 )
-
 search_tool = Tool(function_declarations=[find_prereq_func])
 # --- End Tool Definition ---
 
-# --- Global Model Variable ---
+# --- Global Gemini Model Variable ---
 gemini_model = None
 
-# --- Safety and Generation Config ---
-# Define safety settings - adjust as needed
+# --- Restore Google Safety and Generation Config ---
 safety_settings = [
     {"category": "HARM_CATEGORY_HARASSMENT", "threshold": "BLOCK_MEDIUM_AND_ABOVE"},
     {"category": "HARM_CATEGORY_HATE_SPEECH", "threshold": "BLOCK_MEDIUM_AND_ABOVE"},
     {"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT", "threshold": "BLOCK_MEDIUM_AND_ABOVE"},
     {"category": "HARM_CATEGORY_DANGEROUS_CONTENT", "threshold": "BLOCK_MEDIUM_AND_ABOVE"},
 ]
-
-# Define generation config - adjust as needed
 generation_config = genai.types.GenerationConfig(
-    # candidate_count=1, # Default is 1
-    # stop_sequences=["\n"], # Example stop sequence
-    max_output_tokens=8192, # Maximize output tokens for detailed analysis
-    temperature=0.7, # Adjust creativity/determinism (0.0-1.0)
-    # top_p=0.9, # Nucleus sampling
-    # top_k=40 # Top-k sampling
+    max_output_tokens=8192,
+    temperature=0.7,
 )
+# --- End Google Config ---
 
-# --- Initialization Function ---
-def init_llm():
-    """Initializes the Gemini LLM client and checks for search API keys."""
+# --- Modified Initialization Function (Accepts config) ---
+def init_llm(config): # <-- Accept config dictionary
+    """Initializes the Gemini LLM client using provided configuration."""
+    print("--- Initializing LLM Service ---")
     global gemini_model
-    if (gemini_model is None):
+    if gemini_model is None:
         try:
-            google_api_key = os.getenv("GOOGLE_API_KEY")
-            google_search_api_key = os.getenv("GOOGLE_SEARCH_API_KEY") # Check search key
-            google_search_engine_id = os.getenv("GOOGLE_SEARCH_ENGINE_ID") # Check search engine ID
+            # Get keys from the config dictionary
+            google_api_key = config.get('GOOGLE_API_KEY')
+            perplexity_api_key = config.get('PERPLEXITY_API_KEY') # Check Perplexity key too
+
+            # More informative print:
+            print(f"LLM Service Check: GOOGLE_API_KEY is {'SET' if google_api_key else 'NOT SET'} (from config)", google_api_key)
 
             if not google_api_key:
-                raise ValueError("GOOGLE_API_KEY environment variable not set.")
-            # Add warnings if search keys are missing, as search function will fail
-            if not google_search_api_key:
-                print("Warning: GOOGLE_SEARCH_API_KEY environment variable not set. Web search function will fail.")
-            if not google_search_engine_id:
-                print("Warning: GOOGLE_SEARCH_ENGINE_ID environment variable not set. Web search function will fail.")
-
-            genai.configure(api_key=google_api_key)
-            # Initialize the model with the tool
-            gemini_model = genai.GenerativeModel(
-                'gemini-1.5-pro-preview',
-                tools=[search_tool] # Pass the tool definition
-            )
-            print("Gemini LLM initialized successfully with search tool.")
+                print("Warning: GOOGLE_API_KEY not found in config. Gemini API will not function.")
+                gemini_model = None
+                # Optionally raise an error if Gemini is critical
+                # raise ValueError("GOOGLE_API_KEY missing in configuration.")
+            else:
+                print("LLM Service: Configuring Gemini with API key (from config)...")
+                genai.configure(api_key=google_api_key)
+                # Initialize the Gemini model with the tool
+                gemini_model = genai.GenerativeModel(
+                    'gemini-1.5-flash-latest', # Or your preferred Gemini model
+                    tools=[search_tool]
+                )
+                print("Gemini LLM initialized successfully with search tool.")
+
+            # Check and report Perplexity key status
+            if perplexity_api_key:
+                 print("Perplexity API key found in config for search function.")
+            else:
+                print("Warning: PERPLEXITY_API_KEY not found in config. Web search function will fail.")
+
         except Exception as e:
-            print(f"Error initializing Gemini LLM: {e}")
+            print(f"Error initializing LLM services: {e}")
             traceback.print_exc()
             gemini_model = None # Ensure it's None on failure
 
-# --- Real Web Search Function ---
-def perform_web_search(course_code, institution_name):
+# --- Web Search Function (Uses os.getenv - Consider passing config here too) ---
+def perform_web_search(course_code, institution_name, config): # <-- Pass config
     """
-    Performs a web search using Google Custom Search API to find prerequisites.
+    Uses Perplexity API to search for prerequisites and returns its response content.
     """
-    print(f"--- Performing REAL WEB SEARCH for '{course_code}' at '{institution_name}' ---")
-    api_key = os.getenv("GOOGLE_SEARCH_API_KEY")
-    search_engine_id = os.getenv("GOOGLE_SEARCH_ENGINE_ID")
-
-    if not api_key or not search_engine_id:
-        print("Error: Google Search API Key or Search Engine ID not configured.")
-        return "Search could not be performed due to missing configuration."
-
-    # Construct search query
-    query = f'"{institution_name}" "{course_code}" prerequisites OR requirements'
-    print(f"  Search Query: {query}")
-
-    # Google Custom Search API endpoint
-    url = f"https://www.googleapis.com/customsearch/v1"
-    params = {
-        'key': api_key,
-        'cx': search_engine_id,
-        'q': query,
-        'num': 3 # Request top 3 results
+    print(f"--- Performing WEB SEARCH via Perplexity for '{course_code}' at '{institution_name}' ---")
+    perplexity_api_key = config.get("PERPLEXITY_API_KEY") # <-- Get from config
+    if not perplexity_api_key:
+        print("Error: PERPLEXITY_API_KEY not set in config. Cannot perform Perplexity search.")
+        return "Search could not be performed due to missing Perplexity configuration."
+
+    # Simple prompt for Perplexity
+    search_prompt = f"What are the prerequisites for the course '{course_code}' at '{institution_name}'? Provide details from official sources if possible."
+
+    headers = {
+        "Authorization": f"Bearer {perplexity_api_key}",
+        "Content-Type": "application/json",
+        "Accept": "application/json",
+    }
+    payload = {
+        "model": PERPLEXITY_MODEL,
+        "messages": [
+            {"role": "system", "content": "You are an AI assistant helping find course prerequisites."},
+            {"role": "user", "content": search_prompt}
+        ],
+        "temperature": 0.3, # Lower temperature for more factual search results
+        "max_tokens": 500, # Limit response length from Perplexity
     }
 
     try:
-        response = requests.get(url, params=params, timeout=10) # Add timeout
-        response.raise_for_status() # Raise HTTPError for bad responses (4xx or 5xx)
-
-        search_results = response.json()
-
-        # Extract relevant snippets
-        snippets = []
-        if 'items' in search_results and search_results['items']:
-            for item in search_results['items']:
-                title = item.get('title', 'No Title')
-                snippet = item.get('snippet', 'No Snippet').replace('\n', ' ') # Clean snippet
-                link = item.get('link', '#')
-                snippets.append(f"Title: {title}\nSnippet: {snippet}\nLink: {link}")
-
-            if snippets:
-                print(f"  Found {len(snippets)} relevant results.")
-                # Combine snippets into a single string for the LLM
-                return "Web search results:\n\n" + "\n---\n".join(snippets)
-            else:
-                print("  No relevant items found in search results.")
-                return f"Web search did not find specific prerequisite information for '{course_code}' at '{institution_name}'."
+        response = requests.post(
+            PERPLEXITY_API_URL,
+            headers=headers,
+            json=payload,
+            timeout=60 # Timeout for Perplexity search
+        )
+        response.raise_for_status()
+        result = response.json()
+
+        if result.get("choices") and result["choices"][0].get("message"):
+            content = result["choices"][0]["message"].get("content")
+            print(f"  Perplexity search successful. Result snippet: {content[:100]}...")
+            return content.strip() if content else "Perplexity returned an empty response."
         else:
-            print("  No items found in search results.")
-            return f"Web search returned no results for prerequisites of '{course_code}' at '{institution_name}'."
+            print(f"  Warning: Unexpected response format from Perplexity search: {result}")
+            return "Perplexity search returned an unexpected format."
 
+    except requests.exceptions.Timeout:
+        print("  Error: Request to Perplexity API timed out during search.")
+        return "Perplexity search timed out."
     except requests.exceptions.RequestException as e:
-        print(f"Error during Google Search API request: {e}")
-        return f"Web search failed due to a network or API error: {e}"
-    except json.JSONDecodeError as e:
-         print(f"Error decoding Google Search API response: {e}")
-         return "Web search failed due to invalid API response format."
+        print(f"  Error during Perplexity API search request: {e}")
+        return f"Perplexity search failed: {e}"
     except Exception as e:
-        print(f"An unexpected error occurred during web search: {e}")
-        traceback.print_exc()
-        return "An unexpected error occurred during web search."
-    # --- End Real Web Search ---
+        print(f"  An unexpected error occurred during Perplexity search: {e}")
+        return "An unexpected error occurred during Perplexity search."
+# --- End Web Search Function ---
 
 
-# --- Chat Response Generation (Modified for Tool Use) ---
-def generate_chat_response(prompt, history, image_filenames=None):
+# --- Chat Response Generation (Using Gemini with Function Calling AND Image Support) ---
+def generate_chat_response(prompt, history, image_filenames=None, config=None): # <-- Accept config
     """
-    Generates a chat response using the Gemini LLM, handling potential function calls for web search.
+    Generates a chat response using the Gemini LLM, handling images and
+    potential function calls to perform web search via Perplexity.
+    Requires config if web search might be needed.
     """
     global gemini_model
-    if (gemini_model is None):
-        init_llm()
-        if (gemini_model is None):
+    if gemini_model is None:
+        if not config:
+             print("Error: LLM not initialized and no config provided to initialize it.")
+             return "[LLM Service Error: Not Initialized]"
+        init_llm(config) # Try to initialize if config is provided
+        if gemini_model is None:
             print("LLM initialization failed. Cannot generate response.")
-            return None
+            return "[LLM Service Error: Initialization Failed]"
 
-    fs = None
+    fs = None # Initialize fs
     try:
         # --- Construct Content List (Images + Prompt) ---
         content_parts = []
         if image_filenames:
-            print(f"Processing {len(image_filenames)} image(s) for LLM...")
-            fs = get_gridfs()
+            print(f"Processing {len(image_filenames)} image(s) for Gemini...")
+            fs = get_gridfs() # Get GridFS instance
             if not fs:
-                print("Error: Could not get GridFS instance.")
-                return None
-            for filename in image_filenames:
-                try:
-                    grid_out = fs.find_one({"filename": filename})
-                    if grid_out:
-                        image_bytes = grid_out.read()
-                        img = Image.open(io.BytesIO(image_bytes))
-                        if img.format in ["PNG", "JPEG", "WEBP"]:
+                print("Error: Could not get GridFS instance for image processing.")
+                # Decide how to proceed: return error or continue without images?
+                # Let's continue without images for now, but log the error.
+            else:
+                for filename in image_filenames:
+                    try:
+                        grid_out = fs.find_one({"filename": filename})
+                        if grid_out:
+                            image_bytes = grid_out.read()
+                            # Verify image format if necessary, Gemini supports PNG, JPEG, WEBP, HEIC, HEIF
+                            img = Image.open(io.BytesIO(image_bytes))
+                            # Append the PIL Image object directly
                             content_parts.append(img)
-                            # print(f"Added image '{filename}' to LLM content.") # Less verbose
+                            print(f"  Added image '{filename}' to content parts.")
                         else:
-                            print(f"Warning: Skipping image '{filename}' due to unsupported format: {img.format}")
-                    else:
-                        print(f"Warning: Image '{filename}' not found in GridFS.")
-                except Exception as img_err:
-                    print(f"Error processing image '{filename}': {img_err}")
+                            print(f"Warning: Image '{filename}' not found in GridFS.")
+                    except Exception as img_err:
+                        print(f"Error processing image '{filename}': {img_err}")
+                        # Continue processing other images/prompt
+
+        # Always add the text prompt
         content_parts.append(prompt)
-        # print("Added text prompt to LLM content.") # Less verbose
+        print("Added text prompt to LLM content.")
+        # --- End Content List Construction ---
+
 
-        # --- Format History ---
+        # --- Format History (for Gemini) ---
         formatted_history = []
         for msg in history:
             role = 'model' if msg.get('role') in ['bot', 'assistant'] else 'user'
-            text_content = msg.get('content', '')
-            # Handle potential previous function calls/responses in history if needed
-            # For simplicity, assuming history only contains user/model text for now
-            formatted_history.append({'role': role, 'parts': [text_content]})
+            # Ensure history parts are correctly formatted if function calls were involved previously
+            # Assuming simple text history for now
+            formatted_history.append({'role': role, 'parts': [msg.get('content', '')]})
 
         # --- Start Chat and Send Message ---
-        print("Starting LLM chat session...")
+        print("Starting Gemini LLM chat session...")
         chat = gemini_model.start_chat(history=formatted_history)
 
-        print("Sending message to LLM (potential function call)...")
+        print("Sending message to Gemini (potential function call)...")
         response = chat.send_message(
-            content_parts,
+            content_parts, # Pass the list containing images and text
             generation_config=generation_config,
             safety_settings=safety_settings,
             stream=False
         )
 
-        # --- Handle Function Call ---
-        # Check if the response contains a function call request
+        # --- Handle Function Call (if requested by Gemini) ---
         if response.candidates and response.candidates[0].content.parts:
             first_part = response.candidates[0].content.parts[0]
             if hasattr(first_part, 'function_call') and first_part.function_call:
                 function_call = first_part.function_call
-                print(f"LLM requested function call: {function_call.name}")
+                print(f"Gemini requested function call: {function_call.name}")
 
                 if function_call.name == "find_course_prerequisites":
-                    # Extract arguments
                     args = function_call.args
                     course = args.get('course_code')
                     institution = args.get('institution_name')
                     print(f"  Arguments: course='{course}', institution='{institution}'")
 
                     if course and institution:
-                        # Execute the REAL search
-                        search_result_text = perform_web_search(course, institution) # Calls the new function
-                        print(f"  Web search result snippet: {search_result_text[:200]}...") # Log snippet
+                        if not config:
+                             print("Error: Config needed for web search but not provided.")
+                             search_result_text = "Web search failed: Configuration missing."
+                        else:
+                             # Execute the search using Perplexity via our function
+                             search_result_text = perform_web_search(course, institution, config) # <-- Pass config
 
-                        # --- Send Function Response back to LLM ---
-                        # Create the Struct for the function response content
+                        # --- Send Function Response back to Gemini ---
                         response_data = Struct()
-                        response_data.update({"result": search_result_text})
+                        response_data.update({"result": search_result_text}) # Send Perplexity's response text
 
                         function_response = Part(
                             function_response={
@@ -238,7 +250,7 @@ def generate_chat_response(prompt, history, image_filenames=None):
                             }
                         )
 
-                        print("Sending function response back to LLM...")
+                        print("Sending function response (from Perplexity search) back to Gemini...")
                         # Send the function response to continue the conversation
                         response = chat.send_message(
                             function_response,
@@ -247,20 +259,18 @@ def generate_chat_response(prompt, history, image_filenames=None):
                         # The final response should now be in this new 'response' object
                     else:
                         print("Error: Missing arguments for function call.")
-                        # Handle error - maybe send back an error message to LLM?
-                        # For now, just proceed without calling function
-                        pass # Fall through to process the (likely incomplete) response
+                        # Handle error - maybe send back an error message to Gemini?
+                        pass # Fall through
                 else:
                     print(f"Warning: Received unhandled function call request: {function_call.name}")
-                    # Handle other function calls if defined, or ignore
 
-        # --- Process Final Response (after potential function call) ---
-        print("Processing final LLM response.")
+        # --- Process Final Gemini Response ---
+        print("Processing final Gemini response.")
         if response.parts:
             return response.text
         else:
-            # Handle blocks or empty responses as before
-            print("Warning: Final LLM response was empty or blocked.")
+            # Handle blocks or empty responses
+            print("Warning: Final Gemini response was empty or blocked.")
             print(f"Prompt Feedback: {response.prompt_feedback}")
             if response.candidates and response.candidates[0].finish_reason:
                 print(f"Finish Reason: {response.candidates[0].finish_reason}")
@@ -268,12 +278,13 @@ def generate_chat_response(prompt, history, image_filenames=None):
             block_reason = "Unknown"
             if response.prompt_feedback and response.prompt_feedback.block_reason:
                 block_reason = response.prompt_feedback.block_reason.name
-            return f"[LLM response blocked due to: {block_reason}]"
+            return f"[LLM response blocked due to: {block_reason}]" # Gemini block reason
 
     except Exception as e:
-        print(f"LLM generation error: {e}")
+        print(f"LLM generation error (Gemini): {e}")
         traceback.print_exc()
-        return None
+        return None # Or an error message string
     finally:
-        pass # GridFS connection managed elsewhere
+        # GridFS connection is managed by the getter, no explicit close needed here
+        pass
 
diff --git a/backend/college_transfer_ai/routes/agreement_routes.py b/backend/college_transfer_ai/routes/agreement_routes.py
index 8a72982..a2ec074 100644
--- a/backend/college_transfer_ai/routes/agreement_routes.py
+++ b/backend/college_transfer_ai/routes/agreement_routes.py
@@ -5,38 +5,40 @@
 from PIL import Image
 from flask import Blueprint, jsonify, request, Response, current_app
 from bson.objectid import ObjectId
-from datetime import datetime, timezone # Import datetime
 # Remove OpenAI import if not used
 # from openai import OpenAI
 
 # Import necessary functions/objects from other modules
 from ..utils import verify_google_token, get_or_create_user, check_and_update_usage
-# Use getter functions for all collections now
-# from ..database import get_db, get_gridfs, get_agreement_summaries_collection # Removed get_agreement_summaries_collection
-from ..database import get_db, get_gridfs # Updated import
+from ..database import get_db, get_gridfs # Use getter functions
 from ..college_transfer_API import CollegeTransferAPI
-# Import LLM service functions
-from ..llm_service import generate_chat_response as llm_generate_chat_response, init_llm as llm_init_llm
 
-# --- Remove Gemini-specific imports ---
-# import google.generativeai as genai # Removed
-# from PIL import Image # Keep PIL if used elsewhere (e.g., image processing)
-# import io # Keep io if used elsewhere (e.g., image processing)
-# --- End Remove Gemini-specific imports ---
+# --- Google AI Imports ---
+import google.generativeai as genai
+from google.generativeai.types import HarmCategory, HarmBlockThreshold
+# --- End Google AI Imports ---
 
 FREE_TIER_LIMIT = 10
 PREMIUM_TIER_LIMIT = 200 # Example limit for paid users
 
 agreement_bp = Blueprint('agreement_bp', __name__)
 
-# --- Remove Gemini Initialization ---
-# gemini_model = None # Removed
-# safety_settings = [...] # Removed
-# generation_config = ... # Removed
-# def init_gemini(): # Removed
-#     global gemini_model
-#     # ... removed initialization logic ...
-# --- End Remove Gemini Initialization ---
+# --- Initialize Gemini ---
+# Store model in app context instead of global? For now, global is simpler.
+gemini_model = None
+def init_gemini(api_key):
+    global gemini_model
+    if not api_key:
+        print("Warning: GOOGLE_API_KEY not set. Gemini features will be disabled.")
+        return
+    try:
+        genai.configure(api_key=api_key)
+        # Consider making model name configurable
+        gemini_model = genai.GenerativeModel('gemini-2.5-flash-preview-04-17')
+        print("--- Gemini Initialized Successfully ---")
+    except Exception as e:
+        print(f"!!! Gemini Initialization Error: {e}")
+        gemini_model = None # Ensure it's None if init fails
 
 # --- API Instance ---
 # Initialize CollegeTransferAPI here or in create_app if needed globally
@@ -112,18 +114,13 @@ def get_majors():
 @agreement_bp.route('/articulation-agreements', methods=['POST'])
 def get_articulation_agreements():
     data = request.get_json()
-    # sending_ids = data.get('sending_ids') # Expecting a list - Changed key name
-    sending_ids = data.get('sendingInstitutionIds') # Match frontend key
-    # receiving_id = data.get('receiving_id') # Changed key name
-    receiving_id = data.get('receivingInstitutionId') # Match frontend key
-    # year_id = data.get('year_id') # Changed key name
-    year_id = data.get('academicYearId') # Match frontend key
-    major_key = data.get('majorKey') # Match frontend key
+    sending_ids = data.get('sending_ids') # Expecting a list
+    receiving_id = data.get('receiving_id')
+    year_id = data.get('year_id')
+    major_key = data.get('major_key')
 
     if not sending_ids or not isinstance(sending_ids, list) or not receiving_id or not year_id or not major_key:
-        # return jsonify({"error": "Missing or invalid parameters (sending_ids list, receiving_id, year_id, major_key)"}), 400
-        return jsonify({"error": "Missing or invalid parameters (sendingInstitutionIds list, receivingInstitutionId, academicYearId, majorKey)"}), 400
-
+        return jsonify({"error": "Missing or invalid parameters (sending_ids list, receiving_id, year_id, major_key)"}), 400
 
     results = []
     errors = []
@@ -133,17 +130,14 @@ def get_articulation_agreements():
         try:
             # Fetch name first (assuming it's less likely to fail than PDF fetch)
             try:
-                 # Ensure ID is integer if API expects it
-                 sending_name = api.get_institution_name(int(sending_id)) or sending_name
+                 sending_name = api.get_institution_name(sending_id) # Hypothetical method
             except Exception as name_err:
                  print(f"Warning: Could not fetch name for sending ID {sending_id}: {name_err}")
 
-            # Ensure IDs are integers if API expects it
-            pdf_filename = api.get_articulation_agreement(int(year_id), int(sending_id), int(receiving_id), major_key)
-
+            pdf_filename = api.get_articulation_agreement(year_id, sending_id, receiving_id, major_key)
 
             results.append({
-                 "sendingId": sending_id, # Keep original ID format from request
+                 "sendingId": sending_id,
                  "sendingName": sending_name,
                  "pdfFilename": pdf_filename # Will be None if not found
             })
@@ -160,7 +154,7 @@ def get_articulation_agreements():
             # For now, just add to errors list. The loop continues.
             # Ensure name is included even on error
             results.append({
-                 "sendingId": sending_id, # Keep original ID format from request
+                 "sendingId": sending_id,
                  "sendingName": sending_name,
                  "pdfFilename": None,
                  "error": str(e) # Add error detail to the specific item
@@ -182,41 +176,6 @@ def get_articulation_agreements():
          # At least one PDF found, potentially with other non-PDF results or errors handled above
          return jsonify({"agreements": results}), 200
 
-# --- NEW IGETC Route ---
-@agreement_bp.route('/igetc-agreement', methods=['GET'])
-def get_igetc_agreement_route():
-    """
-    Fetches the IGETC agreement PDF filename for a given sending institution and year.
-    """
-    academic_year_id = request.args.get('academicYearId')
-    sending_institution_id = request.args.get('sendingId')
-
-    if not academic_year_id or not sending_institution_id:
-        return jsonify({"error": "Missing required parameters (academicYearId, sendingId)"}), 400
-
-    try:
-        # Convert IDs to integers if necessary (depends on your API method)
-        year_id = int(academic_year_id)
-        sending_id = int(sending_institution_id)
-
-        print(f"Fetching IGETC agreement for Sending ID: {sending_id}, Year ID: {year_id}")
-        pdf_filename = api.get_igetc_courses(year_id, sending_id)
-
-        if pdf_filename:
-            print(f"Found/Generated IGETC PDF: {pdf_filename}")
-            return jsonify({"pdfFilename": pdf_filename}), 200
-        else:
-            print(f"Could not find or generate IGETC PDF for Sending ID: {sending_id}, Year ID: {year_id}")
-            return jsonify({"error": "IGETC agreement not found or could not be generated."}), 404
-
-    except ValueError:
-        return jsonify({"error": "Invalid ID format. IDs must be integers."}), 400
-    except Exception as e:
-        error_msg = f"Error fetching IGETC agreement for Sending ID {sending_institution_id}: {e}"
-        print(error_msg)
-        traceback.print_exc()
-        return jsonify({"error": "Failed to fetch IGETC agreement.", "details": str(e)}), 500
-# --- End NEW IGETC Route ---
 
 @agreement_bp.route('/pdf-images/<path:filename>', methods=['GET'])
 def get_pdf_images(filename):
@@ -313,49 +272,123 @@ def get_image(filename):
 
 # --- Chat Endpoint ---
 @agreement_bp.route('/chat', methods=['POST'])
-@verify_google_token
-def handle_chat(user_info):
-    llm_init_llm()
+def chat_endpoint():
+    config = current_app.config['APP_CONFIG']
+    GOOGLE_CLIENT_ID = config.get('GOOGLE_CLIENT_ID')
+    # GOOGLE_API_KEY is implicitly used by genai.configure in init_gemini
 
-    data = request.get_json()
-    new_message = data.get('new_message')
-    history = data.get('history', [])
-    # Always try to get image_filenames from the request
-    image_filenames = data.get('image_filenames') # Could be None or []
+    if not GOOGLE_CLIENT_ID:
+         return jsonify({"error": "Google Client ID not configured."}), 500
+    if not gemini_model: # Check if Gemini was initialized
+         return jsonify({"error": "Chat feature disabled: Gemini model not available."}), 503 # Service Unavailable
 
-    if not new_message:
-        return jsonify({"error": "No message provided"}), 400
+    fs = get_gridfs() # Get GridFS instance
 
-    user_id = user_info.get('user_id')
-    if not user_id:
-         return jsonify({"error": "User ID not found in token"}), 401
+    # 1. Authentication & Authorization
+    try:
+        auth_header = request.headers.get('Authorization')
+        if not auth_header or not auth_header.startswith('Bearer '):
+            return jsonify({"error": "Authorization token missing or invalid"}), 401
+        token = auth_header.split(' ')[1]
+        user_info = verify_google_token(token, GOOGLE_CLIENT_ID)
+        user_data = get_or_create_user(user_info)
+
+        # 2. Rate Limiting / Usage Check
+        if not check_and_update_usage(user_data):
+            # Prepare message about limit exceeded, including reset time
+            from datetime import datetime, timedelta, time, timezone # Ensure imports
+            now = datetime.now(timezone.utc)
+            tomorrow = now.date() + timedelta(days=1)
+            tomorrow_midnight_utc = datetime.combine(tomorrow, time(0, 0), tzinfo=timezone.utc)
+            reset_time_str = tomorrow_midnight_utc.strftime('%Y-%m-%d %H:%M:%S %Z')
+            limit = PREMIUM_TIER_LIMIT if user_data.get('tier') == 'premium' else FREE_TIER_LIMIT
+            return jsonify({
+                "error": f"Usage limit ({limit} requests/day) exceeded for your tier ('{user_data.get('tier')}'). Please try again after {reset_time_str}."
+            }), 429 # Too Many Requests
+
+    except ValueError as auth_err:
+        return jsonify({"error": str(auth_err)}), 401
+    except Exception as usage_err:
+        # Handle potential errors from check_and_update_usage (e.g., DB error)
+        print(f"Error during usage check: {usage_err}")
+        traceback.print_exc()
+        return jsonify({"error": "Could not verify usage limits."}), 500
 
-    usage_allowed, usage_message = check_and_update_usage(user_id)
-    if not usage_allowed:
-        return jsonify({"error": usage_message}), 429
+    # 3. Process Request Data
+    data = request.get_json()
+    if not data or 'new_message' not in data:
+        return jsonify({"error": "Missing 'new_message' in request body"}), 400
+
+    new_message_text = data['new_message']
+    history = data.get('history', []) # List of {'role': 'user'/'assistant', 'content': '...'}
+    image_filenames = data.get('image_filenames', []) # Only expected for initial analysis
 
-    # --- Simplified Logic ---
-    # No longer need to distinguish initial vs. follow-up for image handling here
-    print(f"Handling chat message. Including {len(image_filenames) if image_filenames else 0} images.")
+    # 4. Prepare Content for Gemini
+    prompt_parts = []
 
+    # Add image data if provided (for initial analysis)
+    if image_filenames:
+        print(f"Processing {len(image_filenames)} images for chat...")
+        image_mime_type = "image/png" # Assuming PNG from our generation step
+        for img_filename in image_filenames:
+            try:
+                grid_out = fs.find_one({"filename": img_filename})
+                if grid_out:
+                    image_data = grid_out.read()
+                    prompt_parts.append({"mime_type": image_mime_type, "data": image_data})
+                else:
+                    print(f"Warning: Image '{img_filename}' not found in GridFS.")
+            except Exception as img_err:
+                print(f"Error reading image '{img_filename}' from GridFS: {img_err}")
+                # Decide how to handle missing images - skip or return error?
+                # For now, just skip the missing image
+                # return jsonify({"error": f"Failed to load image {img_filename}"}), 500
+
+    # Add the latest user message text
+    prompt_parts.append(new_message_text)
+
+    # 5. Call Gemini API
     try:
-        # Call the imported LLM function, always passing image_filenames
-        # The llm_service function will handle if image_filenames is None or empty
-        llm_reply = llm_generate_chat_response(new_message, history, image_filenames)
-
-        if llm_reply and not llm_reply.startswith("[LLM response blocked"):
-            return jsonify({"reply": llm_reply})
-        elif llm_reply: # Handle block message
-             print(f"LLM response blocked: {llm_reply}")
-             # Return a user-friendly error, maybe masking the specific block reason
-             return jsonify({"error": "Failed to get response due to content restrictions."}), 500
-             # Or return the specific block message if desired:
-             # return jsonify({"error": f"Failed to get response: {llm_reply}"}), 500
-        else:
-            # Handle LLM generation failure (returned None)
-            return jsonify({"error": "Failed to get response from LLM."}), 500
+        print("Sending request to Gemini...")
+        # Construct conversation history for the API
+        api_history = []
+        for msg in history:
+             # Map 'assistant' role from frontend/db to 'model' for Gemini API
+             role = 'model' if msg.get('role') == 'assistant' else msg.get('role')
+             # Ensure role is valid and content exists
+             if role in ['user', 'model'] and msg.get('content'):
+                 api_history.append({'role': role, 'parts': [msg['content']]})
+
+        # Start chat session if history exists
+        chat_session = gemini_model.start_chat(history=api_history)
+        response = chat_session.send_message(
+            prompt_parts,
+            stream=False, # Set to True for streaming response
+            safety_settings={ # Adjust safety settings as needed
+                HarmCategory.HARM_CATEGORY_HARASSMENT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
+                HarmCategory.HARM_CATEGORY_HATE_SPEECH: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
+                HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
+                HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
+            }
+        )
+
+        # Check for safety blocks or empty response
+        if not response.parts:
+             # Investigate response.prompt_feedback if needed
+             print("Gemini response blocked or empty. Feedback:", response.prompt_feedback)
+             try:
+                 # Attempt to access safety ratings safely
+                 safety_feedback = response.prompt_feedback.safety_ratings if response.prompt_feedback else "No feedback available."
+             except Exception as feedback_err:
+                 safety_feedback = f"Error accessing feedback: {feedback_err}"
+             return jsonify({"error": "Response blocked due to safety settings or empty response.", "details": str(safety_feedback)}), 400
+
+        reply_text = response.text
+        print("Received reply from Gemini.")
+        return jsonify({"reply": reply_text})
 
     except Exception as e:
-        print(f"Error during chat processing: {e}")
+        print(f"Error calling Gemini API: {e}")
         traceback.print_exc()
-        return jsonify({"error": f"Server error during chat: {e}"}), 500
+        # Provide a more generic error to the user
+        return jsonify({"error": "Failed to get response from AI assistant."}), 500
\ No newline at end of file
diff --git a/backend/college_transfer_ai/routes/user_routes.py b/backend/college_transfer_ai/routes/user_routes.py
index feda92a..da77416 100644
--- a/backend/college_transfer_ai/routes/user_routes.py
+++ b/backend/college_transfer_ai/routes/user_routes.py
@@ -1,6 +1,6 @@
 from flask import Blueprint, jsonify, request, current_app
 from datetime import datetime, timedelta, time, timezone
-import traceback
+import traceback # Import traceback
 
 # Import necessary functions/objects from other modules
 from ..utils import verify_google_token, get_or_create_user, FREE_TIER_LIMIT, PREMIUM_TIER_LIMIT
@@ -8,61 +8,65 @@
 user_bp = Blueprint('user_bp', __name__)
 
 @user_bp.route('/user-status', methods=['GET'])
-def get_user_status():
-    print("--- !!! GET /api/user-status endpoint hit !!! ---") # Add this line
-    config = current_app.config['APP_CONFIG']
-    GOOGLE_CLIENT_ID = config.get('GOOGLE_CLIENT_ID')
-    if not GOOGLE_CLIENT_ID:
-         return jsonify({"error": "Google Client ID not configured."}), 500
+@verify_google_token
+def get_user_status(user_info):
+    user_id = user_info.get('sub')
+    if not user_id:
+        print("Error: 'sub' key missing in user_info provided by verify_google_token.")
+        # Return a JSON response for consistency
+        return jsonify({"error": "User ID ('sub') not found in verified token information"}), 401
 
     try:
-        auth_header = request.headers.get('Authorization')
-        if not auth_header or not auth_header.startswith('Bearer '):
-            return jsonify({"error": "Authorization token missing or invalid"}), 401
-        token = auth_header.split(' ')[1]
-
-        user_info = verify_google_token(token, GOOGLE_CLIENT_ID)
         user_data = get_or_create_user(user_info)
 
-        tier = user_data.get('tier', 'free')
-        limit = PREMIUM_TIER_LIMIT if tier == 'premium' else FREE_TIER_LIMIT
-        requests_used = user_data.get('requests_used_this_period', 0)
-        period_start = user_data.get('period_start_date')
-
-        now = datetime.now(timezone.utc) # Use timezone-aware
-        reset_time_iso = None
+        if not user_data:
+            print(f"Error: Failed to get or create user for google_id {user_id}.")
+            return jsonify({"error": "Failed to retrieve or create user profile"}), 500
 
-        # Calculate reset time (assuming daily reset at UTC midnight)
-        try:
-            tomorrow = now.date() + timedelta(days=1)
-            tomorrow_midnight_utc = datetime.combine(tomorrow, time(0, 0), tzinfo=timezone.utc)
-            reset_time_iso = tomorrow_midnight_utc.isoformat(timespec='seconds') # Use ISO format with seconds
-        except Exception as time_err:
-            print(f"Error calculating reset time: {time_err}")
-            reset_time_iso = "Error calculating reset time"
+        # Extract relevant status info
+        usage_count = user_data.get("requests_used_this_period", 0) # ADJUST FIELD NAME IF NEEDED
+        is_subscribed = user_data.get("is_subscribed", False)
+        subscription_expires = user_data.get("subscription_expires")
+        expires_str = subscription_expires.isoformat() if subscription_expires and isinstance(subscription_expires, datetime) else None # Add type check
+        user_tier = user_data.get('tier', 'free')
 
+        # Calculate the specific usage limit based on tier
+        current_usage_limit = PREMIUM_TIER_LIMIT if user_tier == 'premium' else FREE_TIER_LIMIT
 
-        # Check if usage needs reset for display purposes (doesn't update DB here)
-        display_requests_used = requests_used
-        if period_start and isinstance(period_start, datetime):
-             if period_start.tzinfo is None:
+        # Calculate the next reset time (assuming daily reset at midnight UTC)
+        period_start = user_data.get('period_start_date') # Get the start date from DB
+        reset_time_iso = None
+        if period_start and isinstance(period_start, datetime): # Add type check
+            # Ensure period_start is timezone-aware (assuming it's stored as UTC)
+            if period_start.tzinfo is None:
                  period_start = period_start.replace(tzinfo=timezone.utc)
-             if period_start.date() < now.date():
-                 display_requests_used = 0 # Display as 0 if period has reset
+            # Calculate the start of the *next* day in UTC
+            today_start_utc = datetime.combine(period_start.date(), time.min, tzinfo=timezone.utc)
+            next_reset_utc = today_start_utc + timedelta(days=1)
+            reset_time_iso = next_reset_utc.isoformat()
+        else: # Handle missing or invalid period_start
+             print(f"Warning: period_start_date missing or invalid for user {user_id}. Calculating default reset time.")
+             now_utc = datetime.now(timezone.utc)
+             today_start_utc = datetime.combine(now_utc.date(), time.min, tzinfo=timezone.utc)
+             next_reset_utc = today_start_utc + timedelta(days=1)
+             reset_time_iso = next_reset_utc.isoformat()
 
-        print(f"User status requested for {user_data.get('google_user_id')}: Used={display_requests_used}, Limit={limit}, Tier={tier}, Resets={reset_time_iso}")
 
+        # Return the data structure expected by the frontend
         return jsonify({
-            "tier": tier,
-            "usageCount": display_requests_used,
-            "usageLimit": limit,
-            "resetTime": reset_time_iso # ISO 8601 format string (UTC)
+            "usageCount": usage_count,
+            "is_subscribed": is_subscribed,
+            "subscription_expires": expires_str,
+            "tier": user_tier,
+            "usageLimit": current_usage_limit,
+            "resetTime": reset_time_iso
         }), 200
 
-    except ValueError as auth_err:
-        print(f"[/user-status] Authentication error: {auth_err}")
-        return jsonify({"error": str(auth_err)}), 401
-    except Exception as e:
-        print(f"Error getting user status: {e}")
+    except ValueError as ve: # Catch specific errors if needed
+        print(f"ValueError during user status processing for {user_id}: {ve}")
         traceback.print_exc()
-        return jsonify({"error": f"Internal server error: {str(e)}"}), 500
+        return jsonify({"error": f"Failed to process user information: {ve}"}), 400
+    except Exception as e: # General catch-all for 500 errors
+        print(f"Unhandled error fetching user status for {user_id}: {e}")
+        traceback.print_exc() # Print the full traceback to the console
+        return jsonify({"error": "Internal Server Error"}), 500 # Generic message to client
diff --git a/backend/college_transfer_ai/utils.py b/backend/college_transfer_ai/utils.py
index 71c297a..547f7d3 100644
--- a/backend/college_transfer_ai/utils.py
+++ b/backend/college_transfer_ai/utils.py
@@ -107,7 +107,8 @@ def check_and_update_usage(user_data):
     """
     Checks if the user is within their usage limit based on tier.
     Resets daily usage if necessary. Increments usage count if within limit.
-    Returns True if usage is allowed, False otherwise.
+    Returns tuple (bool, str): (True, success_message) if usage is allowed, 
+    (False, error_message) otherwise.
     Raises Exception on database error.
     """
     users_collection = get_users_collection() # Get collection via function
@@ -142,7 +143,7 @@ def check_and_update_usage(user_data):
     # --- Check if limit is exceeded ---
     if requests_used >= limit:
         print(f"Usage limit exceeded for user {google_user_id} (Tier: {tier}, Used: {requests_used}, Limit: {limit})")
-        return False # Limit exceeded
+        return False, f"Usage limit reached: {requests_used}/{limit} requests. Upgrade your plan for more requests or wait for the next reset period."
 
     # --- If limit is not exceeded, increment count ---
     try:
@@ -175,9 +176,70 @@ def check_and_update_usage(user_data):
              raise Exception(f"User {google_user_id} not found during usage update.")
 
         print(f"Usage updated for user {google_user_id}: {requests_used + 1}/{limit}")
-        return True # Usage allowed and updated
+        return True, f"Request allowed. Usage: {requests_used + 1}/{limit}."
     except Exception as e:
         print(f"Error updating usage count for user {google_user_id}: {e}")
         # Add traceback here if it's not already in the calling function's handler
         traceback.print_exc()
         raise Exception(f"Failed to update usage count: {e}")
+
+# Example structure for utils.py
+
+import os
+from functools import wraps
+from flask import request, jsonify, current_app # Assuming Flask context
+# Import Google auth libraries
+from google.oauth2 import id_token
+from google.auth.transport import requests as google_requests
+
+GOOGLE_CLIENT_ID = os.getenv("GOOGLE_CLIENT_ID") # Ensure this is loaded correctly
+
+def verify_google_token(f):
+    @wraps(f)
+    def decorated_function(*args, **kwargs):
+        token = None
+        # Extract Bearer token from Authorization header
+        auth_header = request.headers.get('Authorization')
+        if (auth_header):
+            parts = auth_header.split()
+            if len(parts) == 2 and parts[0].lower() == 'bearer':
+                token = parts[1]
+
+        if not token:
+            print("Decorator Error: Authorization token is missing")
+            return jsonify({"error": "Authorization token is missing"}), 401
+
+        if not GOOGLE_CLIENT_ID:
+             print("Decorator Error: GOOGLE_CLIENT_ID is not set in environment variables.")
+             return jsonify({"error": "Server configuration error: Google Client ID not set."}), 500
+
+        try:
+            # Verify the token and get user info
+            idinfo = id_token.verify_oauth2_token(
+                token, google_requests.Request(), GOOGLE_CLIENT_ID
+            )
+
+            # --- Verification Point ---
+            # Ensure 'sub' is present after successful verification
+            if 'sub' not in idinfo:
+                 print(f"Decorator Error: 'sub' key not found in verified token payload: {idinfo}")
+                 return jsonify({"error": "Token verified, but user identifier ('sub') is missing."}), 401
+
+            # --- Crucial Step ---
+            # Pass the complete idinfo dictionary to the decorated route function
+            return f(idinfo, *args, **kwargs)
+
+        except ValueError as e:
+            # Handles common token validation errors (expired, audience, etc.)
+            print(f"Decorator Error: Invalid token - {e}")
+            # It's helpful to return the specific error detail from Google's library
+            return jsonify({"error": "Invalid or expired token", "details": str(e)}), 401
+        except Exception as e:
+            # Catch unexpected errors during verification
+            print(f"Decorator Error: Unexpected error during token verification - {e}")
+            traceback.print_exc() # Log the full traceback
+            return jsonify({"error": "Token verification failed", "details": str(e)}), 500
+
+    return decorated_function
+
+# ... other utility functions ...
diff --git a/src/components/AgreementViewerPage.jsx b/src/components/AgreementViewerPage.jsx
index 547e52e..dc53cfe 100644
--- a/src/components/AgreementViewerPage.jsx
+++ b/src/components/AgreementViewerPage.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useRef, useCallback, useMemo } from 'react';
-import { useParams, useLocation } from 'react-router-dom';
+import { useParams, useLocation } from 'react-router-dom'; // Import useLocation
 import PdfViewer from './PdfViewer';
 import ChatInterface from './ChatInterface';
 import { fetchData } from '../services/api';
@@ -65,20 +65,13 @@ function AgreementViewerPage({ user, userTier }) {
     const [hasDepartmentsAvailable, setHasDepartmentsAvailable] = useState(true);
     const [isLoadingAvailability, setIsLoadingAvailability] = useState(true);
 
-    // --- MODIFIED State for Multiple PDFs/Tabs ---
-    const [agreementData, setAgreementData] = useState([]);
-    // START WITH IGETC TAB ACTIVE
-    const [activeTabIndex, setActiveTabIndex] = useState(-1); // Index for agreements, -1 for IGETC
-    const [imagesForActivePdf, setImagesForActivePdf] = useState([]);
-    const [allAgreementsImageFilenames, setAllAgreementsImageFilenames] = useState([]);
+    // --- NEW State for Multiple PDFs/Tabs ---
+    const [agreementData, setAgreementData] = useState([]); // Array of { sendingId, sendingName, pdfFilename }
+    const [activeTabIndex, setActiveTabIndex] = useState(0); // Index of the currently viewed PDF/Tab
+    const [imagesForActivePdf, setImagesForActivePdf] = useState([]); // Renamed for clarity
+    const [allAgreementsImageFilenames, setAllAgreementsImageFilenames] = useState([]); // NEW: For initial chat analysis
 
-    // --- NEW State for IGETC ---
-    const [igetcPdfFilename, setIgetcPdfFilename] = useState(null);
-    const [isLoadingIgetc, setIsLoadingIgetc] = useState(false);
-    const [igetcImageFilenames, setIgetcImageFilenames] = useState([]); // <-- ADDED: State for IGETC images
-    // --- End IGETC State ---
-
-    // --- State for User Usage Status ---
+    // --- NEW State for User Usage Status ---
     const [usageStatus, setUsageStatus] = useState({
         usageCount: null,
         usageLimit: null,
@@ -89,12 +82,10 @@ function AgreementViewerPage({ user, userTier }) {
     const [countdown, setCountdown] = useState('');
     // --- End Usage Status State ---
 
-    // --- Derived state for the currently active agreement/view ---
-    const isIgetcActive = activeTabIndex === -1;
-    const currentAgreement = !isIgetcActive ? (agreementData[activeTabIndex] || null) : null;
-    // Use the *first* sending institution for IGETC context, or the current agreement's
-    const contextSendingId = isIgetcActive ? (allSelectedSendingInstitutions[0]?.id || initialSendingId) : (currentAgreement?.sendingId || initialSendingId);
-    const currentPdfFilename = isIgetcActive ? igetcPdfFilename : (currentAgreement?.pdfFilename || null);
+    // --- Derived state for the currently active agreement ---
+    const currentAgreement = agreementData[activeTabIndex] || null;
+    const currentSendingId = currentAgreement?.sendingId || initialSendingId; // Fallback to URL param if needed initially
+    const currentPdfFilename = currentAgreement?.pdfFilename || null;
 
     // --- Effect to Fetch User Usage Status ---
     useEffect(() => {
@@ -151,7 +142,7 @@ function AgreementViewerPage({ user, userTier }) {
             console.log("Clearing countdown display because conditions not met.");
         }
     // This effect runs when the conditions required to *start* the display change
-    }, [usageStatus.resetTime, agreementData, isLoadingPdf, isIgetcActive]); // Added isIgetcActive
+    }, [usageStatus.resetTime, agreementData, isLoadingPdf]);
 
     // --- Effect to RUN the Countdown Interval ---
     useEffect(() => {
@@ -326,132 +317,125 @@ function AgreementViewerPage({ user, userTier }) {
 
     }, [initialSendingId, receivingId, yearId, selectedCategory, isLoadingAvailability, hasMajorsAvailable, hasDepartmentsAvailable]);
 
-    // --- MODIFIED Effect to fetch agreement details AND initial images ---
+    // --- MODIFIED Effect to fetch agreement details AND ALL initial images ---
     const fetchAgreementDetailsAndImages = useCallback(async () => {
-        // REMOVED: setIgetcPdfFilename(null); // Keep IGETC data persistent
-        // REMOVED: if (isIgetcActive) setActiveTabIndex(0); // Don't switch here
-
         if (!selectedMajorKey || allSelectedSendingInstitutions.length === 0 || !receivingId || !yearId) {
-            // Clear only agreement-specific data if no major is selected
             setAgreementData([]);
-            setAllAgreementsImageFilenames([]);
-            // Don't clear imagesForActivePdf if IGETC might be active
-            if (!isIgetcActive) {
-                setImagesForActivePdf([]);
-            }
+            setAllAgreementsImageFilenames([]); // Clear all images
+            setImagesForActivePdf([]); // Clear active images
             return;
         }
 
-        setIsLoadingPdf(true);
+        setIsLoadingPdf(true); // Use this state for the overall loading
         setPdfError(null);
-        setAgreementData([]); // Clear previous agreements
+        setAgreementData([]);
         setAllAgreementsImageFilenames([]);
-        // Don't clear imagesForActivePdf yet, wait until fetch completes or fails
+        setImagesForActivePdf([]);
 
-        let fetchedAgreements = [];
+        let fetchedAgreements = []; // To store results from /articulation-agreements
 
         try {
+            // 1. Fetch PDF filenames for all agreements
             const sendingIds = allSelectedSendingInstitutions.map(inst => inst.id);
             console.log("Fetching agreements list for Sending IDs:", sendingIds, selectedMajorKey);
-            // Assuming the API endpoint takes sendingIds, receivingId, yearId, majorKey
             const response = await fetchData('/articulation-agreements', {
-                method: 'POST', // Or GET with query params, adjust as needed
+                method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({
-                    sendingInstitutionIds: sendingIds,
-                    receivingInstitutionId: receivingId,
-                    academicYearId: yearId,
-                    majorKey: selectedMajorKey,
-                    categoryCode: selectedCategory // Pass category if needed by backend
-                })
+                body: JSON.stringify({ sending_ids: sendingIds, receiving_id: receivingId, year_id: yearId, major_key: selectedMajorKey })
             });
 
             if (!response || !Array.isArray(response.agreements)) {
-                throw new Error(response?.error || 'Invalid response format for agreements');
+                throw new Error(response?.error || "Invalid response format from /articulation-agreements");
             }
 
-            // Map response agreements and add sending institution names
+            // Map response to include names
             fetchedAgreements = response.agreements.map(agreement => {
                 const sendingInst = allSelectedSendingInstitutions.find(inst => inst.id === agreement.sendingId);
-                return {
-                    ...agreement, // Spread existing agreement properties (like pdfFilename, sendingId)
-                    sendingName: sendingInst ? sendingInst.name : 'Unknown Sending Institution'
-                };
+                return { ...agreement, sendingName: sendingInst ? sendingInst.name : `Sending ID ${agreement.sendingId}` };
             });
-            setAgreementData(fetchedAgreements); // Set the fetched agreements
-
-            // --- Fetch all images in parallel ---
-            // Filter out agreements without a pdfFilename before attempting to fetch images
-            const agreementsWithPdfs = fetchedAgreements.filter(agreement => agreement.pdfFilename);
-            const imageFetchPromises = agreementsWithPdfs.map(agreement =>
-                fetchData(`pdf-images/${encodeURIComponent(agreement.pdfFilename)}`)
-                    .then(imageResponse => ({
-                        sendingId: agreement.sendingId, // Keep track of which agreement these images belong to
-                        images: imageResponse?.image_filenames || [],
-                        error: imageResponse?.error
-                    }))
-                    .catch(err => ({ // Catch fetch errors for individual image sets
-                        sendingId: agreement.sendingId,
-                        images: [],
-                        error: `Failed to fetch images for ${agreement.sendingName}: ${err.message}`
-                    }))
-            );
+            console.log("Received agreement list:", fetchedAgreements);
+            setAgreementData(fetchedAgreements);
+            setActiveTabIndex(0); // Set first tab active
+
+            // 2. Fetch image filenames for ALL valid PDFs in parallel
+            const imageFetchPromises = fetchedAgreements
+                .filter(agreement => agreement.pdfFilename) // Only fetch for those with a filename
+                .map(agreement =>
+                    fetchData(`pdf-images/${encodeURIComponent(agreement.pdfFilename)}`)
+                        .then(imgResponse => {
+                            if (imgResponse && imgResponse.image_filenames) {
+                                return { sendingId: agreement.sendingId, images: imgResponse.image_filenames };
+                            } else {
+                                console.warn(`No images found for ${agreement.pdfFilename}`);
+                                return { sendingId: agreement.sendingId, images: [] }; // Return empty array on failure/no images
+                            }
+                        })
+                        .catch(err => {
+                            console.error(`Error fetching images for ${agreement.pdfFilename}:`, err);
+                            return { sendingId: agreement.sendingId, images: [] }; // Return empty array on error
+                        })
+                );
+
             const imageResults = await Promise.allSettled(imageFetchPromises);
-            const allImagesCombined = imageResults.reduce(/* ... */); // Existing logic
+
+            const allImagesCombined = imageResults.reduce((acc, result) => {
+                if (result.status === 'fulfilled' && result.value.images.length > 0) {
+                    // Optionally add context comment for LLM?
+                    // acc.push(`--- Images for Sending ID ${result.value.sendingId} ---`);
+                    acc.push(...result.value.images);
+                }
+                return acc;
+            }, []);
+
+            console.log("Combined image filenames for initial analysis:", allImagesCombined);
             setAllAgreementsImageFilenames(allImagesCombined);
 
-            // --- Set images for the first agreement tab (index 0) ---
+            // 3. Fetch images for the *initially active* PDF (tab 0) for the viewer
             const firstAgreement = fetchedAgreements[0];
-            let firstAgreementImages = [];
             if (firstAgreement && firstAgreement.pdfFilename) {
-                const firstAgreementImagesResult = imageResults.find(/* ... */); // Existing logic to find images for first agreement
+                // Find the corresponding images from the parallel fetch results
+                const firstAgreementImagesResult = imageResults.find(result => result.status === 'fulfilled' && result.value.sendingId === firstAgreement.sendingId);
                 if (firstAgreementImagesResult && firstAgreementImagesResult.value.images.length > 0) {
-                    firstAgreementImages = firstAgreementImagesResult.value.images;
+                     setImagesForActivePdf(firstAgreementImagesResult.value.images);
                 } else {
-                    console.warn(`No images loaded for the first agreement: ${firstAgreement.sendingName}`);
+                     // Handle case where even the first PDF's images failed to load
+                     setPdfError(`Failed to load images for the initial agreement: ${firstAgreement.sendingName}`);
+                     setImagesForActivePdf([]);
                 }
+            } else if (fetchedAgreements.length > 0) {
+                setPdfError(`No PDF filename found for the initial agreement: ${fetchedAgreements[0].sendingName}.`);
+                setImagesForActivePdf([]);
+            } else {
+                setPdfError("No agreements found for the selected major and institutions.");
+                setImagesForActivePdf([]);
             }
 
-            // --- NOW switch to the first agreement tab and set its images ---
-            setActiveTabIndex(0);
-            setImagesForActivePdf(firstAgreementImages);
-            if (firstAgreementImages.length === 0 && firstAgreement) {
-                 setPdfError(`No PDF or images found for ${firstAgreement.sendingName}.`);
-            } else if (!firstAgreement) {
-                 setPdfError("No agreements found for the selected major.");
-            }
-
-
         } catch (err) {
             console.error("Error fetching agreement details and images:", err);
             setPdfError(`Failed to load agreement details: ${err.message}`);
             setAgreementData([]);
             setAllAgreementsImageFilenames([]);
             setImagesForActivePdf([]);
-            // Optionally switch back to IGETC or show an error state?
-            // setActiveTabIndex(-1); // Or keep it on the (now empty) agreement tab?
         } finally {
             setIsLoadingPdf(false);
         }
+    }, [selectedMajorKey, allSelectedSendingInstitutions, receivingId, yearId]); // Dependencies
 
-    }, [selectedMajorKey, allSelectedSendingInstitutions, receivingId, yearId, selectedCategory, isIgetcActive]); // Added missing dependencies
-
-    // --- MODIFIED Effect to fetch images for the ACTIVE PDF VIEWER (Agreement Tab) ---
-    const fetchImagesForActiveAgreementTab = useCallback(async () => {
-        if (isIgetcActive) return; // Don't run if IGETC is active
-
+    // --- Effect to fetch images ONLY for the ACTIVE PDF VIEWER when tab changes ---
+    const fetchImagesForActiveTab = useCallback(async () => {
         const activeAgreement = agreementData[activeTabIndex];
         if (!activeAgreement || !activeAgreement.pdfFilename) {
-            setImagesForActivePdf([]);
+            setImagesForActivePdf([]); // Clear if no active agreement or filename
             if (activeAgreement) setPdfError(`No PDF available for ${activeAgreement.sendingName}.`);
             return;
         }
-        // ... (rest of the existing logic inside this function remains the same) ...
-        // Set loading, clear error/images, fetch images, handle response/error, set loading false.
-        setIsLoadingPdf(true);
+
+        // Removed the check for tab 0 here - let's always fetch on tab change for simplicity now.
+
+        setIsLoadingPdf(true); // Show loading for tab switch
         setPdfError(null);
-        setImagesForActivePdf([]);
-        console.log("Fetching images for active agreement tab PDF:", activeAgreement.pdfFilename);
+        setImagesForActivePdf([]); // Clear previous tab's images
+        console.log("Fetching images for active tab PDF:", activeAgreement.pdfFilename);
         try {
             const response = await fetchData(`pdf-images/${encodeURIComponent(activeAgreement.pdfFilename)}`);
             if (response && response.image_filenames) {
@@ -467,99 +451,27 @@ function AgreementViewerPage({ user, userTier }) {
         } finally {
             setIsLoadingPdf(false);
         }
-
-    }, [activeTabIndex, agreementData, isIgetcActive]); // Added isIgetcActive
-
-    // --- NEW Effect to fetch IGETC agreement and images ---
-    const fetchIgetcAgreementAndImages = useCallback(async () => {
-        if (!isIgetcActive) return; // Only run if IGETC tab is active
-
-        // Use the first sending institution ID for IGETC
-        const igetcSendingId = allSelectedSendingInstitutions[0]?.id;
-        if (!igetcSendingId || !yearId) {
-            setPdfError("Missing sending institution or year ID for IGETC.");
-            setImagesForActivePdf([]);
-            setIgetcPdfFilename(null);
-            return;
-        }
-
-        // Reset IGETC specific states
-        setIgetcPdfFilename(null);
-        setIgetcImageFilenames([]); // <-- Reset IGETC image state
-        // Also reset active images if IGETC is active
-        if (isIgetcActive) {
-            setImagesForActivePdf([]);
-        }
-
-        setIsLoadingIgetc(true); // Use separate loading state for IGETC fetch
-        setIsLoadingPdf(true); // Also set general PDF loading true
-        setPdfError(null);
-
-        try {
-            // 1. Fetch IGETC PDF filename
-            console.log(`Fetching IGETC agreement for Sending ID: ${igetcSendingId}, Year ID: ${yearId}`);
-            const igetcResponse = await fetchData(`/igetc-agreement?sendingId=${igetcSendingId}&academicYearId=${yearId}`);
-
-            if (!igetcResponse || !igetcResponse.pdfFilename) {
-                throw new Error(igetcResponse?.error || "Failed to get IGETC PDF filename.");
-            }
-            const filename = igetcResponse.pdfFilename;
-            setIgetcPdfFilename(filename);
-            console.log("Received IGETC PDF filename:", filename);
-
-            // 2. Fetch images for the IGETC PDF
-            console.log("Fetching images for IGETC PDF:", filename);
-            const imageResponse = await fetchData(`pdf-images/${encodeURIComponent(filename)}`);
-            if (imageResponse && imageResponse.image_filenames) {
-                console.log("Received images for IGETC tab:", imageResponse.image_filenames);
-                setIgetcImageFilenames(imageResponse.image_filenames); // <-- SET IGETC image state
-                // If IGETC is the currently active tab, also update imagesForActivePdf
-                if (isIgetcActive) {
-                    setImagesForActivePdf(imageResponse.image_filenames);
-                }
-            } else {
-                throw new Error(imageResponse?.error || "No image filenames received for IGETC tab");
-            }
-
-        } catch (err) {
-            console.error("Error fetching IGETC agreement/images:", err);
-            setPdfError(`Failed to load IGETC details: ${err.message}`);
-            setIgetcImageFilenames([]); // <-- Clear on error
-            setIgetcPdfFilename(null);
-            if (isIgetcActive) {
-                setImagesForActivePdf([]); // Clear active images on error if IGETC is active
-            }
-        } finally {
-            setIsLoadingIgetc(false);
-            // Only set general loading false if IGETC is the active view being loaded
-            if (isIgetcActive) {
-                setIsLoadingPdf(false);
-            }
-        }
-    }, [isIgetcActive, allSelectedSendingInstitutions, yearId]); // Dependencies
+    // MODIFIED Dependencies: Only depend on data needed to identify the active agreement
+    }, [activeTabIndex, agreementData]); // Dependencies
 
     // Trigger initial fetch when major changes
     useEffect(() => {
         fetchAgreementDetailsAndImages();
     }, [fetchAgreementDetailsAndImages]);
 
-    // Trigger active image/data fetch when active tab changes OR agreement data loads
+    // Trigger active image fetch when active tab changes
     useEffect(() => {
-        if (isIgetcActive) {
-            // Fetch IGETC data if IGETC tab is active
-            console.log("IGETC tab active, fetching IGETC data...");
-            fetchIgetcAgreementAndImages();
-        } else if (activeTabIndex >= 0 && agreementData.length > 0) {
-            // Fetch agreement images ONLY if an agreement tab is active AND agreementData has been loaded
-            console.log(`Agreement tab ${activeTabIndex} active, fetching images...`);
-            fetchImagesForActiveAgreementTab();
-        } else if (activeTabIndex >= 0 && agreementData.length === 0 && selectedMajorKey) {
-             console.log(`Agreement tab ${activeTabIndex} active, but agreement data not yet loaded. Waiting...`);
+        // Fetch whenever the active tab index changes, but only if agreementData is loaded.
+        // This prevents fetching when agreementData is initially empty.
+        // Also ensures it runs for tab 0 *after* the initial data load completes.
+        if (agreementData.length > 0) {
+             console.log(`Tab changed to ${activeTabIndex} or agreementData loaded, fetching images for active tab.`);
+             fetchImagesForActiveTab();
         } else {
-            console.log("Skipping active tab fetch: Conditions not met (e.g., no major selected for agreement tabs, or initial state before IGETC fetch).");
+             console.log("Skipping fetchImagesForActiveTab because agreementData is empty.");
         }
-    // Ensure all necessary functions and state variables are included
-    }, [activeTabIndex, agreementData, isIgetcActive, selectedMajorKey, fetchIgetcAgreementAndImages, fetchImagesForActiveAgreementTab]); // Keep dependencies
+    // MODIFIED Dependencies: Remove imagesForActivePdf
+    }, [activeTabIndex, agreementData, fetchImagesForActiveTab]);
 
     // --- Handlers ---
     const handleMajorSelect = (majorKey, majorName) => {
@@ -580,11 +492,10 @@ function AgreementViewerPage({ user, userTier }) {
         // The useEffect for fetching majors/depts will re-run due to selectedCategory change
     };
 
-    // MODIFIED Tab Click Handler
     const handleTabClick = (index) => {
         console.log("Tab clicked:", index);
-        setActiveTabIndex(index); // index will be -1 for IGETC
-        // Image/Data fetch will be triggered by the useEffect dependency change on activeTabIndex
+        setActiveTabIndex(index);
+        // Image fetch will be triggered by the useEffect dependency change
     };
 
     // --- Resizing Handlers (remain the same) ---
@@ -682,20 +593,6 @@ function AgreementViewerPage({ user, userTier }) {
     // Adjust height calculation - remove buttonBarHeight
     const mainContentHeight = `calc(90vh - 53px)`; // Assuming nav is 60px
 
-    // Combine all available image filenames for the chat context
-    const allContextImageFilenames = useMemo(() => {
-        // Use a Set to automatically handle duplicates if any filename appears in both lists
-        const combined = new Set([
-            ...allAgreementsImageFilenames, // Images from all major agreements
-            ...igetcImageFilenames       // Images from IGETC agreement
-        ]);
-        return Array.from(combined); // Convert back to an array
-    }, [allAgreementsImageFilenames, igetcImageFilenames]); // Dependencies
-
-    // Determine images for chat context (This might be redundant now, review usage)
-    // const chatContextImages = isIgetcActive ? imagesForActivePdf : allAgreementsImageFilenames; // OLD
-    const chatContextMajorName = isIgetcActive ? "IGETC Requirements" : selectedMajorName;
-
     return (
         <>
             {/* --- Removed Button Bar --- */}
@@ -741,7 +638,7 @@ function AgreementViewerPage({ user, userTier }) {
 
 
                 {/* Left Column (Majors/Depts List) */}
-                {!isIgetcActive && isMajorsVisible && (
+                {isMajorsVisible && (
                     <div style={{
                         flex: `0 0 ${currentMajorsFlexBasis}`,
                         display: 'flex',
@@ -800,124 +697,69 @@ function AgreementViewerPage({ user, userTier }) {
                         {!isLoadingMajors && !isLoadingAvailability && !hasMajorsAvailable && !hasDepartmentsAvailable && ( <p>No majors or departments found for this combination.</p> )}
                     </div>
                 )}
-                 {/* Show Majors Button (only if majors column is hidden AND IGETC is NOT active) */}
-                 {!isMajorsVisible && !isIgetcActive && (
-                    <button
-                        onClick={toggleMajorsVisibility}
-                        style={{
-                            position: 'absolute',
-                            top: '0.5em',
-                            left: '0.5em',
-                            zIndex: 1,
-                            padding: '4px 8px',
-                            fontSize: '0.85em'
-                        }}
-                        className="btn btn-sm btn-outline-secondary"
-                    >
-                        Show Majors
-                    </button>
-                 )}
 
                 {/* Middle Column (Chat Interface) */}
-                <div style={{
-                     flex: `0 0 ${(!isIgetcActive && isMajorsVisible) ? currentChatFlexBasis : (isIgetcActive ? '400px' : `calc(${currentChatFlexBasis} + ${fixedMajorsWidth}px + 1em)`) }`, // Adjust width calculation
-                     display: 'flex',
-                     flexDirection: 'column',
-                     minWidth: `${minColWidth}px`,
-                     marginRight: (!isIgetcActive && isMajorsVisible) ? '0' : '1em' // Add margin if majors are hidden or IGETC active
-                 }}>
+                <div style={{ flex: `0 0 ${currentChatFlexBasis}`, display: 'flex', flexDirection: 'column', minWidth: `${minColWidth}px` }}>
+                    {/* Pass visibility state and toggle function */}
                     <ChatInterface
-                        // Pass the COMBINED list for the payload
-                        allContextImageFilenames={allContextImageFilenames} // <-- NEW PROP
-
-                        // Keep these if needed for the initial prompt logic specifically
-                        imageFilenames={imagesForActivePdf} // Active images for display/context hints?
-                        allAgreementsImageFilenames={allAgreementsImageFilenames} // Major agreement images
-
-                        selectedMajorName={chatContextMajorName} // Pass appropriate name
+                        imageFilenames={allAgreementsImageFilenames} // Pass the combined list
+                        selectedMajorName={selectedMajorName}
                         userName={userName}
-                        isMajorsVisible={!isIgetcActive && isMajorsVisible} // Only relevant if not IGETC
+                        isMajorsVisible={isMajorsVisible}
                         toggleMajorsVisibility={toggleMajorsVisibility}
-                        sendingInstitutionId={contextSendingId} // Pass context-aware ID
+                        sendingInstitutionId={currentSendingId}
                         allSendingInstitutionIds={allSelectedSendingInstitutions.map(inst => inst.id)}
                         receivingInstitutionId={receivingId}
                         academicYearId={yearId}
                         user={user}
-                        // isIgetcMode={isIgetcActive} // Pass flag if needed by ChatInterface display logic
                     />
                 </div>
 
-                {/* Draggable Divider (Conditionally render or adjust margin) */}
-                {!isIgetcActive && isMajorsVisible && (
-                    <div ref={dividerRef} style={{ width: `${dividerWidth}px`, cursor: 'col-resize', backgroundColor: '#e0e0e0', borderLeft: '1px solid #ccc', borderRight: '1px solid #ccc', alignSelf: 'stretch', flexShrink: 0, marginLeft: isMajorsVisible ? '1em' : '0' }} onMouseDown={handleMouseDown} />
-                )}
+                {/* Draggable Divider */}
+                <div ref={dividerRef} style={{ width: `${dividerWidth}px`, cursor: 'col-resize', backgroundColor: '#e0e0e0', borderLeft: '1px solid #ccc', borderRight: '1px solid #ccc', alignSelf: 'stretch', flexShrink: 0, marginLeft: isMajorsVisible ? '1em' : '0' }} onMouseDown={handleMouseDown} />
 
                 {/* Right Column (PDF Viewer) */}
-                <div style={{
-                    flex: '1 1 0',
-                    display: 'flex',
-                    flexDirection: 'column',
-                    minWidth: `${minColWidth}px`,
-                    marginLeft: (!isIgetcActive && isMajorsVisible) ? '1em' : '0' // Adjust margin
-                 }}>
+                <div style={{ flex: '1 1 0', display: 'flex', flexDirection: 'column', minWidth: `${minColWidth}px`, marginLeft: '1em' }}>
                     {/* --- PDF Tabs --- */}
-                    <div style={{ display: 'flex', borderBottom: '1px solid #ccc', flexShrink: 0, background: '#e9ecef' }}>
-                        {/* IGETC Tab */}
-                        <button
-                            key="igetc-tab"
-                            onClick={() => handleTabClick(-1)} // Use -1 index
-                            style={{
-                                // ... (copy styling from agreement tabs) ...
-                                padding: '10px 15px', border: 'none',
-                                borderBottom: isIgetcActive ? '3px solid #0056b3' : '3px solid transparent',
-                                background: isIgetcActive ? '#ffffff' : '#e9ecef',
-                                color: isIgetcActive ? '#0056b3' : '#495057',
-                                cursor: 'pointer', fontWeight: isIgetcActive ? 'bold' : 'normal',
-                                fontSize: '0.95em', textAlign: 'center',
-                                borderTop: !isIgetcActive ? '1px solid #dee2e6' : 'none',
-                                borderLeft: !isIgetcActive ? '1px solid #dee2e6' : 'none',
-                                borderRight: !isIgetcActive ? '1px solid #dee2e6' : 'none',
-                                borderTopLeftRadius: '4px', borderTopRightRadius: '4px',
-                                marginRight: '2px',
-                            }}
-                            title="View IGETC Requirements"
-                        >
-                            IGETC {isLoadingIgetc && <span style={{ marginLeft: '5px', fontStyle: 'italic' }}>(Loading...)</span>}
-                        </button>
-
-                        {/* Agreement Tabs (only if agreements exist) */}
-                        {agreementData.map((agreement, index) => (
-                            <button
-                                key={agreement.sendingId}
-                                onClick={() => handleTabClick(index)}
-                                style={{
-                                    // ... (existing styling) ...
-                                    padding: '10px 15px', border: 'none',
-                                    borderBottom: activeTabIndex === index ? '3px solid #0056b3' : '3px solid transparent',
-                                    background: activeTabIndex === index ? '#ffffff' : '#e9ecef',
-                                    color: activeTabIndex === index ? '#0056b3' : '#495057',
-                                    cursor: 'pointer', fontWeight: activeTabIndex === index ? 'bold' : 'normal',
-                                    fontSize: '0.95em', textAlign: 'center',
-                                    borderTop: activeTabIndex !== index ? '1px solid #dee2e6' : 'none',
-                                    borderLeft: activeTabIndex !== index ? '1px solid #dee2e6' : 'none',
-                                    borderRight: activeTabIndex !== index ? '1px solid #dee2e6' : 'none',
-                                    borderTopLeftRadius: '4px', borderTopRightRadius: '4px',
-                                    marginRight: '2px',
-                                }}
-                                title={`View agreement from ${agreement.sendingName}`}
-                            >
-                                {agreement.sendingName}
-                            </button>
-                        ))}
-                    </div>
+                    {agreementData.length > 1 && (
+                        <div style={{ display: 'flex', borderBottom: '1px solid #ccc', flexShrink: 0, background: '#e9ecef' /* Light grey background for the tab bar */ }}>
+                            {agreementData.map((agreement, index) => (
+                                <button
+                                    key={agreement.sendingId}
+                                    onClick={() => handleTabClick(index)}
+                                    style={{
+                                        padding: '10px 15px',
+                                        border: 'none', // Remove default border
+                                        borderBottom: activeTabIndex === index ? '3px solid #0056b3' : '3px solid transparent', // Stronger blue for active border
+                                        background: activeTabIndex === index ? '#ffffff' : '#e9ecef', // White background for active, match bar background for inactive
+                                        color: activeTabIndex === index ? '#0056b3' : '#495057', // Darker text for inactive, blue for active
+                                        cursor: 'pointer',
+                                        fontWeight: activeTabIndex === index ? 'bold' : 'normal',
+                                        fontSize: '0.95em', // Slightly larger font
+                                        textAlign: 'center',
+                                        // Add subtle top/side borders for inactive tabs for definition
+                                        borderTop: activeTabIndex !== index ? '1px solid #dee2e6' : 'none',
+                                        borderLeft: activeTabIndex !== index ? '1px solid #dee2e6' : 'none',
+                                        borderRight: activeTabIndex !== index ? '1px solid #dee2e6' : 'none',
+                                        borderTopLeftRadius: '4px', // Slightly rounded top corners
+                                        borderTopRightRadius: '4px',
+                                        marginRight: '2px', // Small gap between tabs
+                                    }}
+                                    title={`View agreement from ${agreement.sendingName}`}
+                                >
+                                    {agreement.sendingName}
+                                </button>
+                            ))}
+                        </div>
+                    )}
                     {/* --- End PDF Tabs --- */}
 
-                    {/* PDF Viewer */}
+                    {/* Pass data for the ACTIVE PDF */}
                     <PdfViewer
-                        imageFilenames={imagesForActivePdf}
-                        isLoading={isLoadingPdf} // Use general loading state
-                        error={pdfError}
-                        filename={currentPdfFilename} // Pass the active/IGETC filename
+                        imageFilenames={imagesForActivePdf} // Use state for active PDF's images
+                        isLoading={isLoadingPdf && agreementData[activeTabIndex]?.pdfFilename === currentPdfFilename} // Only show loading for the active tab's fetch
+                        error={pdfError} // Show general PDF error
+                        filename={currentPdfFilename} // Pass the active filename
                     />
                 </div>
             </div>
diff --git a/src/components/ChatInterface.jsx b/src/components/ChatInterface.jsx
index 5c2525a..4a9d004 100644
--- a/src/components/ChatInterface.jsx
+++ b/src/components/ChatInterface.jsx
@@ -67,9 +67,7 @@ function formatText(text) {
 
 // Accept new props for context
 function ChatInterface({
-    allContextImageFilenames, // <-- NEW: Combined list for payload
-    imageFilenames, // Keep if needed for display logic or initial prompt details
-    // allAgreementsImageFilenames, // Keep if needed for initial prompt details
+    imageFilenames, // This now contains images from ALL agreements for the initial call
     selectedMajorName,
     userName, // Keep userName prop for display when logged in
     isMajorsVisible,
@@ -122,7 +120,7 @@ function ChatInterface({
         // - Analysis hasn't been sent for this context yet.
         // - We are not currently loading anything (prevents race conditions).
         // - User is logged in (checked above)
-        if (allContextImageFilenames && allContextImageFilenames.length > 0 && !initialAnalysisSentRef.current && !isLoading) {
+        if (imageFilenames && imageFilenames.length > 0 && !initialAnalysisSentRef.current && !isLoading) {
 
             const sendInitialAnalysis = async () => {
                 // User/token check is still good practice here, though the outer effect also checks
@@ -152,17 +150,12 @@ ${overallContextInfo ? `**Overall Context:** ${overallContextInfo}` : ''}
 
 Analyze the provided agreement images thoroughly. Perform the following steps:
 1.  **Focus on the Current Context:** Analyze the agreement for the major between the **current sending institution** and the receiving institution.
-2.  **Explicitly state the current context:** Start your response with: "Analyzing the agreement for the **[Major Name]** major between **[Current Sending Institution Name]** and **[Receiving Institution Name]** for the **[academic year name]** academic year." (Replace bracketed placeholders with actual names/year).
-3.  **Provide a detailed, accurate, yet concise summary** of the key details for the **current** agreement. This summary should include:
-    *   All articulated courses (sending course -> receiving course).
-    *   Any specific GPA requirements mentioned.
-    *   Any other critical requirements or notes from the agreement.
-    *   Crucially, identify any required courses for the major at the receiving institution that are **not articulated** by the current sending institution according to this agreement. List these clearly.
-4.  **Compare Articulation (If Applicable):** If you identified non-articulated courses in step 3 AND other sending institutions were selected (see Overall Context), examine the provided images for the **other** agreements (Sending IDs: ${allSendingInstitutionIds.filter(id => id !== sendingInstitutionId).join(', ') || 'None'}). For each non-articulated course from the current agreement, state whether it **is articulated** by any of the **other** sending institutions based on their respective agreements. Present this comparison clearly, perhaps in a separate section or list (e.g., "Comparison with Other Selected Colleges:").
+2.  **Explicitly state the current context:** Start your response with: "Analyzing the agreement for the [Major Name] (bold) major between [Current Sending Instituion Name] (bold) and [Receiving Institution Name] (bold) for the [academic year name] (bold) academic year."
+3.  **Provide a concise summary** of the key details for the **current** agreement (articulated courses, requirements, etc.). Identify any required courses for the major at the receiving institution that are **not articulated** by the current sending institution.
+4.  **Compare Articulation (If Applicable):** If you identified non-articulated courses in step 3 AND other sending institutions were selected (see Overall Context), examine the provided images for the **other** agreements (Sending IDs: ${allSendingInstitutionIds.filter(id => id !== sendingInstitutionId).join(', ') || 'None'}). For each non-articulated course from the current agreement, state whether it **is articulated** by any of the **other** sending institutions based on their respective agreements. Present this comparison clearly, perhaps in a separate section or list.
 5.  **Suggest Next Steps:** Conclude with relevant advice or next steps for the student based on the analysis and comparison.
-6.  **Offer Education Plan:** After providing the analysis and next steps, ask the user: "Would you like me to generate a potential 2-year education plan based on this information? If yes, I will outline courses semester-by-semester (Year 1 Fall, Year 1 Spring, Year 1 Summer, Year 2 Fall, Year 2 Spring, Year 2 Summer) aiming for approximately 4 classes per Fall/Spring semester and 2 classes during the Summer. This plan will incorporate courses from the **[Sending Institution(s) names]** to meet the requirements for the **[Receiving Institution name]**. For each course, I will include its *unit count* and *check for common prerequisites* using my knowledge base. If the prerequisite information isn't readily available, I can perform a web search to find it. Importantly, I will ensure that any identified prerequisite course is placed in a semester *before* the course that requires it."
 
-**Formatting:** Use bullet points (* or -) for lists, **bold** for emphasis (especially names and key terms), and \`italic\` for course codes/titles. Ensure the summary in step 3 is well-organized and easy to read.`;
+**Formatting:** Use bullet points (* or -) for lists, **bold** for emphasis, and \`italic\` for course codes/titles.`;
                 // --- End MODIFIED Initial Prompt ---
 
                 // Display a system message while analysis runs
@@ -171,7 +164,7 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
                 const payload = {
                     new_message: initialPrompt,
                     history: [], // No history for the very first message
-                    image_filenames: allContextImageFilenames // <-- USE COMBINED LIST
+                    image_filenames: imageFilenames // Send the combined list of images
                 };
 
                 try {
@@ -216,7 +209,7 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
         // This effect depends on imageFilenames to know when context is ready,
         // and isLoading to avoid running while another request is in progress.
         // Also depends on user to re-evaluate if user logs in/out
-    }, [allContextImageFilenames, isLoading, selectedMajorName, sendingInstitutionId, allSendingInstitutionIds, receivingInstitutionId, academicYearId, user]);
+    }, [imageFilenames, isLoading, selectedMajorName, sendingInstitutionId, allSendingInstitutionIds, receivingInstitutionId, academicYearId, user]);
 
 
     const handleSend = async () => {
@@ -248,12 +241,10 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
                 content: msg.text
             }));
 
-        // Payload for subsequent messages - NOW INCLUDES ACTIVE image_filenames
+        // Payload for subsequent messages (no image_filenames needed)
         const payload = {
             new_message: currentInput,
-            history: apiHistory,
-            // Send the filenames relevant to the currently active view
-            image_filenames: allContextImageFilenames // <-- USE COMBINED LIST
+            history: apiHistory
         };
 
         // --- Backend Call ---
@@ -290,14 +281,14 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
     };
 
     // Disable input/button if loading OR if user is not logged in
-    const isInteractionDisabled = isLoading || !user || !allContextImageFilenames || allContextImageFilenames.length === 0;
+    const isInteractionDisabled = isLoading || !user || !imageFilenames || imageFilenames.length === 0;
     const isSendDisabled = isInteractionDisabled || !userInput.trim();
 
     // Adjust placeholder based on loading state, user state, and agreement context
     const placeholderText = !user
         ? "Please sign in to use the chat feature."
-        : (!allContextImageFilenames || allContextImageFilenames.length === 0)
-            ? "Select a major/department to load agreements and chat." // Updated placeholder
+        : (!imageFilenames || imageFilenames.length === 0)
+            ? "Select a major/department to chat." // New placeholder for logged-in user without context
             : isLoading
                 ? (messages.length === 0 ? "Analyzing agreement..." : "Thinking...")
                 : "Ask a follow-up question..."; // Placeholder when ready
@@ -423,4 +414,4 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
     );
 }
 
-export default ChatInterface;
+export default ChatInterface;
\ No newline at end of file

From 8a2bc14b4a16fae9c6dfcea4522c93f31323464e Mon Sep 17 00:00:00 2001
From: Ahmon <ahmonembaye@gmail.com>
Date: Sun, 4 May 2025 10:34:11 -0700
Subject: [PATCH 12/16] Revert "fix: Using gemini-2.5-flash and ensure
 countdown runs continuously"

This reverts commit 34b5d16ad37afb015f456047f17359107db8d9ae.
---
 .../routes/agreement_routes.py                |  2 +-
 src/components/AgreementViewerPage.jsx        | 57 +++++++------------
 2 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/backend/college_transfer_ai/routes/agreement_routes.py b/backend/college_transfer_ai/routes/agreement_routes.py
index a2ec074..7f8fb26 100644
--- a/backend/college_transfer_ai/routes/agreement_routes.py
+++ b/backend/college_transfer_ai/routes/agreement_routes.py
@@ -34,7 +34,7 @@ def init_gemini(api_key):
     try:
         genai.configure(api_key=api_key)
         # Consider making model name configurable
-        gemini_model = genai.GenerativeModel('gemini-2.5-flash-preview-04-17')
+        gemini_model = genai.GenerativeModel('gemini-1.5-pro')
         print("--- Gemini Initialized Successfully ---")
     except Exception as e:
         print(f"!!! Gemini Initialization Error: {e}")
diff --git a/src/components/AgreementViewerPage.jsx b/src/components/AgreementViewerPage.jsx
index dc53cfe..1f30d7b 100644
--- a/src/components/AgreementViewerPage.jsx
+++ b/src/components/AgreementViewerPage.jsx
@@ -129,57 +129,42 @@ function AgreementViewerPage({ user, userTier }) {
 
     }, [user, userTier]); // Re-fetch when user object changes
 
-    // --- Effect to SET Initial Countdown Value ---
+    // --- Effect for Countdown Timer ---
     useEffect(() => {
-        // Set the initial display value only when all conditions are met
-        if (usageStatus.resetTime && agreementData.length > 0 && !isLoadingPdf) {
-            const initialRemaining = formatRemainingTime(usageStatus.resetTime);
-            setCountdown(initialRemaining);
-            console.log("Setting initial countdown display:", initialRemaining);
-        } else {
-            // Clear the display if conditions aren't met (e.g., loading, no reset time)
-            setCountdown('');
-            console.log("Clearing countdown display because conditions not met.");
+        if (!usageStatus.resetTime || agreementData.length === 0 || isLoadingPdf) {
+            setCountdown(''); // Clear countdown if conditions aren't met
+            return; // Exit effect
         }
-    // This effect runs when the conditions required to *start* the display change
-    }, [usageStatus.resetTime, agreementData, isLoadingPdf]);
+        console.log("Starting countdown timer as agreement is loaded."); // Add log
 
-    // --- Effect to RUN the Countdown Interval ---
-    useEffect(() => {
-        // Only manage the interval based on the existence of a reset time
-        if (!usageStatus.resetTime) {
-            setCountdown(''); // Ensure countdown is cleared if resetTime becomes invalid/null
-            return; // Don't start interval if no reset time
-        }
+        // Calculate initial remaining time immediately
+        const initialRemaining = formatRemainingTime(usageStatus.resetTime);
+        setCountdown(initialRemaining);
 
-        // Check if already reset initially when this effect runs
-        const initialCheck = formatRemainingTime(usageStatus.resetTime);
-        if (initialCheck === 'Usage reset') {
-            setCountdown(initialCheck); // Ensure display shows 'Usage reset'
-            return; // Don't start interval if already reset
+        // If already reset, don't start interval
+        if (initialRemaining === 'Usage reset') {
+            return;
         }
 
-        console.log("Starting countdown interval timer.");
+        // Start the interval to update every second
         const intervalId = setInterval(() => {
             const remaining = formatRemainingTime(usageStatus.resetTime);
-            setCountdown(remaining); // Update display every second
-
+            setCountdown(remaining);
             if (remaining === 'Usage reset') {
-                console.log("Countdown reached reset time, clearing interval.");
                 clearInterval(intervalId);
-                // Optionally refetch status here if needed after reset
-                // fetchStatus(); // Make sure fetchStatus is accessible if you uncomment this
+                // Optionally refetch status after reset?
+                // fetchStatus(); // You might need to define fetchStatus outside its effect or pass it down
             }
         }, 1000); // Update every second
 
-        // Cleanup interval ONLY when the component unmounts or resetTime changes
+        // Cleanup interval on unmount or when dependencies change causing the effect to re-run
         return () => {
-            console.log("Clearing countdown interval due to unmount or resetTime change.");
+            console.log("Clearing countdown interval."); // Add log for cleanup
             clearInterval(intervalId);
-        };
-    }, [usageStatus.resetTime]); // Only depend on resetTime for the interval itself
-
-    // --- End Countdown Effects ---
+        }
+    // Add agreementData and isLoadingPdf as dependencies
+    }, [usageStatus.resetTime, agreementData, isLoadingPdf]);
+    // --- End Countdown Effect ---
 
 
     // --- Existing Effects (Availability, Fetching Majors - adjust dependencies) ---

From e261324af244dde4ffc91e6d2a5d75aafc99d15f Mon Sep 17 00:00:00 2001
From: Ahmon <ahmonembaye@gmail.com>
Date: Sun, 4 May 2025 22:20:17 -0700
Subject: [PATCH 13/16] refactor(frontend): Modularize AgreementViewerPage and
 ChatInterface

Major refactoring of AgreementViewerPage and ChatInterface components to improve modularity and maintainability.

- Extracted UI sections into dedicated components:
  - AgreementViewerPage: MajorsList, AgreementTabs, UsageStatusDisplay
  - ChatInterface: ChatHeader, MessageList, MessageInput, ChatMessage, SignInPrompt
- Extracted state management and logic into custom hooks:
  - useAgreementData: Manages majors, agreement details, PDF/image fetching & caching.
  - useChat: Handles chat messages, loading state, API calls.
  - useResizeHandler: Encapsulates draggable divider logic.
  - useUsageStatus: Fetches and displays user tier/usage/reset time.
  - (Also includes hooks for institution/year data)
- Created utility function `formatText` for chat message formatting.
- Simplified PdfViewer loading display.

refactor(backend): Adjust user routes and utils

- Replaced `@verify_google_token` decorator in `user_routes.py` with manual token verification.
- Simplified `check_and_update_usage` return value in `utils.py`.
- Removed unused decorator code from `utils.py`.

chore: Minor code formatting (trailing newlines)
---
 backend/college_transfer_ai/__init__.py       |  70 +-
 .../college_transfer_API.py                   |  22 +-
 backend/college_transfer_ai/config.py         |  38 +-
 backend/college_transfer_ai/database.py       |  19 +-
 backend/college_transfer_ai/llm_service.py    | 290 ------
 .../routes/agreement_routes.py                |  86 +-
 .../college_transfer_ai/routes/user_routes.py |  94 +-
 backend/college_transfer_ai/utils.py          |  70 +-
 src/App.jsx                                   |   2 +-
 src/components/AgreementViewerPage.jsx        | 825 +++---------------
 .../AgreementViewerPage/AgreementTabs.jsx     |  59 ++
 .../AgreementViewerPage/MajorsList.jsx        | 112 +++
 .../UsageStatusDisplay.jsx                    |  34 +
 src/components/ChatInterface.jsx              | 436 ++-------
 src/components/ChatInterface/ChatHeader.jsx   |  34 +
 src/components/ChatInterface/ChatMessage.jsx  |  29 +
 src/components/ChatInterface/MessageInput.jsx |  41 +
 src/components/ChatInterface/MessageList.jsx  |  39 +
 src/components/ChatInterface/SignInPrompt.jsx |  11 +
 src/components/PdfViewer.jsx                  |   1 -
 src/hooks/useAcademicYears.js                 | 176 ++++
 src/hooks/useAgreementData.js                 | 398 +++++++++
 src/hooks/useChat.js                          | 184 ++++
 src/hooks/useInstitutionData.js               |  65 ++
 src/hooks/useReceivingInstitutions.js         | 146 ++++
 src/hooks/useResizeHandler.js                 |  75 ++
 src/hooks/useUsageStatus.js                   |  88 ++
 src/main.jsx                                  |   2 +-
 src/utils/formatText.jsx                      |  65 ++
 29 files changed, 1928 insertions(+), 1583 deletions(-)
 delete mode 100644 backend/college_transfer_ai/llm_service.py
 create mode 100644 src/components/AgreementViewerPage/AgreementTabs.jsx
 create mode 100644 src/components/AgreementViewerPage/MajorsList.jsx
 create mode 100644 src/components/AgreementViewerPage/UsageStatusDisplay.jsx
 create mode 100644 src/components/ChatInterface/ChatHeader.jsx
 create mode 100644 src/components/ChatInterface/ChatMessage.jsx
 create mode 100644 src/components/ChatInterface/MessageInput.jsx
 create mode 100644 src/components/ChatInterface/MessageList.jsx
 create mode 100644 src/components/ChatInterface/SignInPrompt.jsx
 create mode 100644 src/hooks/useAcademicYears.js
 create mode 100644 src/hooks/useAgreementData.js
 create mode 100644 src/hooks/useChat.js
 create mode 100644 src/hooks/useInstitutionData.js
 create mode 100644 src/hooks/useReceivingInstitutions.js
 create mode 100644 src/hooks/useResizeHandler.js
 create mode 100644 src/hooks/useUsageStatus.js
 create mode 100644 src/utils/formatText.jsx

diff --git a/backend/college_transfer_ai/__init__.py b/backend/college_transfer_ai/__init__.py
index 49c7694..f499f30 100644
--- a/backend/college_transfer_ai/__init__.py
+++ b/backend/college_transfer_ai/__init__.py
@@ -1,59 +1,57 @@
 import os
 import traceback
-from flask import Flask, jsonify, request
+from flask import Flask
 from flask_cors import CORS
 
 # Import configuration, database setup, and blueprints
 from .config import load_configuration
-from .database import init_db, close_db
+from .database import init_db
 from .routes.stripe_routes import stripe_bp
-# Remove init_gemini import from agreement_routes
-# from .routes.agreement_routes import agreement_bp, init_gemini # Import init_gemini
-from .routes.agreement_routes import agreement_bp
+from .routes.agreement_routes import agreement_bp, init_gemini # Import init_gemini
 from .routes.course_map_routes import course_map_bp
 from .routes.user_routes import user_bp
-# Import the correct init function from llm_service
-from .llm_service import init_llm
 
 def create_app():
     """Flask application factory."""
     app = Flask(__name__)
+
     print("--- Creating Flask App ---")
 
-    config = None # Initialize config variable
     try:
         # Load configuration
         config = load_configuration()
-        app.config['APP_CONFIG'] = config # Store config for access in blueprints if needed
+        app.config['APP_CONFIG'] = config # Store config for access in blueprints
     except Exception as config_err:
         print(f"!!! CRITICAL: Failed to load configuration: {config_err}")
-        # Decide if the app should exit or continue with defaults/limited functionality
-        # For now, let it continue, but LLM/DB might fail later
-        config = {} # Use an empty config to avoid None errors later
+        traceback.print_exc()
+        # Exit if config is essential and failed to load
+        exit(1)
 
-    # Initialize CORS (using config)
-    frontend_url = config.get("FRONTEND_URL", "http://localhost:5173") # Default if missing
-    CORS(app, resources={r"/api/*": {"origins": frontend_url}}, supports_credentials=True)
-    print(f"--- CORS Initialized (Origins: {frontend_url}) ---")
+    # Initialize CORS
+    # Be more specific with origins in production
+    cors_origins = config.get("FRONTEND_URL", "*") # Default to '*' if not set
+    CORS(app, resources={r"/*": {"origins": cors_origins}})
+    print(f"--- CORS Initialized (Origins: {cors_origins}) ---")
 
-    # Initialize Database (using config)
+    # Initialize Database
     try:
-        mongo_uri = config.get("MONGO_URI")
-        if not mongo_uri:
-            raise ValueError("MONGO_URI not found in configuration.")
-        init_db(mongo_uri)
-    except Exception as db_err:
-        print(f"!!! CRITICAL: Failed to initialize Database: {db_err}")
-        # Decide if the app should exit
+        init_db(config.get('MONGO_URI'))
+    except ConnectionError as db_err:
+        print(f"!!! CRITICAL: Could not connect to database on startup: {db_err}")
+        # Depending on requirements, you might exit or continue with DB unavailable
+        exit(1) # Example: Exit if DB is essential
+    except Exception as general_db_err:
+        print(f"!!! CRITICAL: Unexpected error initializing database: {general_db_err}")
+        traceback.print_exc()
+        exit(1)
+
 
-    # Initialize LLM Service (passing config)
+    # Initialize Gemini (if using GOOGLE_API_KEY)
     try:
-        print("Initializing LLM Service...")
-        init_llm(config) # <-- Pass the loaded config dictionary
-    except Exception as llm_err:
-        print(f"!!! WARNING: Failed to initialize LLM Service: {llm_err}")
-        traceback.print_exc()
-        # App can likely continue without LLM, just log the warning
+        init_gemini(config.get('GOOGLE_API_KEY'))
+    except Exception as gemini_err:
+        print(f"!!! WARNING: Failed to initialize Gemini: {gemini_err}")
+        # App can likely continue without Gemini, just log the warning
 
     # Register Blueprints with optional API prefix
     api_prefix = '/api' # Example prefix, adjust as needed or remove if using '/'
@@ -69,12 +67,4 @@ def index():
         return "College Transfer AI Backend is running."
 
     print("--- Flask App Creation Complete ---")
-
-    return app
-
-if __name__ == '__main__':
-    app = create_app()
-    print("--- Starting Flask Server ---")
-    # Use host/port from config or defaults
-    debug_mode = True # Or get from config/env
-    app.run(host='0.0.0.0', port=5000, debug=debug_mode)
\ No newline at end of file
+    return app
\ No newline at end of file
diff --git a/backend/college_transfer_ai/college_transfer_API.py b/backend/college_transfer_ai/college_transfer_API.py
index 9a9a868..9be9401 100644
--- a/backend/college_transfer_ai/college_transfer_API.py
+++ b/backend/college_transfer_ai/college_transfer_API.py
@@ -317,11 +317,11 @@ def get_articulation_agreement(self, academic_year_id, sending_institution_id, r
             client = get_mongo_client() # Get client connection
             db = client["CollegeTransferAICluster"] # Use correct DB name if needed
             fs = gridfs.GridFS(db)
-            if fs.find_one({"filename": filename}):
-                print(f"PDF '{filename}' already exists in GridFS. Skipping download.")
-                # --- Removed context processing call ---
-                client.close()
-                return filename # Return existing filename if found
+            # if fs.find_one({"filename": filename}):
+            #     print(f"PDF '{filename}' already exists in GridFS. Skipping download.")
+            #     # --- Removed context processing call ---
+            #     client.close()
+            #     return filename # Return existing filename if found
 
             # --- Construct URL (same as before) ---
             viewBy = "major"
@@ -363,9 +363,17 @@ def get_articulation_agreement(self, academic_year_id, sending_institution_id, r
                     browser = p.chromium.launch(headless=True)
                     page = browser.new_page()
                     page.goto(url, wait_until="networkidle", timeout=60000)
-                    page.wait_for_timeout(2000)
+                     # --- Wait for the specific header element instead of fixed timeout ---
+                    header_selector = '#view-results > app-report-preview > div.resultsBox > awc-agreement > div > div > awc-agreement-row:nth-child(1) > div > div.rowContent > div > div.rowReceiving > awc-articulation-receiving > div > div > awc-articulation-node > div > awc-articulation-node-receiving-course > awc-course > div > div.courseTitle'
+                    print(f"Waiting for selector '{header_selector}' indicating page load...")
+                    page.wait_for_selector(header_selector, timeout=30000) # Wait up to 30 seconds
+                    print("Selector found. Proceeding with PDF generation.")
+                    
                     pdf_bytes = page.pdf(format="A4")
                     print(f"Successfully downloaded PDF bytes (size: {len(pdf_bytes)} bytes)")
+                    
+                    # with open(filename, "wb") as f:
+                        # f.write(pdf_bytes)
                 except Exception as playwright_err:
                      print(f"Playwright error fetching PDF from {url}: {playwright_err}")
                      if browser: browser.close()
@@ -489,4 +497,4 @@ def get_igetc_courses(self, academic_year_id, sending_institution_id):
              if client:
                  client.close()
 
-api = CollegeTransferAPI()
+api = CollegeTransferAPI()
\ No newline at end of file
diff --git a/backend/college_transfer_ai/config.py b/backend/college_transfer_ai/config.py
index 8b285e3..73104cb 100644
--- a/backend/college_transfer_ai/config.py
+++ b/backend/college_transfer_ai/config.py
@@ -1,41 +1,22 @@
-from dotenv import load_dotenv
 import os
+from dotenv import load_dotenv
 
 def load_configuration():
     """Loads environment variables and returns them in a dictionary."""
-    print("--- Attempting to load configuration ---")
     # Assuming .env is at the project root (two levels up from this file's directory)
-    config_dir = os.path.dirname(__file__)
-    project_root = os.path.abspath(os.path.join(config_dir, '..', '..'))
-    dotenv_path = os.path.join(project_root, '.env')
-
-    print(f"Config directory: {config_dir}")
-    print(f"Project root guess: {project_root}")
-    print(f"Calculated .env path: {dotenv_path}")
-    print(f"Does .env exist at path? {os.path.exists(dotenv_path)}")
-
-    # Load the .env file
-    loaded_ok = load_dotenv(dotenv_path=dotenv_path, verbose=True) # Add verbose=True
-    print(f"load_dotenv successful? {loaded_ok}")
-
-    # Check the key IMMEDIATELY after loading
-    google_api_key_after_load = os.getenv("GOOGLE_API_KEY")
-    print(f"GOOGLE_API_KEY immediately after load_dotenv: {'Set' if google_api_key_after_load else 'Not Set'}")
-    if google_api_key_after_load:
-         # Print a few chars to confirm it's not empty (avoid printing full key)
-         print(f"  (Starts with: {google_api_key_after_load[:4]}...)")
-
+    dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
+    load_dotenv(dotenv_path=dotenv_path)
 
     config = {
         "MONGO_URI": os.getenv("MONGO_URI"),
         "GOOGLE_CLIENT_ID": os.getenv("GOOGLE_CLIENT_ID"),
-        "GOOGLE_API_KEY": google_api_key_after_load, # Use the value we just checked
-        "OPENAI_API_KEY": os.getenv("OPENAI_API_KEY"),
+        "GOOGLE_API_KEY": os.getenv("GOOGLE_API_KEY"), # For Gemini if needed
+        "OPENAI_API_KEY": os.getenv("OPENAI_API_KEY"), # If still used
         "STRIPE_SECRET_KEY": os.getenv("STRIPE_SECRET_KEY"),
         "STRIPE_PRICE_ID": os.getenv("STRIPE_PRICE_ID"),
         "STRIPE_WEBHOOK_SECRET": os.getenv("STRIPE_WEBHOOK_SECRET"),
         "FRONTEND_URL": os.getenv("FRONTEND_URL", "http://localhost:5173"),
-        "PERPLEXITY_API_KEY": os.getenv("PERPLEXITY_API_KEY"),
+        # Add other config variables as needed
     }
     # Basic validation
     if not config["MONGO_URI"]:
@@ -45,5 +26,12 @@ def load_configuration():
     # Add more checks as needed
 
     print("--- Configuration Loaded ---")
+    # Print loaded values for debugging (consider removing sensitive keys in production logs)
+    # print(f"MONGO_URI: {'Set' if config['MONGO_URI'] else 'Not Set'}")
+    # print(f"GOOGLE_CLIENT_ID: {'Set' if config['GOOGLE_CLIENT_ID'] else 'Not Set'}")
+    # print(f"STRIPE_SECRET_KEY: {'Set' if config['STRIPE_SECRET_KEY'] else 'Not Set'}")
+    # print(f"STRIPE_WEBHOOK_SECRET: {'Set' if config['STRIPE_WEBHOOK_SECRET'] else 'Not Set'}")
+    # print(f"FRONTEND_URL: {config['FRONTEND_URL']}")
     return config
 
+# config = load_configuration() # Optionally load here if needed globally at import time
\ No newline at end of file
diff --git a/backend/college_transfer_ai/database.py b/backend/college_transfer_ai/database.py
index 75d56f0..f1b3432 100644
--- a/backend/college_transfer_ai/database.py
+++ b/backend/college_transfer_ai/database.py
@@ -6,11 +6,10 @@
 fs = None
 users_collection = None
 course_maps_collection = None
-agreement_summaries_collection = None # Add collection for summaries
 
 def init_db(mongo_uri):
     """Initializes MongoDB connection, database, GridFS, and collections."""
-    global mongo_client, db, fs, users_collection, course_maps_collection, agreement_summaries_collection # Add global
+    global mongo_client, db, fs, users_collection, course_maps_collection
     if not mongo_uri:
         raise ConnectionError("MongoDB URI not provided in configuration.")
     try:
@@ -23,7 +22,6 @@ def init_db(mongo_uri):
         fs = gridfs.GridFS(db)
         users_collection = db.users
         course_maps_collection = db.course_maps
-        agreement_summaries_collection = db.agreement_summaries # Initialize collection
         # Test connection
         mongo_client.admin.command('ping')
         print(f"--- MongoDB Connected Successfully (DB: {db_name}) ---")
@@ -50,17 +48,4 @@ def get_users_collection():
 def get_course_maps_collection():
      if course_maps_collection is None:
          raise Exception("Course maps collection not initialized.")
-     return course_maps_collection
-
-def get_agreement_summaries_collection(): # Add getter for summaries
-    if agreement_summaries_collection is None:
-        raise Exception("Agreement summaries collection not initialized.")
-    return agreement_summaries_collection
-
-def close_db(exception=None):
-    """Closes the MongoDB connection."""
-    global mongo_client
-    if mongo_client:
-        print("--- Closing MongoDB Connection ---")
-        mongo_client.close()
-        mongo_client = None # Optional: Reset global variable
+     return course_maps_collection
\ No newline at end of file
diff --git a/backend/college_transfer_ai/llm_service.py b/backend/college_transfer_ai/llm_service.py
deleted file mode 100644
index e8e93b3..0000000
--- a/backend/college_transfer_ai/llm_service.py
+++ /dev/null
@@ -1,290 +0,0 @@
-import os
-import traceback
-import requests
-import json
-
-# --- Restore Google Gemini Imports ---
-import google.generativeai as genai
-from google.ai.generativelanguage import FunctionDeclaration, Tool, Part
-from google.protobuf.struct_pb2 import Struct
-# --- Restore Image/GridFS Imports ---
-from PIL import Image
-import io
-from .database import get_gridfs # Import GridFS getter
-
-# --- Perplexity API Configuration (for search function) ---
-PERPLEXITY_API_URL = "https://api.perplexity.ai/chat/completions"
-PERPLEXITY_MODEL = "sonar-medium-online" # Use an online model for search
-
-# --- Restore Google Tool Definition ---
-find_prereq_func = FunctionDeclaration(
-    name="find_course_prerequisites",
-    description="Search the web to find prerequisites for a specific college course at a given institution. Only use if the information is not readily available in the provided documents or general knowledge.",
-    parameters={
-        "type_": "OBJECT",
-        "properties": {
-            "course_code": {"type_": "STRING", "description": "The course code (e.g., 'MATH 101', 'CS 50')."},
-            "institution_name": {"type_": "STRING", "description": "The full name of the college or university."},
-        },
-        "required": ["course_code", "institution_name"],
-    },
-)
-search_tool = Tool(function_declarations=[find_prereq_func])
-# --- End Tool Definition ---
-
-# --- Global Gemini Model Variable ---
-gemini_model = None
-
-# --- Restore Google Safety and Generation Config ---
-safety_settings = [
-    {"category": "HARM_CATEGORY_HARASSMENT", "threshold": "BLOCK_MEDIUM_AND_ABOVE"},
-    {"category": "HARM_CATEGORY_HATE_SPEECH", "threshold": "BLOCK_MEDIUM_AND_ABOVE"},
-    {"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT", "threshold": "BLOCK_MEDIUM_AND_ABOVE"},
-    {"category": "HARM_CATEGORY_DANGEROUS_CONTENT", "threshold": "BLOCK_MEDIUM_AND_ABOVE"},
-]
-generation_config = genai.types.GenerationConfig(
-    max_output_tokens=8192,
-    temperature=0.7,
-)
-# --- End Google Config ---
-
-# --- Modified Initialization Function (Accepts config) ---
-def init_llm(config): # <-- Accept config dictionary
-    """Initializes the Gemini LLM client using provided configuration."""
-    print("--- Initializing LLM Service ---")
-    global gemini_model
-    if gemini_model is None:
-        try:
-            # Get keys from the config dictionary
-            google_api_key = config.get('GOOGLE_API_KEY')
-            perplexity_api_key = config.get('PERPLEXITY_API_KEY') # Check Perplexity key too
-
-            # More informative print:
-            print(f"LLM Service Check: GOOGLE_API_KEY is {'SET' if google_api_key else 'NOT SET'} (from config)", google_api_key)
-
-            if not google_api_key:
-                print("Warning: GOOGLE_API_KEY not found in config. Gemini API will not function.")
-                gemini_model = None
-                # Optionally raise an error if Gemini is critical
-                # raise ValueError("GOOGLE_API_KEY missing in configuration.")
-            else:
-                print("LLM Service: Configuring Gemini with API key (from config)...")
-                genai.configure(api_key=google_api_key)
-                # Initialize the Gemini model with the tool
-                gemini_model = genai.GenerativeModel(
-                    'gemini-1.5-flash-latest', # Or your preferred Gemini model
-                    tools=[search_tool]
-                )
-                print("Gemini LLM initialized successfully with search tool.")
-
-            # Check and report Perplexity key status
-            if perplexity_api_key:
-                 print("Perplexity API key found in config for search function.")
-            else:
-                print("Warning: PERPLEXITY_API_KEY not found in config. Web search function will fail.")
-
-        except Exception as e:
-            print(f"Error initializing LLM services: {e}")
-            traceback.print_exc()
-            gemini_model = None # Ensure it's None on failure
-
-# --- Web Search Function (Uses os.getenv - Consider passing config here too) ---
-def perform_web_search(course_code, institution_name, config): # <-- Pass config
-    """
-    Uses Perplexity API to search for prerequisites and returns its response content.
-    """
-    print(f"--- Performing WEB SEARCH via Perplexity for '{course_code}' at '{institution_name}' ---")
-    perplexity_api_key = config.get("PERPLEXITY_API_KEY") # <-- Get from config
-    if not perplexity_api_key:
-        print("Error: PERPLEXITY_API_KEY not set in config. Cannot perform Perplexity search.")
-        return "Search could not be performed due to missing Perplexity configuration."
-
-    # Simple prompt for Perplexity
-    search_prompt = f"What are the prerequisites for the course '{course_code}' at '{institution_name}'? Provide details from official sources if possible."
-
-    headers = {
-        "Authorization": f"Bearer {perplexity_api_key}",
-        "Content-Type": "application/json",
-        "Accept": "application/json",
-    }
-    payload = {
-        "model": PERPLEXITY_MODEL,
-        "messages": [
-            {"role": "system", "content": "You are an AI assistant helping find course prerequisites."},
-            {"role": "user", "content": search_prompt}
-        ],
-        "temperature": 0.3, # Lower temperature for more factual search results
-        "max_tokens": 500, # Limit response length from Perplexity
-    }
-
-    try:
-        response = requests.post(
-            PERPLEXITY_API_URL,
-            headers=headers,
-            json=payload,
-            timeout=60 # Timeout for Perplexity search
-        )
-        response.raise_for_status()
-        result = response.json()
-
-        if result.get("choices") and result["choices"][0].get("message"):
-            content = result["choices"][0]["message"].get("content")
-            print(f"  Perplexity search successful. Result snippet: {content[:100]}...")
-            return content.strip() if content else "Perplexity returned an empty response."
-        else:
-            print(f"  Warning: Unexpected response format from Perplexity search: {result}")
-            return "Perplexity search returned an unexpected format."
-
-    except requests.exceptions.Timeout:
-        print("  Error: Request to Perplexity API timed out during search.")
-        return "Perplexity search timed out."
-    except requests.exceptions.RequestException as e:
-        print(f"  Error during Perplexity API search request: {e}")
-        return f"Perplexity search failed: {e}"
-    except Exception as e:
-        print(f"  An unexpected error occurred during Perplexity search: {e}")
-        return "An unexpected error occurred during Perplexity search."
-# --- End Web Search Function ---
-
-
-# --- Chat Response Generation (Using Gemini with Function Calling AND Image Support) ---
-def generate_chat_response(prompt, history, image_filenames=None, config=None): # <-- Accept config
-    """
-    Generates a chat response using the Gemini LLM, handling images and
-    potential function calls to perform web search via Perplexity.
-    Requires config if web search might be needed.
-    """
-    global gemini_model
-    if gemini_model is None:
-        if not config:
-             print("Error: LLM not initialized and no config provided to initialize it.")
-             return "[LLM Service Error: Not Initialized]"
-        init_llm(config) # Try to initialize if config is provided
-        if gemini_model is None:
-            print("LLM initialization failed. Cannot generate response.")
-            return "[LLM Service Error: Initialization Failed]"
-
-    fs = None # Initialize fs
-    try:
-        # --- Construct Content List (Images + Prompt) ---
-        content_parts = []
-        if image_filenames:
-            print(f"Processing {len(image_filenames)} image(s) for Gemini...")
-            fs = get_gridfs() # Get GridFS instance
-            if not fs:
-                print("Error: Could not get GridFS instance for image processing.")
-                # Decide how to proceed: return error or continue without images?
-                # Let's continue without images for now, but log the error.
-            else:
-                for filename in image_filenames:
-                    try:
-                        grid_out = fs.find_one({"filename": filename})
-                        if grid_out:
-                            image_bytes = grid_out.read()
-                            # Verify image format if necessary, Gemini supports PNG, JPEG, WEBP, HEIC, HEIF
-                            img = Image.open(io.BytesIO(image_bytes))
-                            # Append the PIL Image object directly
-                            content_parts.append(img)
-                            print(f"  Added image '{filename}' to content parts.")
-                        else:
-                            print(f"Warning: Image '{filename}' not found in GridFS.")
-                    except Exception as img_err:
-                        print(f"Error processing image '{filename}': {img_err}")
-                        # Continue processing other images/prompt
-
-        # Always add the text prompt
-        content_parts.append(prompt)
-        print("Added text prompt to LLM content.")
-        # --- End Content List Construction ---
-
-
-        # --- Format History (for Gemini) ---
-        formatted_history = []
-        for msg in history:
-            role = 'model' if msg.get('role') in ['bot', 'assistant'] else 'user'
-            # Ensure history parts are correctly formatted if function calls were involved previously
-            # Assuming simple text history for now
-            formatted_history.append({'role': role, 'parts': [msg.get('content', '')]})
-
-        # --- Start Chat and Send Message ---
-        print("Starting Gemini LLM chat session...")
-        chat = gemini_model.start_chat(history=formatted_history)
-
-        print("Sending message to Gemini (potential function call)...")
-        response = chat.send_message(
-            content_parts, # Pass the list containing images and text
-            generation_config=generation_config,
-            safety_settings=safety_settings,
-            stream=False
-        )
-
-        # --- Handle Function Call (if requested by Gemini) ---
-        if response.candidates and response.candidates[0].content.parts:
-            first_part = response.candidates[0].content.parts[0]
-            if hasattr(first_part, 'function_call') and first_part.function_call:
-                function_call = first_part.function_call
-                print(f"Gemini requested function call: {function_call.name}")
-
-                if function_call.name == "find_course_prerequisites":
-                    args = function_call.args
-                    course = args.get('course_code')
-                    institution = args.get('institution_name')
-                    print(f"  Arguments: course='{course}', institution='{institution}'")
-
-                    if course and institution:
-                        if not config:
-                             print("Error: Config needed for web search but not provided.")
-                             search_result_text = "Web search failed: Configuration missing."
-                        else:
-                             # Execute the search using Perplexity via our function
-                             search_result_text = perform_web_search(course, institution, config) # <-- Pass config
-
-                        # --- Send Function Response back to Gemini ---
-                        response_data = Struct()
-                        response_data.update({"result": search_result_text}) # Send Perplexity's response text
-
-                        function_response = Part(
-                            function_response={
-                                "name": "find_course_prerequisites",
-                                "response": response_data,
-                            }
-                        )
-
-                        print("Sending function response (from Perplexity search) back to Gemini...")
-                        # Send the function response to continue the conversation
-                        response = chat.send_message(
-                            function_response,
-                            stream=False
-                        )
-                        # The final response should now be in this new 'response' object
-                    else:
-                        print("Error: Missing arguments for function call.")
-                        # Handle error - maybe send back an error message to Gemini?
-                        pass # Fall through
-                else:
-                    print(f"Warning: Received unhandled function call request: {function_call.name}")
-
-        # --- Process Final Gemini Response ---
-        print("Processing final Gemini response.")
-        if response.parts:
-            return response.text
-        else:
-            # Handle blocks or empty responses
-            print("Warning: Final Gemini response was empty or blocked.")
-            print(f"Prompt Feedback: {response.prompt_feedback}")
-            if response.candidates and response.candidates[0].finish_reason:
-                print(f"Finish Reason: {response.candidates[0].finish_reason}")
-                print(f"Safety Ratings: {response.candidates[0].safety_ratings}")
-            block_reason = "Unknown"
-            if response.prompt_feedback and response.prompt_feedback.block_reason:
-                block_reason = response.prompt_feedback.block_reason.name
-            return f"[LLM response blocked due to: {block_reason}]" # Gemini block reason
-
-    except Exception as e:
-        print(f"LLM generation error (Gemini): {e}")
-        traceback.print_exc()
-        return None # Or an error message string
-    finally:
-        # GridFS connection is managed by the getter, no explicit close needed here
-        pass
-
diff --git a/backend/college_transfer_ai/routes/agreement_routes.py b/backend/college_transfer_ai/routes/agreement_routes.py
index 7f8fb26..f95b1ed 100644
--- a/backend/college_transfer_ai/routes/agreement_routes.py
+++ b/backend/college_transfer_ai/routes/agreement_routes.py
@@ -3,7 +3,7 @@
 import io
 import fitz # PyMuPDF
 from PIL import Image
-from flask import Blueprint, jsonify, request, Response, current_app
+from flask import Blueprint, jsonify, request, Response, current_app, send_file, make_response
 from bson.objectid import ObjectId
 # Remove OpenAI import if not used
 # from openai import OpenAI
@@ -19,7 +19,7 @@
 # --- End Google AI Imports ---
 
 FREE_TIER_LIMIT = 10
-PREMIUM_TIER_LIMIT = 200 # Example limit for paid users
+PREMIUM_TIER_LIMIT = 50 # Example limit for paid users
 
 agreement_bp = Blueprint('agreement_bp', __name__)
 
@@ -34,7 +34,7 @@ def init_gemini(api_key):
     try:
         genai.configure(api_key=api_key)
         # Consider making model name configurable
-        gemini_model = genai.GenerativeModel('gemini-1.5-pro')
+        gemini_model = genai.GenerativeModel('gemini-2.5-flash-preview-04-17')
         print("--- Gemini Initialized Successfully ---")
     except Exception as e:
         print(f"!!! Gemini Initialization Error: {e}")
@@ -254,21 +254,39 @@ def get_pdf_images(filename):
 
 @agreement_bp.route('/image/<path:filename>', methods=['GET'])
 def get_image(filename):
-    """Serves an image file directly from GridFS."""
+    """Serves an image file directly from GridFS with cache headers."""
     fs = get_gridfs() # Get GridFS instance
+    grid_out = None
     try:
         grid_out = fs.find_one({"filename": filename})
         if not grid_out:
             return jsonify({"error": "Image not found"}), 404
 
-        response = Response(grid_out.read(), mimetype=grid_out.contentType)
-        # Optional: Add cache headers
-        # response.headers['Cache-Control'] = 'public, max-age=3600' # Cache for 1 hour
+        # Create a file-like object from the GridFS data
+        image_data_stream = io.BytesIO(grid_out.read())
+
+        # Create a response object using send_file
+        response = make_response(send_file(
+            image_data_stream,
+            mimetype=grid_out.contentType or 'image/png', # Use stored content type or default
+            as_attachment=False, # Serve inline
+            download_name=grid_out.filename # Optional: helps browser name if saved
+        ))
+
+        # --- Add Cache-Control Header ---
+        response.headers['Cache-Control'] = 'public, max-age=8640000'
+
         return response
+
     except Exception as e:
         print(f"Error serving image {filename}: {e}")
         traceback.print_exc()
+        # Note: grid_out.read() reads the whole file, no explicit close needed here
         return jsonify({"error": "Failed to serve image"}), 500
+    # finally: # GridFS find_one().read() doesn't require explicit closing like open_download_stream
+        # if grid_out and hasattr(grid_out, 'close'): # Check if grid_out is a file-like object that needs closing
+        #     grid_out.close() # This block is likely not needed with find_one().read()
+
 
 # --- Chat Endpoint ---
 @agreement_bp.route('/chat', methods=['POST'])
@@ -391,4 +409,56 @@ def chat_endpoint():
         print(f"Error calling Gemini API: {e}")
         traceback.print_exc()
         # Provide a more generic error to the user
-        return jsonify({"error": "Failed to get response from AI assistant."}), 500
\ No newline at end of file
+        return jsonify({"error": "Failed to get response from AI assistant."}), 500
+    
+# --- NEW: IGETC Agreement Endpoint ---
+@agreement_bp.route('/igetc-agreement', methods=['GET'])
+def get_igetc_agreement():
+    # --- Optional: Add Authentication/Authorization ---
+    config = current_app.config['APP_CONFIG']
+    GOOGLE_CLIENT_ID = config.get('GOOGLE_CLIENT_ID')
+    if not GOOGLE_CLIENT_ID:
+         return jsonify({"error": "Google Client ID not configured."}), 500
+
+    try:
+        auth_header = request.headers.get('Authorization')
+        if not auth_header or not auth_header.startswith('Bearer '):
+            return jsonify({"error": "Authorization token missing or invalid"}), 401
+        token = auth_header.split(' ')[1]
+        user_info = verify_google_token(token, GOOGLE_CLIENT_ID)
+        # You might not need get_or_create_user here if just checking validity
+        if not user_info:
+             raise ValueError("Invalid token or user not found.")
+    except ValueError as auth_err:
+        return jsonify({"error": str(auth_err)}), 401
+    except Exception as e:
+        print(f"Error during IGETC auth check: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Authentication failed."}), 500
+    # --- End Optional Auth ---
+
+    sending_institution_id = request.args.get('sendingId')
+    academic_year_id = request.args.get('academicYearId')
+
+    if not sending_institution_id or not academic_year_id:
+        return jsonify({"error": "Missing sendingId or academicYearId parameter"}), 400
+
+    try:
+        # Assuming api is your CollegeTransferAPI instance
+        pdf_filename = api.get_igetc_courses(int(academic_year_id), int(sending_institution_id))
+
+        if pdf_filename:
+            return jsonify({"pdfFilename": pdf_filename}), 200
+        else:
+            # Distinguish between "not found" and an error during fetch/save
+            # The get_igetc_courses function should ideally return None if not found
+            # and raise an exception for other errors, but we'll handle None here.
+            return jsonify({"error": "IGETC agreement PDF not found or could not be generated."}), 404
+
+    except ValueError:
+         return jsonify({"error": "Invalid ID format. IDs must be integers."}), 400
+    except Exception as e:
+        print(f"Error fetching IGETC agreement for {sending_institution_id} / {academic_year_id}: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Failed to fetch IGETC agreement"}), 500
+# --- End IGETC Endpoint ---
\ No newline at end of file
diff --git a/backend/college_transfer_ai/routes/user_routes.py b/backend/college_transfer_ai/routes/user_routes.py
index da77416..9be0fd0 100644
--- a/backend/college_transfer_ai/routes/user_routes.py
+++ b/backend/college_transfer_ai/routes/user_routes.py
@@ -1,6 +1,6 @@
 from flask import Blueprint, jsonify, request, current_app
 from datetime import datetime, timedelta, time, timezone
-import traceback # Import traceback
+import traceback
 
 # Import necessary functions/objects from other modules
 from ..utils import verify_google_token, get_or_create_user, FREE_TIER_LIMIT, PREMIUM_TIER_LIMIT
@@ -8,65 +8,61 @@
 user_bp = Blueprint('user_bp', __name__)
 
 @user_bp.route('/user-status', methods=['GET'])
-@verify_google_token
-def get_user_status(user_info):
-    user_id = user_info.get('sub')
-    if not user_id:
-        print("Error: 'sub' key missing in user_info provided by verify_google_token.")
-        # Return a JSON response for consistency
-        return jsonify({"error": "User ID ('sub') not found in verified token information"}), 401
+def get_user_status():
+    print("--- !!! GET /api/user-status endpoint hit !!! ---") # Add this line
+    config = current_app.config['APP_CONFIG']
+    GOOGLE_CLIENT_ID = config.get('GOOGLE_CLIENT_ID')
+    if not GOOGLE_CLIENT_ID:
+         return jsonify({"error": "Google Client ID not configured."}), 500
 
     try:
+        auth_header = request.headers.get('Authorization')
+        if not auth_header or not auth_header.startswith('Bearer '):
+            return jsonify({"error": "Authorization token missing or invalid"}), 401
+        token = auth_header.split(' ')[1]
+
+        user_info = verify_google_token(token, GOOGLE_CLIENT_ID)
         user_data = get_or_create_user(user_info)
 
-        if not user_data:
-            print(f"Error: Failed to get or create user for google_id {user_id}.")
-            return jsonify({"error": "Failed to retrieve or create user profile"}), 500
+        tier = user_data.get('tier', 'free')
+        limit = PREMIUM_TIER_LIMIT if tier == 'premium' else FREE_TIER_LIMIT
+        requests_used = user_data.get('requests_used_this_period', 0)
+        period_start = user_data.get('period_start_date')
+
+        now = datetime.now(timezone.utc) # Use timezone-aware
+        reset_time_iso = None
 
-        # Extract relevant status info
-        usage_count = user_data.get("requests_used_this_period", 0) # ADJUST FIELD NAME IF NEEDED
-        is_subscribed = user_data.get("is_subscribed", False)
-        subscription_expires = user_data.get("subscription_expires")
-        expires_str = subscription_expires.isoformat() if subscription_expires and isinstance(subscription_expires, datetime) else None # Add type check
-        user_tier = user_data.get('tier', 'free')
+        # Calculate reset time (assuming daily reset at UTC midnight)
+        try:
+            tomorrow = now.date() + timedelta(days=1)
+            tomorrow_midnight_utc = datetime.combine(tomorrow, time(0, 0), tzinfo=timezone.utc)
+            reset_time_iso = tomorrow_midnight_utc.isoformat(timespec='seconds') # Use ISO format with seconds
+        except Exception as time_err:
+            print(f"Error calculating reset time: {time_err}")
+            reset_time_iso = "Error calculating reset time"
 
-        # Calculate the specific usage limit based on tier
-        current_usage_limit = PREMIUM_TIER_LIMIT if user_tier == 'premium' else FREE_TIER_LIMIT
 
-        # Calculate the next reset time (assuming daily reset at midnight UTC)
-        period_start = user_data.get('period_start_date') # Get the start date from DB
-        reset_time_iso = None
-        if period_start and isinstance(period_start, datetime): # Add type check
-            # Ensure period_start is timezone-aware (assuming it's stored as UTC)
-            if period_start.tzinfo is None:
+        # Check if usage needs reset for display purposes (doesn't update DB here)
+        display_requests_used = requests_used
+        if period_start and isinstance(period_start, datetime):
+             if period_start.tzinfo is None:
                  period_start = period_start.replace(tzinfo=timezone.utc)
-            # Calculate the start of the *next* day in UTC
-            today_start_utc = datetime.combine(period_start.date(), time.min, tzinfo=timezone.utc)
-            next_reset_utc = today_start_utc + timedelta(days=1)
-            reset_time_iso = next_reset_utc.isoformat()
-        else: # Handle missing or invalid period_start
-             print(f"Warning: period_start_date missing or invalid for user {user_id}. Calculating default reset time.")
-             now_utc = datetime.now(timezone.utc)
-             today_start_utc = datetime.combine(now_utc.date(), time.min, tzinfo=timezone.utc)
-             next_reset_utc = today_start_utc + timedelta(days=1)
-             reset_time_iso = next_reset_utc.isoformat()
+             if period_start.date() < now.date():
+                 display_requests_used = 0 # Display as 0 if period has reset
 
+        print(f"User status requested for {user_data.get('google_user_id')}: Used={display_requests_used}, Limit={limit}, Tier={tier}, Resets={reset_time_iso}")
 
-        # Return the data structure expected by the frontend
         return jsonify({
-            "usageCount": usage_count,
-            "is_subscribed": is_subscribed,
-            "subscription_expires": expires_str,
-            "tier": user_tier,
-            "usageLimit": current_usage_limit,
-            "resetTime": reset_time_iso
+            "tier": tier,
+            "usageCount": display_requests_used,
+            "usageLimit": limit,
+            "resetTime": reset_time_iso # ISO 8601 format string (UTC)
         }), 200
 
-    except ValueError as ve: # Catch specific errors if needed
-        print(f"ValueError during user status processing for {user_id}: {ve}")
+    except ValueError as auth_err:
+        print(f"[/user-status] Authentication error: {auth_err}")
+        return jsonify({"error": str(auth_err)}), 401
+    except Exception as e:
+        print(f"Error getting user status: {e}")
         traceback.print_exc()
-        return jsonify({"error": f"Failed to process user information: {ve}"}), 400
-    except Exception as e: # General catch-all for 500 errors
-        print(f"Unhandled error fetching user status for {user_id}: {e}")
-        traceback.print_exc() # Print the full traceback to the console
-        return jsonify({"error": "Internal Server Error"}), 500 # Generic message to client
+        return jsonify({"error": f"Internal server error: {str(e)}"}), 500
\ No newline at end of file
diff --git a/backend/college_transfer_ai/utils.py b/backend/college_transfer_ai/utils.py
index 547f7d3..2736029 100644
--- a/backend/college_transfer_ai/utils.py
+++ b/backend/college_transfer_ai/utils.py
@@ -107,8 +107,7 @@ def check_and_update_usage(user_data):
     """
     Checks if the user is within their usage limit based on tier.
     Resets daily usage if necessary. Increments usage count if within limit.
-    Returns tuple (bool, str): (True, success_message) if usage is allowed, 
-    (False, error_message) otherwise.
+    Returns True if usage is allowed, False otherwise.
     Raises Exception on database error.
     """
     users_collection = get_users_collection() # Get collection via function
@@ -143,7 +142,7 @@ def check_and_update_usage(user_data):
     # --- Check if limit is exceeded ---
     if requests_used >= limit:
         print(f"Usage limit exceeded for user {google_user_id} (Tier: {tier}, Used: {requests_used}, Limit: {limit})")
-        return False, f"Usage limit reached: {requests_used}/{limit} requests. Upgrade your plan for more requests or wait for the next reset period."
+        return False # Limit exceeded
 
     # --- If limit is not exceeded, increment count ---
     try:
@@ -176,70 +175,9 @@ def check_and_update_usage(user_data):
              raise Exception(f"User {google_user_id} not found during usage update.")
 
         print(f"Usage updated for user {google_user_id}: {requests_used + 1}/{limit}")
-        return True, f"Request allowed. Usage: {requests_used + 1}/{limit}."
+        return True # Usage allowed and updated
     except Exception as e:
         print(f"Error updating usage count for user {google_user_id}: {e}")
         # Add traceback here if it's not already in the calling function's handler
         traceback.print_exc()
-        raise Exception(f"Failed to update usage count: {e}")
-
-# Example structure for utils.py
-
-import os
-from functools import wraps
-from flask import request, jsonify, current_app # Assuming Flask context
-# Import Google auth libraries
-from google.oauth2 import id_token
-from google.auth.transport import requests as google_requests
-
-GOOGLE_CLIENT_ID = os.getenv("GOOGLE_CLIENT_ID") # Ensure this is loaded correctly
-
-def verify_google_token(f):
-    @wraps(f)
-    def decorated_function(*args, **kwargs):
-        token = None
-        # Extract Bearer token from Authorization header
-        auth_header = request.headers.get('Authorization')
-        if (auth_header):
-            parts = auth_header.split()
-            if len(parts) == 2 and parts[0].lower() == 'bearer':
-                token = parts[1]
-
-        if not token:
-            print("Decorator Error: Authorization token is missing")
-            return jsonify({"error": "Authorization token is missing"}), 401
-
-        if not GOOGLE_CLIENT_ID:
-             print("Decorator Error: GOOGLE_CLIENT_ID is not set in environment variables.")
-             return jsonify({"error": "Server configuration error: Google Client ID not set."}), 500
-
-        try:
-            # Verify the token and get user info
-            idinfo = id_token.verify_oauth2_token(
-                token, google_requests.Request(), GOOGLE_CLIENT_ID
-            )
-
-            # --- Verification Point ---
-            # Ensure 'sub' is present after successful verification
-            if 'sub' not in idinfo:
-                 print(f"Decorator Error: 'sub' key not found in verified token payload: {idinfo}")
-                 return jsonify({"error": "Token verified, but user identifier ('sub') is missing."}), 401
-
-            # --- Crucial Step ---
-            # Pass the complete idinfo dictionary to the decorated route function
-            return f(idinfo, *args, **kwargs)
-
-        except ValueError as e:
-            # Handles common token validation errors (expired, audience, etc.)
-            print(f"Decorator Error: Invalid token - {e}")
-            # It's helpful to return the specific error detail from Google's library
-            return jsonify({"error": "Invalid or expired token", "details": str(e)}), 401
-        except Exception as e:
-            # Catch unexpected errors during verification
-            print(f"Decorator Error: Unexpected error during token verification - {e}")
-            traceback.print_exc() # Log the full traceback
-            return jsonify({"error": "Token verification failed", "details": str(e)}), 500
-
-    return decorated_function
-
-# ... other utility functions ...
+        raise Exception(f"Failed to update usage count: {e}")
\ No newline at end of file
diff --git a/src/App.jsx b/src/App.jsx
index 6c0da65..f5e20b6 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -305,4 +305,4 @@ function App() {
   );
 }
 
-export default App;
+export default App;
\ No newline at end of file
diff --git a/src/components/AgreementViewerPage.jsx b/src/components/AgreementViewerPage.jsx
index 1f30d7b..68ae506 100644
--- a/src/components/AgreementViewerPage.jsx
+++ b/src/components/AgreementViewerPage.jsx
@@ -1,697 +1,141 @@
-import React, { useState, useEffect, useRef, useCallback, useMemo } from 'react';
-import { useParams, useLocation } from 'react-router-dom'; // Import useLocation
+import React, { useState, useEffect, useRef, useMemo } from 'react';
+import { useParams, useLocation } from 'react-router-dom';
+
+// Import Components
 import PdfViewer from './PdfViewer';
 import ChatInterface from './ChatInterface';
-import { fetchData } from '../services/api';
-import '../App.css';
+import MajorsList from './AgreementViewerPage/MajorsList'; // Adjusted path
+import AgreementTabs from './AgreementViewerPage/AgreementTabs'; // Adjusted path
+import UsageStatusDisplay from './AgreementViewerPage/UsageStatusDisplay'; // Adjusted path
 
-// Helper function to format remaining time
-function formatRemainingTime(resetTimestamp) {
-    if (!resetTimestamp) return '';
-    const now = new Date();
-    const resetDate = new Date(resetTimestamp);
-    const diff = resetDate.getTime() - now.getTime();
+// Import Hooks
+import { useResizeHandler } from '../hooks/useResizeHandler'; // Adjusted path
+import { useUsageStatus } from '../hooks/useUsageStatus'; // Adjusted path
+import { useAgreementData } from '../hooks/useAgreementData'; // Adjusted path
 
-    if (diff <= 0) return 'Usage reset';
+// Import CSS
+import '../App.css'; // Keep general styles if needed
 
-    const hours = Math.floor(diff / (1000 * 60 * 60));
-    const minutes = Math.floor((diff % (1000 * 60 * 60)) / (1000 * 60));
-    const seconds = Math.floor((diff % (1000 * 60)) / 1000);
+// Constants
+const MIN_COL_WIDTH = 150;
+const FIXED_MAJORS_WIDTH = 300;
 
-    return `Resets in ${hours}h ${minutes}m ${seconds}s`;
-}
+// Helper function to format remaining time (moved to useUsageStatus hook)
+// function formatRemainingTime(resetTimestamp) { ... }
 
 
 function AgreementViewerPage({ user, userTier }) {
-    const { sendingId: initialSendingId, receivingId, yearId } = useParams(); // Get initial IDs from URL
-    const location = useLocation(); // Get location object
+    const { sendingId: initialSendingId, receivingId, yearId } = useParams();
+    const location = useLocation();
 
-    // Get the full list passed from the form, default to an array containing the initial one if state is missing
     const allSelectedSendingInstitutions = useMemo(() => {
+        // Use the *first* selected institution for IGETC fetching logic
         return location.state?.allSelectedSendingInstitutions || [{ id: initialSendingId, name: 'Unknown Sending Institution' }];
     }, [location.state?.allSelectedSendingInstitutions, initialSendingId]);
 
-    // --- State for resizing (remains the same) ---
-    const [chatColumnWidth, setChatColumnWidth] = useState(400);
-    const isResizingRef = useRef(false);
-    const dividerRef = useRef(null);
-    const containerRef = useRef(null);
-
-    // Define minColWidth and dividerWidth as constants outside the component
-    const minColWidth = 150;
-    const dividerWidth = 1;
-    const fixedMajorsWidth = 300; // Revert to fixed width for majors
-
-    // --- State for Majors Column Visibility (remains the same) ---
+    // --- State for Majors Column Visibility ---
     const [isMajorsVisible, setIsMajorsVisible] = useState(true);
     const isMajorsVisibleRef = useRef(isMajorsVisible);
-
-    // --- Update ref whenever visibility state changes ---
-    useEffect(() => {
-        isMajorsVisibleRef.current = isMajorsVisible;
-    }, [isMajorsVisible]);
-
-    // --- State for Agreement Data ---
-    const [selectedCategory, setSelectedCategory] = useState('major');
-    const [majors, setMajors] = useState({});
-    const [isLoadingMajors, setIsLoadingMajors] = useState(true);
-    const [error, setError] = useState(null); // General error
-    const [pdfError, setPdfError] = useState(null); // PDF/Image specific error
-    const [selectedMajorKey, setSelectedMajorKey] = useState(null);
-    const [selectedMajorName, setSelectedMajorName] = useState('');
-    const [isLoadingPdf, setIsLoadingPdf] = useState(false);
-    const [majorSearchTerm, setMajorSearchTerm] = useState('');
-    const [hasMajorsAvailable, setHasMajorsAvailable] = useState(true);
-    const [hasDepartmentsAvailable, setHasDepartmentsAvailable] = useState(true);
-    const [isLoadingAvailability, setIsLoadingAvailability] = useState(true);
-
-    // --- NEW State for Multiple PDFs/Tabs ---
-    const [agreementData, setAgreementData] = useState([]); // Array of { sendingId, sendingName, pdfFilename }
-    const [activeTabIndex, setActiveTabIndex] = useState(0); // Index of the currently viewed PDF/Tab
-    const [imagesForActivePdf, setImagesForActivePdf] = useState([]); // Renamed for clarity
-    const [allAgreementsImageFilenames, setAllAgreementsImageFilenames] = useState([]); // NEW: For initial chat analysis
-
-    // --- NEW State for User Usage Status ---
-    const [usageStatus, setUsageStatus] = useState({
-        usageCount: null,
-        usageLimit: null,
-        resetTime: null,
-        tier: userTier || null, // Initialize tier from prop
-        error: null,
-    });
-    const [countdown, setCountdown] = useState('');
-    // --- End Usage Status State ---
-
-    // --- Derived state for the currently active agreement ---
-    const currentAgreement = agreementData[activeTabIndex] || null;
-    const currentSendingId = currentAgreement?.sendingId || initialSendingId; // Fallback to URL param if needed initially
-    const currentPdfFilename = currentAgreement?.pdfFilename || null;
-
-    // --- Effect to Fetch User Usage Status ---
-    useEffect(() => {
-        // Update local tier state if prop changes (e.g., after successful payment webhook)
-        setUsageStatus(prev => ({ ...prev, tier: userTier }));
-
-        if (!user || !user.idToken) {
-            setUsageStatus({ usageCount: null, usageLimit: null, resetTime: null, tier: userTier, error: 'Not logged in' });
-            return;
-        }
-
-        const fetchStatus = async () => {
-            try {
-                const data = await fetchData('user-status', {
-                    headers: {
-                        'Authorization': `Bearer ${user.idToken}`
-                    }
-                });
-                if (data && data.usageLimit !== undefined) {
-                    setUsageStatus({
-                        usageCount: data.usageCount,
-                        usageLimit: data.usageLimit,
-                        resetTime: data.resetTime,
-                        tier: data.tier, // Use tier from API response
-                        error: null,
-                    });
-                } else {
-                    throw new Error(data?.error || 'Invalid status response');
-                }
-            } catch (err) {
-                console.error("Error fetching user status:", err);
-                // Keep tier from prop even if fetch fails? Or show error?
-                setUsageStatus(prev => ({ ...prev, tier: userTier, error: `Failed to load usage: ${err.message}` }));
-            }
-        };
-
-        fetchStatus();
-        // Optionally, refetch periodically if needed, but a single fetch on load/user change might be sufficient
-        // const intervalId = setInterval(fetchStatus, 60000); // Example: refetch every minute
-        // return () => clearInterval(intervalId);
-
-    }, [user, userTier]); // Re-fetch when user object changes
-
-    // --- Effect for Countdown Timer ---
-    useEffect(() => {
-        if (!usageStatus.resetTime || agreementData.length === 0 || isLoadingPdf) {
-            setCountdown(''); // Clear countdown if conditions aren't met
-            return; // Exit effect
-        }
-        console.log("Starting countdown timer as agreement is loaded."); // Add log
-
-        // Calculate initial remaining time immediately
-        const initialRemaining = formatRemainingTime(usageStatus.resetTime);
-        setCountdown(initialRemaining);
-
-        // If already reset, don't start interval
-        if (initialRemaining === 'Usage reset') {
-            return;
-        }
-
-        // Start the interval to update every second
-        const intervalId = setInterval(() => {
-            const remaining = formatRemainingTime(usageStatus.resetTime);
-            setCountdown(remaining);
-            if (remaining === 'Usage reset') {
-                clearInterval(intervalId);
-                // Optionally refetch status after reset?
-                // fetchStatus(); // You might need to define fetchStatus outside its effect or pass it down
-            }
-        }, 1000); // Update every second
-
-        // Cleanup interval on unmount or when dependencies change causing the effect to re-run
-        return () => {
-            console.log("Clearing countdown interval."); // Add log for cleanup
-            clearInterval(intervalId);
-        }
-    // Add agreementData and isLoadingPdf as dependencies
-    }, [usageStatus.resetTime, agreementData, isLoadingPdf]);
-    // --- End Countdown Effect ---
-
-
-    // --- Existing Effects (Availability, Fetching Majors - adjust dependencies) ---
-    // Availability check might need adjustment if it depends on a single sendingId
-    useEffect(() => {
-        if (!initialSendingId || !receivingId || !yearId) {
-            setIsLoadingAvailability(false);
-            setHasMajorsAvailable(false);
-            setHasDepartmentsAvailable(false);
-            return;
-        }
-
-        setIsLoadingAvailability(true);
-        setHasMajorsAvailable(false);
-        setHasDepartmentsAvailable(false);
-
-        const checkAvailability = async (category) => {
-            const cacheKey = `agreements-${category}-${initialSendingId}-${receivingId}-${yearId}`;
-            try {
-                const storedData = localStorage.getItem(cacheKey);
-                if (storedData) {
-                    const parsedData = JSON.parse(storedData);
-                    if (parsedData && Object.keys(parsedData).length > 0) {
-                        return true;
-                    }
-                }
-            } catch (e) {
-                console.error(`Failed to read or parse ${category} cache for availability check:`, e);
-                localStorage.removeItem(cacheKey);
-            }
-
-            try {
-                const data = await fetchData(`majors?sendingId=${initialSendingId}&receivingId=${receivingId}&academicYearId=${yearId}&categoryCode=${category}`);
-                return data && Object.keys(data).length > 0;
-            } catch (err) {
-                console.error(`Error checking availability for ${category}:`, err);
-                return false;
-            }
-        };
-
-        Promise.all([checkAvailability('major'), checkAvailability('dept')])
-            .then(([majorsExist, deptsExist]) => {
-                setHasMajorsAvailable(majorsExist);
-                setHasDepartmentsAvailable(deptsExist);
-
-                if (selectedCategory === 'major' && !majorsExist && deptsExist) {
-                    setSelectedCategory('dept');
-                } else if (selectedCategory === 'dept' && !deptsExist && majorsExist) {
-                    setSelectedCategory('major');
-                } else if (!majorsExist && !deptsExist) {
-                    setError("No majors or departments found for the selected combination.");
-                }
-
-            })
-            .finally(() => {
-                setIsLoadingAvailability(false);
-            });
-
-    }, [initialSendingId, receivingId, yearId, selectedCategory]);
-
-    // Fetch Majors/Departments based on the *initial* sendingId from URL (or decide how to handle multiple)
-    // For now, let's assume majors are fetched based on the first sending institution shown
-    useEffect(() => {
-        if (isLoadingAvailability || !initialSendingId || !receivingId || !yearId) {
-            if (!initialSendingId || !receivingId || !yearId) {
-                setError("Required institution or year information is missing in URL.");
-                setIsLoadingMajors(false);
-                setMajors({});
-            }
-            return;
-        }
-
-        if ((selectedCategory === 'major' && !hasMajorsAvailable) || (selectedCategory === 'dept' && !hasDepartmentsAvailable)) {
-            setError(`No ${selectedCategory}s found for the selected combination.`);
-            setIsLoadingMajors(false);
-            setMajors({});
-            return;
-        }
-
-        const cacheKey = `agreements-${selectedCategory}-${initialSendingId}-${receivingId}-${yearId}`;
-        let cachedData = null;
-
-        try {
-            const storedData = localStorage.getItem(cacheKey);
-            if (storedData) {
-                cachedData = JSON.parse(storedData);
-                console.log(`Loaded ${selectedCategory}s from cache:`, cacheKey);
-                setMajors(cachedData);
-                setIsLoadingMajors(false);
-                setError(null);
-                return;
-            }
-        } catch (e) {
-            console.error(`Failed to read or parse ${selectedCategory}s cache:`, e);
-            localStorage.removeItem(cacheKey);
-        }
-
-        console.log(`Fetching ${selectedCategory}s from API:`, cacheKey);
-        setIsLoadingMajors(true);
-        setError(null);
-        setMajors({});
-
-        const fetchCategoryData = async () => {
-            try {
-                const data = await fetchData(`majors?sendingId=${initialSendingId}&receivingId=${receivingId}&academicYearId=${yearId}&categoryCode=${selectedCategory}`);
-                console.log(`API response for ${selectedCategory}:`, data);
-
-                if (data && Object.keys(data).length > 0) {
-                    setMajors(data);
-                    setError(null);
-                    try {
-                        localStorage.setItem(cacheKey, JSON.stringify(data));
-                        console.log(`Saved ${selectedCategory}s data to cache:`, cacheKey);
-                    } catch (e) {
-                        console.error(`Failed to save ${selectedCategory}s data to cache:`, e);
-                    }
-                } else {
-                    setError(`No ${selectedCategory}s found for the selected combination.`);
-                    setMajors({});
-                    if (selectedCategory === 'major') setHasMajorsAvailable(false);
-                    if (selectedCategory === 'dept') setHasDepartmentsAvailable(false);
-                }
-            } catch (err) {
-                console.error(`Error fetching ${selectedCategory}s:`, err);
-                setError(err.message || `An error occurred fetching ${selectedCategory}s.`);
-                setMajors({});
-                if (selectedCategory === 'major') setHasMajorsAvailable(false);
-                if (selectedCategory === 'dept') setHasDepartmentsAvailable(false);
-            } finally {
-                setIsLoadingMajors(false);
-            }
-        };
-
-        fetchCategoryData();
-
-    }, [initialSendingId, receivingId, yearId, selectedCategory, isLoadingAvailability, hasMajorsAvailable, hasDepartmentsAvailable]);
-
-    // --- MODIFIED Effect to fetch agreement details AND ALL initial images ---
-    const fetchAgreementDetailsAndImages = useCallback(async () => {
-        if (!selectedMajorKey || allSelectedSendingInstitutions.length === 0 || !receivingId || !yearId) {
-            setAgreementData([]);
-            setAllAgreementsImageFilenames([]); // Clear all images
-            setImagesForActivePdf([]); // Clear active images
-            return;
-        }
-
-        setIsLoadingPdf(true); // Use this state for the overall loading
-        setPdfError(null);
-        setAgreementData([]);
-        setAllAgreementsImageFilenames([]);
-        setImagesForActivePdf([]);
-
-        let fetchedAgreements = []; // To store results from /articulation-agreements
-
-        try {
-            // 1. Fetch PDF filenames for all agreements
-            const sendingIds = allSelectedSendingInstitutions.map(inst => inst.id);
-            console.log("Fetching agreements list for Sending IDs:", sendingIds, selectedMajorKey);
-            const response = await fetchData('/articulation-agreements', {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ sending_ids: sendingIds, receiving_id: receivingId, year_id: yearId, major_key: selectedMajorKey })
-            });
-
-            if (!response || !Array.isArray(response.agreements)) {
-                throw new Error(response?.error || "Invalid response format from /articulation-agreements");
-            }
-
-            // Map response to include names
-            fetchedAgreements = response.agreements.map(agreement => {
-                const sendingInst = allSelectedSendingInstitutions.find(inst => inst.id === agreement.sendingId);
-                return { ...agreement, sendingName: sendingInst ? sendingInst.name : `Sending ID ${agreement.sendingId}` };
-            });
-            console.log("Received agreement list:", fetchedAgreements);
-            setAgreementData(fetchedAgreements);
-            setActiveTabIndex(0); // Set first tab active
-
-            // 2. Fetch image filenames for ALL valid PDFs in parallel
-            const imageFetchPromises = fetchedAgreements
-                .filter(agreement => agreement.pdfFilename) // Only fetch for those with a filename
-                .map(agreement =>
-                    fetchData(`pdf-images/${encodeURIComponent(agreement.pdfFilename)}`)
-                        .then(imgResponse => {
-                            if (imgResponse && imgResponse.image_filenames) {
-                                return { sendingId: agreement.sendingId, images: imgResponse.image_filenames };
-                            } else {
-                                console.warn(`No images found for ${agreement.pdfFilename}`);
-                                return { sendingId: agreement.sendingId, images: [] }; // Return empty array on failure/no images
-                            }
-                        })
-                        .catch(err => {
-                            console.error(`Error fetching images for ${agreement.pdfFilename}:`, err);
-                            return { sendingId: agreement.sendingId, images: [] }; // Return empty array on error
-                        })
-                );
-
-            const imageResults = await Promise.allSettled(imageFetchPromises);
-
-            const allImagesCombined = imageResults.reduce((acc, result) => {
-                if (result.status === 'fulfilled' && result.value.images.length > 0) {
-                    // Optionally add context comment for LLM?
-                    // acc.push(`--- Images for Sending ID ${result.value.sendingId} ---`);
-                    acc.push(...result.value.images);
-                }
-                return acc;
-            }, []);
-
-            console.log("Combined image filenames for initial analysis:", allImagesCombined);
-            setAllAgreementsImageFilenames(allImagesCombined);
-
-            // 3. Fetch images for the *initially active* PDF (tab 0) for the viewer
-            const firstAgreement = fetchedAgreements[0];
-            if (firstAgreement && firstAgreement.pdfFilename) {
-                // Find the corresponding images from the parallel fetch results
-                const firstAgreementImagesResult = imageResults.find(result => result.status === 'fulfilled' && result.value.sendingId === firstAgreement.sendingId);
-                if (firstAgreementImagesResult && firstAgreementImagesResult.value.images.length > 0) {
-                     setImagesForActivePdf(firstAgreementImagesResult.value.images);
-                } else {
-                     // Handle case where even the first PDF's images failed to load
-                     setPdfError(`Failed to load images for the initial agreement: ${firstAgreement.sendingName}`);
-                     setImagesForActivePdf([]);
-                }
-            } else if (fetchedAgreements.length > 0) {
-                setPdfError(`No PDF filename found for the initial agreement: ${fetchedAgreements[0].sendingName}.`);
-                setImagesForActivePdf([]);
-            } else {
-                setPdfError("No agreements found for the selected major and institutions.");
-                setImagesForActivePdf([]);
-            }
-
-        } catch (err) {
-            console.error("Error fetching agreement details and images:", err);
-            setPdfError(`Failed to load agreement details: ${err.message}`);
-            setAgreementData([]);
-            setAllAgreementsImageFilenames([]);
-            setImagesForActivePdf([]);
-        } finally {
-            setIsLoadingPdf(false);
-        }
-    }, [selectedMajorKey, allSelectedSendingInstitutions, receivingId, yearId]); // Dependencies
-
-    // --- Effect to fetch images ONLY for the ACTIVE PDF VIEWER when tab changes ---
-    const fetchImagesForActiveTab = useCallback(async () => {
-        const activeAgreement = agreementData[activeTabIndex];
-        if (!activeAgreement || !activeAgreement.pdfFilename) {
-            setImagesForActivePdf([]); // Clear if no active agreement or filename
-            if (activeAgreement) setPdfError(`No PDF available for ${activeAgreement.sendingName}.`);
-            return;
-        }
-
-        // Removed the check for tab 0 here - let's always fetch on tab change for simplicity now.
-
-        setIsLoadingPdf(true); // Show loading for tab switch
-        setPdfError(null);
-        setImagesForActivePdf([]); // Clear previous tab's images
-        console.log("Fetching images for active tab PDF:", activeAgreement.pdfFilename);
-        try {
-            const response = await fetchData(`pdf-images/${encodeURIComponent(activeAgreement.pdfFilename)}`);
-            if (response && response.image_filenames) {
-                console.log("Received images for active tab:", response.image_filenames);
-                setImagesForActivePdf(response.image_filenames);
-            } else {
-                throw new Error(response?.error || "No image filenames received for active tab");
-            }
-        } catch (err) {
-            console.error(`Error fetching images for ${activeAgreement.pdfFilename}:`, err);
-            setPdfError(`Failed to load images for ${activeAgreement.sendingName}: ${err.message}`);
-            setImagesForActivePdf([]);
-        } finally {
-            setIsLoadingPdf(false);
-        }
-    // MODIFIED Dependencies: Only depend on data needed to identify the active agreement
-    }, [activeTabIndex, agreementData]); // Dependencies
-
-    // Trigger initial fetch when major changes
-    useEffect(() => {
-        fetchAgreementDetailsAndImages();
-    }, [fetchAgreementDetailsAndImages]);
-
-    // Trigger active image fetch when active tab changes
-    useEffect(() => {
-        // Fetch whenever the active tab index changes, but only if agreementData is loaded.
-        // This prevents fetching when agreementData is initially empty.
-        // Also ensures it runs for tab 0 *after* the initial data load completes.
-        if (agreementData.length > 0) {
-             console.log(`Tab changed to ${activeTabIndex} or agreementData loaded, fetching images for active tab.`);
-             fetchImagesForActiveTab();
-        } else {
-             console.log("Skipping fetchImagesForActiveTab because agreementData is empty.");
-        }
-    // MODIFIED Dependencies: Remove imagesForActivePdf
-    }, [activeTabIndex, agreementData, fetchImagesForActiveTab]);
-
-    // --- Handlers ---
-    const handleMajorSelect = (majorKey, majorName) => {
-        console.log("Major selected:", majorKey, majorName);
-        setSelectedMajorKey(majorKey);
-        setSelectedMajorName(majorName);
-        // fetchAgreementDetails will be triggered by the useEffect dependency change
-    };
-
-    const handleCategoryChange = (event) => {
-        const newCategory = event.target.value;
-        console.log("Category changed to:", newCategory);
-        setSelectedCategory(newCategory);
-        // Reset major selection when category changes
-        setSelectedMajorKey(null);
-        setSelectedMajorName('');
-        setMajorSearchTerm(''); // Clear search term as well
-        // The useEffect for fetching majors/depts will re-run due to selectedCategory change
-    };
-
-    const handleTabClick = (index) => {
-        console.log("Tab clicked:", index);
-        setActiveTabIndex(index);
-        // Image fetch will be triggered by the useEffect dependency change
-    };
-
-    // --- Resizing Handlers (remain the same) ---
-    const handleMouseMove = useCallback((e) => { // Keep useCallback, but dependencies change
-        if (!isResizingRef.current || !containerRef.current) {
-            return;
-        }
-
-        const containerRect = containerRef.current.getBoundingClientRect();
-        const mouseX = e.clientX;
-        const containerLeft = containerRect.left;
-        const totalWidth = containerRect.width;
-        const gapWidth = 16; // Assumed 1em = 16px
-
-        // --- Read the *current* visibility from the ref ---
-        const currentVisibility = isMajorsVisibleRef.current;
-
-        // Calculate the starting position of the chat column
-        const majorsEffectiveWidth = currentVisibility ? fixedMajorsWidth : 0;
-        const gap1EffectiveWidth = currentVisibility ? gapWidth : 0; // Gap between majors and chat
-        const chatStartOffset = majorsEffectiveWidth + gap1EffectiveWidth;
-
-        // Calculate desired chat width based on mouse position relative to chat start
-        let newChatWidth = mouseX - containerLeft - chatStartOffset;
-
-        // Constraints: ensure chat and PDF columns have minimum width
-        const maxChatWidth = totalWidth - chatStartOffset - minColWidth - gapWidth - dividerWidth;
-        newChatWidth = Math.max(minColWidth, Math.min(newChatWidth, maxChatWidth));
-
-        setChatColumnWidth(newChatWidth);
-
-    // --- Remove isMajorsVisible from dependencies, rely on the ref ---
-    }, []); // Empty dependency array is okay now because we use the ref
-
-    const handleMouseUp = useCallback(() => {
-        if (isResizingRef.current) {
-            isResizingRef.current = false;
-            window.removeEventListener('mousemove', handleMouseMove);
-            window.removeEventListener('mouseup', handleMouseUp);
-            document.body.style.cursor = '';
-            document.body.style.userSelect = '';
-        }
-    }, [handleMouseMove]);
-
-    useEffect(() => {
-        const currentHandleMouseMove = handleMouseMove;
-        const currentHandleMouseUp = handleMouseUp;
-        return () => {
-            window.removeEventListener('mousemove', currentHandleMouseMove);
-            window.removeEventListener('mouseup', currentHandleMouseUp);
-        };
-    }, [handleMouseMove, handleMouseUp]);
-
-    const handleMouseDown = useCallback((e) => {
-        e.preventDefault();
-        isResizingRef.current = true;
-        window.addEventListener('mousemove', handleMouseMove);
-        window.addEventListener('mouseup', handleMouseUp);
-        document.body.style.cursor = 'col-resize';
-        document.body.style.userSelect = 'none';
-    }, [handleMouseMove, handleMouseUp]);
-
-    // --- Toggle Majors Visibility (remains the same) ---
+    useEffect(() => { isMajorsVisibleRef.current = isMajorsVisible; }, [isMajorsVisible]);
+
+    // --- Custom Hooks ---
+    const {
+        chatColumnWidth,
+        setChatColumnWidth, // Get setter from hook
+        dividerRef,
+        containerRef,
+        handleMouseDown,
+    } = useResizeHandler(400, MIN_COL_WIDTH, FIXED_MAJORS_WIDTH, isMajorsVisibleRef);
+
+    const { usageStatus, countdown } = useUsageStatus(user, userTier);
+
+    const {
+        // State & Derived State
+        selectedCategory, majors, isLoadingMajors, error, pdfError,
+        selectedMajorKey, selectedMajorName, isLoadingPdf, majorSearchTerm,
+        hasMajorsAvailable, hasDepartmentsAvailable, isLoadingAvailability,
+        agreementData, activeTabIndex, imagesForActivePdf,
+        currentPdfFilename, filteredMajors,
+
+        // Handlers & Setters
+        handleMajorSelect, handleCategoryChange, handleTabClick, setMajorSearchTerm,
+    } = useAgreementData(initialSendingId, receivingId, yearId, user, allSelectedSendingInstitutions);
+
+    // --- Toggle Majors Visibility ---
     const toggleMajorsVisibility = () => {
-        const gapWidth = 16;
+        const gapWidth = 16; // Assuming 1em = 16px
         setIsMajorsVisible(prevVisible => {
             const nextVisible = !prevVisible;
-            setChatColumnWidth(prevChatWidth => {
-                if (nextVisible === false) { // Hiding
-                    return prevChatWidth + fixedMajorsWidth + gapWidth;
-                } else { // Showing
-                    const newWidth = prevChatWidth - fixedMajorsWidth - gapWidth;
-                    return Math.max(minColWidth, newWidth);
-                }
-            });
+            // Adjust chat width if hiding majors to prevent jump
+            if (!nextVisible && containerRef.current) {
+                const containerWidth = containerRef.current.getBoundingClientRect().width;
+                const pdfMinWidth = MIN_COL_WIDTH;
+                const availableWidth = containerWidth - pdfMinWidth - gapWidth - 1; // 1 for divider
+                setChatColumnWidth(prevChatWidth => Math.min(prevChatWidth + FIXED_MAJORS_WIDTH + gapWidth, availableWidth));
+            }
             return nextVisible;
         });
     };
 
-    // --- Calculate Layout (remains the same) ---
-    const filteredMajors = useMemo(() => {
-        const lowerCaseSearchTerm = majorSearchTerm.toLowerCase();
-        if (typeof majors !== 'object' || majors === null) {
-            return [];
-        }
-        return Object.entries(majors).filter(([name]) =>
-            name.toLowerCase().includes(lowerCaseSearchTerm)
-        );
-    }, [majors, majorSearchTerm]);
-
-    const currentMajorsFlexBasis = isMajorsVisible ? `${fixedMajorsWidth}px` : '0px';
+    // --- Layout Calculation ---
     const currentChatFlexBasis = `${chatColumnWidth}px`;
     const userName = user?.name || user?.email || "You";
+    const mainContentHeight = `calc(90vh - 53px)`; // Assuming nav height + padding
+
+    // Determine images for chat
+    const currentSendingId = (activeTabIndex >= 0 ? agreementData[activeTabIndex]?.sendingId : null) || allSelectedSendingInstitutions[0]?.id;
 
-    // Adjust height calculation - remove buttonBarHeight
-    const mainContentHeight = `calc(90vh - 53px)`; // Assuming nav is 60px
 
     return (
         <>
-            {/* --- Removed Button Bar --- */}
-
-            {/* Main container using Flexbox */}
             <div
                 ref={containerRef}
                 style={{
                     display: 'flex',
-                    height: mainContentHeight, // Use updated height
+                    height: mainContentHeight,
                     padding: '0.5em',
                     boxSizing: 'border-box',
                     color: "#333",
-                    position: 'relative', // Needed for absolute positioning of usage status
-                }}>
-
-                {/* --- Usage Status Display --- */}
-                {user && (usageStatus.usageLimit !== null || usageStatus.error) && (
-                    <div style={{
-                        position: 'absolute',
-                        bottom: '10px',
-                        right: '20px',
-                        background: 'rgba(255, 255, 255, 0.8)',
-                        padding: '5px 10px',
-                        borderRadius: '4px',
-                        fontSize: '0.85em',
-                        color: usageStatus.error ? 'red' : '#555',
-                        border: '1px solid #ccc',
-                        zIndex: 10 // Ensure it's above other elements
-                    }}>
-                        {usageStatus.error ? (
-                            <span>{usageStatus.error}</span>
-                        ) : (
-                            <>
-                                <span>Tier: {usageStatus.tier || 'N/A'} | </span>
-                                <span>Usage: {usageStatus.usageCount ?? 'N/A'} / {usageStatus.usageLimit ?? 'N/A'} | </span>
-                                <span>{countdown || 'Calculating reset...'}</span>
-                            </>
-                        )}
-                    </div>
-                )}
-                {/* --- End Usage Status Display --- */}
-
-
-                {/* Left Column (Majors/Depts List) */}
-                {isMajorsVisible && (
-                    <div style={{
-                        flex: `0 0 ${currentMajorsFlexBasis}`,
-                        display: 'flex',
-                        flexDirection: 'column',
-                        minWidth: isMajorsVisible ? `${minColWidth}px` : '0px',
-                        overflow: 'hidden',
-                        transition: 'flex-basis 0.3s ease, min-width 0.3s ease',
-                        marginRight: isMajorsVisible ? '1em' : '0',
-                        position: 'relative',
-                        paddingTop: '2.5em'
-                    }}>
-                        {/* --- Hide Majors Button (Stays Here) --- */}
-                        <button
-                            onClick={toggleMajorsVisibility}
-                            style={{
-                                position: 'absolute',
-                                top: '0.5em',
-                                left: '0.5em',
-                                zIndex: 1,
-                                padding: '4px 8px',
-                                fontSize: '0.85em'
-                            }}
-                            className="btn btn-sm btn-outline-secondary"
-                        >
-                            Hide Majors
-                        </button>
-                        {/* --- End Hide Majors Button --- */}
-
-                        {/* Content of Majors/Depts Column */}
-                        <h2 style={{ marginTop: '0', marginBottom: '0.5em', whiteSpace: 'nowrap' }}>
-                            Select {selectedCategory === 'major' ? 'Major' : 'Department'}
-                        </h2>
-                        {/* ... rest of majors column content ... */}
-                         <div style={{ marginBottom: '0.5em', display: 'flex', justifyContent: 'center', gap: '1em' }}>
-                            {isLoadingAvailability ? ( <p>Checking availability...</p> ) : (
-                                <>
-                                    <label style={{ opacity: hasMajorsAvailable ? 1 : 0.5, cursor: hasMajorsAvailable ? 'pointer' : 'not-allowed' }}>
-                                        <input type="radio" name="category" value="major" checked={selectedCategory === 'major'} onChange={handleCategoryChange} disabled={!hasMajorsAvailable} /> Majors
-                                    </label>
-                                    <label style={{ opacity: hasDepartmentsAvailable ? 1 : 0.5, cursor: hasDepartmentsAvailable ? 'pointer' : 'not-allowed' }}>
-                                        <input type="radio" name="category" value="dept" checked={selectedCategory === 'dept'} onChange={handleCategoryChange} disabled={!hasDepartmentsAvailable} /> Departments
-                                    </label>
-                                </>
-                            )}
-                        </div>
-                        <input type="text" placeholder={`Search ${selectedCategory === 'major' ? 'majors' : 'departments'}...`} value={majorSearchTerm} onChange={(e) => setMajorSearchTerm(e.target.value)} style={{ marginBottom: '0.5em', padding: '8px', border: '1px solid #ccc' }} />
-                        {error && <div style={{ color: 'red', marginBottom: '1em' }}>Error: {error}</div>}
-                        {isLoadingMajors && <p>Loading available {selectedCategory === 'major' ? 'majors' : 'departments'}...</p>}
-                        {!isLoadingMajors && filteredMajors.length > 0 && (
-                            <div style={{ flex: '1 1 auto', overflowY: 'auto', border: '1px solid #ccc' }}>
-                                {filteredMajors.map(([name, key]) => ( <div key={key} onClick={() => handleMajorSelect(key, name)} style={{ padding: '8px 12px', cursor: 'pointer', borderBottom: '1px solid #eee', backgroundColor: selectedMajorKey === key ? '#e0e0e0' : 'transparent', fontWeight: selectedMajorKey === key ? 'bold' : 'normal' }} className="major-list-item"> {name} {selectedMajorKey === key && isLoadingPdf && <span style={{ marginLeft: '10px', fontStyle: 'italic' }}>(Loading...)</span>} </div> ))}
-                            </div>
-                        )}
-                        {!isLoadingMajors && filteredMajors.length === 0 && Object.keys(majors).length > 0 && ( <p style={{ marginTop: '1em' }}>No {selectedCategory === 'major' ? 'majors' : 'departments'} match your search.</p> )}
-                        {!isLoadingMajors && Object.keys(majors).length === 0 && !error && ( <p>No {selectedCategory === 'major' ? 'majors' : 'departments'} found.</p> )}
-                        {!isLoadingMajors && !isLoadingAvailability && !hasMajorsAvailable && !hasDepartmentsAvailable && ( <p>No majors or departments found for this combination.</p> )}
-                    </div>
-                )}
+                    position: 'relative',
+                }}
+            >
+                <UsageStatusDisplay user={user} usageStatus={usageStatus} countdown={countdown} />
+
+                {/* Pass isMajorsVisible directly */}
+                <MajorsList
+                    isMajorsVisible={isMajorsVisible}
+                    toggleMajorsVisibility={toggleMajorsVisibility}
+                    selectedCategory={selectedCategory}
+                    handleCategoryChange={handleCategoryChange}
+                    majorSearchTerm={majorSearchTerm}
+                    setMajorSearchTerm={setMajorSearchTerm}
+                    filteredMajors={filteredMajors} // Pass filtered list
+                    handleMajorSelect={handleMajorSelect}
+                    isLoadingMajors={isLoadingMajors}
+                    error={error} // Pass majors list error
+                    hasMajorsAvailable={hasMajorsAvailable}
+                    hasDepartmentsAvailable={hasDepartmentsAvailable}
+                    isLoadingAvailability={isLoadingAvailability}
+                    selectedMajorKey={selectedMajorKey}
+                    isLoadingPdf={isLoadingPdf} // Pass PDF loading state for indicator
+                    majors={majors} // Pass raw majors for checking length in component
+                />
 
                 {/* Middle Column (Chat Interface) */}
-                <div style={{ flex: `0 0 ${currentChatFlexBasis}`, display: 'flex', flexDirection: 'column', minWidth: `${minColWidth}px` }}>
-                    {/* Pass visibility state and toggle function */}
+                <div style={{
+                    flex: `0 0 ${currentChatFlexBasis}`,
+                    display: 'flex',
+                    flexDirection: 'column',
+                    minWidth: `${MIN_COL_WIDTH}px`,
+                    // Add margin if majors are visible
+                    marginLeft: isMajorsVisible ? '1em' : '0',
+                    transition: 'margin-left 0.3s ease' // Smooth transition for margin
+                }}>
                     <ChatInterface
-                        imageFilenames={allAgreementsImageFilenames} // Pass the combined list
                         selectedMajorName={selectedMajorName}
                         userName={userName}
-                        isMajorsVisible={isMajorsVisible}
-                        toggleMajorsVisibility={toggleMajorsVisibility}
+                        isMajorsVisible={isMajorsVisible} // Pass visibility state
+                        toggleMajorsVisibility={toggleMajorsVisibility} // Pass toggle function
                         sendingInstitutionId={currentSendingId}
                         allSendingInstitutionIds={allSelectedSendingInstitutions.map(inst => inst.id)}
                         receivingInstitutionId={receivingId}
@@ -701,50 +145,43 @@ function AgreementViewerPage({ user, userTier }) {
                 </div>
 
                 {/* Draggable Divider */}
-                <div ref={dividerRef} style={{ width: `${dividerWidth}px`, cursor: 'col-resize', backgroundColor: '#e0e0e0', borderLeft: '1px solid #ccc', borderRight: '1px solid #ccc', alignSelf: 'stretch', flexShrink: 0, marginLeft: isMajorsVisible ? '1em' : '0' }} onMouseDown={handleMouseDown} />
+                <div
+                    ref={dividerRef}
+                    style={{
+                        width: `1px`, // Fixed width
+                        cursor: 'col-resize',
+                        backgroundColor: '#e0e0e0',
+                        borderLeft: '1px solid #ccc',
+                        borderRight: '1px solid #ccc',
+                        alignSelf: 'stretch',
+                        flexShrink: 0,
+                        // Adjust margin based on majors visibility
+                        marginLeft: '1em', // Always have margin before PDF viewer
+                        transition: 'margin-left 0.3s ease'
+                    }}
+                    onMouseDown={handleMouseDown}
+                />
 
                 {/* Right Column (PDF Viewer) */}
-                <div style={{ flex: '1 1 0', display: 'flex', flexDirection: 'column', minWidth: `${minColWidth}px`, marginLeft: '1em' }}>
-                    {/* --- PDF Tabs --- */}
-                    {agreementData.length > 1 && (
-                        <div style={{ display: 'flex', borderBottom: '1px solid #ccc', flexShrink: 0, background: '#e9ecef' /* Light grey background for the tab bar */ }}>
-                            {agreementData.map((agreement, index) => (
-                                <button
-                                    key={agreement.sendingId}
-                                    onClick={() => handleTabClick(index)}
-                                    style={{
-                                        padding: '10px 15px',
-                                        border: 'none', // Remove default border
-                                        borderBottom: activeTabIndex === index ? '3px solid #0056b3' : '3px solid transparent', // Stronger blue for active border
-                                        background: activeTabIndex === index ? '#ffffff' : '#e9ecef', // White background for active, match bar background for inactive
-                                        color: activeTabIndex === index ? '#0056b3' : '#495057', // Darker text for inactive, blue for active
-                                        cursor: 'pointer',
-                                        fontWeight: activeTabIndex === index ? 'bold' : 'normal',
-                                        fontSize: '0.95em', // Slightly larger font
-                                        textAlign: 'center',
-                                        // Add subtle top/side borders for inactive tabs for definition
-                                        borderTop: activeTabIndex !== index ? '1px solid #dee2e6' : 'none',
-                                        borderLeft: activeTabIndex !== index ? '1px solid #dee2e6' : 'none',
-                                        borderRight: activeTabIndex !== index ? '1px solid #dee2e6' : 'none',
-                                        borderTopLeftRadius: '4px', // Slightly rounded top corners
-                                        borderTopRightRadius: '4px',
-                                        marginRight: '2px', // Small gap between tabs
-                                    }}
-                                    title={`View agreement from ${agreement.sendingName}`}
-                                >
-                                    {agreement.sendingName}
-                                </button>
-                            ))}
-                        </div>
-                    )}
-                    {/* --- End PDF Tabs --- */}
-
-                    {/* Pass data for the ACTIVE PDF */}
+                <div style={{
+                    flex: '1 1 0', // Takes remaining space
+                    display: 'flex',
+                    flexDirection: 'column',
+                    minWidth: `${MIN_COL_WIDTH}px`,
+                    marginLeft: '1em' // Always have margin after divider
+                }}>
+                    <AgreementTabs
+                        agreementData={agreementData}
+                        activeTabIndex={activeTabIndex}
+                        handleTabClick={handleTabClick}
+                        allSelectedSendingInstitutions={allSelectedSendingInstitutions}
+                        yearId={yearId}
+                    />
                     <PdfViewer
-                        imageFilenames={imagesForActivePdf} // Use state for active PDF's images
-                        isLoading={isLoadingPdf && agreementData[activeTabIndex]?.pdfFilename === currentPdfFilename} // Only show loading for the active tab's fetch
-                        error={pdfError} // Show general PDF error
-                        filename={currentPdfFilename} // Pass the active filename
+                        imageFilenames={imagesForActivePdf}
+                        // Refined loading state check
+                        error={pdfError} // Pass PDF viewer error
+                        filename={currentPdfFilename}
                     />
                 </div>
             </div>
diff --git a/src/components/AgreementViewerPage/AgreementTabs.jsx b/src/components/AgreementViewerPage/AgreementTabs.jsx
new file mode 100644
index 0000000..c45e6b5
--- /dev/null
+++ b/src/components/AgreementViewerPage/AgreementTabs.jsx
@@ -0,0 +1,59 @@
+import React from 'react';
+
+function AgreementTabs({
+    agreementData,
+    activeTabIndex,
+    handleTabClick,
+}) {
+    const tabBaseStyle = {
+        padding: '10px 15px',
+        border: 'none',
+        cursor: 'pointer',
+        fontWeight: 'normal',
+        fontSize: '0.95em',
+        textAlign: 'center',
+        borderTopLeftRadius: '4px',
+        borderTopRightRadius: '4px',
+        marginRight: '2px',
+    };
+
+    const activeTabStyle = {
+        ...tabBaseStyle,
+        borderBottom: '3px solid #0056b3',
+        background: '#ffffff',
+        color: '#0056b3',
+        fontWeight: 'bold',
+        borderTop: 'none',
+        borderLeft: 'none',
+        borderRight: 'none',
+    };
+
+    const inactiveTabStyle = {
+        ...tabBaseStyle,
+        borderBottom: '3px solid transparent',
+        background: '#e9ecef',
+        color: '#495057',
+        borderTop: '1px solid #dee2e6',
+        borderLeft: '1px solid #dee2e6',
+        borderRight: '1px solid #dee2e6',
+    };
+
+    return (
+        <div style={{ display: 'flex', borderBottom: '1px solid #ccc', flexShrink: 0, background: '#e9ecef' }}>
+            {/* Dynamic Major Agreement Tabs */}
+            {agreementData.map((agreement, index) => (
+                <button
+                    key={agreement.sendingId}
+                    onClick={() => handleTabClick(index)}
+                    style={activeTabIndex === index ? activeTabStyle : inactiveTabStyle}
+                    title={`View agreement from ${agreement.sendingName}`}
+                    disabled={!agreement.pdfFilename}
+                >
+                    {agreement.sendingName}
+                </button>
+            ))}
+        </div>
+    );
+}
+
+export default AgreementTabs;
diff --git a/src/components/AgreementViewerPage/MajorsList.jsx b/src/components/AgreementViewerPage/MajorsList.jsx
new file mode 100644
index 0000000..50ce253
--- /dev/null
+++ b/src/components/AgreementViewerPage/MajorsList.jsx
@@ -0,0 +1,112 @@
+import React from 'react';
+
+function MajorsList({
+    isMajorsVisible,
+    toggleMajorsVisibility,
+    selectedCategory,
+    handleCategoryChange, // Pass the handler
+    majorSearchTerm,
+    setMajorSearchTerm,
+    filteredMajors,
+    handleMajorSelect,
+    isLoadingMajors,
+    error,
+    hasMajorsAvailable,
+    hasDepartmentsAvailable,
+    isLoadingAvailability,
+    selectedMajorKey,
+    isLoadingPdf,
+    majors // Pass raw majors for checking length
+}) {
+    if (!isMajorsVisible) return null;
+
+    return (
+        <div style={{
+            flex: `0 0 300px`, // Use fixed width directly
+            display: 'flex',
+            flexDirection: 'column',
+            minWidth: '150px', // Keep minWidth
+            overflow: 'hidden',
+            transition: 'flex-basis 0.3s ease, min-width 0.3s ease', // flex-basis might not be needed if fixed
+            marginRight: '1em',
+            position: 'relative',
+            paddingTop: '2.5em'
+        }}>
+            <button
+                onClick={toggleMajorsVisibility}
+                style={{
+                    position: 'absolute',
+                    top: '0.5em',
+                    left: '0.5em',
+                    zIndex: 1,
+                    padding: '4px 8px',
+                    fontSize: '0.85em'
+                }}
+                className="btn btn-sm btn-outline-secondary"
+            >
+                Hide Majors
+            </button>
+
+            <h2 style={{ marginTop: '0', marginBottom: '0.5em', whiteSpace: 'nowrap' }}>
+                Select {selectedCategory === 'major' ? 'Major' : 'Department'}
+            </h2>
+
+            <div style={{ marginBottom: '0.5em', display: 'flex', justifyContent: 'center', gap: '1em' }}>
+                {isLoadingAvailability ? (<p>Checking availability...</p>) : (
+                    <>
+                        <label style={{ opacity: hasMajorsAvailable ? 1 : 0.5, cursor: hasMajorsAvailable ? 'pointer' : 'not-allowed' }}>
+                            <input type="radio" name="category" value="major" checked={selectedCategory === 'major'} onChange={handleCategoryChange} disabled={!hasMajorsAvailable} /> Majors
+                        </label>
+                        <label style={{ opacity: hasDepartmentsAvailable ? 1 : 0.5, cursor: hasDepartmentsAvailable ? 'pointer' : 'not-allowed' }}>
+                            <input type="radio" name="category" value="dept" checked={selectedCategory === 'dept'} onChange={handleCategoryChange} disabled={!hasDepartmentsAvailable} /> Departments
+                        </label>
+                    </>
+                )}
+            </div>
+
+            <input
+                type="text"
+                placeholder={`Search ${selectedCategory === 'major' ? 'majors' : 'departments'}...`}
+                value={majorSearchTerm}
+                onChange={(e) => setMajorSearchTerm(e.target.value)}
+                style={{ marginBottom: '0.5em', padding: '8px', border: '1px solid #ccc' }}
+            />
+
+            {error && <div style={{ color: 'red', marginBottom: '1em' }}>Error: {error}</div>}
+            {isLoadingMajors && <p>Loading available {selectedCategory === 'major' ? 'majors' : 'departments'}...</p>}
+
+            {!isLoadingMajors && filteredMajors.length > 0 && (
+                <div style={{ flex: '1 1 auto', overflowY: 'auto', border: '1px solid #ccc' }}>
+                    {filteredMajors.map(([name, key]) => (
+                        <div
+                            key={key}
+                            onClick={() => handleMajorSelect(key, name)}
+                            style={{
+                                padding: '8px 12px',
+                                cursor: 'pointer',
+                                borderBottom: '1px solid #eee',
+                                backgroundColor: selectedMajorKey === key ? '#e0e0e0' : 'transparent',
+                                fontWeight: selectedMajorKey === key ? 'bold' : 'normal'
+                            }}
+                            className="major-list-item"
+                        >
+                            {name} {selectedMajorKey === key && isLoadingPdf && <span style={{ marginLeft: '10px', fontStyle: 'italic' }}>(Loading...)</span>}
+                        </div>
+                    ))}
+                </div>
+            )}
+
+            {!isLoadingMajors && filteredMajors.length === 0 && Object.keys(majors).length > 0 && (
+                 <p style={{ marginTop: '1em' }}>No {selectedCategory === 'major' ? 'majors' : 'departments'} match your search.</p>
+            )}
+            {!isLoadingMajors && Object.keys(majors).length === 0 && !error && (
+                 <p>No {selectedCategory === 'major' ? 'majors' : 'departments'} found.</p>
+            )}
+            {!isLoadingMajors && !isLoadingAvailability && !hasMajorsAvailable && !hasDepartmentsAvailable && (
+                 <p>No majors or departments found for this combination.</p>
+            )}
+        </div>
+    );
+}
+
+export default MajorsList;
diff --git a/src/components/AgreementViewerPage/UsageStatusDisplay.jsx b/src/components/AgreementViewerPage/UsageStatusDisplay.jsx
new file mode 100644
index 0000000..b2bf4c0
--- /dev/null
+++ b/src/components/AgreementViewerPage/UsageStatusDisplay.jsx
@@ -0,0 +1,34 @@
+import React from 'react';
+
+function UsageStatusDisplay({ user, usageStatus, countdown }) {
+    if (!user || (usageStatus.usageLimit === null && !usageStatus.error)) {
+        return null; // Don't display if not logged in or status not loaded (and no error)
+    }
+
+    return (
+        <div style={{
+            position: 'absolute',
+            bottom: '10px',
+            right: '20px',
+            background: 'rgba(255, 255, 255, 0.8)',
+            padding: '5px 10px',
+            borderRadius: '4px',
+            fontSize: '0.85em',
+            color: usageStatus.error ? 'red' : '#555',
+            border: '1px solid #ccc',
+            zIndex: 10
+        }}>
+            {usageStatus.error ? (
+                <span>{usageStatus.error}</span>
+            ) : (
+                <>
+                    <span>Tier: {usageStatus.tier || 'N/A'} | </span>
+                    <span>Usage: {usageStatus.usageCount ?? 'N/A'} / {usageStatus.usageLimit ?? 'N/A'} | </span>
+                    <span>{countdown || 'Calculating reset...'}</span>
+                </>
+            )}
+        </div>
+    );
+}
+
+export default UsageStatusDisplay;
diff --git a/src/components/ChatInterface.jsx b/src/components/ChatInterface.jsx
index 4a9d004..82ad696 100644
--- a/src/components/ChatInterface.jsx
+++ b/src/components/ChatInterface.jsx
@@ -1,298 +1,53 @@
-import React, { useState, useEffect, useRef } from 'react';
-import { fetchData } from '../services/api';
+import React from 'react';
 
-// Helper function to parse basic markdown (bold/italic/bullets)
-function formatText(text) {
-  if (!text) return ''; // Handle null or undefined text
+// Import Components
+import ChatHeader from './ChatInterface/ChatHeader';
+import MessageList from './ChatInterface/MessageList';
+import MessageInput from './ChatInterface/MessageInput';
 
-  // 1. Pre-process lines for bullets ('* ' -> '• ')
-  const lines = text.split('\n');
-  const processedLines = lines.map(line => {
-    // Use trim() to handle potential leading whitespace before '*'
-    if (line.trim().startsWith('* ')) {
-      // Replace '* ' with '• ' and keep the rest of the line content
-      // Use indexOf to find the first '*' to correctly handle indentation
-      const starIndex = line.indexOf('*');
-      const prefix = line.substring(0, starIndex); // Keep indentation
-      return prefix + '• ' + line.substring(starIndex + 2);
-    }
-    return line;
-  });
-  const textWithBullets = processedLines.join('\n');
+// Import Hook
+import { useChat } from '../hooks/useChat';
 
-  // 2. Apply bold/italic formatting to the text with bullets
-  const regex = /(\*\*.*?\*\*|`.*?`)/g; // Regex to find **bold** or `italic`
-  let lastIndex = 0;
-  const result = [];
-  let match;
-
-  try {
-      // Use textWithBullets for bold/italic parsing
-      while ((match = regex.exec(textWithBullets)) !== null) {
-        // Add text before the match
-        if (match.index > lastIndex) {
-          result.push(textWithBullets.substring(lastIndex, match.index));
-        }
-
-        const matchedText = match[0];
-        // Add bold or italic element
-        if (matchedText.startsWith('**') && matchedText.endsWith('**')) {
-          // Ensure content exists before slicing
-          const content = matchedText.length > 4 ? matchedText.slice(2, -2) : '';
-          result.push(<strong key={`bold-${lastIndex}`}>{content}</strong>); // Use unique keys
-        } else if (matchedText.startsWith('`') && matchedText.endsWith('`')) {
-           // Ensure content exists before slicing
-          const content = matchedText.length > 2 ? matchedText.slice(1, -1) : '';
-          result.push(<em key={`italic-${lastIndex}`}>{content}</em>); // Use unique keys
-        } else {
-           // Should not happen with this regex, but as fallback, add the raw match
-           result.push(matchedText);
-        }
-
-        lastIndex = regex.lastIndex;
-      }
-
-      // Add any remaining text after the last match
-      if (lastIndex < textWithBullets.length) {
-        result.push(textWithBullets.substring(lastIndex));
-      }
-
-      // Filter out potential empty strings and ensure valid React children
-      return result.filter(part => part !== null && part !== '');
-   } catch (error) {
-       console.error("Error formatting text:", error, "Original text:", text);
-       return text; // Return original text on error
-   }
-}
-
-// Accept new props for context
 function ChatInterface({
-    imageFilenames, // This now contains images from ALL agreements for the initial call
+    imageFilenames,
     selectedMajorName,
-    userName, // Keep userName prop for display when logged in
+    userName,
     isMajorsVisible,
     toggleMajorsVisibility,
-    sendingInstitutionId, // ID for the currently viewed agreement (Current Context)
-    allSendingInstitutionIds, // Array of all selected sending IDs (Overall Context)
+    sendingInstitutionId,
+    allSendingInstitutionIds,
     receivingInstitutionId,
     academicYearId,
-    user // Add user prop
+    user
 }) {
-    const [userInput, setUserInput] = useState('');
-    const [messages, setMessages] = useState([]);
-    const [isLoading, setIsLoading] = useState(false);
-    const [chatError, setChatError] = useState(null);
-
-    const messagesEndRef = useRef(null);
-    const initialAnalysisSentRef = useRef(false); // Ref to track if initial analysis was sent
-
-    // --- Add this useEffect to log messages ---
-    useEffect(() => {
-        console.log("Current message history:", messages);
-    }, [messages]); // Run whenever the messages array changes
-    // --- End logging effect ---
-
-    // Scroll to bottom effect
-    useEffect(() => {
-        messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
-    }, [messages]);
-
-    // Clear chat and reset flag when agreement context changes OR user logs out
-    useEffect(() => {
-        setMessages([]);
-        setUserInput('');
-        setChatError(null);
-        initialAnalysisSentRef.current = false; // Reset flag
-        console.log("Chat cleared due to new context or user change.");
-    }, [imageFilenames, selectedMajorName, user]); // Add user dependency here
-
-    // Effect to send initial analysis request when images are loaded
-    useEffect(() => {
-        // --- Add user check at the beginning ---
-        if (!user) {
-            initialAnalysisSentRef.current = false; // Ensure flag is reset if user logs out
-            return; // Don't proceed if user is not logged in
-        }
-        // --- End user check ---
-
-        // Run only if:
-        // - We have image filenames.
-        // - Analysis hasn't been sent for this context yet.
-        // - We are not currently loading anything (prevents race conditions).
-        // - User is logged in (checked above)
-        if (imageFilenames && imageFilenames.length > 0 && !initialAnalysisSentRef.current && !isLoading) {
-
-            const sendInitialAnalysis = async () => {
-                // User/token check is still good practice here, though the outer effect also checks
-                if (!user || !user.idToken) {
-                    console.error("Cannot send initial analysis: User not logged in or token missing.");
-                    setChatError("Authentication error. Please log in again.");
-                    setMessages([{ type: 'system', text: "Authentication error. Please log in again." }]);
-                    initialAnalysisSentRef.current = false; // Allow retry if user logs in
-                    return; // Stop execution
-                }
-
-                console.log("Sending initial analysis request...");
-                setIsLoading(true);
-                setChatError(null);
-                initialAnalysisSentRef.current = true; // Mark as sent for this context
-
-                const currentContextInfo = `The user is viewing an articulation agreement for the academic year ${academicYearId || 'N/A'} between sending institution ID ${sendingInstitutionId || 'N/A'} (the 'current' agreement) and receiving institution ID ${receivingInstitutionId || 'N/A'}. The selected major/department is "${selectedMajorName || 'N/A'}".`;
-                const overallContextInfo = allSendingInstitutionIds && allSendingInstitutionIds.length > 1
-                    ? `Note: The user originally selected multiple sending institutions (IDs: ${allSendingInstitutionIds.join(', ')}). Images for all selected agreements have been provided.`
-                    : 'Only one sending institution was selected.';
-
-                // --- MODIFIED Initial Prompt ---
-                const initialPrompt = `You are a helpful, knowledgeable, and supportive college counselor specializing in helping community college students successfully transfer to four-year universities. Your guidance should be clear, encouraging, and personalized based on each student's academic goals, major, preferred universities, and career aspirations. You provide information about transfer requirements, application tips, deadlines, articulation agreements, financial aid, scholarships, and campus life insights. Always empower students with accurate, up-to-date information and a positive, motivating tone. If you don't know an answer, offer to help them find resources or suggest next steps.
-
-**Current Context:** ${currentContextInfo}
-${overallContextInfo ? `**Overall Context:** ${overallContextInfo}` : ''}
-
-Analyze the provided agreement images thoroughly. Perform the following steps:
-1.  **Focus on the Current Context:** Analyze the agreement for the major between the **current sending institution** and the receiving institution.
-2.  **Explicitly state the current context:** Start your response with: "Analyzing the agreement for the [Major Name] (bold) major between [Current Sending Instituion Name] (bold) and [Receiving Institution Name] (bold) for the [academic year name] (bold) academic year."
-3.  **Provide a concise summary** of the key details for the **current** agreement (articulated courses, requirements, etc.). Identify any required courses for the major at the receiving institution that are **not articulated** by the current sending institution.
-4.  **Compare Articulation (If Applicable):** If you identified non-articulated courses in step 3 AND other sending institutions were selected (see Overall Context), examine the provided images for the **other** agreements (Sending IDs: ${allSendingInstitutionIds.filter(id => id !== sendingInstitutionId).join(', ') || 'None'}). For each non-articulated course from the current agreement, state whether it **is articulated** by any of the **other** sending institutions based on their respective agreements. Present this comparison clearly, perhaps in a separate section or list.
-5.  **Suggest Next Steps:** Conclude with relevant advice or next steps for the student based on the analysis and comparison.
-
-**Formatting:** Use bullet points (* or -) for lists, **bold** for emphasis, and \`italic\` for course codes/titles.`;
-                // --- End MODIFIED Initial Prompt ---
-
-                // Display a system message while analysis runs
-                setMessages([{ type: 'system', text: "Analyzing agreements and generating summary..." }]);
-
-                const payload = {
-                    new_message: initialPrompt,
-                    history: [], // No history for the very first message
-                    image_filenames: imageFilenames // Send the combined list of images
-                };
-
-                try {
-                    console.log("Sending initial analysis to /chat:", payload);
-                    const response = await fetchData('chat', {
-                        method: 'POST',
-                        headers: {
-                            'Content-Type': 'application/json',
-                            'Authorization': `Bearer ${user.idToken}`
-                        },
-                        body: JSON.stringify(payload)
-                    });
-
-                    if (response && response.reply) {
-                        const replyText = response.reply;
-                        // Replace the "Analyzing..." message with the actual reply
-                        setMessages([{ type: 'bot', text: replyText }]);
-                    } else {
-                        // Check specifically for auth error from backend response if possible
-                        if (response?.error?.includes("Authorization")) {
-                            throw new Error("Authorization token missing or invalid");
-                        }
-                        throw new Error(response?.error || "No reply received for initial analysis.");
-                    }
-                } catch (err) {
-                    console.error("Initial analysis API error:", err);
-                    const errorMsg = `Failed initial analysis: ${err.message}`;
-                    setChatError(errorMsg);
-                    // Replace "Analyzing..." with error message
-                    setMessages([{ type: 'system', text: `Error during analysis: ${err.message}` }]);
-                    // Consider resetting initialAnalysisSentRef.current = false; if the error is auth-related
-                    if (err.message.includes("Authorization")) {
-                        initialAnalysisSentRef.current = false;
-                    }
-                } finally {
-                    setIsLoading(false);
-                }
-            };
-
-            sendInitialAnalysis();
-        }
-        // This effect depends on imageFilenames to know when context is ready,
-        // and isLoading to avoid running while another request is in progress.
-        // Also depends on user to re-evaluate if user logs in/out
-    }, [imageFilenames, isLoading, selectedMajorName, sendingInstitutionId, allSendingInstitutionIds, receivingInstitutionId, academicYearId, user]);
-
-
-    const handleSend = async () => {
-        // Guard: Check for input, loading state, and user login
-        if (!userInput.trim() || isLoading || !user) return;
-
-        // User/token check (redundant with the main guard but safe)
-        if (!user || !user.idToken) {
-            console.error("Cannot send message: User not logged in or token missing.");
-            setChatError("Authentication error. Please log in again.");
-            setMessages(prev => [...prev, { type: 'system', text: "Authentication error. Please log in again." }]);
-            return; // Stop execution
-        }
-
-        const currentInput = userInput;
-        const currentHistory = [...messages];
-
-        // Add user message to local state
-        setMessages(prev => [...prev, { type: 'user', text: currentInput }]);
-        setUserInput('');
-        setIsLoading(true);
-        setChatError(null);
-
-        // Prepare history for API
-        const apiHistory = currentHistory
-            .filter(msg => msg.type === 'user' || msg.type === 'bot') // Only send user/bot messages as history
-            .map(msg => ({
-                role: msg.type === 'bot' ? 'assistant' : msg.type, // 'user' or 'assistant'
-                content: msg.text
-            }));
-
-        // Payload for subsequent messages (no image_filenames needed)
-        const payload = {
-            new_message: currentInput,
-            history: apiHistory
-        };
-
-        // --- Backend Call ---
-        try {
-            console.log("Sending to /chat:", JSON.stringify(payload));
-            const response = await fetchData('chat', {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                     'Authorization': `Bearer ${user.idToken}`
-                },
-                body: JSON.stringify(payload)
-            });
-
-            if (response && response.reply) {
-                 const replyText = response.reply;
-                 setMessages(prev => [...prev, { type: 'bot', text: replyText }]);
-            } else {
-                 // Check specifically for auth error from backend response if possible
-                 if (response?.error?.includes("Authorization")) {
-                     throw new Error("Authorization token missing or invalid");
-                 }
-                 throw new Error(response?.error || "No reply received or unexpected response format.");
-            }
-        } catch (err) {
-            console.error("Chat API error:", err);
-            setChatError(`Failed to get response: ${err.message}`);
-            // Add error message back to chat, but don't re-add user input
-            setMessages(prev => [...prev, { type: 'system', text: `Error: ${err.message}` }]);
-        } finally {
-            setIsLoading(false);
-        }
-        // --- End Backend Call ---
-    };
+    const {
+        userInput,
+        setUserInput,
+        messages,
+        isLoading,
+        chatError,
+        handleSend
+    } = useChat(
+        imageFilenames,
+        selectedMajorName,
+        user,
+        sendingInstitutionId,
+        allSendingInstitutionIds,
+        receivingInstitutionId,
+        academicYearId
+    );
 
-    // Disable input/button if loading OR if user is not logged in
+    // Determine disabled states and placeholder text
     const isInteractionDisabled = isLoading || !user || !imageFilenames || imageFilenames.length === 0;
     const isSendDisabled = isInteractionDisabled || !userInput.trim();
 
-    // Adjust placeholder based on loading state, user state, and agreement context
     const placeholderText = !user
         ? "Please sign in to use the chat feature."
         : (!imageFilenames || imageFilenames.length === 0)
-            ? "Select a major/department to chat." // New placeholder for logged-in user without context
+            ? "Select a major/department to chat."
             : isLoading
                 ? (messages.length === 0 ? "Analyzing agreement..." : "Thinking...")
-                : "Ask a follow-up question..."; // Placeholder when ready
-
+                : "Ask a follow-up question...";
 
     return (
         <div style={{
@@ -302,114 +57,27 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
             border: '1px solid #ccc',
             backgroundColor: '#f9f9f9'
         }}>
-            {/* Chat Header */}
-            <div style={{
-                padding: '8px 12px',
-                borderBottom: '1px solid #ccc',
-                backgroundColor: '#eee',
-                fontSize: '0.9em',
-                color: '#555',
-                display: 'flex', // Use flex to position button
-                justifyContent: 'space-between', // Space between title and button
-                alignItems: 'center' // Vertically align items
-            }}>
-                {/* Title */}
-                <span>Chatting about: {selectedMajorName || "Selected Agreement"}</span>
-
-                {/* --- Show Majors Button (Conditional) --- */}
-                {!isMajorsVisible && (
-                    <button
-                        onClick={toggleMajorsVisibility} // Use the passed function
-                        style={{
-                            padding: '2px 6px', // Smaller padding
-                            fontSize: '0.8em', // Smaller font
-                            marginLeft: '10px' // Add some space
-                        }}
-                        className="btn btn-sm btn-outline-secondary"
-                    >
-                        Show Majors
-                    </button>
-                )}
-                {/* --- End Show Majors Button --- */}
-            </div>
-
-            {/* Message Display Area */}
-            <div style={{
-                flex: '1 1 auto',
-                overflowY: 'auto',
-                padding: '10px',
-                minHeight: 0,
-                 // Add a subtle background change if user is not logged in
-                backgroundColor: !user ? '#e9ecef' : '#f9f9f9'
-            }}>
-                {/* --- Show Sign-in Prompt if user is not logged in --- */}
-                {!user && (
-                    <div style={{ textAlign: 'center', color: '#6c757d', marginTop: '30px', padding: '20px', fontSize: '1.1em' }}>
-                        Please sign in to analyze agreements and chat with the AI counselor.
-                    </div>
-                )}
-                {/* --- End Sign-in Prompt --- */}
-
-                {/* Display messages only if user is logged in */}
-                {user && messages.length === 0 && !isLoading && (
-                    <div style={{ textAlign: 'center', color: '#888', marginTop: '20px' }}>
-                        {placeholderText}
-                    </div>
-                )}
-                {user && messages.map((msg, index) => (
-                    <div key={index} style={{ marginBottom: '10px', display: 'flex', justifyContent: msg.type === 'user' ? 'flex-end' : 'flex-start' }}>
-                        <span style={{
-                            display: 'inline-block',
-                            padding: '8px 12px',
-                            borderRadius: '15px',
-                            backgroundColor: msg.type === 'user' ? '#007bff' : (msg.type === 'system' ? '#f8d7da' : '#e9ecef'),
-                            color: msg.type === 'user' ? 'white' : (msg.type === 'system' ? '#721c24' : '#333'),
-                            border: msg.type === 'system' ? '1px solid #f5c6cb' : 'none',
-                            maxWidth: '80%',
-                            wordWrap: 'break-word',
-                            whiteSpace: 'pre-wrap' // Crucial for rendering newlines and spaces correctly
-                        }}>
-                            {/* Add Prefix based on type */}
-                            {msg.type === 'bot' && <strong style={{ marginRight: '5px' }}>AI:</strong>}
-                            {/* Use userName prop if available, otherwise fallback */}
-                            {msg.type === 'user' && <strong style={{ marginRight: '5px' }}>{userName || 'You'}:</strong>}
-                            {/* Render formatted text */}
-                            {formatText(msg.text)}
-                        </span>
-                    </div>
-                ))}
-                <div ref={messagesEndRef} />
-                {/* Error Indicator (only show if user is logged in) */}
-                {user && chatError && !isLoading && <p style={{ color: 'red', textAlign: 'center', fontWeight: 'bold' }}>{chatError}</p>}
-            </div>
-
-            {/* Input Area */}
-            <div style={{ display: 'flex', padding: '10px', borderTop: '1px solid #ccc', backgroundColor: '#f1f1f1' }}>
-                <input
-                    type="text"
-                    value={userInput}
-                    onChange={(e) => setUserInput(e.target.value)}
-                    onKeyDown={(e) => e.key === 'Enter' && !isSendDisabled && handleSend()}
-                    placeholder={placeholderText}
-                    style={{ flexGrow: 1, marginRight: '10px', padding: '10px', borderRadius: '20px', border: '1px solid #ccc' }}
-                    disabled={isInteractionDisabled} // Disable if loading OR not logged in
-                />
-                <button
-                    onClick={handleSend}
-                    disabled={isSendDisabled} // Disable if loading OR not logged in OR no input
-                    style={{
-                        padding: '10px 15px',
-                        borderRadius: '20px',
-                        border: 'none',
-                        backgroundColor: '#007bff',
-                        color: 'white',
-                        cursor: isSendDisabled ? 'not-allowed' : 'pointer',
-                        opacity: isSendDisabled ? 0.6 : 1 // Visual cue for disabled state
-                    }}
-                >
-                    Send
-                </button>
-            </div>
+            <ChatHeader
+                selectedMajorName={selectedMajorName}
+                isMajorsVisible={isMajorsVisible}
+                toggleMajorsVisibility={toggleMajorsVisibility}
+            />
+            <MessageList
+                messages={messages}
+                isLoading={isLoading}
+                chatError={chatError}
+                user={user}
+                userName={userName}
+                placeholderText={placeholderText}
+            />
+            <MessageInput
+                userInput={userInput}
+                setUserInput={setUserInput}
+                handleSend={handleSend}
+                placeholderText={placeholderText}
+                isInteractionDisabled={isInteractionDisabled}
+                isSendDisabled={isSendDisabled}
+            />
         </div>
     );
 }
diff --git a/src/components/ChatInterface/ChatHeader.jsx b/src/components/ChatInterface/ChatHeader.jsx
new file mode 100644
index 0000000..948e74f
--- /dev/null
+++ b/src/components/ChatInterface/ChatHeader.jsx
@@ -0,0 +1,34 @@
+import React from 'react';
+
+function ChatHeader({ selectedMajorName, isMajorsVisible, toggleMajorsVisibility }) {
+    return (
+        <div style={{
+            padding: '8px 12px',
+            borderBottom: '1px solid #ccc',
+            backgroundColor: '#eee',
+            fontSize: '0.9em',
+            color: '#555',
+            display: 'flex',
+            justifyContent: 'space-between',
+            alignItems: 'center'
+        }}>
+            <span>Chatting about: {selectedMajorName || "Selected Agreement"}</span>
+
+            {!isMajorsVisible && (
+                <button
+                    onClick={toggleMajorsVisibility}
+                    style={{
+                        padding: '2px 6px',
+                        fontSize: '0.8em',
+                        marginLeft: '10px'
+                    }}
+                    className="btn btn-sm btn-outline-secondary"
+                >
+                    Show Majors
+                </button>
+            )}
+        </div>
+    );
+}
+
+export default ChatHeader;
diff --git a/src/components/ChatInterface/ChatMessage.jsx b/src/components/ChatInterface/ChatMessage.jsx
new file mode 100644
index 0000000..a78d63e
--- /dev/null
+++ b/src/components/ChatInterface/ChatMessage.jsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import { formatText } from '../../utils/formatText'; // Import the helper
+
+function ChatMessage({ msg, userName }) {
+    return (
+        <div style={{ marginBottom: '10px', display: 'flex', justifyContent: msg.type === 'user' ? 'flex-end' : 'flex-start' }}>
+            <span style={{
+                display: 'inline-block',
+                padding: '8px 12px',
+                borderRadius: '15px',
+                backgroundColor: msg.type === 'user' ? '#007bff' : (msg.type === 'system' ? '#f8d7da' : '#e9ecef'),
+                color: msg.type === 'user' ? 'white' : (msg.type === 'system' ? '#721c24' : '#333'),
+                border: msg.type === 'system' ? '1px solid #f5c6cb' : 'none',
+                maxWidth: '80%',
+                wordWrap: 'break-word',
+                whiteSpace: 'pre-wrap' // Crucial for rendering newlines and spaces correctly
+            }}>
+                {/* Add Prefix based on type */}
+                {msg.type === 'bot' && <strong style={{ marginRight: '5px' }}>AI:</strong>}
+                {/* Use userName prop if available, otherwise fallback */}
+                {msg.type === 'user' && <strong style={{ marginRight: '5px' }}>{userName || 'You'}:</strong>}
+                {/* Render formatted text */}
+                {formatText(msg.text)}
+            </span>
+        </div>
+    );
+}
+
+export default ChatMessage;
diff --git a/src/components/ChatInterface/MessageInput.jsx b/src/components/ChatInterface/MessageInput.jsx
new file mode 100644
index 0000000..da67772
--- /dev/null
+++ b/src/components/ChatInterface/MessageInput.jsx
@@ -0,0 +1,41 @@
+import React from 'react';
+
+function MessageInput({
+    userInput,
+    setUserInput,
+    handleSend,
+    placeholderText,
+    isInteractionDisabled,
+    isSendDisabled
+}) {
+    return (
+        <div style={{ display: 'flex', padding: '10px', borderTop: '1px solid #ccc', backgroundColor: '#f1f1f1' }}>
+            <input
+                type="text"
+                value={userInput}
+                onChange={(e) => setUserInput(e.target.value)}
+                onKeyDown={(e) => e.key === 'Enter' && !isSendDisabled && handleSend()}
+                placeholder={placeholderText}
+                style={{ flexGrow: 1, marginRight: '10px', padding: '10px', borderRadius: '20px', border: '1px solid #ccc' }}
+                disabled={isInteractionDisabled}
+            />
+            <button
+                onClick={handleSend}
+                disabled={isSendDisabled}
+                style={{
+                    padding: '10px 15px',
+                    borderRadius: '20px',
+                    border: 'none',
+                    backgroundColor: '#007bff',
+                    color: 'white',
+                    cursor: isSendDisabled ? 'not-allowed' : 'pointer',
+                    opacity: isSendDisabled ? 0.6 : 1
+                }}
+            >
+                Send
+            </button>
+        </div>
+    );
+}
+
+export default MessageInput;
diff --git a/src/components/ChatInterface/MessageList.jsx b/src/components/ChatInterface/MessageList.jsx
new file mode 100644
index 0000000..f6501e3
--- /dev/null
+++ b/src/components/ChatInterface/MessageList.jsx
@@ -0,0 +1,39 @@
+import React, { useEffect, useRef } from 'react';
+import ChatMessage from './ChatMessage';
+import SignInPrompt from './SignInPrompt';
+
+function MessageList({ messages, isLoading, chatError, user, userName, placeholderText }) {
+    const messagesEndRef = useRef(null);
+
+    // Scroll to bottom effect
+    useEffect(() => {
+        messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
+    }, [messages]);
+
+    return (
+        <div style={{
+            flex: '1 1 auto',
+            overflowY: 'auto',
+            padding: '10px',
+            minHeight: 0,
+            backgroundColor: !user ? '#e9ecef' : '#f9f9f9' // Subtle background change if not logged in
+        }}>
+            {!user && <SignInPrompt />}
+
+            {/* Display messages only if user is logged in */}
+            {user && messages.length === 0 && !isLoading && (
+                <div style={{ textAlign: 'center', color: '#888', marginTop: '20px' }}>
+                    {placeholderText}
+                </div>
+            )}
+            {user && messages.map((msg, index) => (
+                <ChatMessage key={index} msg={msg} userName={userName} />
+            ))}
+            <div ref={messagesEndRef} />
+            {/* Error Indicator (only show if user is logged in) */}
+            {user && chatError && !isLoading && <p style={{ color: 'red', textAlign: 'center', fontWeight: 'bold' }}>{chatError}</p>}
+        </div>
+    );
+}
+
+export default MessageList;
diff --git a/src/components/ChatInterface/SignInPrompt.jsx b/src/components/ChatInterface/SignInPrompt.jsx
new file mode 100644
index 0000000..d55b82e
--- /dev/null
+++ b/src/components/ChatInterface/SignInPrompt.jsx
@@ -0,0 +1,11 @@
+import React from 'react';
+
+function SignInPrompt() {
+    return (
+        <div style={{ textAlign: 'center', color: '#6c757d', marginTop: '30px', padding: '20px', fontSize: '1.1em' }}>
+            Please sign in to analyze agreements and chat with the AI counselor.
+        </div>
+    );
+}
+
+export default SignInPrompt;
diff --git a/src/components/PdfViewer.jsx b/src/components/PdfViewer.jsx
index 18682dd..daf44f0 100644
--- a/src/components/PdfViewer.jsx
+++ b/src/components/PdfViewer.jsx
@@ -8,7 +8,6 @@ function PdfViewer({ imageFilenames, isLoading, error, filename }) { // Added is
     <div style={{ height: '100%', display: 'flex', flexDirection: 'column' }}>
       {/* Show messages passed from parent */}
       {!filename && <p style={{ textAlign: 'center', marginTop: '2em' }}>Select a major/department to view the agreement.</p>}
-      {isLoading && <p>Loading agreement images...</p>}
       {error && <p style={{ color: 'red' }}>Error loading agreement: {error}</p>}
 
       {!isLoading && !error && filename && (!imageFilenames || imageFilenames.length === 0) && (
diff --git a/src/hooks/useAcademicYears.js b/src/hooks/useAcademicYears.js
new file mode 100644
index 0000000..d02b1af
--- /dev/null
+++ b/src/hooks/useAcademicYears.js
@@ -0,0 +1,176 @@
+import { useState, useEffect } from 'react';
+import { fetchData } from '../services/api';
+
+// Helper function to calculate intersection of academic years
+const calculateYearIntersection = (results) => {
+    if (!results || results.length === 0 || results.some(res => res === null || typeof res === 'undefined')) {
+        return {};
+    }
+
+    const validResults = results.filter(res => typeof res === 'object' && res !== null && Object.keys(res).length > 0);
+
+    if (validResults.length === 0) {
+        return {};
+    }
+
+    let commonIds = new Set(Object.values(validResults[0]));
+
+    for (let i = 1; i < validResults.length; i++) {
+        const currentIds = new Set(Object.values(validResults[i]));
+        commonIds = new Set([...commonIds].filter(id => currentIds.has(id)));
+    }
+
+    console.log("Common academic year IDs:", commonIds);
+
+    const intersection = {};
+    const nameMapSource = validResults[0];
+    const idToNameMap = Object.entries(nameMapSource).reduce((acc, [name, id]) => {
+        acc[id] = name;
+        return acc;
+    }, {});
+
+    commonIds.forEach(id => {
+        const name = idToNameMap[id];
+        if (name) {
+            intersection[name] = id;
+        } else {
+            console.warn(`Could not find name for common academic year ID: ${id}.`);
+             // Attempt fallback search in other results
+            for (const res of validResults) {
+                const foundEntry = Object.entries(res).find(([, resId]) => resId === id);
+                if (foundEntry) {
+                    intersection[foundEntry[0]] = id;
+                    break;
+                }
+            }
+        }
+    });
+
+    console.log("Intersection year result:", intersection);
+    return intersection;
+};
+
+
+export function useAcademicYears(selectedSendingInstitutions, selectedReceivingId) {
+    const [academicYears, setAcademicYears] = useState({});
+    const [isLoading, setIsLoading] = useState(false);
+    const [error, setError] = useState(null);
+
+    useEffect(() => {
+        let isMounted = true;
+        const senderIds = selectedSendingInstitutions.map(s => s.id);
+
+        // Only proceed if we have at least one sending institution AND a receiving institution selected
+        if (senderIds.length === 0 || !selectedReceivingId) {
+            setAcademicYears({});
+            setIsLoading(false);
+            setError(null);
+            return; // Clear years if selections are incomplete
+        }
+
+        const fetchAndIntersect = async () => {
+            if (!isMounted) return;
+            setIsLoading(true);
+            setError(null);
+            setAcademicYears({}); // Clear previous results
+
+            // const cacheKeyBase = `academic-years-${selectedReceivingId}`;
+            // let combinedCacheKey = cacheKeyBase + '-' + senderIds.sort().join(','); // Create a consistent key for multiple senders - Not currently used for multi-sender caching
+
+            try {
+                // --- Check Cache for the specific combination ---
+                // Note: Caching intersection results might be complex if senders change frequently.
+                // We'll cache individual results for single senders, but recalculate intersection for multiple.
+                if (senderIds.length === 1) {
+                    const singleCacheKey = `academic-years-${senderIds[0]}-${selectedReceivingId}`;
+                    try {
+                        const cachedData = localStorage.getItem(singleCacheKey);
+                        if (cachedData) {
+                            const parsedData = JSON.parse(cachedData);
+                            console.log("Loaded academic years from cache:", singleCacheKey);
+                            if (isMounted) {
+                                setAcademicYears(parsedData);
+                                setIsLoading(false);
+                            }
+                            return; // Exit early
+                        }
+                    } catch (e) {
+                        console.error("Error loading academic years from cache:", e);
+                        localStorage.removeItem(singleCacheKey);
+                    }
+                }
+
+
+                // --- Fetch from API ---
+                if (senderIds.length === 1) {
+                    const sendingId = senderIds[0];
+                    console.log(`Fetching years for single sender S=${sendingId}, R=${selectedReceivingId}`);
+                    const data = await fetchData(`academic-years?sendingId=${sendingId}&receivingId=${selectedReceivingId}`);
+                    if (!isMounted) return;
+
+                    if (data && Object.keys(data).length > 0) {
+                        setAcademicYears(data);
+                        // Cache Result for single sender
+                        const singleCacheKey = `academic-years-${sendingId}-${selectedReceivingId}`;
+                        try {
+                            localStorage.setItem(singleCacheKey, JSON.stringify(data));
+                            console.log("Academic Years cached successfully:", singleCacheKey);
+                        } catch (e) {
+                            console.error("Error caching academic years:", e);
+                        }
+                    } else {
+                        setAcademicYears({});
+                        setError(`No academic years found for the selected combination.`);
+                    }
+                } else {
+                    // --- Fetch for multiple senders and find intersection ---
+                    console.log(`Fetching years for multiple senders (Count: ${senderIds.length}), R=${selectedReceivingId}`);
+                    const promises = senderIds.map(id =>
+                        fetchData(`academic-years?sendingId=${id}&receivingId=${selectedReceivingId}`)
+                            .catch(err => {
+                                console.error(`Failed to fetch years for S=${id}, R=${selectedReceivingId}:`, err);
+                                return {}; // Return empty object on error
+                            })
+                    );
+
+                    const results = await Promise.all(promises);
+                    if (!isMounted) return;
+                    console.log("Raw year results from multiple fetches:", results);
+
+                    if (results.some(res => res === null || typeof res === 'undefined')) {
+                        throw new Error("One or more requests for academic years failed.");
+                    }
+
+                    const intersection = calculateYearIntersection(results);
+
+                    if (Object.keys(intersection).length > 0) {
+                        setAcademicYears(intersection);
+                    } else {
+                        setAcademicYears({});
+                        setError("No common academic years found for the selected combination of institutions.");
+                    }
+                }
+            } catch (err) {
+                console.error("Error processing academic years:", err);
+                if (isMounted) {
+                    setError(`Failed to load or process academic years: ${err.message}`);
+                    setAcademicYears({}); // Clear on error
+                }
+            } finally {
+                if (isMounted) {
+                    setIsLoading(false); // Stop loading
+                }
+            }
+        };
+
+        fetchAndIntersect();
+
+        return () => {
+            isMounted = false; // Cleanup
+        };
+    // Re-run when senders or receiver changes
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [JSON.stringify(selectedSendingInstitutions.map(s => s.id)), selectedReceivingId]);
+
+    return { academicYears, isLoading, error };
+}
diff --git a/src/hooks/useAgreementData.js b/src/hooks/useAgreementData.js
new file mode 100644
index 0000000..5fea021
--- /dev/null
+++ b/src/hooks/useAgreementData.js
@@ -0,0 +1,398 @@
+import { useState, useEffect, useRef, useCallback, useMemo } from 'react';
+import { fetchData } from '../services/api'; // Assuming api.js is in services
+
+const IGETC_ID = 'IGETC';
+
+export function useAgreementData(initialSendingId, receivingId, yearId, user, allSelectedSendingInstitutions) {
+    // --- State for Agreement Data ---
+    const [selectedCategory, setSelectedCategory] = useState('major');
+    const [majors, setMajors] = useState({});
+    const [isLoadingMajors, setIsLoadingMajors] = useState(true);
+    const [error, setError] = useState(null); // Error for majors list
+    const [pdfError, setPdfError] = useState(null); // Error for PDF viewer area
+    const [selectedMajorKey, setSelectedMajorKey] = useState(null);
+    const [selectedMajorName, setSelectedMajorName] = useState('');
+    const [isLoadingPdf, setIsLoadingPdf] = useState(false); // General loading for PDF viewer area (controlled by fetch)
+    const [majorSearchTerm, setMajorSearchTerm] = useState('');
+    const [hasMajorsAvailable, setHasMajorsAvailable] = useState(true);
+    const [hasDepartmentsAvailable, setHasDepartmentsAvailable] = useState(true);
+    const [isLoadingAvailability, setIsLoadingAvailability] = useState(true);
+
+    // --- State for Multiple PDFs/Tabs ---
+    const [agreementData, setAgreementData] = useState([]); // Will include IGETC if available
+    const [activeTabIndex, setActiveTabIndex] = useState(0); // Start potentially at IGETC (index 0)
+    const [imagesForActivePdf, setImagesForActivePdf] = useState([]);
+    // const [allAgreementsImageFilenames, setAllAgreementsImageFilenames] = useState([]); // Removed: Not directly used/needed if caching by filename
+
+    // --- Cache Ref for Images ---
+    const imageCacheRef = useRef({}); // Store images keyed by PDF filename
+
+    // --- Derived state ---
+    const currentAgreement = activeTabIndex >= 0 && activeTabIndex < agreementData.length ? agreementData[activeTabIndex] : null;
+    const currentPdfFilename = currentAgreement?.pdfFilename;
+
+    // --- Availability Check ---
+    useEffect(() => {
+        if (!initialSendingId || !receivingId || !yearId) {
+            setIsLoadingAvailability(false);
+            setHasMajorsAvailable(false);
+            setHasDepartmentsAvailable(false);
+            return;
+        }
+        setIsLoadingAvailability(true);
+        setHasMajorsAvailable(false); // Reset on change
+        setHasDepartmentsAvailable(false);
+
+        const checkAvailability = async (category) => {
+            try {
+                const data = await fetchData(`/majors?sendingId=${initialSendingId}&receivingId=${receivingId}&academicYearId=${yearId}&categoryCode=${category}`);
+                return Object.keys(data || {}).length > 0;
+            } catch (err) {
+                console.error(`Error checking availability for ${category}:`, err);
+                return false;
+            }
+        };
+
+        Promise.all([checkAvailability('major'), checkAvailability('dept')])
+            .then(([majorsExist, deptsExist]) => {
+                setHasMajorsAvailable(majorsExist);
+                setHasDepartmentsAvailable(deptsExist);
+                if (selectedCategory === 'major' && !majorsExist && deptsExist) {
+                    setSelectedCategory('dept');
+                } else if (selectedCategory === 'dept' && !deptsExist && majorsExist) {
+                    setSelectedCategory('major');
+                }
+            })
+            .finally(() => setIsLoadingAvailability(false));
+
+    }, [initialSendingId, receivingId, yearId, selectedCategory]);
+
+
+    // --- Fetch Majors/Departments ---
+    useEffect(() => {
+        if (isLoadingAvailability || !initialSendingId || !receivingId || !yearId) {
+            if (!initialSendingId || !receivingId || !yearId) setError("Missing selection criteria.");
+            return;
+        }
+
+        if ((selectedCategory === 'major' && !hasMajorsAvailable) || (selectedCategory === 'dept' && !hasDepartmentsAvailable)) {
+            setError(`No ${selectedCategory}s found for the selected combination.`);
+            setIsLoadingMajors(false);
+            setMajors({});
+            return;
+        }
+
+        setIsLoadingMajors(true);
+        setError(null);
+        setMajors({});
+
+        const fetchCategoryData = async () => {
+            try {
+                const data = await fetchData(`/majors?sendingId=${initialSendingId}&receivingId=${receivingId}&academicYearId=${yearId}&categoryCode=${selectedCategory}`);
+                setMajors(data || {});
+            } catch (err) {
+                console.error(`Error fetching ${selectedCategory}s:`, err);
+                setError(`Failed to load ${selectedCategory}s.`);
+                setMajors({});
+            } finally {
+                setIsLoadingMajors(false);
+            }
+        };
+
+        fetchCategoryData();
+    }, [initialSendingId, receivingId, yearId, selectedCategory, isLoadingAvailability, hasMajorsAvailable, hasDepartmentsAvailable]);
+
+
+    // --- Fetch Agreement Details and Images (including IGETC) ---
+    // This is the main function responsible for fetching ALL agreement data and images
+    // It is ONLY called when a major/department is selected via handleMajorSelect.
+    const fetchAgreementDetailsAndImages = useCallback(async (majorKey) => {
+        // Guard against missing context needed for fetching
+        if (!majorKey || allSelectedSendingInstitutions.length === 0 || !receivingId || !yearId) {
+             console.warn("Skipping agreement fetch: Missing major key or context.");
+             setAgreementData([]);
+             // setAllAgreementsImageFilenames([]); // Removed state
+             setImagesForActivePdf([]);
+             setActiveTabIndex(0);
+             setPdfError("Select a major/department and ensure all institutions/year are set.");
+             setIsLoadingPdf(false); // Not loading if nothing to fetch
+             return;
+        }
+
+        console.log(`Fetching agreements and images for majorKey: ${majorKey}`);
+        setIsLoadingPdf(true); // START loading indicator for the entire process
+        setPdfError(null);
+        setAgreementData([]); // Clear previous agreements
+        // setAllAgreementsImageFilenames([]); // Removed state
+        setImagesForActivePdf([]); // Clear viewer
+        setActiveTabIndex(0); // Reset tab index temporarily
+
+        // Determine the sending ID to use for the IGETC check (prefer initial, fallback to first selected)
+        const contextSendingId = initialSendingId || allSelectedSendingInstitutions[0]?.id;
+
+        let combinedAgreements = [];
+        let initialActiveIndex = 0; // Default to 0
+
+        try {
+            let igetcAgreement = null;
+            // 1. Fetch IGETC Agreement Filename (if logged in and context available)
+            if (user && user.idToken && contextSendingId && yearId) {
+                try {
+                    const igetcResponse = await fetchData(`/igetc-agreement?sendingId=${contextSendingId}&academicYearId=${yearId}`, {
+                        headers: { 'Authorization': `Bearer ${user.idToken}` }
+                    });
+                    if (igetcResponse?.pdfFilename) {
+                        igetcAgreement = {
+                            sendingId: IGETC_ID, // Special ID
+                            sendingName: 'IGETC',
+                            pdfFilename: igetcResponse.pdfFilename,
+                            isIgetc: true
+                        };
+                        console.log("IGETC agreement found:", igetcAgreement.pdfFilename);
+                    } else {
+                         console.warn("No IGETC PDF filename received:", igetcResponse?.error || "Empty response");
+                    }
+                } catch (err) {
+                    console.error("Error fetching IGETC filename:", err);
+                    // Log error but continue to fetch major agreements
+                }
+            } else {
+                 console.log("Skipping IGETC fetch: User not logged in or missing context.");
+            }
+
+            // 2. Fetch Major Articulation Agreements
+            const sendingIds = allSelectedSendingInstitutions.map(inst => inst.id);
+            const response = await fetchData('/articulation-agreements', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ sending_ids: sendingIds, receiving_id: receivingId, year_id: yearId, major_key: majorKey }) // Use passed majorKey
+            });
+
+            let fetchedAgreements = [];
+            if (response?.agreements) {
+                 fetchedAgreements = response.agreements.map(a => ({
+                    ...a,
+                    sendingName: allSelectedSendingInstitutions.find(inst => inst.id === a.sendingId)?.name || `ID ${a.sendingId}`,
+                    isIgetc: false
+                }));
+                 console.log(`Fetched ${fetchedAgreements.length} major agreements.`);
+            } else {
+                 console.error("Invalid response format for major agreements:", response?.error || "No agreements array");
+                 if (!igetcAgreement) { // Only throw if IGETC also failed
+                    throw new Error(response?.error || "Failed to load major agreements and no IGETC found.");
+                 }
+            }
+
+            // 3. Combine IGETC and Major Agreements
+            combinedAgreements = igetcAgreement ? [igetcAgreement, ...fetchedAgreements] : fetchedAgreements;
+            setAgreementData(combinedAgreements); // Set the combined list
+
+            if (combinedAgreements.length === 0) {
+                setPdfError("No agreements found for this major/department.");
+                // No need to fetch images if no agreements
+                setIsLoadingPdf(false); // STOP loading
+                return;
+            }
+
+            // 4. Fetch Images for ALL agreements in parallel (check/populate cache)
+            console.log("Fetching images for all agreements...");
+            const imageFetchPromises = combinedAgreements
+                .filter(a => a.pdfFilename) // Only fetch for agreements with a PDF
+                .map(async (agreement) => {
+                    const filename = agreement.pdfFilename;
+                    if (imageCacheRef.current[filename]) {
+                        console.log(`Cache hit for images: ${filename}`);
+                        return { filename, images: imageCacheRef.current[filename] }; // Return filename for mapping
+                    }
+                    console.log(`Cache miss, fetching images for: ${filename}`);
+                    try {
+                        const imgResponse = await fetchData(`pdf-images/${encodeURIComponent(filename)}`);
+                        if (imgResponse?.image_filenames) {
+                            imageCacheRef.current[filename] = imgResponse.image_filenames; // Cache the images
+                            console.log(`Successfully fetched and cached images for: ${filename}`);
+                            return { filename, images: imgResponse.image_filenames };
+                        }
+                         console.warn(`No image filenames received for ${filename}`);
+                         imageCacheRef.current[filename] = []; // Cache empty array if no images found
+                         return { filename, images: [] };
+                    } catch (imgErr) {
+                         console.error(`Error fetching images for ${filename}:`, imgErr);
+                         imageCacheRef.current[filename] = []; // Cache empty array on error
+                         return { filename, images: [] }; // Indicate failure for this PDF
+                    }
+                });
+
+            // Wait for all image fetches to settle
+            await Promise.allSettled(imageFetchPromises);
+            console.log("All image fetch attempts completed.");
+
+            // 5. Determine initial active tab index (first non-IGETC, or 0 if only IGETC/none)
+            const firstRealAgreementIndex = combinedAgreements.findIndex(a => !a.isIgetc);
+            initialActiveIndex = firstRealAgreementIndex !== -1 ? firstRealAgreementIndex : 0;
+            setActiveTabIndex(initialActiveIndex); // Set the final active tab index
+
+            // 6. Set images for the initially active PDF (using initialActiveIndex)
+            // This is now handled by the useEffect watching activeTabIndex
+            // We just need to ensure the cache is populated by this point.
+
+        } catch (err) {
+            console.error("Error during agreement details/images fetch:", err);
+            setPdfError(`Failed to load agreement data: ${err.message}`);
+            setAgreementData([]); // Clear data on error
+            // setAllAgreementsImageFilenames([]); // Removed state
+            setImagesForActivePdf([]);
+            setActiveTabIndex(0); // Reset index
+        } finally {
+            // Loading stops AFTER all fetches (agreements + images) are attempted and initial tab is set.
+            // The useEffect watching activeTabIndex will then display the images for that tab from the cache.
+             setIsLoadingPdf(false); // STOP loading indicator
+             console.log("Finished fetchAgreementDetailsAndImages. isLoadingPdf: false");
+        }
+    // Dependencies: All inputs that should trigger a full refetch when they change.
+    // Note: `majorKey` is passed as an argument, so it doesn't need to be a dependency here.
+    // `user` dependency ensures refetch if login state changes (for IGETC).
+    }, [allSelectedSendingInstitutions, receivingId, yearId, initialSendingId, user?.idToken]); // Refined dependencies
+
+
+    // --- Effect to Handle Active Tab Image Loading (Display Only) ---
+    useEffect(() => {
+        // This effect ONLY sets the images for the currently active tab based on fetched data in the cache.
+        // It does NOT trigger fetches or manage the main isLoadingPdf state.
+        if (agreementData.length === 0 || activeTabIndex < 0 || activeTabIndex >= agreementData.length) {
+            setImagesForActivePdf([]);
+            // pdfError should be handled by the fetch function if data is missing or failed to load
+            return;
+        }
+
+        const activeAgreement = agreementData[activeTabIndex];
+        const filename = activeAgreement?.pdfFilename;
+
+        console.log(`Active tab changed to ${activeTabIndex}. Agreement: ${activeAgreement?.sendingName}, PDF: ${filename}`);
+
+        if (filename) {
+            const cachedImages = imageCacheRef.current[filename];
+            if (cachedImages) {
+                // Images are expected to be in the cache if fetchAgreementDetailsAndImages succeeded for this PDF
+                setImagesForActivePdf(cachedImages);
+                console.log(`Displaying ${cachedImages.length} cached images for active tab ${activeTabIndex} (${filename}).`);
+                // Clear transient errors maybe? Or rely on fetchAgreementDetailsAndImages to set persistent errors.
+                // setPdfError(null); // Let fetch manage persistent errors.
+            } else {
+                // This case should ideally not happen if fetchAgreementDetailsAndImages completed successfully
+                // and the PDF had images. It might indicate an error during the image fetch for this specific PDF.
+                setImagesForActivePdf([]);
+                console.warn(`Images not found in cache for active tab ${activeTabIndex} (${filename}). This might indicate a fetch error for this specific PDF.`);
+                // Do not set pdfError here; rely on the error state set during the main fetch process.
+                // If isLoadingPdf is false here, it means the main fetch finished, but these images are missing.
+                // The UI should ideally reflect the error set by the fetch function (pdfError state).
+            }
+        } else {
+            // No PDF filename associated with this agreement tab
+            setImagesForActivePdf([]);
+            console.log(`No PDF filename for active tab ${activeTabIndex}. Clearing images.`);
+            // pdfError related to "No PDF available" should be handled by UI based on missing filename or set during fetch.
+        }
+        // This effect does not manage isLoadingPdf.
+    // Depend only on the active tab index and the agreement data itself.
+    }, [activeTabIndex, agreementData]); // Correct dependencies for display logic
+
+
+    // --- Effect to reset selections when core context changes (URL params) ---
+    useEffect(() => {
+        console.log("Core context changed (URL params), resetting selections and agreement data.");
+        setSelectedMajorKey(null); setSelectedMajorName('');
+        setAgreementData([]);
+        // setAllAgreementsImageFilenames([]); // Removed state
+        setActiveTabIndex(0); // Default back to index 0
+        setImagesForActivePdf([]);
+        setPdfError(null); // Clear errors
+        setIsLoadingPdf(false); // Ensure loading is off
+        // Clear image cache when core context changes, as agreements might be different
+        imageCacheRef.current = {};
+        console.log("Image cache cleared due to context change.");
+    }, [initialSendingId, receivingId, yearId]);
+
+    // --- Handlers ---
+    const handleMajorSelect = useCallback((majorKey, majorName) => {
+        if (majorKey === selectedMajorKey) return; // Avoid refetch if same major clicked
+
+        console.log("Major selected:", majorKey, majorName);
+        setSelectedMajorKey(majorKey);
+        setSelectedMajorName(majorName);
+
+        // Clear previous data immediately for responsiveness before fetch starts
+        setAgreementData([]);
+        // setAllAgreementsImageFilenames([]); // Removed state
+        setImagesForActivePdf([]);
+        setActiveTabIndex(0); // Reset to 0 temporarily
+        setPdfError(null); // Clear previous errors
+        // setIsLoadingPdf(true); // Set inside fetchAgreementDetailsAndImages
+
+        // Trigger the main fetch function for the new major
+        fetchAgreementDetailsAndImages(majorKey); // Pass majorKey directly
+
+    }, [selectedMajorKey, fetchAgreementDetailsAndImages]); // Dependency on fetch function is key
+
+    const handleCategoryChange = useCallback((event) => {
+        const newCategory = event.target.value;
+        setSelectedCategory(newCategory);
+        // Reset major selection and agreement data when category changes
+        setSelectedMajorKey(null); setSelectedMajorName('');
+        setMajorSearchTerm('');
+        setAgreementData([]);
+        // setAllAgreementsImageFilenames([]); // Removed state
+        setImagesForActivePdf([]);
+        setActiveTabIndex(0);
+        setError(null);
+        setPdfError(null);
+        setIsLoadingPdf(false); // Ensure loading is off
+        // Keep image cache, category change doesn't invalidate PDFs for same context
+    }, []);
+
+    const handleTabClick = useCallback((index) => {
+        if (index === activeTabIndex) return;
+        console.log("Tab clicked:", index, "Setting active tab index.");
+        setActiveTabIndex(index);
+        // DO NOT trigger fetches or set isLoadingPdf here.
+        // The useEffect watching activeTabIndex will handle displaying cached images.
+    }, [activeTabIndex]);
+
+    // --- Filtered Majors ---
+    const filteredMajors = useMemo(() => {
+        const lowerCaseSearchTerm = majorSearchTerm.toLowerCase();
+        if (typeof majors !== 'object' || majors === null) return [];
+        return Object.entries(majors).filter(([name]) =>
+            name.toLowerCase().includes(lowerCaseSearchTerm)
+        );
+    }, [majors, majorSearchTerm]);
+
+
+    return {
+        // State
+        selectedCategory,
+        majors,
+        isLoadingMajors,
+        error,
+        pdfError,
+        selectedMajorKey,
+        selectedMajorName,
+        isLoadingPdf, // Indicates loading of agreements/images AFTER major select
+        majorSearchTerm,
+        hasMajorsAvailable,
+        hasDepartmentsAvailable,
+        isLoadingAvailability,
+        agreementData, // Includes IGETC + Major agreements
+        activeTabIndex,
+        imagesForActivePdf, // Images for the currently selected tab
+
+        // Derived State
+        currentPdfFilename,
+        filteredMajors,
+
+        // Handlers
+        handleMajorSelect,
+        handleCategoryChange,
+        handleTabClick,
+        setMajorSearchTerm,
+    };
+}
diff --git a/src/hooks/useChat.js b/src/hooks/useChat.js
new file mode 100644
index 0000000..0f016fa
--- /dev/null
+++ b/src/hooks/useChat.js
@@ -0,0 +1,184 @@
+import { useState, useEffect, useRef, useCallback } from 'react';
+import { fetchData } from '../services/api';
+
+export function useChat(
+    imageFilenames,
+    selectedMajorName,
+    user,
+    sendingInstitutionId,
+    allSendingInstitutionIds,
+    receivingInstitutionId,
+    academicYearId
+) {
+    const [userInput, setUserInput] = useState('');
+    const [messages, setMessages] = useState([]);
+    const [isLoading, setIsLoading] = useState(false);
+    const [chatError, setChatError] = useState(null);
+    const initialAnalysisSentRef = useRef(false);
+
+    // Log messages
+    useEffect(() => {
+        console.log("Current message history:", messages);
+    }, [messages]);
+
+    // Clear chat and reset flag when context changes or user logs out
+    useEffect(() => {
+        setMessages([]);
+        setUserInput('');
+        setChatError(null);
+        initialAnalysisSentRef.current = false;
+        console.log("Chat cleared due to new context or user change.");
+    }, [imageFilenames, selectedMajorName, user]);
+
+    // Effect to send initial analysis request
+    useEffect(() => {
+        if (!user) {
+            initialAnalysisSentRef.current = false;
+            return;
+        }
+
+        if (imageFilenames && imageFilenames.length > 0 && !initialAnalysisSentRef.current && !isLoading) {
+            const sendInitialAnalysis = async () => {
+                if (!user || !user.idToken) {
+                    console.error("Cannot send initial analysis: User not logged in or token missing.");
+                    setChatError("Authentication error. Please log in again.");
+                    setMessages([{ type: 'system', text: "Authentication error. Please log in again." }]);
+                    initialAnalysisSentRef.current = false;
+                    return;
+                }
+
+                console.log("Sending initial analysis request...");
+                setIsLoading(true);
+                setChatError(null);
+                initialAnalysisSentRef.current = true;
+
+                const currentContextInfo = `The user is viewing an articulation agreement for the academic year ${academicYearId || 'N/A'} between sending institution ID ${sendingInstitutionId || 'N/A'} (the 'current' agreement) and receiving institution ID ${receivingInstitutionId || 'N/A'}. The selected major/department is "${selectedMajorName || 'N/A'}".`;
+                const overallContextInfo = allSendingInstitutionIds && allSendingInstitutionIds.length > 1
+                    ? `Note: The user originally selected multiple sending institutions (IDs: ${allSendingInstitutionIds.join(', ')}). Images for all selected agreements have been provided.`
+                    : 'Only one sending institution was selected.';
+
+                const initialPrompt = `You are a helpful, knowledgeable, and supportive college counselor specializing in helping community college students successfully transfer to four-year universities. Your guidance should be clear, encouraging, and personalized based on each student's academic goals, major, preferred universities, and career aspirations. You provide information about transfer requirements, application tips, deadlines, articulation agreements, financial aid, scholarships, and campus life insights. Always empower students with accurate, up-to-date information and a positive, motivating tone. If you don't know an answer, offer to help them find resources or suggest next steps.
+
+**Current Context:** ${currentContextInfo}
+${overallContextInfo ? `**Overall Context:** ${overallContextInfo}` : ''}
+
+Analyze the provided agreement images thoroughly. Perform the following steps:
+1.  **Focus on the Current Context:** Analyze the agreement for the major between the **current sending institution** and the receiving institution.
+2.  **Explicitly state the current context:** Start your response with: "Analyzing the agreement for the [Major Name] (bold) major between [Current Sending Instituion Name] (bold) and [Receiving Institution Name] (bold) for the [academic year name] (bold) academic year."
+3.  **Provide a concise summary** of the key details for the **current** agreement (articulated courses, requirements, etc.). Identify any required courses for the major at the receiving institution that are **not articulated** by the current sending institution.
+4.  **Compare Articulation (If Applicable):** If you identified non-articulated courses in step 3 AND other sending institutions were selected (see Overall Context), examine the provided images for the **other** agreements (Sending IDs: ${allSendingInstitutionIds.filter(id => id !== sendingInstitutionId).join(', ') || 'None'}). For each non-articulated course from the current agreement, state whether it **is articulated** by any of the **other** sending institutions based on their respective agreements. Present this comparison clearly, perhaps in a separate section or list.
+5.  **Suggest Next Steps:** Conclude with relevant advice or next steps for the student based on the analysis and comparison.
+
+**Formatting:** Use bullet points (* or -) for lists, **bold** for emphasis, and \`italic\` for course codes/titles.`;
+
+                setMessages([{ type: 'system', text: "Analyzing agreements and generating summary..." }]);
+
+                const payload = {
+                    new_message: initialPrompt,
+                    history: [],
+                    image_filenames: imageFilenames
+                };
+
+                try {
+                    console.log("Sending initial analysis to /chat:", payload);
+                    const response = await fetchData('chat', {
+                        method: 'POST',
+                        headers: {
+                            'Content-Type': 'application/json',
+                            'Authorization': `Bearer ${user.idToken}`
+                        },
+                        body: JSON.stringify(payload)
+                    });
+
+                    if (response && response.reply) {
+                        setMessages([{ type: 'bot', text: response.reply }]);
+                    } else {
+                        if (response?.error?.includes("Authorization")) {
+                            throw new Error("Authorization token missing or invalid");
+                        }
+                        throw new Error(response?.error || "No reply received for initial analysis.");
+                    }
+                } catch (err) {
+                    console.error("Initial analysis API error:", err);
+                    const errorMsg = `Failed initial analysis: ${err.message}`;
+                    setChatError(errorMsg);
+                    setMessages([{ type: 'system', text: `Error during analysis: ${err.message}` }]);
+                    if (err.message.includes("Authorization")) {
+                        initialAnalysisSentRef.current = false;
+                    }
+                } finally {
+                    setIsLoading(false);
+                }
+            };
+
+            sendInitialAnalysis();
+        }
+    }, [imageFilenames, isLoading, selectedMajorName, sendingInstitutionId, allSendingInstitutionIds, receivingInstitutionId, academicYearId, user]);
+
+    const handleSend = useCallback(async () => {
+        if (!userInput.trim() || isLoading || !user || !user.idToken) {
+            if (!user || !user.idToken) {
+                console.error("Cannot send message: User not logged in or token missing.");
+                setChatError("Authentication error. Please log in again.");
+                setMessages(prev => [...prev, { type: 'system', text: "Authentication error. Please log in again." }]);
+            }
+            return;
+        }
+
+        const currentInput = userInput;
+        const currentHistory = [...messages];
+
+        setMessages(prev => [...prev, { type: 'user', text: currentInput }]);
+        setUserInput('');
+        setIsLoading(true);
+        setChatError(null);
+
+        const apiHistory = currentHistory
+            .filter(msg => msg.type === 'user' || msg.type === 'bot')
+            .map(msg => ({
+                role: msg.type === 'bot' ? 'assistant' : msg.type,
+                content: msg.text
+            }));
+
+        const payload = {
+            new_message: currentInput,
+            history: apiHistory
+        };
+
+        try {
+            console.log("Sending to /chat:", JSON.stringify(payload));
+            const response = await fetchData('chat', {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Authorization': `Bearer ${user.idToken}`
+                },
+                body: JSON.stringify(payload)
+            });
+
+            if (response && response.reply) {
+                setMessages(prev => [...prev, { type: 'bot', text: response.reply }]);
+            } else {
+                if (response?.error?.includes("Authorization")) {
+                    throw new Error("Authorization token missing or invalid");
+                }
+                throw new Error(response?.error || "No reply received or unexpected response format.");
+            }
+        } catch (err) {
+            console.error("Chat API error:", err);
+            setChatError(`Failed to get response: ${err.message}`);
+            setMessages(prev => [...prev, { type: 'system', text: `Error: ${err.message}` }]);
+        } finally {
+            setIsLoading(false);
+        }
+    }, [userInput, isLoading, user, messages]); // Dependencies for handleSend
+
+    return {
+        userInput,
+        setUserInput,
+        messages,
+        isLoading,
+        chatError,
+        handleSend
+    };
+}
diff --git a/src/hooks/useInstitutionData.js b/src/hooks/useInstitutionData.js
new file mode 100644
index 0000000..1cef707
--- /dev/null
+++ b/src/hooks/useInstitutionData.js
@@ -0,0 +1,65 @@
+import { useState, useEffect } from 'react';
+import { fetchData } from '../services/api';
+
+const CACHE_KEY = "institutions";
+
+export function useInstitutionData() {
+    const [institutions, setInstitutions] = useState({});
+    const [isLoading, setIsLoading] = useState(true);
+    const [error, setError] = useState(null);
+
+    useEffect(() => {
+        let isMounted = true;
+        setIsLoading(true);
+        setError(null);
+
+        // --- Check Cache ---
+        try {
+            const cachedData = localStorage.getItem(CACHE_KEY);
+            if (cachedData) {
+                const parsedData = JSON.parse(cachedData);
+                console.log("Loaded institutions from cache:", CACHE_KEY);
+                if (isMounted) {
+                    setInstitutions(parsedData);
+                    setIsLoading(false);
+                }
+                return; // Exit early if loaded from cache
+            }
+        } catch (e) {
+            console.error("Error loading institutions from cache:", e);
+            localStorage.removeItem(CACHE_KEY); // Clear cache on error
+        }
+
+        // --- Fetch from API ---
+        fetchData('institutions')
+            .then(data => {
+                if (isMounted) {
+                    setInstitutions(data);
+                    // --- Cache Result ---
+                    try {
+                        localStorage.setItem(CACHE_KEY, JSON.stringify(data));
+                        console.log("Institutions cached successfully:", CACHE_KEY);
+                    } catch (e) {
+                        console.error("Error caching institutions:", e);
+                    }
+                }
+            })
+            .catch(err => {
+                if (isMounted) {
+                    setError(`Failed to load institutions: ${err.message}`);
+                    setInstitutions({}); // Clear on error
+                }
+            })
+            .finally(() => {
+                if (isMounted) {
+                    setIsLoading(false);
+                }
+            });
+
+        return () => {
+            isMounted = false; // Cleanup function to prevent state updates on unmounted component
+        };
+    }, []); // Empty dependency array means this runs once on mount
+
+    return { institutions, isLoading, error };
+}
diff --git a/src/hooks/useReceivingInstitutions.js b/src/hooks/useReceivingInstitutions.js
new file mode 100644
index 0000000..fe83ffc
--- /dev/null
+++ b/src/hooks/useReceivingInstitutions.js
@@ -0,0 +1,146 @@
+import { useState, useEffect } from 'react';
+import { fetchData } from '../services/api';
+
+// Helper function to calculate intersection of receiving institutions
+const calculateIntersection = (results) => {
+    if (!results || results.length === 0 || results.some(res => res === null || typeof res === 'undefined')) {
+        return {};
+    }
+
+    // Filter out any potentially empty results before processing
+    const validResults = results.filter(res => typeof res === 'object' && res !== null && Object.keys(res).length > 0);
+
+    if (validResults.length === 0) {
+        return {}; // No valid data to intersect
+    }
+
+    // Get IDs from the first valid result as the starting point
+    let commonIds = new Set(Object.values(validResults[0]));
+
+    // Intersect with IDs from subsequent valid results
+    for (let i = 1; i < validResults.length; i++) {
+        const currentIds = new Set(Object.values(validResults[i]));
+        commonIds = new Set([...commonIds].filter(id => currentIds.has(id)));
+    }
+
+    console.log("Common receiving institution IDs:", commonIds);
+
+    // Rebuild the availableReceivingInstitutions object using common IDs
+    const intersection = {};
+    // Use the first valid result to map IDs back to names
+    const nameMapSource = validResults[0];
+    const idToNameMap = Object.entries(nameMapSource).reduce((acc, [name, id]) => {
+        acc[id] = name;
+        return acc;
+    }, {});
+
+    commonIds.forEach(id => {
+        const name = idToNameMap[id];
+        if (name) {
+            intersection[name] = id;
+        } else {
+            console.warn(`Could not find name for common receiving ID: ${id}.`);
+            // Attempt to find name in other results as a fallback (more robust but less efficient)
+            for (const res of validResults) {
+                const foundEntry = Object.entries(res).find(([, resId]) => resId === id);
+                if (foundEntry) {
+                    intersection[foundEntry[0]] = id;
+                    break;
+                }
+            }
+        }
+    });
+
+    console.log("Intersection result:", intersection);
+    return intersection;
+};
+
+
+export function useReceivingInstitutions(selectedSendingInstitutions) {
+    const [availableReceivingInstitutions, setAvailableReceivingInstitutions] = useState({});
+    const [isLoading, setIsLoading] = useState(false);
+    const [error, setError] = useState(null);
+
+    useEffect(() => {
+        let isMounted = true;
+        const senderIds = selectedSendingInstitutions.map(s => s.id);
+
+        if (senderIds.length === 0) {
+            setAvailableReceivingInstitutions({});
+            setIsLoading(false);
+            setError(null);
+            return; // No senders, no need to fetch
+        }
+
+        const fetchAndIntersect = async () => {
+            if (!isMounted) return;
+            setIsLoading(true);
+            setError(null);
+            setAvailableReceivingInstitutions({}); // Clear previous results
+
+            try {
+                let data;
+                if (senderIds.length === 1) {
+                    // --- Fetch for a single sender ---
+                    const sendingId = senderIds[0];
+                    console.log("Fetching receiving for single sender:", sendingId);
+                    data = await fetchData(`receiving-institutions?sendingId=${sendingId}`);
+                    if (!isMounted) return;
+                    if (data && Object.keys(data).length > 0) {
+                        setAvailableReceivingInstitutions(data);
+                    } else {
+                        setAvailableReceivingInstitutions({});
+                        setError(`No receiving institutions found with agreements for the selected sender.`);
+                    }
+                } else {
+                    // --- Fetch for multiple senders and find intersection ---
+                    console.log("Fetching receiving for multiple senders:", senderIds);
+                    const promises = senderIds.map(id =>
+                        fetchData(`receiving-institutions?sendingId=${id}`)
+                            .catch(err => {
+                                console.error(`Failed to fetch receiving for sender ${id}:`, err);
+                                return {}; // Return empty object on error for this sender
+                            })
+                    );
+
+                    const results = await Promise.all(promises);
+                    if (!isMounted) return;
+                    console.log("Raw results from multiple fetches:", results);
+
+                    if (results.some(res => res === null || typeof res === 'undefined')) {
+                         throw new Error("One or more requests for receiving institutions failed.");
+                    }
+
+                    const intersection = calculateIntersection(results);
+
+                    if (Object.keys(intersection).length > 0) {
+                        setAvailableReceivingInstitutions(intersection);
+                    } else {
+                        setAvailableReceivingInstitutions({});
+                        setError("No common receiving institutions found for the selected sending institutions.");
+                    }
+                }
+            } catch (err) {
+                console.error("Error processing receiving institutions:", err);
+                 if (isMounted) {
+                    setError(`Failed to load or process receiving institutions: ${err.message}`);
+                    setAvailableReceivingInstitutions({}); // Clear on error
+                 }
+            } finally {
+                if (isMounted) {
+                    setIsLoading(false); // Stop loading
+                }
+            }
+        };
+
+        fetchAndIntersect();
+
+        return () => {
+            isMounted = false; // Cleanup
+        };
+    // Re-run when the list of selected senders changes (deep comparison isn't perfect here, but IDs changing is the key)
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [JSON.stringify(selectedSendingInstitutions.map(s => s.id))]);
+
+    return { availableReceivingInstitutions, isLoading, error };
+}
diff --git a/src/hooks/useResizeHandler.js b/src/hooks/useResizeHandler.js
new file mode 100644
index 0000000..f507b81
--- /dev/null
+++ b/src/hooks/useResizeHandler.js
@@ -0,0 +1,75 @@
+import { useState, useRef, useCallback, useEffect } from 'react';
+
+export function useResizeHandler(initialWidth, minColWidth, fixedMajorsWidth, isMajorsVisibleRef) {
+    const [chatColumnWidth, setChatColumnWidth] = useState(initialWidth);
+    const isResizingRef = useRef(false);
+    const dividerRef = useRef(null);
+    const containerRef = useRef(null);
+    const dividerWidth = 1; // Assuming divider width is 1px
+
+    const handleMouseMove = useCallback((e) => {
+        if (!isResizingRef.current || !containerRef.current) {
+            return;
+        }
+
+        const containerRect = containerRef.current.getBoundingClientRect();
+        const mouseX = e.clientX;
+        const containerLeft = containerRect.left;
+        const totalWidth = containerRect.width;
+        const gapWidth = 16; // Assuming 1em = 16px gap
+
+        // Read the *current* visibility from the ref
+        const currentVisibility = isMajorsVisibleRef.current;
+
+        // Calculate the starting position of the chat column
+        const majorsEffectiveWidth = currentVisibility ? fixedMajorsWidth : 0;
+        const gap1EffectiveWidth = currentVisibility ? gapWidth : 0;
+        const chatStartOffset = majorsEffectiveWidth + gap1EffectiveWidth;
+
+        // Calculate desired chat width based on mouse position relative to chat start
+        let newChatWidth = mouseX - containerLeft - chatStartOffset;
+
+        // Constraints: ensure chat and PDF columns have minimum width
+        const maxChatWidth = totalWidth - chatStartOffset - minColWidth - gapWidth - dividerWidth;
+        newChatWidth = Math.max(minColWidth, Math.min(newChatWidth, maxChatWidth));
+
+        setChatColumnWidth(newChatWidth);
+    }, [minColWidth, fixedMajorsWidth, isMajorsVisibleRef]); // Dependencies updated
+
+    const handleMouseUp = useCallback(() => {
+        if (isResizingRef.current) {
+            isResizingRef.current = false;
+            window.removeEventListener('mousemove', handleMouseMove);
+            window.removeEventListener('mouseup', handleMouseUp);
+            document.body.style.cursor = '';
+            document.body.style.userSelect = '';
+        }
+    }, [handleMouseMove]); // Dependency on handleMouseMove
+
+    useEffect(() => {
+        // Cleanup function to remove listeners if component unmounts while resizing
+        return () => {
+            if (isResizingRef.current) {
+                window.removeEventListener('mousemove', handleMouseMove);
+                window.removeEventListener('mouseup', handleMouseUp);
+            }
+        };
+    }, [handleMouseMove, handleMouseUp]);
+
+    const handleMouseDown = useCallback((e) => {
+        e.preventDefault();
+        isResizingRef.current = true;
+        window.addEventListener('mousemove', handleMouseMove);
+        window.addEventListener('mouseup', handleMouseUp);
+        document.body.style.cursor = 'col-resize';
+        document.body.style.userSelect = 'none';
+    }, [handleMouseMove, handleMouseUp]);
+
+    return {
+        chatColumnWidth,
+        setChatColumnWidth, // Expose setter if needed externally
+        dividerRef,
+        containerRef,
+        handleMouseDown,
+    };
+}
diff --git a/src/hooks/useUsageStatus.js b/src/hooks/useUsageStatus.js
new file mode 100644
index 0000000..a9411ec
--- /dev/null
+++ b/src/hooks/useUsageStatus.js
@@ -0,0 +1,88 @@
+import { useState, useEffect } from 'react';
+import { fetchData } from '../services/api'; // Assuming api.js is in services
+
+// Helper function (can be moved to a utils file)
+function formatRemainingTime(resetTimestamp) {
+    if (!resetTimestamp) return '';
+    const now = new Date();
+    const resetDate = new Date(resetTimestamp);
+    const diff = resetDate.getTime() - now.getTime();
+
+    if (diff <= 0) return 'Usage reset';
+
+    const hours = Math.floor(diff / (1000 * 60 * 60));
+    const minutes = Math.floor((diff % (1000 * 60 * 60)) / (1000 * 60));
+    const seconds = Math.floor((diff % (1000 * 60)) / 1000);
+
+    return `Resets in ${hours}h ${minutes}m ${seconds}s`;
+}
+
+export function useUsageStatus(user, userTier) {
+    const [usageStatus, setUsageStatus] = useState({
+        usageCount: null,
+        usageLimit: null,
+        resetTime: null,
+        tier: userTier || null,
+        error: null,
+    });
+    const [countdown, setCountdown] = useState('');
+
+    // Fetch User Usage Status
+    useEffect(() => {
+        setUsageStatus(prev => ({ ...prev, tier: userTier }));
+
+        if (!user || !user.idToken) {
+            setUsageStatus({ usageCount: null, usageLimit: null, resetTime: null, tier: userTier, error: 'Not logged in' });
+            return;
+        }
+
+        const fetchStatus = async () => {
+            try {
+                const status = await fetchData('/user-status', { // This path is likely correct if fetchData adds /api
+                    headers: { 'Authorization': `Bearer ${user.idToken}` }
+                });
+                // --- Use the correct keys from the backend response ---
+                setUsageStatus({
+                    usageCount: status.usageCount, // Use camelCase
+                    usageLimit: status.usageLimit, // Use camelCase
+                    resetTime: status.resetTime,   // Use camelCase
+                    tier: status.tier,
+                    error: null,
+                });
+            } catch (err) {
+                console.error("Error fetching usage status:", err);
+                setUsageStatus(prev => ({ ...prev, error: err.message || 'Failed to fetch usage status' }));
+            }
+        };
+
+        fetchStatus();
+    }, [user, userTier]);
+
+    // Countdown Timer Logic
+    useEffect(() => {
+        if (!usageStatus.resetTime) {
+            setCountdown('');
+            return;
+        }
+
+        const initialRemaining = formatRemainingTime(usageStatus.resetTime);
+        setCountdown(initialRemaining);
+
+        if (initialRemaining === 'Usage reset') {
+            return;
+        }
+
+        const intervalId = setInterval(() => {
+            const remaining = formatRemainingTime(usageStatus.resetTime);
+            setCountdown(remaining);
+            if (remaining === 'Usage reset') {
+                clearInterval(intervalId);
+                // Optionally refetch usage status after reset
+            }
+        }, 1000);
+
+        return () => clearInterval(intervalId);
+    }, [usageStatus.resetTime]);
+
+    return { usageStatus, countdown };
+}
diff --git a/src/main.jsx b/src/main.jsx
index ef14fef..1f48bdc 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -25,4 +25,4 @@ createRoot(document.getElementById('root')).render(
       </BrowserRouter>
     </GoogleOAuthProvider>
   </React.StrictMode>
-);
+);
\ No newline at end of file
diff --git a/src/utils/formatText.jsx b/src/utils/formatText.jsx
new file mode 100644
index 0000000..a7bdca6
--- /dev/null
+++ b/src/utils/formatText.jsx
@@ -0,0 +1,65 @@
+import React from 'react';
+
+// Helper function to parse basic markdown (bold/italic/bullets)
+export function formatText(text) {
+  if (!text) return ''; // Handle null or undefined text
+
+  // 1. Pre-process lines for bullets ('* ' -> '• ')
+  const lines = text.split('\n');
+  const processedLines = lines.map(line => {
+    // Use trim() to handle potential leading whitespace before '*'
+    if (line.trim().startsWith('* ')) {
+      // Replace '* ' with '• ' and keep the rest of the line content
+      // Use indexOf to find the first '*' to correctly handle indentation
+      const starIndex = line.indexOf('*');
+      const prefix = line.substring(0, starIndex); // Keep indentation
+      return prefix + '• ' + line.substring(starIndex + 2);
+    }
+    return line;
+  });
+  const textWithBullets = processedLines.join('\n');
+
+  // 2. Apply bold/italic formatting to the text with bullets
+  const regex = /(\*\*.*?\*\*|`.*?`)/g; // Regex to find **bold** or `italic`
+  let lastIndex = 0;
+  const result = [];
+  let match;
+
+  try {
+      // Use textWithBullets for bold/italic parsing
+      while ((match = regex.exec(textWithBullets)) !== null) {
+        // Add text before the match
+        if (match.index > lastIndex) {
+          result.push(textWithBullets.substring(lastIndex, match.index));
+        }
+
+        const matchedText = match[0];
+        // Add bold or italic element
+        if (matchedText.startsWith('**') && matchedText.endsWith('**')) {
+          // Ensure content exists before slicing
+          const content = matchedText.length > 4 ? matchedText.slice(2, -2) : '';
+          result.push(<strong key={`bold-${lastIndex}`}>{content}</strong>); // Use unique keys
+        } else if (matchedText.startsWith('`') && matchedText.endsWith('`')) {
+           // Ensure content exists before slicing
+          const content = matchedText.length > 2 ? matchedText.slice(1, -1) : '';
+          result.push(<em key={`italic-${lastIndex}`}>{content}</em>); // Use unique keys
+        } else {
+           // Should not happen with this regex, but as fallback, add the raw match
+           result.push(matchedText);
+        }
+
+        lastIndex = regex.lastIndex;
+      }
+
+      // Add any remaining text after the last match
+      if (lastIndex < textWithBullets.length) {
+        result.push(textWithBullets.substring(lastIndex));
+      }
+
+      // Filter out potential empty strings and ensure valid React children
+      return result.filter(part => part !== null && part !== '');
+   } catch (error) {
+       console.error("Error formatting text:", error, "Original text:", text);
+       return text; // Return original text on error
+   }
+}

From a42138b49508f98b68f9249df7c431f078144f9f Mon Sep 17 00:00:00 2001
From: Ahmon <ahmonembaye@gmail.com>
Date: Mon, 5 May 2025 22:40:29 -0700
Subject: [PATCH 14/16] feat: Implement backend services, refactor frontend
 data fetching & chat

This commit introduces major backend services and refactors frontend data handling for improved performance, caching, and functionality.

**Backend:**

-   **New Services:**
    -   `AssistApiClient`: Centralizes interaction with the Assist.org API, including in-memory caching.
    -   `PdfService`: Handles fetching/generating PDFs (articulation agreements, IGETC) using Playwright and storing/retrieving from GridFS.
    -   `mongo_helper`: Basic MongoDB connection utility.
-   **New Routes (Blueprints):**
    -   `api_info_routes`: Exposes Assist API data (institutions, receiving inst., academic years, majors), performing intersection logic server-side for receiving institutions and years. Includes caching headers.
    -   `agreement_pdf_routes`: Handles POST requests to fetch/generate agreement PDFs, GET requests to generate/retrieve PDF page images (using PyMuPDF), and GET requests to serve images from GridFS with cache headers. Supports partial success (207 status).
    -   `igetc_routes`: Provides authenticated endpoint to fetch/generate IGETC PDF filenames.
    -   `chat_routes`: Implements the core `/chat` endpoint:
        -   Handles authentication (Google JWT verification).
        -   Performs user lookup/creation and rate limiting/usage checks against MongoDB.
        -   Initializes Gemini model and Perplexity API key.
        -   Accepts message history and image filenames (read from GridFS).
        -   Implements Gemini Function Calling loop for `search_web` tool, using Perplexity API for prerequisite lookups.
        -   Handles safety blocking and response parsing.
-   **Structure:** Organized backend code using Flask Blueprints.

**Frontend:**

-   **Data Fetching & Caching:**
    -   Refactored `CollegeTransferForm` data fetching for receiving institutions and academic years into custom hooks (`useReceivingInstitutions`, `useAcademicYears`).
    -   Implemented 3-tier caching (memory -> localStorage -> API) in `useReceivingInstitutions`, `useAcademicYears`, `useAgreementData` (majors, availability), and `CollegeTransferForm` (institutions).
    -   Optimized `useAgreementData` to fetch all agreement details/images in parallel upon major selection, cache them, and display the active tab's images from cache.
    -   Improved context change cleanup in `useAgreementData` to clear caches.
-   **Authentication & Session:**
    -   Implemented automatic JWT attachment to API requests (`api.js`).
    -   Added global 401 handling in `api.js` to dispatch `auth-expired` event.
    -   Implemented listener in `App.jsx` to handle `auth-expired` event for automatic logout.
    -   Refactored logout logic using `useCallback`.
-   **Chat (`useChat`):**
    -   Integrated Gemini Function Calling for web search (prerequisites) via Perplexity.
    -   Added detailed prompt for education plan generation.
    -   Ensured all relevant agreement image filenames are consistently passed to the backend.
    -   Improved initial analysis prompt and triggering logic.
-   **UI (`AgreementViewerPage`):**
    -   Improved chat/PDF column resizing when toggling majors list visibility.
    -   Optimized prop passing using `useMemo`.

**Fixes:**

-   Corrected API endpoint paths in frontend fetch calls (removed leading slashes).
-   Ensured MongoDB client connections are properly managed/closed in `PdfService`.
---
 backend/college_transfer_ai/__init__.py       |  58 +-
 .../college_transfer_ai/assist_api_client.py  | 237 +++++++++
 .../college_transfer_API.py                   | 500 ------------------
 backend/college_transfer_ai/config.py         |   2 +-
 backend/college_transfer_ai/database.py       | 155 ++++--
 .../helpers/mongo_helper.py                   |  10 +
 backend/college_transfer_ai/pdf_service.py    | 202 +++++++
 .../routes/agreement_pdf_routes.py            | 180 +++++++
 .../routes/agreement_routes.py                | 464 ----------------
 .../routes/api_info_routes.py                 | 141 +++++
 .../college_transfer_ai/routes/chat_routes.py | 299 +++++++++++
 .../routes/igetc_routes.py                    |  64 +++
 backend/college_transfer_ai/utils.py          |  72 ++-
 src/App.jsx                                   |  67 ++-
 src/components/AgreementViewerPage.jsx        |  66 ++-
 src/components/CollegeTransferForm.jsx        | 480 ++++++-----------
 src/hooks/useAcademicYears.js                 | 195 +++----
 src/hooks/useAgreementData.js                 | 153 +++++-
 src/hooks/useChat.js                          |  84 ++-
 src/hooks/useReceivingInstitutions.js         | 177 +++----
 src/services/api.js                           | 100 ++--
 21 files changed, 2011 insertions(+), 1695 deletions(-)
 create mode 100644 backend/college_transfer_ai/assist_api_client.py
 delete mode 100644 backend/college_transfer_ai/college_transfer_API.py
 create mode 100644 backend/college_transfer_ai/helpers/mongo_helper.py
 create mode 100644 backend/college_transfer_ai/pdf_service.py
 create mode 100644 backend/college_transfer_ai/routes/agreement_pdf_routes.py
 delete mode 100644 backend/college_transfer_ai/routes/agreement_routes.py
 create mode 100644 backend/college_transfer_ai/routes/api_info_routes.py
 create mode 100644 backend/college_transfer_ai/routes/chat_routes.py
 create mode 100644 backend/college_transfer_ai/routes/igetc_routes.py

diff --git a/backend/college_transfer_ai/__init__.py b/backend/college_transfer_ai/__init__.py
index f499f30..886df96 100644
--- a/backend/college_transfer_ai/__init__.py
+++ b/backend/college_transfer_ai/__init__.py
@@ -4,12 +4,16 @@
 from flask_cors import CORS
 
 # Import configuration, database setup, and blueprints
-from .config import load_configuration
-from .database import init_db
-from .routes.stripe_routes import stripe_bp
-from .routes.agreement_routes import agreement_bp, init_gemini # Import init_gemini
-from .routes.course_map_routes import course_map_bp
-from .routes.user_routes import user_bp
+from college_transfer_ai.config import load_configuration
+# Import init_db and close_db specifically
+from college_transfer_ai.database import init_db, close_db
+from college_transfer_ai.routes.stripe_routes import stripe_bp
+from college_transfer_ai.routes.agreement_pdf_routes import agreement_pdf_bp
+from college_transfer_ai.routes.chat_routes import init_chat_routes # Keep this import
+from college_transfer_ai.routes.course_map_routes import course_map_bp
+from college_transfer_ai.routes.user_routes import user_bp
+from college_transfer_ai.routes.api_info_routes import api_info_bp
+from college_transfer_ai.routes.igetc_routes import igetc_bp
 
 def create_app():
     """Flask application factory."""
@@ -24,41 +28,39 @@ def create_app():
     except Exception as config_err:
         print(f"!!! CRITICAL: Failed to load configuration: {config_err}")
         traceback.print_exc()
-        # Exit if config is essential and failed to load
         exit(1)
 
     # Initialize CORS
-    # Be more specific with origins in production
-    cors_origins = config.get("FRONTEND_URL", "*") # Default to '*' if not set
+    cors_origins = config.get("FRONTEND_URL", "*")
     CORS(app, resources={r"/*": {"origins": cors_origins}})
     print(f"--- CORS Initialized (Origins: {cors_origins}) ---")
 
-    # Initialize Database
+    # Initialize Database (but don't register teardown here)
     try:
-        init_db(config.get('MONGO_URI'))
-    except ConnectionError as db_err:
-        print(f"!!! CRITICAL: Could not connect to database on startup: {db_err}")
-        # Depending on requirements, you might exit or continue with DB unavailable
-        exit(1) # Example: Exit if DB is essential
-    except Exception as general_db_err:
-        print(f"!!! CRITICAL: Unexpected error initializing database: {general_db_err}")
-        traceback.print_exc()
-        exit(1)
+        init_db(app, config.get('MONGO_URI'))
+    except (ConnectionError, ValueError, Exception) as db_err: # Catch specific errors from init_db
+        print(f"!!! CRITICAL: Database initialization failed: {db_err}")
+        # Optionally print traceback for unexpected errors
+        if not isinstance(db_err, (ConnectionError, ValueError)):
+             traceback.print_exc()
+        exit(1) # Exit if DB is essential
 
-
-    # Initialize Gemini (if using GOOGLE_API_KEY)
+    # Initialize Chat Routes (Pass the app object)
     try:
-        init_gemini(config.get('GOOGLE_API_KEY'))
+        # Pass the app object to init_chat_routes
+        init_chat_routes(app) # This might still print the GridFS error if it needs it prematurely
     except Exception as gemini_err:
-        print(f"!!! WARNING: Failed to initialize Gemini: {gemini_err}")
-        # App can likely continue without Gemini, just log the warning
+        print(f"!!! WARNING: Failed to initialize Gemini/Chat: {gemini_err}")
+        # App can likely continue without Chat, just log the warning
 
     # Register Blueprints with optional API prefix
-    api_prefix = '/api' # Example prefix, adjust as needed or remove if using '/'
+    api_prefix = '/api'
     app.register_blueprint(stripe_bp, url_prefix=api_prefix)
-    app.register_blueprint(agreement_bp, url_prefix=api_prefix)
+    app.register_blueprint(agreement_pdf_bp, url_prefix=api_prefix)
     app.register_blueprint(course_map_bp, url_prefix=api_prefix)
     app.register_blueprint(user_bp, url_prefix=api_prefix)
+    app.register_blueprint(api_info_bp, url_prefix=api_prefix)
+    app.register_blueprint(igetc_bp, url_prefix=api_prefix)
     print(f"--- Blueprints Registered (Prefix: {api_prefix}) ---")
 
     # Optional: Add a simple root route for health check or basic info
@@ -66,5 +68,9 @@ def create_app():
     def index():
         return "College Transfer AI Backend is running."
 
+    # Register the database teardown function HERE, at the end of app setup
+    app.teardown_appcontext(close_db)
+    print("--- Database teardown function registered ---")
+
     print("--- Flask App Creation Complete ---")
     return app
\ No newline at end of file
diff --git a/backend/college_transfer_ai/assist_api_client.py b/backend/college_transfer_ai/assist_api_client.py
new file mode 100644
index 0000000..4d908a5
--- /dev/null
+++ b/backend/college_transfer_ai/assist_api_client.py
@@ -0,0 +1,237 @@
+import requests
+import json
+import os
+import traceback
+
+class AssistApiClient:
+    """
+    Client for interacting with the Assist.org JSON API endpoints.
+    Handles fetching data and in-memory caching.
+    """
+    def __init__(self):
+        self.base_url = "https://assist.org/api/"
+        # --- Simple In-Memory Cache ---
+        self._institution_name_cache = {} # Key: inst_id (str), Value: name
+        self._year_id_cache = {}        # Key: year_id (str), Value: year_string
+        self._receiving_cache = {}      # Key: sending_id (str), Value: {name: id, ...}
+        self._academic_years_cache = {} # Key: f"{send_id}-{recv_id}", Value: {year_string: id, ...}
+        self._majors_cache = {}         # Key: f"{send_id}-{recv_id}-{year_id}-{cat}", Value: {label: key, ...}
+        # Consider using a more robust caching library like cachetools for TTL etc.
+        # --- End Cache ---
+
+    def _make_request(self, endpoint, params=None):
+        """Helper function to make requests to the Assist API."""
+        url = self.base_url + endpoint
+        try:
+            response = requests.get(url, params=params, timeout=15) # Add timeout
+            response.raise_for_status() # Raise HTTPError for bad responses (4xx or 5xx)
+            return response.json()
+        except requests.exceptions.RequestException as e:
+            print(f"Error fetching {url} with params {params}: {e}")
+            return None # Return None on request errors
+        except json.JSONDecodeError as e:
+            print(f"Error decoding JSON from {url}: {e}")
+            return None # Return None on JSON errors
+
+    def get_academic_years(self, sending_institution_id, receiving_institution_id):
+        """Fetches academic years for which agreements exist between the two institutions."""
+        sending_id_str = str(sending_institution_id)
+        receiving_id_str = str(receiving_institution_id)
+        cache_key = f"{sending_id_str}-{receiving_id_str}"
+
+        if cache_key in self._academic_years_cache:
+            print(f"API Cache hit for academic years: {cache_key}")
+            return self._academic_years_cache[cache_key]
+
+        print(f"API Cache miss for academic years: {cache_key}. Fetching...")
+        endpoint = f"institutions/{sending_id_str}/agreements"
+        agreement_list = self._make_request(endpoint)
+
+        if not agreement_list or not isinstance(agreement_list, list):
+            print(f"No valid agreement list found for sending institution {sending_id_str} at endpoint {endpoint}")
+            self._academic_years_cache[cache_key] = {}
+            return {}
+
+        academic_years = {}
+        found_receiving_inst = False
+        for agreement_info in agreement_list:
+            inst_parent_id = agreement_info.get("institutionParentId")
+            if str(inst_parent_id) == receiving_id_str:
+                found_receiving_inst = True
+                year_ids = agreement_info.get("receivingYearIds", [])
+                if not year_ids:
+                    print(f"Receiving institution {receiving_id_str} found, but no receivingYearIds listed.")
+                    break
+
+                for year_id in year_ids:
+                    year_string = self.get_year_from_id(year_id)
+                    if year_id and year_string and year_string not in academic_years:
+                        academic_years[year_string] = year_id
+                break
+
+        if not found_receiving_inst:
+            print(f"Receiving institution {receiving_id_str} not found in agreement list for sending institution {sending_id_str}.")
+
+        print(f"Found {len(academic_years)} academic years for {cache_key}")
+        self._academic_years_cache[cache_key] = academic_years
+        return academic_years
+
+    def get_institution_name(self, id):
+        cache_key = str(id)
+        if cache_key in self._institution_name_cache:
+            return self._institution_name_cache[cache_key]
+
+        print(f"Cache MISS for institution name: {id}. Fetching from API...")
+        data = self._make_request("institutions")
+        if not data:
+            return None
+
+        name_to_return = None
+        for item in data:
+            if str(item.get("id")) == cache_key:
+                if item.get("names"):
+                    name_to_return = item["names"][0].get("name")
+                    if name_to_return:
+                        self._institution_name_cache[cache_key] = name_to_return
+                        break
+
+        if not name_to_return:
+             print(f"Institution name not found for ID: {id}")
+        return name_to_return
+
+    def get_year_from_id(self, id):
+        cache_key = str(id)
+        if cache_key in self._year_id_cache:
+            return self._year_id_cache[cache_key]
+
+        print(f"Cache MISS for year ID: {id}. Fetching from API...")
+        data = self._make_request("AcademicYears")
+        if not data:
+            return None
+
+        year_str_to_return = None
+        for year_data in data:
+            if str(year_data.get("Id")) == cache_key:
+                fall_year = year_data.get("FallYear")
+                if fall_year:
+                    year_str_to_return = str(fall_year) + "-" + str(fall_year + 1)
+                    self._year_id_cache[cache_key] = year_str_to_return
+                    break
+
+        if not year_str_to_return:
+            print(f"Year string not found for ID: {id}")
+        return year_str_to_return
+
+    def get_receiving_institutions(self, sending_institution_id):
+        """Fetches receiving institutions that have agreements with the sending institution."""
+        cache_key = str(sending_institution_id)
+        if cache_key in self._receiving_cache:
+            print(f"API Cache hit for receiving institutions: {sending_institution_id}")
+            return self._receiving_cache[cache_key]
+
+        print(f"API Cache miss for receiving institutions: {sending_institution_id}. Fetching...")
+        endpoint = f"institutions/{sending_institution_id}/agreements"
+        agreement_list = self._make_request(endpoint)
+
+        if not agreement_list or not isinstance(agreement_list, list):
+             print(f"No valid agreement list found for sending institution {sending_institution_id} at endpoint {endpoint}")
+             self._receiving_cache[cache_key] = {}
+             return {}
+
+        receiving_institutions = {}
+        for agreement_info in agreement_list:
+            receiving_id = agreement_info.get("institutionParentId")
+            receiving_name = agreement_info.get("institutionName")
+            if not receiving_id or not receiving_name:
+                print(f"Skipping entry with missing ID or Name: {agreement_info}")
+                continue
+            if receiving_id not in receiving_institutions.values():
+                 receiving_institutions[receiving_name] = receiving_id
+
+        print(f"Found {len(receiving_institutions)} unique receiving institutions for {sending_institution_id}")
+        self._receiving_cache[cache_key] = receiving_institutions
+        return receiving_institutions
+
+    def get_majors_or_departments(self, sending_institution_id, receiving_institution_id, academic_year_id, category_code):
+        cache_key = f"{sending_institution_id}-{receiving_institution_id}-{academic_year_id}-{category_code}"
+        if cache_key in self._majors_cache:
+            return self._majors_cache[cache_key]
+
+        print(f"Cache MISS for majors/depts: {cache_key}. Fetching from API...")
+        params = {
+            "receivingInstitutionId": receiving_institution_id,
+            "sendingInstitutionId": sending_institution_id,
+            "academicYearId": academic_year_id,
+            "categoryCode": category_code
+        }
+        data = self._make_request("agreements", params=params)
+
+        if not data or not data.get("reports"):
+             print(f"No majors/depts found for {cache_key}")
+             self._majors_cache[cache_key] = {}
+             return {}
+
+        majors_dict = {}
+        for report in data["reports"]:
+             label = report.get("label")
+             key = report.get("key")
+             if label and key:
+                 majors_dict[label] = key
+
+        self._majors_cache[cache_key] = majors_dict
+        return majors_dict
+
+    def get_major_from_key(self, key):
+        """Resolves a major/dept label from its key by fetching the relevant agreement list."""
+        try:
+            keyArray = key.split("/")
+            if len(keyArray) < 4: # Basic validation
+                print(f"Invalid key format: {key}")
+                return "Invalid Key Format"
+
+            sending_institution_id = int(keyArray[1])
+            receiving_institution_id = int(keyArray[3])
+            academic_year_id = int(keyArray[0])
+            category_code = "dept" if "Department" in key else "major"
+
+            # Fetch the list using the existing method
+            majors_dict = self.get_majors_or_departments(
+                sending_institution_id,
+                receiving_institution_id,
+                academic_year_id,
+                category_code
+            )
+
+            # Find the label corresponding to the key
+            for label, k in majors_dict.items():
+                if k == key:
+                    return label
+
+            print(f"Major label not found for key: {key}")
+            return "Label Not Found" # Consistent return value
+
+        except Exception as e:
+            print(f"Error resolving major from key {key}: {e}")
+            traceback.print_exc()
+            return "Resolution Error" # Consistent return value
+
+    def get_sending_institutions(self):
+        """Fetches all sending institutions."""
+        # Note: This doesn't use the cache as it's typically fetched once
+        print("Fetching sending institutions list...")
+        data = self._make_request("institutions")
+        if not data:
+            return {}
+
+        result_dict_colleges = {}
+        for institution in data:
+            inst_id = institution.get("id")
+            if inst_id and institution.get("names") and isinstance(institution["names"], list) and institution["names"]:
+                 first_name_obj = institution["names"][0]
+                 if first_name_obj and first_name_obj.get("name"):
+                     result_dict_colleges[first_name_obj["name"]] = inst_id
+
+        return result_dict_colleges
+
+# Create a single instance for the application to use
+assist_client = AssistApiClient()
diff --git a/backend/college_transfer_ai/college_transfer_API.py b/backend/college_transfer_ai/college_transfer_API.py
deleted file mode 100644
index 9be9401..0000000
--- a/backend/college_transfer_ai/college_transfer_API.py
+++ /dev/null
@@ -1,500 +0,0 @@
-import requests
-from playwright.sync_api import sync_playwright
-from pymongo import MongoClient
-import gridfs
-import json
-import os
-import traceback # Ensure traceback is imported
-import datetime
-# Consider adding background task queue like Celery or RQ if processing is slow
-# from some_background_task_library import enqueue_task
-
-# --- MongoDB Connection Helper (Example) ---
-def get_mongo_client():
-    MONGO_URI = os.getenv("MONGO_URI")
-    if not MONGO_URI:
-        raise ValueError("MONGO_URI environment variable not set.")
-    return MongoClient(MONGO_URI)
-
-# --- Removed Placeholder for PDF Processing Logic ---
-# def process_and_store_agreement_context(filename, pdf_bytes):
-#     """
-#     Placeholder function to extract text, summarize/structure, and store context.
-#     This should ideally run asynchronously (e.g., in a background task).
-#     """
-#     print(f"Initiating context processing for: {filename}")
-#     client = None
-#     try:
-#         client = get_mongo_client()
-#         db = client["CollegeTransferAICluster"]
-#         context_collection = db["agreement_context"] # Or agreement_summaries
-#
-#         # Check if context already exists
-#         if context_collection.find_one({"_id": filename}):
-#             print(f"Context already exists for {filename}. Skipping processing.")
-#             return
-#
-#         # ... (rest of the removed function) ...
-#
-#     except Exception as e:
-#         print(f"Error processing context for {filename}: {e}")
-#         traceback.print_exc()
-#     finally:
-#         if client:
-#             client.close()
-# --- End Removed Placeholder ---
-
-
-class CollegeTransferAPI:
-    def __init__(self):
-        self.base_url = "https://assist.org/api/"
-        # --- Simple In-Memory Cache ---
-        self._institution_name_cache = {}
-        self._year_id_cache = {}
-        self._majors_cache = {} # Cache key could be f"{send_id}-{recv_id}-{year_id}-{cat}"
-        # Consider using a more robust caching library like cachetools for TTL etc.
-        # --- End Cache ---
-
-    def get_academic_year(self, id):
-        url = self.base_url + "AcademicYears"
-        response = requests.get(url)
-
-        result_academic_years = {}
-
-        academic_years_dict = {}
-
-        if response.status_code == 200:
-            academic_years = response.json()
-            result_academic_years = academic_years
-        else:
-            raise Exception("Failed to fetch academic years")
-
-        for year in result_academic_years:
-            academic_year = (str(year['FallYear'] - 1) + "-" + str(year['FallYear']))
-            if academic_year == "2025-2026": continue
-            academic_years_dict[year['Id'] - 1] = academic_year
-
-        return academic_years_dict[id] if id in academic_years_dict else None
-
-
-    def get_academic_years(self, sending_institution_id, receiving_institution_id):
-        url = f"{self.base_url}/institutions/{sending_institution_id}/agreements"
-
-        response = requests.get(url)
-
-        institutions_dict = {}
-
-        academic_years_dict = {}
-
-        if response.status_code == 200:
-            json_response = response.json()
-            institutions_dict = json_response
-        else:
-            raise Exception("Failed to fetch academic years")
-
-
-        for institution in institutions_dict:
-            if institution["institutionParentId"] == receiving_institution_id:
-                for year_id in institution["receivingYearIds"]:
-                    academic_years_dict[self.get_academic_year(year_id)] = year_id
-
-        return academic_years_dict
-
-    def get_institution_name(self, id):
-        # Check cache first
-        if id in self._institution_name_cache:
-            # print(f"Cache HIT for institution name: {id}")
-            return self._institution_name_cache[id]
-
-        # print(f"Cache MISS for institution name: {id}. Fetching from API...")
-        url = "https://assist.org/api/institutions"
-
-        result = requests.get(url)
-        result_json = {}
-        try:
-            json_data = result.json()
-            result_json = json_data
-        except ValueError:
-            print("Request failed")
-
-        institutions_dict = {str(item["id"]): item for item in result_json if "id" in item}
-
-        name_to_return = None
-        for k,v in institutions_dict.items():
-            if k == str(id):
-                # Store in cache before returning
-                # name_to_return = v['names'][0]['name'].replace(" ", "_") # Removed replace
-                name_to_return = v['names'][0]['name'] # Keep original name
-                self._institution_name_cache[id] = name_to_return
-                break # Found it, no need to continue loop
-
-        return name_to_return # Return the found name or None
-
-    def get_year_from_id(self, id):
-        # Check cache first
-        if id in self._year_id_cache:
-            # print(f"Cache HIT for year ID: {id}")
-            return self._year_id_cache[id]
-
-        # print(f"Cache MISS for year ID: {id}. Fetching from API...")
-        url = "https://assist.org/api/AcademicYears"
-
-        result = requests.get(url)
-        result_json = {}
-        try:
-            json_data = result.json()
-            result_json = json_data
-        except ValueError:
-            print("Request failed")
-
-        year_str_to_return = None
-        for k in result_json:
-            for idx, value in k.items():
-                if idx == "Id" and value == id:
-                    # year_str_to_return = str(k["FallYear"]) + "-" + str(k["FallYear"] + 1) # Removed +1
-                    year_str_to_return = str(k["FallYear"] - 1) + "-" + str(k["FallYear"]) # Correct year range
-                    # Store in cache before returning
-                    self._year_id_cache[id] = year_str_to_return
-                    break # Found it
-            if year_str_to_return: break # Exit outer loop too
-
-        return year_str_to_return
-
-    def get_majors_or_departments(self, sending_institution_id, receiving_institution_id, academic_year_id, category_code):
-        cache_key = f"{sending_institution_id}-{receiving_institution_id}-{academic_year_id}-{category_code}"
-        if cache_key in self._majors_cache:
-            # print(f"Cache HIT for majors/depts: {cache_key}")
-            return self._majors_cache[cache_key]
-
-        # print(f"Cache MISS for majors/depts: {cache_key}. Fetching from API...")
-        url = f"https://assist.org/api/agreements?receivingInstitutionId={receiving_institution_id}&sendingInstitutionId={sending_institution_id}&academicYearId={academic_year_id}&categoryCode={category_code}"
-
-        result = requests.get(url)
-
-        result_json = {}
-
-        majors_dict = {}
-
-        # Convert the response to JSON and write it to a file
-        try:
-            json_data = result.json()
-            result_json = json_data
-        except ValueError:
-            print("Request failed")
-
-        for n,v in result_json.items():
-            for major in v:
-                  majors_dict[major["label"]] = major["key"]
-
-        # Store in cache
-        self._majors_cache[cache_key] = majors_dict
-        return majors_dict
-
-    def get_major_from_key(self, key):
-        # Define the parameters
-        # sending_institution_id = 61
-        # receiving_institution_id = 79
-        # academic_year_id = 75
-        # category_code = "major"
-
-        # Define the API endpoint and parameters
-
-        keyArray = key.split("/")
-
-        sending_institution_id = int(keyArray[1])
-        receiving_institution_id = int(keyArray[3])
-        academic_year_id = int(keyArray[0])
-        category_code = "major"
-
-        if "Department" in key:
-            category_code = "dept"
-
-        url = f"https://assist.org/api/agreements?receivingInstitutionId={receiving_institution_id}&sendingInstitutionId={sending_institution_id}&academicYearId={academic_year_id}&categoryCode={category_code}"
-
-        result = requests.get(url)
-
-        result_json = {}
-
-        print("KEY AND URL: ",key, url)
-
-        # Convert the response to JSON and write it to a file
-        try:
-            json_data = result.json()
-            result_json = json_data
-        except ValueError:
-            print("Request failed")
-
-        for _, c in result_json.items():
-            for i in c:
-                for l, j in i.items():
-                    if l == "key" and j == key:
-                        # return i["label"].replace(" ", "_") # Removed replace
-                        return i["label"] # Keep original name
-        
-        return "Key Not Found", key
-
-    def get_sending_institutions(self):
-
-        url = "https://assist.org/api/institutions"
-
-        result = requests.get(url)
-
-        result_json = {}
-
-        result_dict_colleges = {}
-
-        try:
-            json_data = result.json()
-            result_json = json_data
-        except ValueError:
-            print("Something went wrong when getting colleges")
-
-        for institution in result_json:
-            for name in institution["names"]:
-                result_dict_colleges[name["name"]] = institution["id"]
-
-        return result_dict_colleges
-
-    def get_receiving_institutions(self, receiving_institution_id):
-        url = f"https://assist.org/api/institutions/{receiving_institution_id}/agreements"
-
-        result = requests.get(url)
-
-        result_json = {}
-
-        result_dict_non_ccs = {}
-
-        try:
-            json_data = result.json()
-            result_json = json_data
-        except ValueError:
-            print("Something went wrong when getting colleges")
-
-        for institution in result_json:
-            result_dict_non_ccs[institution["institutionName"]] = institution["institutionParentId"]
-
-        return result_dict_non_ccs
-
-
-    def get_articulation_agreement(self, academic_year_id, sending_institution_id, receiving_institution_id, key):
-        print(f"Fetching articulation agreement for key: {key}")
-        client = None # Initialize client to None
-        try: # Wrap more of the logic for better error handling
-
-            print(f"Academic Year ID: {academic_year_id}, Sending Institution ID: {sending_institution_id}, Receiving Institution ID: {receiving_institution_id}")
-
-            college_name = self.get_institution_name(sending_institution_id)
-            receiving_name = self.get_institution_name(receiving_institution_id)
-            major_name = self.get_major_from_key(key)
-            year_name = self.get_year_from_id(academic_year_id)
-
-            if not all([college_name, receiving_name, major_name, year_name]):
-                 print(f"Warning: Could not resolve all names for key {key}. Using fallback names.")
-                 # Provide fallback names or handle the error more gracefully
-                 college_name = college_name or f"sending_{sending_institution_id}"
-                 receiving_name = receiving_name or f"receiving_{receiving_institution_id}"
-                 major_name = major_name or f"major_{key.split('/')[-1]}" # Use last part of key
-                 year_name = year_name or f"year_{academic_year_id}"
-
-            # Sanitize names for filename
-            college_name_safe = college_name.replace(" ", "_").replace("/", "_")
-            receiving_name_safe = receiving_name.replace(" ", "_").replace("/", "_")
-            major_name_safe = major_name.replace(" ", "_").replace("/", "_")
-            year_name_safe = year_name.replace(" ", "_").replace("/", "_")
-
-
-            filename = (
-                f"{college_name_safe}_to_"
-                f"{receiving_name_safe}_"
-                f"{major_name_safe}_"
-                f"{year_name_safe}.pdf"
-            )
-            # Basic sanitization (already done above, but keep for safety)
-            filename = filename.replace('/', '_').replace('\\', '_')
-            print(f"Generated filename: {filename}")
-
-            # --- Check if already exists in GridFS ---
-            client = get_mongo_client() # Get client connection
-            db = client["CollegeTransferAICluster"] # Use correct DB name if needed
-            fs = gridfs.GridFS(db)
-            # if fs.find_one({"filename": filename}):
-            #     print(f"PDF '{filename}' already exists in GridFS. Skipping download.")
-            #     # --- Removed context processing call ---
-            #     client.close()
-            #     return filename # Return existing filename if found
-
-            # --- Construct URL (same as before) ---
-            viewBy = "major"
-
-
-            url = (
-                f"https://assist.org/transfer/results?year={academic_year_id}"
-                f"&institution={sending_institution_id}"
-                f"&agreement={receiving_institution_id}"
-                f"&agreementType=to&viewAgreementsOptions=true&view=agreement"
-                f"&viewBy={viewBy}&viewSendingAgreements=false&viewByKey={key}"
-            )
-
-            if "Department" in key:
-                viewBy = "dept"
-                if "SendingDepartment" in key:
-                    url = (
-                        f"https://assist.org/transfer/results?year={academic_year_id}"
-                        f"&institution={sending_institution_id}"
-                        f"&agreement={receiving_institution_id}"
-                        f"&agreementType=to&viewAgreementsOptions=true&view=agreement"
-                        f"&viewBy={viewBy}&viewByKey={key}&viewSendingAgreements=true"
-                    )
-                else:
-                    url = (
-                        f"https://assist.org/transfer/results?year={academic_year_id}"
-                        f"&institution={sending_institution_id}"
-                        f"&agreement={receiving_institution_id}"
-                        f"&agreementType=to&viewAgreementsOptions=true&view=agreement"
-                        f"&viewBy={viewBy}&viewByKey={key}"
-                    )
-
-            print(f"Attempting to fetch PDF from URL: {url}")
-
-            pdf_bytes = None
-            with sync_playwright() as p:
-                browser = None
-                try:
-                    browser = p.chromium.launch(headless=True)
-                    page = browser.new_page()
-                    page.goto(url, wait_until="networkidle", timeout=60000)
-                     # --- Wait for the specific header element instead of fixed timeout ---
-                    header_selector = '#view-results > app-report-preview > div.resultsBox > awc-agreement > div > div > awc-agreement-row:nth-child(1) > div > div.rowContent > div > div.rowReceiving > awc-articulation-receiving > div > div > awc-articulation-node > div > awc-articulation-node-receiving-course > awc-course > div > div.courseTitle'
-                    print(f"Waiting for selector '{header_selector}' indicating page load...")
-                    page.wait_for_selector(header_selector, timeout=30000) # Wait up to 30 seconds
-                    print("Selector found. Proceeding with PDF generation.")
-                    
-                    pdf_bytes = page.pdf(format="A4")
-                    print(f"Successfully downloaded PDF bytes (size: {len(pdf_bytes)} bytes)")
-                    
-                    # with open(filename, "wb") as f:
-                        # f.write(pdf_bytes)
-                except Exception as playwright_err:
-                     print(f"Playwright error fetching PDF from {url}: {playwright_err}")
-                     if browser: browser.close()
-                     client.close()
-                     return None
-                finally:
-                    if browser: browser.close()
-
-            if pdf_bytes:
-                try:
-                    fs.put(pdf_bytes, filename=filename, contentType='application/pdf')
-                    print(f"Successfully saved PDF '{filename}' to GridFS.")
-                    # --- Removed context processing call ---
-                except Exception as gridfs_err:
-                    print(f"Error saving PDF '{filename}' to GridFS: {gridfs_err}")
-                    # Don't process context if save failed
-            else:
-                 print("Failed to obtain PDF bytes, cannot save.")
-                 client.close()
-                 return None
-
-            client.close()
-            return filename
-
-        except Exception as e:
-            print(f"General error in get_articulation_agreement for key {key}: {e}")
-            import traceback
-            traceback.print_exc()
-            if 'client' in locals() and client:
-                 client.close()
-            return None
-        finally:
-            if client: # Close client if it was opened
-                client.close()
-
-    def get_igetc_courses(self, academic_year_id, sending_institution_id):
-        print("Fetching IGETC agreement for")
-        client = None # Initialize client to None
-        try:
-
-            college_name = self.get_institution_name(sending_institution_id)
-            year_name = self.get_year_from_id(academic_year_id)
-
-            if not all([college_name, year_name]):
-                 college_name = college_name or f"sending_{sending_institution_id}"
-                 year_name = year_name or f"year_{academic_year_id}"
-
-            # Sanitize names for filename
-            college_name_safe = college_name.replace(" ", "_").replace("/", "_")
-            year_name_safe = year_name.replace(" ", "_").replace("/", "_")
-
-
-            filename = (
-                f"{college_name_safe}_IGETC_" # Added IGETC identifier
-                f"{year_name_safe}.pdf"
-            )
-            filename = filename.replace('/', '_').replace('\\', '_')
-            print(f"Generated filename: {filename}")
-
-            client = get_mongo_client() # Get client connection
-            db = client["CollegeTransferAICluster"] # Use correct DB name if needed
-            fs = gridfs.GridFS(db)
-            if fs.find_one({"filename": filename}):
-                print(f"PDF '{filename}' already exists in GridFS. Skipping download.")
-                # --- Removed context processing call ---
-                client.close()
-                return filename
-
-            url = (
-                f"https://assist.org/transfer/results?year={academic_year_id}"
-                f"&institution={sending_institution_id}"
-                f"&type=IGETC&view=transferability&viewBy=igetcArea"
-                f"&viewSendingAgreements=false&viewByKey=all"
-
-            )
-
-
-            print(f"Attempting to fetch IGETC from URL: {url}")
-
-            pdf_bytes = None
-            with sync_playwright() as p:
-                browser = None
-                try:
-                    browser = p.chromium.launch(headless=True)
-                    page = browser.new_page()
-                    page.goto(url, wait_until="networkidle", timeout=60000)
-                    page.wait_for_timeout(2000)
-                    pdf_bytes = page.pdf(format="A4")
-                    print(f"Successfully downloaded PDF bytes (size: {len(pdf_bytes)} bytes)")
-                except Exception as playwright_err:
-                     print(f"Playwright error fetching PDF from {url}: {playwright_err}")
-                     if browser: browser.close()
-                     client.close()
-                     return None
-                finally:
-                    if browser: browser.close()
-
-            if pdf_bytes:
-                try:
-                    fs.put(pdf_bytes, filename=filename, contentType='application/pdf')
-                    print(f"Successfully saved PDF '{filename}' to GridFS.")
-                    # --- Removed context processing call ---
-                except Exception as gridfs_err:
-                    print(f"Error saving PDF '{filename}' to GridFS: {gridfs_err}")
-            else:
-                 print("Failed to obtain PDF bytes, cannot save.")
-                 client.close()
-                 return None
-
-            client.close()
-            return filename
-
-        except Exception as e:
-            print(f"General error in get_igetc_courses: {e}")
-            import traceback
-            traceback.print_exc()
-            if 'client' in locals() and client:
-                 client.close()
-            return None
-        finally: # Ensure client is closed even on error
-             if client:
-                 client.close()
-
-api = CollegeTransferAPI()
\ No newline at end of file
diff --git a/backend/college_transfer_ai/config.py b/backend/college_transfer_ai/config.py
index 73104cb..13e8906 100644
--- a/backend/college_transfer_ai/config.py
+++ b/backend/college_transfer_ai/config.py
@@ -11,7 +11,7 @@ def load_configuration():
         "MONGO_URI": os.getenv("MONGO_URI"),
         "GOOGLE_CLIENT_ID": os.getenv("GOOGLE_CLIENT_ID"),
         "GOOGLE_API_KEY": os.getenv("GOOGLE_API_KEY"), # For Gemini if needed
-        "OPENAI_API_KEY": os.getenv("OPENAI_API_KEY"), # If still used
+        "PERPLEXITY_API_KEY": os.getenv("PERPLEXITY_API_KEY"),
         "STRIPE_SECRET_KEY": os.getenv("STRIPE_SECRET_KEY"),
         "STRIPE_PRICE_ID": os.getenv("STRIPE_PRICE_ID"),
         "STRIPE_WEBHOOK_SECRET": os.getenv("STRIPE_WEBHOOK_SECRET"),
diff --git a/backend/college_transfer_ai/database.py b/backend/college_transfer_ai/database.py
index f1b3432..4cb0214 100644
--- a/backend/college_transfer_ai/database.py
+++ b/backend/college_transfer_ai/database.py
@@ -1,51 +1,142 @@
+from flask import current_app, g # Keep g for request context
 from pymongo import MongoClient
+from pymongo.errors import ConnectionFailure
 import gridfs
+import os
+from urllib.parse import urlparse
+import traceback
 
-mongo_client = None
+# Global variables to hold the single instances initialized by init_db
+# These represent the main connection pool/client setup at startup.
+client = None
 db = None
 fs = None
 users_collection = None
 course_maps_collection = None
 
-def init_db(mongo_uri):
-    """Initializes MongoDB connection, database, GridFS, and collections."""
-    global mongo_client, db, fs, users_collection, course_maps_collection
+def init_db(app, mongo_uri):
+    """
+    Initializes the MongoDB connection and GridFS using global variables.
+    DOES NOT register the teardown function here anymore.
+    """
+    global client, db, fs, users_collection, course_maps_collection
+
+    if client: # Avoid re-initialization if called multiple times
+        print("--- Database already initialized ---")
+        return
+
     if not mongo_uri:
-        raise ConnectionError("MongoDB URI not provided in configuration.")
+        print("!!! CRITICAL: MONGO_URI not set in configuration.")
+        raise ValueError("MONGO_URI is required for database initialization.")
+
     try:
-        print(f"Connecting to MongoDB...") # Hide URI from logs
-        mongo_client = MongoClient(mongo_uri)
-        # Use the database name specified in the connection string if available,
-        # otherwise default to 'CollegeTransferAI_DB'
-        db_name = mongo_client.get_database().name
-        db = mongo_client[db_name] # Access the database
-        fs = gridfs.GridFS(db)
-        users_collection = db.users
-        course_maps_collection = db.course_maps
-        # Test connection
-        mongo_client.admin.command('ping')
-        print(f"--- MongoDB Connected Successfully (DB: {db_name}) ---")
+        print(f"--- Attempting MongoDB Connection to URI specified ---") # Log URI being used
+        client = MongoClient(mongo_uri)
+        client.admin.command('ismaster') # Verify connection
+        db_name = urlparse(mongo_uri).path.lstrip('/')
+        if not db_name:
+            db_name = 'college_transfer_ai_db' # Default DB name if not in URI
+            print(f"Warning: Database name not found in MONGO_URI path, defaulting to '{db_name}'.")
+        db = client[db_name] # Assign to global db
+        fs = gridfs.GridFS(db) # Assign to global fs
+
+        users_collection = db['users'] # Assign to global users_collection
+        course_maps_collection = db['course_maps'] # Assign to global course_maps_collection
+
+        print(f"--- MongoDB Connected & GridFS Initialized (DB: {db_name}) ---")
+        print(f"--- Collections Initialized: {users_collection.name}, {course_maps_collection.name} ---")
+
+    except ConnectionFailure as e:
+        print(f"!!! CRITICAL: MongoDB Server not available. Error: {e}")
+        client = None; db = None; fs = None; users_collection = None; course_maps_collection = None
+        raise ConnectionError(f"Failed to connect to MongoDB: {e}") from e
     except Exception as e:
-        print(f"!!! MongoDB Connection Error: {e}")
-        raise ConnectionError(f"Failed to connect to MongoDB: {e}")
+        print(f"!!! CRITICAL: An unexpected error occurred during MongoDB initialization: {e}")
+        traceback.print_exc()
+        client = None; db = None; fs = None; users_collection = None; course_maps_collection = None
+        raise
+
+# --- Accessor Functions ---
+# Use Flask's 'g' object for request-scoped resources.
 
-# Optional helper functions to access db objects if avoiding globals
 def get_db():
-    if db is None:
-        raise Exception("Database not initialized.")
-    return db
+    """
+    Returns the database instance for the current request context.
+    Uses the globally initialized 'db' if not already in 'g'.
+    """
+    if 'db' not in g:
+        if db is None: # Check if global db was initialized
+             raise Exception("Global database not initialized. Ensure init_db() was called successfully at app startup.")
+        g.db = db # Store the global db instance in g for this request
+        print("--- Attaching global DB to request context 'g' ---")
+    return g.db
 
 def get_gridfs():
-    if fs is None:
-        raise Exception("GridFS not initialized.")
-    return fs
+    """
+    Returns the GridFS instance for the current request context.
+    Uses the globally initialized 'fs' if not already in 'g'.
+    """
+    if 'fs' not in g:
+        if fs is None: # Check if global fs was initialized
+             raise Exception("Global GridFS not initialized. Ensure init_db() was called successfully at app startup.")
+        g.fs = fs # Store the global fs instance in g for this request
+        print("--- Attaching global GridFS to request context 'g' ---")
+    return g.fs
 
 def get_users_collection():
-    if users_collection is None:
-        raise Exception("Users collection not initialized.")
-    return users_collection
+    """
+    Returns the users collection instance for the current request context.
+    Uses the globally initialized 'users_collection' if not already in 'g'.
+    """
+    if 'users_collection' not in g:
+        if users_collection is None:
+            raise Exception("Global Users collection not initialized. Ensure init_db() was called successfully.")
+        g.users_collection = users_collection
+        print("--- Attaching global Users Collection to request context 'g' ---")
+    return g.users_collection
 
 def get_course_maps_collection():
-     if course_maps_collection is None:
-         raise Exception("Course maps collection not initialized.")
-     return course_maps_collection
\ No newline at end of file
+    """
+    Returns the course maps collection instance for the current request context.
+    Uses the globally initialized 'course_maps_collection' if not already in 'g'.
+    """
+    if 'course_maps_collection' not in g:
+        if course_maps_collection is None:
+             raise Exception("Global Course maps collection not initialized. Ensure init_db() was called successfully.")
+        g.course_maps_collection = course_maps_collection
+        print("--- Attaching global Course Maps Collection to request context 'g' ---")
+    return g.course_maps_collection
+
+# --- Teardown Function ---
+
+def close_db(e=None):
+    """
+    Cleans up resources from the request context 'g'.
+    Does NOT close the global client connection.
+    """
+    # Pop resources from 'g' if they exist. No need to explicitly close them
+    # as they are just references to the globally managed instances.
+    db_instance = g.pop('db', None)
+    fs_instance = g.pop('fs', None)
+    users_coll_instance = g.pop('users_collection', None)
+    course_maps_coll_instance = g.pop('course_maps_collection', None)
+
+    if db_instance is not None or fs_instance is not None:
+         print("--- Cleaning up DB/GridFS references from request context 'g' ---")
+
+    # DO NOT close the global client here:
+    # if client is not None: client.close()
+
+# --- Standalone Client Getter (Remains unchanged) ---
+def get_mongo_client():
+    """Creates a new MongoDB client instance. Caller is responsible for closing."""
+    MONGO_URI = os.getenv("MONGO_URI")
+    if not MONGO_URI:
+         try:
+             MONGO_URI = current_app.config['APP_CONFIG'].get("MONGO_URI")
+             if not MONGO_URI:
+                 raise ValueError("MONGO_URI environment variable not set and not found in app config.")
+         except (RuntimeError, KeyError):
+             raise ValueError("MONGO_URI environment variable not set and no Flask app context available.")
+    print("--- Creating new standalone MongoDB client connection (caller must close) ---")
+    return MongoClient(MONGO_URI)
\ No newline at end of file
diff --git a/backend/college_transfer_ai/helpers/mongo_helper.py b/backend/college_transfer_ai/helpers/mongo_helper.py
new file mode 100644
index 0000000..1758823
--- /dev/null
+++ b/backend/college_transfer_ai/helpers/mongo_helper.py
@@ -0,0 +1,10 @@
+import os
+from pymongo import MongoClient
+
+# --- MongoDB Connection Helper ---
+def get_mongo_client():
+    MONGO_URI = os.getenv("MONGO_URI")
+    if not MONGO_URI:
+        raise ValueError("MONGO_URI environment variable not set.")
+    # Consider managing client lifetime or using a connection pool in a real application
+    return MongoClient(MONGO_URI)
diff --git a/backend/college_transfer_ai/pdf_service.py b/backend/college_transfer_ai/pdf_service.py
new file mode 100644
index 0000000..895acb5
--- /dev/null
+++ b/backend/college_transfer_ai/pdf_service.py
@@ -0,0 +1,202 @@
+from playwright.sync_api import sync_playwright
+import gridfs
+import traceback
+# Use absolute import
+from .helpers.mongo_helper import get_mongo_client
+# Use absolute import
+from college_transfer_ai.assist_api_client import AssistApiClient
+
+class PdfService:
+    def __init__(self, assist_api_client: AssistApiClient):
+        self.assist_api_client = assist_api_client
+        # Initialize GridFS connection here or pass db/fs instance
+        # For simplicity, getting client on demand, but consider managing lifetime
+        # self.mongo_client = get_mongo_client()
+        # self.db = self.mongo_client["CollegeTransferAICluster"]
+        # self.fs = gridfs.GridFS(self.db)
+
+    def _get_gridfs_instance(self):
+        """Helper to get a GridFS instance, managing client connection."""
+        client = get_mongo_client()
+        db = client["CollegeTransferAICluster"] # Use correct DB name if needed
+        fs = gridfs.GridFS(db)
+        return client, fs # Return client to close it later
+
+    def get_articulation_agreement(self, academic_year_id, sending_institution_id, receiving_institution_id, key):
+        print(f"Fetching articulation agreement for key: {key}")
+        mongo_client = None # Initialize client to None outside try
+        try:
+            print(f"Academic Year ID: {academic_year_id}, Sending Institution ID: {sending_institution_id}, Receiving Institution ID: {receiving_institution_id}")
+
+            # Use the injected assist_api_client instance
+            college_name = self.assist_api_client.get_institution_name(sending_institution_id)
+            receiving_name = self.assist_api_client.get_institution_name(receiving_institution_id)
+            major_name = self.assist_api_client.get_major_from_key(key)
+            year_name = self.assist_api_client.get_year_from_id(academic_year_id)
+
+            # Check for failure indicators from get_major_from_key
+            major_lookup_failed = major_name in ["Request Failed", "No Reports Found", "Key Not Found", "Label Not Found"]
+
+            if not all([college_name, receiving_name, major_name, year_name]) or major_lookup_failed:
+                 print(f"Warning: Could not resolve all names for key {key}. Using fallback names.")
+                 college_name = college_name or f"sending_{sending_institution_id}"
+                 receiving_name = receiving_name or f"receiving_{receiving_institution_id}"
+                 major_name = major_name if not major_lookup_failed else f"major_{key.split('/')[-1]}"
+                 year_name = year_name or f"year_{academic_year_id}"
+
+            # Sanitize names for filename
+            college_name_safe = college_name.replace(" ", "_").replace("/", "_")
+            receiving_name_safe = receiving_name.replace(" ", "_").replace("/", "_")
+            major_name_safe = major_name.replace(" ", "_").replace("/", "_")
+            year_name_safe = year_name.replace(" ", "_").replace("/", "_")
+
+            filename = (
+                f"{college_name_safe}_to_"
+                f"{receiving_name_safe}_"
+                f"{major_name_safe}_"
+                f"{year_name_safe}.pdf"
+            )
+            filename = filename.replace('/', '_').replace('\\', '_') # Basic sanitization
+            print(f"Generated filename: {filename}")
+
+            # --- Check if already exists in GridFS ---
+            mongo_client, fs = self._get_gridfs_instance() # Get client and fs
+            if fs.find_one({"filename": filename}):
+                print(f"PDF '{filename}' already exists in GridFS. Skipping download.")
+                return filename # Return existing filename (client closed in finally)
+
+            # --- Construct URL ---
+            viewBy = "major"
+            if "Department" in key: viewBy = "dept"
+
+            # Simplified URL construction
+            base_url_part = (
+                f"https://assist.org/transfer/results?year={academic_year_id}"
+                f"&institution={sending_institution_id}"
+                f"&agreement={receiving_institution_id}"
+                f"&agreementType=to&viewAgreementsOptions=true&view=agreement"
+                f"&viewBy={viewBy}&viewByKey={key}"
+            )
+            if viewBy == "dept" and "SendingDepartment" in key:
+                 url = base_url_part + "&viewSendingAgreements=true"
+            else:
+                 url = base_url_part
+
+            print(f"Attempting to fetch PDF from URL: {url}")
+
+            pdf_bytes = None
+            with sync_playwright() as p:
+                browser = None
+                try:
+                    browser = p.chromium.launch(headless=True)
+                    page = browser.new_page()
+                    page.goto(url, wait_until="networkidle", timeout=60000)
+                    header_selector = '//*[@id="view-results"]/app-report-preview/div[2]/awc-agreement/div/awc-report-header/div[3]/h1'
+                    print(f"Waiting for selector '{header_selector}' indicating page load...")
+                    page.wait_for_selector(header_selector, timeout=30000)
+                    print("Selector found. Proceeding with PDF generation.")
+                    pdf_bytes = page.pdf(format="A4")
+                    print(f"Successfully downloaded PDF bytes (size: {len(pdf_bytes)} bytes)")
+                except Exception as playwright_err:
+                     print(f"Playwright error fetching PDF from {url}: {playwright_err}")
+                     # No need to return here, let finally handle client close
+                finally:
+                    if browser: browser.close()
+
+            if pdf_bytes:
+                try:
+                    fs.put(pdf_bytes, filename=filename, contentType='application/pdf')
+                    print(f"Successfully saved PDF '{filename}' to GridFS.")
+                    return filename # Return filename on success (client closed in finally)
+                except Exception as gridfs_err:
+                    print(f"Error saving PDF '{filename}' to GridFS: {gridfs_err}")
+                    return None # Return None on GridFS error (client closed in finally)
+            else:
+                 print("Failed to obtain PDF bytes, cannot save.")
+                 return None # Return None if PDF download failed (client closed in finally)
+
+        except Exception as e:
+            print(f"General error in get_articulation_agreement for key {key}: {e}")
+            traceback.print_exc()
+            return None
+        finally:
+            if mongo_client: # Close client if it was successfully created
+                print("Closing MongoDB client connection.")
+                mongo_client.close()
+
+    def get_igetc_courses(self, academic_year_id, sending_institution_id):
+        print("Fetching IGETC agreement for")
+        mongo_client = None # Initialize client to None outside try
+        try:
+            # Use the injected assist_api_client instance
+            college_name = self.assist_api_client.get_institution_name(sending_institution_id)
+            year_name = self.assist_api_client.get_year_from_id(academic_year_id)
+
+            if not all([college_name, year_name]):
+                 college_name = college_name or f"sending_{sending_institution_id}"
+                 year_name = year_name or f"year_{academic_year_id}"
+
+            college_name_safe = college_name.replace(" ", "_").replace("/", "_")
+            year_name_safe = year_name.replace(" ", "_").replace("/", "_")
+
+            filename = (
+                f"{college_name_safe}_IGETC_"
+                f"{year_name_safe}.pdf"
+            )
+            filename = filename.replace('/', '_').replace('\\', '_')
+            print(f"Generated filename: {filename}")
+
+            mongo_client, fs = self._get_gridfs_instance() # Get client and fs
+            if fs.find_one({"filename": filename}):
+                print(f"PDF '{filename}' already exists in GridFS. Skipping download.")
+                return filename # Return existing filename (client closed in finally)
+
+            url = (
+                f"https://assist.org/transfer/results?year={academic_year_id}"
+                f"&institution={sending_institution_id}"
+                f"&type=IGETC&view=transferability&viewBy=igetcArea"
+                f"&viewSendingAgreements=false&viewByKey=all"
+            )
+            print(f"Attempting to fetch IGETC from URL: {url}")
+
+            pdf_bytes = None
+            with sync_playwright() as p:
+                browser = None
+                try:
+                    browser = p.chromium.launch(headless=True)
+                    page = browser.new_page()
+                    page.goto(url, wait_until="networkidle", timeout=60000)
+                    # --- Improved Wait Condition ---
+                    igetc_content_selector = 'div > div > div > awc-print-header > table > tbody > tr > td > div > div:nth-child(1) > h4.areaTitle'
+                    print(f"Waiting for selector '{igetc_content_selector}' indicating IGETC page load...")
+                    page.wait_for_selector(igetc_content_selector, timeout=30000)
+                    print("Selector found. Proceeding with PDF generation.")
+                    # --- End Improved Wait ---
+                    pdf_bytes = page.pdf(format="A4")
+                    print(f"Successfully downloaded PDF bytes (size: {len(pdf_bytes)} bytes)")
+                except Exception as playwright_err:
+                     print(f"Playwright error fetching PDF from {url}: {playwright_err}")
+                     # Let finally handle client close
+                finally:
+                    if browser: browser.close()
+
+            if pdf_bytes:
+                try:
+                    fs.put(pdf_bytes, filename=filename, contentType='application/pdf')
+                    print(f"Successfully saved PDF '{filename}' to GridFS.")
+                    return filename # Return filename on success (client closed in finally)
+                except Exception as gridfs_err:
+                    print(f"Error saving PDF '{filename}' to GridFS: {gridfs_err}")
+                    return None # Return None on GridFS error (client closed in finally)
+            else:
+                 print("Failed to obtain PDF bytes, cannot save.")
+                 return None # Return None if PDF download failed (client closed in finally)
+
+        except Exception as e:
+            print(f"General error in get_igetc_courses: {e}")
+            traceback.print_exc()
+            return None
+        finally:
+            if mongo_client: # Close client if it was successfully created
+                print("Closing MongoDB client connection.")
+                mongo_client.close()
diff --git a/backend/college_transfer_ai/routes/agreement_pdf_routes.py b/backend/college_transfer_ai/routes/agreement_pdf_routes.py
new file mode 100644
index 0000000..dfdc94a
--- /dev/null
+++ b/backend/college_transfer_ai/routes/agreement_pdf_routes.py
@@ -0,0 +1,180 @@
+# filepath: backend/college_transfer_ai/routes/agreement_pdf_routes.py
+import traceback
+import io
+import fitz # PyMuPDF - Keep import here for image generation
+from flask import Blueprint, jsonify, request, send_file, make_response
+from ..database import get_gridfs # Keep for serving images
+# Import the specific PDF fetching function and the client for name resolution
+from ..pdf_service import PdfService
+from ..assist_api_client import assist_client
+
+agreement_pdf_bp = Blueprint('agreement_pdf_bp', __name__) # Removed url_prefix, assuming it's added during registration
+
+# Remove global fs variable: fs = None
+# Remove unused init function: def init_pdf_routes(app): ...
+
+# Initialize the PDF service instance (assuming assist_client is available globally or passed appropriately)
+# If assist_client relies on app context, this might need adjustment or lazy initialization.
+pdf_service_instance = PdfService(assist_client)
+
+@agreement_pdf_bp.route('/articulation-agreements', methods=['POST'])
+def get_articulation_agreements():
+    data = request.get_json()
+    sending_ids = data.get('sending_ids')
+    receiving_id = data.get('receiving_id')
+    year_id = data.get('year_id')
+    major_key = data.get('major_key')
+
+    if not sending_ids or not isinstance(sending_ids, list) or not receiving_id or not year_id or not major_key:
+        return jsonify({"error": "Missing or invalid parameters (sending_ids list, receiving_id, year_id, major_key)"}), 400
+
+    results = []
+    errors = []
+
+    for sending_id in sending_ids:
+        sending_name = assist_client.get_institution_name(sending_id) or f"ID {sending_id}"
+        try:
+            key_parts = major_key.split("/")
+            if len(key_parts) > 1:
+                key_parts[1] = str(sending_id)
+                current_major_key = "/".join(key_parts)
+            else:
+                print(f"Warning: Unexpected major_key format '{major_key}'. Using original.")
+                current_major_key = major_key
+
+            pdf_filename = pdf_service_instance.get_articulation_agreement(
+                year_id, sending_id, receiving_id, current_major_key
+            )
+
+            results.append({
+                 "sendingId": sending_id,
+                 "sendingName": sending_name,
+                 "pdfFilename": pdf_filename
+            })
+            if not pdf_filename:
+                 print(f"PDF generation/fetch failed for Sending ID {sending_id} / Major Key {current_major_key}.")
+
+        except Exception as e:
+            error_msg = f"Error processing request for Sending ID {sending_id}: {e}"
+            print(error_msg)
+            traceback.print_exc()
+            errors.append(error_msg)
+            results.append({
+                 "sendingId": sending_id,
+                 "sendingName": sending_name,
+                 "pdfFilename": None,
+                 "error": str(e)
+            })
+
+    if not results and errors:
+         return jsonify({"error": "Failed to process any agreement requests.", "details": errors}), 500
+    elif errors:
+         has_success = any(item.get('pdfFilename') for item in results if not item.get('error'))
+         status_code = 207 if has_success else 500
+         message = "Partial success fetching agreements." if has_success else "Failed to fetch any agreements."
+         print(f"{message} Errors: {errors}")
+         return jsonify({"agreements": results, "warnings": errors}), status_code
+    elif not any(item.get('pdfFilename') for item in results):
+         return jsonify({"agreements": results, "message": "No articulation agreements found or generated for the selected criteria."}), 200
+    else:
+         return jsonify({"agreements": results}), 200
+
+
+@agreement_pdf_bp.route('/pdf-images/<path:filename>', methods=['GET'])
+def get_pdf_images(filename):
+    """
+    Checks if images for a PDF exist in GridFS. If not, generates, stores,
+    and returns them. If they exist, returns the existing filenames.
+    """
+    fs = get_gridfs() # Get GridFS instance directly
+    if fs is None:
+        print("Error: GridFS not available when requested in get_pdf_images.") # More specific log
+        return jsonify({"error": "Storage service not available."}), 503
+
+    try:
+        # Check for existing sorted images
+        existing_images_cursor = fs.find(
+            {"metadata.original_pdf": filename, "contentType": "image/png"},
+            sort=[("metadata.page_number", 1)] # Sort by page number
+        )
+        existing_images = list(existing_images_cursor)
+
+        if existing_images:
+            image_filenames = [img.filename for img in existing_images]
+            print(f"Found {len(image_filenames)} existing images for {filename} (sorted)")
+            return jsonify({"image_filenames": image_filenames})
+
+        # If not found, generate images
+        print(f"Generating images for {filename}...")
+        grid_out = fs.find_one({"filename": filename})
+        if not grid_out:
+            return jsonify({"error": f"PDF file '{filename}' not found in storage."}), 404
+
+        pdf_data = grid_out.read()
+        doc = fitz.open(stream=pdf_data, filetype="pdf")
+        image_filenames = []
+        zoom = 2 # Increase resolution
+        mat = fitz.Matrix(zoom, zoom)
+        generated_files_metadata = [] # Store metadata to sort later
+
+        for i, page in enumerate(doc):
+            try:
+                pix = page.get_pixmap(matrix=mat)
+                img_bytes = pix.tobytes("png")
+                image_filename = f"{filename}_page_{i}.png"
+                # Store with metadata including original PDF and page number
+                fs.put(
+                    img_bytes,
+                    filename=image_filename,
+                    contentType="image/png",
+                    metadata={"original_pdf": filename, "page_number": i}
+                )
+                generated_files_metadata.append({"filename": image_filename, "page_number": i})
+            except Exception as page_err:
+                 print(f"Error processing page {i} for {filename}: {page_err}")
+                 # Decide if you want to skip the page or fail the whole process
+
+        doc.close()
+
+        # Sort the generated filenames by page number before returning
+        generated_files_metadata.sort(key=lambda x: x["page_number"])
+        image_filenames = [item["filename"] for item in generated_files_metadata]
+
+        print(f"Stored {len(image_filenames)} images for {filename}")
+        return jsonify({"image_filenames": image_filenames})
+
+    except Exception as e:
+        print(f"Error getting/generating images for {filename}: {e}")
+        traceback.print_exc()
+        return jsonify({"error": f"Failed to process PDF '{filename}': {str(e)}"}), 500
+
+
+@agreement_pdf_bp.route('/image/<path:filename>', methods=['GET'])
+def get_image(filename):
+    """Serves an image file directly from GridFS with cache headers."""
+    fs = get_gridfs() # Get GridFS instance directly
+    if fs is None:
+        print("Error: GridFS not available when requested in get_image.") # More specific log
+        return jsonify({"error": "Storage service not available."}), 503
+
+    grid_out = None
+    try:
+        grid_out = fs.find_one({"filename": filename})
+        if not grid_out:
+            return jsonify({"error": "Image not found"}), 404
+
+        image_data_stream = io.BytesIO(grid_out.read())
+        response = make_response(send_file(
+            image_data_stream,
+            mimetype=grid_out.contentType or 'image/png',
+            as_attachment=False,
+            download_name=grid_out.filename
+        ))
+        # Set cache headers for immutable content
+        response.headers['Cache-Control'] = 'public, immutable, max-age=31536000'
+        return response
+
+    except Exception as e:
+        print(f"Error serving image {filename}: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Failed to serve image"}), 500
diff --git a/backend/college_transfer_ai/routes/agreement_routes.py b/backend/college_transfer_ai/routes/agreement_routes.py
deleted file mode 100644
index f95b1ed..0000000
--- a/backend/college_transfer_ai/routes/agreement_routes.py
+++ /dev/null
@@ -1,464 +0,0 @@
-import traceback
-import base64
-import io
-import fitz # PyMuPDF
-from PIL import Image
-from flask import Blueprint, jsonify, request, Response, current_app, send_file, make_response
-from bson.objectid import ObjectId
-# Remove OpenAI import if not used
-# from openai import OpenAI
-
-# Import necessary functions/objects from other modules
-from ..utils import verify_google_token, get_or_create_user, check_and_update_usage
-from ..database import get_db, get_gridfs # Use getter functions
-from ..college_transfer_API import CollegeTransferAPI
-
-# --- Google AI Imports ---
-import google.generativeai as genai
-from google.generativeai.types import HarmCategory, HarmBlockThreshold
-# --- End Google AI Imports ---
-
-FREE_TIER_LIMIT = 10
-PREMIUM_TIER_LIMIT = 50 # Example limit for paid users
-
-agreement_bp = Blueprint('agreement_bp', __name__)
-
-# --- Initialize Gemini ---
-# Store model in app context instead of global? For now, global is simpler.
-gemini_model = None
-def init_gemini(api_key):
-    global gemini_model
-    if not api_key:
-        print("Warning: GOOGLE_API_KEY not set. Gemini features will be disabled.")
-        return
-    try:
-        genai.configure(api_key=api_key)
-        # Consider making model name configurable
-        gemini_model = genai.GenerativeModel('gemini-2.5-flash-preview-04-17')
-        print("--- Gemini Initialized Successfully ---")
-    except Exception as e:
-        print(f"!!! Gemini Initialization Error: {e}")
-        gemini_model = None # Ensure it's None if init fails
-
-# --- API Instance ---
-# Initialize CollegeTransferAPI here or in create_app if needed globally
-api = CollegeTransferAPI()
-
-# --- Routes ---
-@agreement_bp.route('/', methods=['GET'])
-def home():
-    # This might conflict if other blueprints also define '/', consider removing or using a specific path like '/api'
-    return jsonify({"message": "Welcome to the College Transfer AI Backend (Agreement Routes)!"})
-
-@agreement_bp.route('/institutions', methods=['GET'])
-def get_institutions():
-    try:
-        institutions = api.get_sending_institutions()
-        return jsonify(institutions)
-    except Exception as e:
-        print(f"Error fetching institutions: {e}")
-        traceback.print_exc()
-        return jsonify({"error": "Failed to fetch institutions"}), 500
-
-@agreement_bp.route('/receiving-institutions', methods=['GET'])
-def get_receiving_institutions():
-    sending_institution_id = request.args.get('sendingId')
-    if not sending_institution_id:
-        return jsonify({"error": "Missing sendingId parameter"}), 400
-    try:
-        institutions = api.get_receiving_institutions(sending_institution_id)
-        return jsonify(institutions)
-    except Exception as e:
-        print(f"Error fetching receiving institutions for {sending_institution_id}: {e}")
-        traceback.print_exc()
-        return jsonify({"error": "Failed to fetch receiving institutions"}), 500
-
-@agreement_bp.route('/academic-years', methods=['GET'])
-def get_academic_years():
-    sending_institution_id = request.args.get('sendingId')
-    receiving_institution_id = request.args.get('receivingId')
-    print(f"Received sendingId: {sending_institution_id}, receivingId: {receiving_institution_id}")
-    if not sending_institution_id or not receiving_institution_id:
-        return jsonify({"error": "Missing sendingInstitutionId or receivingInstitutionId parameter"}), 400
-    try:
-        years = api.get_academic_years(int(sending_institution_id), int(receiving_institution_id))
-        return jsonify(years)
-    except Exception as e:
-        print(f"Error fetching academic years for {sending_institution_id} -> {receiving_institution_id}: {e}")
-        traceback.print_exc()
-        return jsonify({"error": "Failed to fetch academic years"}), 500
-
-@agreement_bp.route('/majors', methods=['GET'])
-def get_majors():
-    sending_institution_id = request.args.get('sendingId')
-    receiving_institution_id = request.args.get('receivingId')
-    academic_year_id = request.args.get('academicYearId')
-    category_code = request.args.get('categoryCode', 'major') # Default to major
-
-    if not sending_institution_id or not receiving_institution_id or not academic_year_id:
-        return jsonify({"error": "Missing required parameters (sending, receiving, year)"}), 400
-
-    try:
-        majors = api.get_majors_or_departments(
-            sending_institution_id,
-            receiving_institution_id,
-            academic_year_id,
-            category_code
-        )
-        return jsonify(majors)
-    except Exception as e:
-        print(f"Error fetching {category_code}s: {e}")
-        traceback.print_exc()
-        return jsonify({"error": f"Failed to fetch {category_code}s"}), 500
-
-@agreement_bp.route('/articulation-agreements', methods=['POST'])
-def get_articulation_agreements():
-    data = request.get_json()
-    sending_ids = data.get('sending_ids') # Expecting a list
-    receiving_id = data.get('receiving_id')
-    year_id = data.get('year_id')
-    major_key = data.get('major_key')
-
-    if not sending_ids or not isinstance(sending_ids, list) or not receiving_id or not year_id or not major_key:
-        return jsonify({"error": "Missing or invalid parameters (sending_ids list, receiving_id, year_id, major_key)"}), 400
-
-    results = []
-    errors = []
-
-    for sending_id in sending_ids:
-        sending_name = f"ID {sending_id}" # Default name
-        try:
-            # Fetch name first (assuming it's less likely to fail than PDF fetch)
-            try:
-                 sending_name = api.get_institution_name(sending_id) # Hypothetical method
-            except Exception as name_err:
-                 print(f"Warning: Could not fetch name for sending ID {sending_id}: {name_err}")
-
-            pdf_filename = api.get_articulation_agreement(year_id, sending_id, receiving_id, major_key)
-
-            results.append({
-                 "sendingId": sending_id,
-                 "sendingName": sending_name,
-                 "pdfFilename": pdf_filename # Will be None if not found
-            })
-            if not pdf_filename:
-                 print(f"No agreement PDF found for Sending ID {sending_id} / Major {major_key}.")
-                 # No need to add to errors list if it's just 'not found'
-
-        except Exception as e:
-            error_msg = f"Error fetching agreement for Sending ID {sending_id}: {e}"
-            print(error_msg)
-            traceback.print_exc()
-            errors.append(error_msg)
-            # Add entry with error status? Or just rely on errors list?
-            # For now, just add to errors list. The loop continues.
-            # Ensure name is included even on error
-            results.append({
-                 "sendingId": sending_id,
-                 "sendingName": sending_name,
-                 "pdfFilename": None,
-                 "error": str(e) # Add error detail to the specific item
-            })
-
-
-    if not results and errors:
-         # If only errors occurred across all attempts
-         return jsonify({"error": "Failed to fetch any agreements.", "details": errors}), 500
-    elif errors:
-         # If some succeeded and some failed
-         print(f"Partial success fetching agreements. Errors: {errors}")
-         # Return the results including those with errors, plus a general warning
-         return jsonify({"agreements": results, "warnings": errors}), 207 # Multi-Status
-    elif not any(item.get('pdfFilename') for item in results):
-         # If no errors but also no PDFs found for any sending ID
-         return jsonify({"agreements": results, "message": "No articulation agreements found for the selected criteria."}), 200 # Or 404? 200 is okay.
-    else:
-         # At least one PDF found, potentially with other non-PDF results or errors handled above
-         return jsonify({"agreements": results}), 200
-
-
-@agreement_bp.route('/pdf-images/<path:filename>', methods=['GET'])
-def get_pdf_images(filename):
-    """
-    Checks if images for a PDF exist in GridFS. If not, generates, stores,
-    and returns them. If they exist, returns the existing filenames.
-    """
-    fs = get_gridfs() # Get GridFS instance
-
-    try:
-        # Check if images already exist (using metadata)
-        existing_images = list(fs.find({"metadata.original_pdf": filename, "contentType": "image/png"}))
-
-        if existing_images:
-            image_filenames = [img.filename for img in existing_images]
-            # Sort filenames numerically based on page number in metadata
-            try:
-                image_filenames.sort(key=lambda f: fs.find_one({"filename": f}).metadata.get("page_number", float('inf')))
-            except Exception as sort_err:
-                print(f"Warning: Could not sort images by page number metadata for {filename}: {sort_err}. Using alphabetical sort.")
-                image_filenames.sort() # Fallback sort
-
-            print(f"Found {len(image_filenames)} existing images for {filename}")
-            return jsonify({"image_filenames": image_filenames})
-
-        # If images don't exist, generate them
-        print(f"Generating images for {filename}...")
-        # 1. Retrieve PDF from GridFS
-        grid_out = fs.find_one({"filename": filename})
-        if not grid_out:
-            return jsonify({"error": f"PDF file '{filename}' not found in storage."}), 404
-
-        pdf_data = grid_out.read()
-
-        # 2. Generate images using PyMuPDF
-        doc = fitz.open(stream=pdf_data, filetype="pdf")
-        image_filenames = []
-        zoom = 2 # Increase zoom for higher resolution (2 = 200%)
-        mat = fitz.Matrix(zoom, zoom)
-        generated_files_metadata = [] # Store metadata for sorting later
-
-        for i, page in enumerate(doc):
-            try:
-                pix = page.get_pixmap(matrix=mat)
-                img_bytes = pix.tobytes("png") # Output as PNG
-
-                # Create a unique filename for the image page
-                image_filename = f"{filename}_page_{i}.png"
-
-                # Store image in GridFS with metadata linking to original PDF
-                fs.put(
-                    img_bytes,
-                    filename=image_filename,
-                    contentType="image/png",
-                    metadata={"original_pdf": filename, "page_number": i}
-                )
-                generated_files_metadata.append({"filename": image_filename, "page_number": i})
-            except Exception as page_err:
-                 print(f"Error processing page {i} for {filename}: {page_err}")
-                 # Decide if you want to skip the page or fail the whole process
-                 # For now, skip the page and continue
-                 # return jsonify({"error": f"Failed to process page {i} of PDF '{filename}'"}), 500
-
-        doc.close()
-        # Sort the generated filenames based on page number
-        generated_files_metadata.sort(key=lambda x: x["page_number"])
-        image_filenames = [item["filename"] for item in generated_files_metadata]
-
-        print(f"Stored {len(image_filenames)} images for {filename}")
-        return jsonify({"image_filenames": image_filenames})
-
-    except Exception as e:
-        print(f"Error getting/generating images for {filename}: {e}")
-        traceback.print_exc()
-        return jsonify({"error": f"Failed to process PDF '{filename}': {str(e)}"}), 500
-
-@agreement_bp.route('/image/<path:filename>', methods=['GET'])
-def get_image(filename):
-    """Serves an image file directly from GridFS with cache headers."""
-    fs = get_gridfs() # Get GridFS instance
-    grid_out = None
-    try:
-        grid_out = fs.find_one({"filename": filename})
-        if not grid_out:
-            return jsonify({"error": "Image not found"}), 404
-
-        # Create a file-like object from the GridFS data
-        image_data_stream = io.BytesIO(grid_out.read())
-
-        # Create a response object using send_file
-        response = make_response(send_file(
-            image_data_stream,
-            mimetype=grid_out.contentType or 'image/png', # Use stored content type or default
-            as_attachment=False, # Serve inline
-            download_name=grid_out.filename # Optional: helps browser name if saved
-        ))
-
-        # --- Add Cache-Control Header ---
-        response.headers['Cache-Control'] = 'public, max-age=8640000'
-
-        return response
-
-    except Exception as e:
-        print(f"Error serving image {filename}: {e}")
-        traceback.print_exc()
-        # Note: grid_out.read() reads the whole file, no explicit close needed here
-        return jsonify({"error": "Failed to serve image"}), 500
-    # finally: # GridFS find_one().read() doesn't require explicit closing like open_download_stream
-        # if grid_out and hasattr(grid_out, 'close'): # Check if grid_out is a file-like object that needs closing
-        #     grid_out.close() # This block is likely not needed with find_one().read()
-
-
-# --- Chat Endpoint ---
-@agreement_bp.route('/chat', methods=['POST'])
-def chat_endpoint():
-    config = current_app.config['APP_CONFIG']
-    GOOGLE_CLIENT_ID = config.get('GOOGLE_CLIENT_ID')
-    # GOOGLE_API_KEY is implicitly used by genai.configure in init_gemini
-
-    if not GOOGLE_CLIENT_ID:
-         return jsonify({"error": "Google Client ID not configured."}), 500
-    if not gemini_model: # Check if Gemini was initialized
-         return jsonify({"error": "Chat feature disabled: Gemini model not available."}), 503 # Service Unavailable
-
-    fs = get_gridfs() # Get GridFS instance
-
-    # 1. Authentication & Authorization
-    try:
-        auth_header = request.headers.get('Authorization')
-        if not auth_header or not auth_header.startswith('Bearer '):
-            return jsonify({"error": "Authorization token missing or invalid"}), 401
-        token = auth_header.split(' ')[1]
-        user_info = verify_google_token(token, GOOGLE_CLIENT_ID)
-        user_data = get_or_create_user(user_info)
-
-        # 2. Rate Limiting / Usage Check
-        if not check_and_update_usage(user_data):
-            # Prepare message about limit exceeded, including reset time
-            from datetime import datetime, timedelta, time, timezone # Ensure imports
-            now = datetime.now(timezone.utc)
-            tomorrow = now.date() + timedelta(days=1)
-            tomorrow_midnight_utc = datetime.combine(tomorrow, time(0, 0), tzinfo=timezone.utc)
-            reset_time_str = tomorrow_midnight_utc.strftime('%Y-%m-%d %H:%M:%S %Z')
-            limit = PREMIUM_TIER_LIMIT if user_data.get('tier') == 'premium' else FREE_TIER_LIMIT
-            return jsonify({
-                "error": f"Usage limit ({limit} requests/day) exceeded for your tier ('{user_data.get('tier')}'). Please try again after {reset_time_str}."
-            }), 429 # Too Many Requests
-
-    except ValueError as auth_err:
-        return jsonify({"error": str(auth_err)}), 401
-    except Exception as usage_err:
-        # Handle potential errors from check_and_update_usage (e.g., DB error)
-        print(f"Error during usage check: {usage_err}")
-        traceback.print_exc()
-        return jsonify({"error": "Could not verify usage limits."}), 500
-
-    # 3. Process Request Data
-    data = request.get_json()
-    if not data or 'new_message' not in data:
-        return jsonify({"error": "Missing 'new_message' in request body"}), 400
-
-    new_message_text = data['new_message']
-    history = data.get('history', []) # List of {'role': 'user'/'assistant', 'content': '...'}
-    image_filenames = data.get('image_filenames', []) # Only expected for initial analysis
-
-    # 4. Prepare Content for Gemini
-    prompt_parts = []
-
-    # Add image data if provided (for initial analysis)
-    if image_filenames:
-        print(f"Processing {len(image_filenames)} images for chat...")
-        image_mime_type = "image/png" # Assuming PNG from our generation step
-        for img_filename in image_filenames:
-            try:
-                grid_out = fs.find_one({"filename": img_filename})
-                if grid_out:
-                    image_data = grid_out.read()
-                    prompt_parts.append({"mime_type": image_mime_type, "data": image_data})
-                else:
-                    print(f"Warning: Image '{img_filename}' not found in GridFS.")
-            except Exception as img_err:
-                print(f"Error reading image '{img_filename}' from GridFS: {img_err}")
-                # Decide how to handle missing images - skip or return error?
-                # For now, just skip the missing image
-                # return jsonify({"error": f"Failed to load image {img_filename}"}), 500
-
-    # Add the latest user message text
-    prompt_parts.append(new_message_text)
-
-    # 5. Call Gemini API
-    try:
-        print("Sending request to Gemini...")
-        # Construct conversation history for the API
-        api_history = []
-        for msg in history:
-             # Map 'assistant' role from frontend/db to 'model' for Gemini API
-             role = 'model' if msg.get('role') == 'assistant' else msg.get('role')
-             # Ensure role is valid and content exists
-             if role in ['user', 'model'] and msg.get('content'):
-                 api_history.append({'role': role, 'parts': [msg['content']]})
-
-        # Start chat session if history exists
-        chat_session = gemini_model.start_chat(history=api_history)
-        response = chat_session.send_message(
-            prompt_parts,
-            stream=False, # Set to True for streaming response
-            safety_settings={ # Adjust safety settings as needed
-                HarmCategory.HARM_CATEGORY_HARASSMENT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
-                HarmCategory.HARM_CATEGORY_HATE_SPEECH: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
-                HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
-                HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
-            }
-        )
-
-        # Check for safety blocks or empty response
-        if not response.parts:
-             # Investigate response.prompt_feedback if needed
-             print("Gemini response blocked or empty. Feedback:", response.prompt_feedback)
-             try:
-                 # Attempt to access safety ratings safely
-                 safety_feedback = response.prompt_feedback.safety_ratings if response.prompt_feedback else "No feedback available."
-             except Exception as feedback_err:
-                 safety_feedback = f"Error accessing feedback: {feedback_err}"
-             return jsonify({"error": "Response blocked due to safety settings or empty response.", "details": str(safety_feedback)}), 400
-
-        reply_text = response.text
-        print("Received reply from Gemini.")
-        return jsonify({"reply": reply_text})
-
-    except Exception as e:
-        print(f"Error calling Gemini API: {e}")
-        traceback.print_exc()
-        # Provide a more generic error to the user
-        return jsonify({"error": "Failed to get response from AI assistant."}), 500
-    
-# --- NEW: IGETC Agreement Endpoint ---
-@agreement_bp.route('/igetc-agreement', methods=['GET'])
-def get_igetc_agreement():
-    # --- Optional: Add Authentication/Authorization ---
-    config = current_app.config['APP_CONFIG']
-    GOOGLE_CLIENT_ID = config.get('GOOGLE_CLIENT_ID')
-    if not GOOGLE_CLIENT_ID:
-         return jsonify({"error": "Google Client ID not configured."}), 500
-
-    try:
-        auth_header = request.headers.get('Authorization')
-        if not auth_header or not auth_header.startswith('Bearer '):
-            return jsonify({"error": "Authorization token missing or invalid"}), 401
-        token = auth_header.split(' ')[1]
-        user_info = verify_google_token(token, GOOGLE_CLIENT_ID)
-        # You might not need get_or_create_user here if just checking validity
-        if not user_info:
-             raise ValueError("Invalid token or user not found.")
-    except ValueError as auth_err:
-        return jsonify({"error": str(auth_err)}), 401
-    except Exception as e:
-        print(f"Error during IGETC auth check: {e}")
-        traceback.print_exc()
-        return jsonify({"error": "Authentication failed."}), 500
-    # --- End Optional Auth ---
-
-    sending_institution_id = request.args.get('sendingId')
-    academic_year_id = request.args.get('academicYearId')
-
-    if not sending_institution_id or not academic_year_id:
-        return jsonify({"error": "Missing sendingId or academicYearId parameter"}), 400
-
-    try:
-        # Assuming api is your CollegeTransferAPI instance
-        pdf_filename = api.get_igetc_courses(int(academic_year_id), int(sending_institution_id))
-
-        if pdf_filename:
-            return jsonify({"pdfFilename": pdf_filename}), 200
-        else:
-            # Distinguish between "not found" and an error during fetch/save
-            # The get_igetc_courses function should ideally return None if not found
-            # and raise an exception for other errors, but we'll handle None here.
-            return jsonify({"error": "IGETC agreement PDF not found or could not be generated."}), 404
-
-    except ValueError:
-         return jsonify({"error": "Invalid ID format. IDs must be integers."}), 400
-    except Exception as e:
-        print(f"Error fetching IGETC agreement for {sending_institution_id} / {academic_year_id}: {e}")
-        traceback.print_exc()
-        return jsonify({"error": "Failed to fetch IGETC agreement"}), 500
-# --- End IGETC Endpoint ---
\ No newline at end of file
diff --git a/backend/college_transfer_ai/routes/api_info_routes.py b/backend/college_transfer_ai/routes/api_info_routes.py
new file mode 100644
index 0000000..50a9e8f
--- /dev/null
+++ b/backend/college_transfer_ai/routes/api_info_routes.py
@@ -0,0 +1,141 @@
+# filepath: backend/college_transfer_ai/routes/api_info_routes.py
+import traceback
+from flask import Blueprint, jsonify, request, make_response
+# Import the client instance and the helper function
+from ..assist_api_client import assist_client
+from ..utils import calculate_intersection # Moved to utils
+
+api_info_bp = Blueprint('api_info_bp', __name__)
+
+@api_info_bp.route('/institutions', methods=['GET'])
+def get_institutions():
+    try:
+        # Use the imported client instance
+        institutions = assist_client.get_sending_institutions()
+        return jsonify(institutions)
+    except Exception as e:
+        print(f"Error fetching institutions: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Failed to fetch institutions"}), 500
+
+@api_info_bp.route('/receiving-institutions', methods=['GET'])
+def get_receiving_institutions():
+    """
+    Gets common receiving institutions for one or more sending institutions.
+    Accepts comma-separated 'sendingId' query parameter.
+    """
+    sending_ids_str = request.args.get('sendingId')
+    if not sending_ids_str:
+        return jsonify({"error": "Missing required parameter 'sendingId'"}), 400
+
+    sending_ids = [s_id.strip() for s_id in sending_ids_str.split(',') if s_id.strip()]
+    if not sending_ids:
+        return jsonify({"error": "Invalid 'sendingId' parameter"}), 400
+
+    try:
+        all_results = []
+        errors = []
+        for s_id in sending_ids:
+            try:
+                # Use the imported client instance
+                data = assist_client.get_receiving_institutions(s_id)
+                all_results.append(data or {})
+            except Exception as e:
+                print(f"Error fetching receiving institutions for sender {s_id}: {e}")
+                errors.append({"sendingId": s_id, "error": str(e)})
+                all_results.append({})
+
+        if not all_results and errors:
+             return jsonify({"error": "Failed to fetch receiving institutions for all senders.", "details": errors}), 500
+
+        # Use imported calculate_intersection
+        intersection = calculate_intersection(all_results)
+
+        response_data = intersection
+        status_code = 200
+        if errors:
+            response_data = {"institutions": intersection, "warnings": errors}
+            status_code = 207 # Multi-Status
+
+        response = make_response(jsonify(response_data), status_code)
+        response.headers['Cache-Control'] = 'public, max-age=3600000'
+        return response
+
+    except Exception as e:
+        print(f"Error processing receiving institutions intersection: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Failed to process receiving institutions"}), 500
+
+@api_info_bp.route('/academic-years', methods=['GET'])
+def get_academic_years():
+    """
+    Gets common academic years for one or more sending institutions and one receiving institution.
+    Accepts comma-separated 'sendingId' and single 'receivingId'.
+    """
+    sending_ids_str = request.args.get('sendingId')
+    receiving_id = request.args.get('receivingId')
+
+    if not sending_ids_str or not receiving_id:
+        return jsonify({"error": "Missing required parameters 'sendingId' and 'receivingId'"}), 400
+
+    sending_ids = [s_id.strip() for s_id in sending_ids_str.split(',') if s_id.strip()]
+    if not sending_ids:
+        return jsonify({"error": "Invalid 'sendingId' parameter"}), 400
+
+    try:
+        all_results = []
+        errors = []
+        for s_id in sending_ids:
+            try:
+                # Use the imported client instance
+                data = assist_client.get_academic_years(s_id, receiving_id)
+                all_results.append(data or {})
+            except Exception as e:
+                print(f"Error fetching academic years for sender {s_id}, receiver {receiving_id}: {e}")
+                errors.append({"sendingId": s_id, "receivingId": receiving_id, "error": str(e)})
+                all_results.append({})
+
+        if not all_results and errors:
+             return jsonify({"error": "Failed to fetch academic years for all combinations.", "details": errors}), 500
+
+        # Use imported calculate_intersection
+        intersection = calculate_intersection(all_results)
+
+        response_data = intersection
+        status_code = 200
+        if errors:
+            response_data = {"years": intersection, "warnings": errors}
+            status_code = 207 # Multi-Status
+
+        response = make_response(jsonify(response_data), status_code)
+        response.headers['Cache-Control'] = 'public, max-age=3600000'
+        return response
+
+    except Exception as e:
+        print(f"Error processing academic years intersection: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Failed to process academic years"}), 500
+
+@api_info_bp.route('/majors', methods=['GET'])
+def get_majors():
+    sending_institution_id = request.args.get('sendingId')
+    receiving_institution_id = request.args.get('receivingId')
+    academic_year_id = request.args.get('academicYearId')
+    category_code = request.args.get('categoryCode', 'major') # Default to major
+
+    if not sending_institution_id or not receiving_institution_id or not academic_year_id:
+        return jsonify({"error": "Missing required parameters (sending, receiving, year)"}), 400
+
+    try:
+        # Use the imported client instance
+        majors = assist_client.get_majors_or_departments(
+            sending_institution_id,
+            receiving_institution_id,
+            academic_year_id,
+            category_code
+        )
+        return jsonify(majors)
+    except Exception as e:
+        print(f"Error fetching {category_code}s: {e}")
+        traceback.print_exc()
+        return jsonify({"error": f"Failed to fetch {category_code}s"}), 500
diff --git a/backend/college_transfer_ai/routes/chat_routes.py b/backend/college_transfer_ai/routes/chat_routes.py
new file mode 100644
index 0000000..a87c705
--- /dev/null
+++ b/backend/college_transfer_ai/routes/chat_routes.py
@@ -0,0 +1,299 @@
+# filepath: backend/college_transfer_ai/routes/chat_routes.py
+import traceback
+import requests
+import json
+from flask import Blueprint, jsonify, request, current_app
+from datetime import datetime, timedelta, time, timezone
+
+# --- Google AI Imports ---
+import google.generativeai as genai
+# Try importing FunctionResponse from content_types
+from google.generativeai.types import HarmCategory, HarmBlockThreshold, Tool, FunctionDeclaration
+from google.generativeai.types import content_types # Import the module
+# --- End Google AI Imports ---
+
+from ..utils import verify_google_token, get_or_create_user, check_and_update_usage
+from ..database import get_gridfs, get_db # Import necessary accessors
+
+chat_bp = Blueprint('chat_bp', __name__) # Removed url_prefix, assuming added during registration
+
+FREE_TIER_LIMIT = 10
+PREMIUM_TIER_LIMIT = 50
+
+gemini_model = None
+perplexity_api_key = None
+
+# --- Define the Web Search Tool for Gemini ---
+search_web_func = FunctionDeclaration(
+    name="search_web",
+    description="Search the web specifically for course prerequisite information. Use this tool when generating an educational plan to find prerequisites for a given course at a specific institution. If a prerequisite course is found, use this tool again to find *its* prerequisites, continuing recursively until no further prerequisites are found or a reasonable depth is reached (e.g., 2-3 levels deep). Only use this for finding prerequisite chains.",
+    parameters={
+        "type": "object",
+        "properties": {
+            "query": {
+                "type": "string",
+                "description": "The search query, which should include the course code (e.g., 'MATH 101') and the specific institution name (e.g., 'Example University') to find its prerequisites. Example: 'prerequisites for MATH 101 at Example University'"
+            }
+        },
+        "required": ["query"]
+    }
+)
+search_tool = Tool(function_declarations=[search_web_func])
+# --- End Tool Definition ---
+
+def init_chat_routes(app):
+    """Initialize Gemini model, Perplexity key, and GridFS for chat routes."""
+    global gemini_model, perplexity_api_key
+
+    config = app.config['APP_CONFIG'] # Access config directly from the passed 'app' object
+    google_api_key = config.get('GOOGLE_API_KEY')
+    perplexity_api_key = config.get('PERPLEXITY_API_KEY') # Load Perplexity key
+
+    # --- Add app context specifically for DB/GridFS access during init ---
+    try:
+        with app.app_context(): # Push context for the 'get_gridfs' call
+            fs_instance = get_gridfs() # Use the accessor function
+            if fs_instance:
+                print("--- GridFS accessed successfully in init_chat_routes (within context) ---")
+                # Use fs_instance here if needed during init
+            else:
+                # This path shouldn't be hit if init_db runs first and succeeds
+                print("!!! WARNING: get_gridfs() returned None in init_chat_routes.")
+    except Exception as e:
+        print(f"Error during chat routes initialization related to DB/GridFS: {e}")
+        # Handle error appropriately
+    # --- End app context block ---
+
+    if not google_api_key:
+        print("Warning: GOOGLE_API_KEY not set. Gemini features will be disabled.")
+        return # Exit initialization if key is missing
+    if not perplexity_api_key:
+        print("Warning: PERPLEXITY_API_KEY not set. Web search tool will be disabled.")
+        # Continue initialization even if Perplexity key is missing
+
+    try:
+        genai.configure(api_key=google_api_key)
+        model_tools = [search_tool] if perplexity_api_key else None
+        gemini_model = genai.GenerativeModel(
+            'gemini-1.5-flash',
+            tools=model_tools
+        )
+        print(f"--- Gemini Initialized Successfully {'with Web Search Tool' if model_tools else ''} ---")
+    except Exception as e:
+        print(f"!!! Gemini Initialization Error: {e}")
+        gemini_model = None
+        # Decide if you want to clear perplexity_api_key here too
+
+
+# --- Helper Function for Perplexity API ---
+def call_perplexity_api(query: str) -> dict:
+    """Calls the Perplexity API with a search query."""
+    if not perplexity_api_key:
+        print("Error: Perplexity API key not configured.")
+        return {"error": "Web search tool not configured."}
+
+    url = "https://api.perplexity.ai/chat/completions"
+    payload = {
+        "model": "sonar",
+        "messages": [
+            {"role": "system", "content": "You are an AI assistant specialized in finding and extracting course prerequisite information from web searches. Provide only the prerequisite course codes (e.g., MATH 100, ENGL 1A) or state 'None' if no prerequisites are found."},
+            {"role": "user", "content": query}
+        ]
+    }
+    headers = {
+        "accept": "application/json",
+        "content-type": "application/json",
+        "authorization": f"Bearer {perplexity_api_key}"
+    }
+
+    try:
+        print(f"--- Calling Perplexity API with query: {query} ---")
+        response = requests.post(url, json=payload, headers=headers, timeout=30)
+        response.raise_for_status()
+        result = response.json()
+        print(f"--- Perplexity API Response Status: {response.status_code} ---")
+
+        if result.get("choices") and len(result["choices"]) > 0:
+            content = result["choices"][0].get("message", {}).get("content")
+            if content:
+                 return {"result": content}
+            else:
+                 print("Warning: Perplexity response missing content.")
+                 return {"result": "No prerequisite information found in search results."}
+        else:
+            print("Warning: Perplexity response format unexpected:", result)
+            return {"error": "Unexpected response format from Perplexity."}
+
+    except requests.exceptions.RequestException as e:
+        print(f"Error calling Perplexity API: {e}")
+        return {"error": f"Failed to connect to web search service: {e}"}
+    except Exception as e:
+        print(f"Unexpected error during Perplexity call: {e}")
+        traceback.print_exc()
+        return {"error": "An unexpected error occurred during web search."}
+
+
+# --- Chat Endpoint ---
+@chat_bp.route('/chat', methods=['POST'])
+def chat_endpoint():
+    # Inside the request handler, it's safe to use get_gridfs() which uses 'g'
+    fs_request = get_gridfs()
+    if fs_request is None:
+         print("Error: GridFS not available for this request.")
+         return jsonify({"error": "Storage service unavailable"}), 500
+
+    config = current_app.config['APP_CONFIG']
+    GOOGLE_CLIENT_ID = config.get('GOOGLE_CLIENT_ID')
+
+    if not GOOGLE_CLIENT_ID:
+         print("Error: GOOGLE_CLIENT_ID not configured.")
+         return jsonify({"error": "Server configuration error"}), 500 # Return error
+    if not gemini_model:
+         print("Error: Gemini model not initialized.")
+         return jsonify({"error": "Chat service unavailable"}), 500 # Return error
+    # Removed the fs check here, using fs_request obtained via get_gridfs()
+
+    # 1. Authentication & Authorization
+    try:
+        auth_header = request.headers.get('Authorization')
+        if not auth_header or not auth_header.startswith('Bearer '):
+            return jsonify({"error": "Authorization token missing or invalid"}), 401
+        token = auth_header.split(' ')[1]
+        user_info = verify_google_token(token, GOOGLE_CLIENT_ID)
+        user_data = get_or_create_user(user_info)
+
+        # 2. Rate Limiting / Usage Check
+        if not check_and_update_usage(user_data):
+            now = datetime.now(timezone.utc)
+            tomorrow = now.date() + timedelta(days=1)
+            tomorrow_midnight_utc = datetime.combine(tomorrow, time(0, 0), tzinfo=timezone.utc)
+            reset_time_str = tomorrow_midnight_utc.strftime('%Y-%m-%d %H:%M:%S %Z')
+            limit = PREMIUM_TIER_LIMIT if user_data.get('tier') == 'premium' else FREE_TIER_LIMIT
+            return jsonify({
+                "error": f"Usage limit ({limit} requests/day) exceeded for your tier ('{user_data.get('tier')}'). Please try again after {reset_time_str}."
+            }), 429
+
+    except ValueError as auth_err:
+        return jsonify({"error": str(auth_err)}), 401
+    except Exception as usage_err:
+        print(f"Error during usage check: {usage_err}")
+        traceback.print_exc()
+        return jsonify({"error": "Could not verify usage limits."}), 500
+
+    # 3. Process Request Data
+    data = request.get_json()
+    if not data or 'new_message' not in data:
+        return jsonify({"error": "Missing 'new_message' in request body"}), 400
+
+    new_message_text = data['new_message']
+    history = data.get('history', [])
+    image_filenames = data.get('image_filenames', [])
+
+    # 4. Prepare Content for Gemini
+    prompt_parts = []
+    if image_filenames:
+        print(f"Processing {len(image_filenames)} images for chat...")
+        image_mime_type = "image/png"
+        for img_filename in image_filenames:
+            try:
+                grid_out = fs_request.find_one({"filename": img_filename})
+                if grid_out:
+                    image_data = grid_out.read()
+                    prompt_parts.append({"mime_type": image_mime_type, "data": image_data})
+                else:
+                    print(f"Warning: Image '{img_filename}' not found in GridFS.")
+            except Exception as img_err:
+                print(f"Error reading image '{img_filename}' from GridFS: {img_err}")
+
+    prompt_parts.append(new_message_text)
+
+    # 5. Call Gemini API (with Tool Handling)
+    try:
+        print("Sending initial request to Gemini...")
+        api_history = []
+        for msg in history:
+             role = 'model' if msg.get('role') == 'assistant' else msg.get('role')
+             if role in ['user', 'model'] and msg.get('content'):
+                 api_history.append({'role': role, 'parts': [msg['content']]})
+
+        chat_session = gemini_model.start_chat(history=api_history)
+        response = chat_session.send_message(
+            prompt_parts,
+            stream=False,
+            safety_settings={
+                HarmCategory.HARM_CATEGORY_HARASSMENT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
+                HarmCategory.HARM_CATEGORY_HATE_SPEECH: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
+                HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
+                HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT: HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE,
+            }
+        )
+
+        # --- Tool Handling Loop ---
+        while response.candidates and response.candidates[0].content.parts and isinstance(response.candidates[0].content.parts[0], genai.types.FunctionCall):
+            function_call = response.candidates[0].content.parts[0].function_call
+            print(f"--- Gemini requested Function Call: {function_call.name} ---")
+
+            if function_call.name == "search_web":
+                query = function_call.args.get("query")
+                if not query:
+                    print("Error: Gemini function call 'search_web' missing 'query' argument.")
+                    # Use the imported module to access FunctionResponse
+                    function_response_part = content_types.FunctionResponse(
+                        name="search_web",
+                        response={"error": "Missing 'query' argument in function call."}
+                    )
+                else:
+                    search_results = call_perplexity_api(query)
+                    # Use the imported module to access FunctionResponse
+                    function_response_part = content_types.FunctionResponse(
+                        name="search_web",
+                        response=search_results
+                    )
+
+                print(f"--- Sending Function Response back to Gemini for {function_call.name} ---")
+                # Pass the FunctionResponse object directly
+                response = chat_session.send_message(content_types.to_content(function_response_part), stream=False)
+
+
+            else:
+                print(f"Error: Unknown function call requested by Gemini: {function_call.name}")
+                 # Use the imported module to access FunctionResponse
+                function_response_part = content_types.FunctionResponse(
+                    name=function_call.name,
+                    response={"error": f"Function '{function_call.name}' is not implemented."}
+                )
+                # Pass the FunctionResponse object directly
+                response = chat_session.send_message(content_types.to_content(function_response_part), stream=False)
+
+        # --- Process Final Response ---
+        if not response.candidates or not response.candidates[0].content.parts:
+             print("Gemini response blocked or empty after processing. Feedback:", response.prompt_feedback if hasattr(response, 'prompt_feedback') else "N/A")
+             try:
+                 safety_feedback = response.prompt_feedback.safety_ratings if hasattr(response, 'prompt_feedback') and hasattr(response.prompt_feedback, 'safety_ratings') else "No feedback available."
+             except Exception as feedback_err:
+                 safety_feedback = f"Error accessing feedback: {feedback_err}"
+             return jsonify({"error": "Response blocked due to safety settings or empty response.", "details": str(safety_feedback)}), 400
+
+        reply_text = ""
+        try:
+            if hasattr(response, 'text'):
+                reply_text = response.text
+            elif response.candidates and response.candidates[0].content.parts:
+                 reply_text = "".join(part.text for part in response.candidates[0].content.parts if hasattr(part, 'text'))
+
+            if not reply_text:
+                 print("Warning: Could not extract text from final Gemini response.")
+                 return jsonify({"error": "AI assistant returned an empty reply."}), 500
+
+        except AttributeError as e:
+             print(f"Error accessing final response text: {e}")
+             print("Final Gemini Response Object:", response)
+             return jsonify({"error": "Failed to parse final AI response."}), 500
+
+        print("Received final reply from Gemini.")
+        return jsonify({"reply": reply_text})
+
+    except Exception as e:
+        print(f"Error during Gemini interaction: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Failed to get response from AI assistant."}), 500
diff --git a/backend/college_transfer_ai/routes/igetc_routes.py b/backend/college_transfer_ai/routes/igetc_routes.py
new file mode 100644
index 0000000..e72031b
--- /dev/null
+++ b/backend/college_transfer_ai/routes/igetc_routes.py
@@ -0,0 +1,64 @@
+import traceback
+from flask import Blueprint, jsonify, request, current_app
+# Import the specific PDF fetching function
+from ..pdf_service import PdfService
+from ..utils import verify_google_token
+# Import the Assist API client if needed by PdfService initialization (check your __init__.py or app factory)
+from ..assist_api_client import assist_client # Assuming you have this
+
+igetc_bp = Blueprint('igetc_bp', __name__)
+
+# Initialize PdfService instance - This might be done in your app factory (__init__.py) instead.
+# If it's initialized globally in the app factory and passed via current_app.extensions or similar,
+# you would access it differently, e.g., pdf_service = current_app.extensions['pdf_service']
+# For this example, we assume direct instantiation here or that it's correctly imported.
+pdf_service = PdfService(assist_client) # Ensure assist_client is available
+
+@igetc_bp.route('/igetc-agreement', methods=['GET'])
+def get_igetc_agreement():
+    # --- Authentication/Authorization ---
+    config = current_app.config['APP_CONFIG']
+    GOOGLE_CLIENT_ID = config.get('GOOGLE_CLIENT_ID')
+    if not GOOGLE_CLIENT_ID:
+         return jsonify({"error": "Google Client ID not configured."}), 500
+
+    try:
+        auth_header = request.headers.get('Authorization')
+        if not auth_header or not auth_header.startswith('Bearer '):
+            return jsonify({"error": "Authorization token missing or invalid"}), 401
+        token = auth_header.split(' ')[1]
+        user_info = verify_google_token(token, GOOGLE_CLIENT_ID)
+        if not user_info:
+             raise ValueError("Invalid token or user not found.")
+    except ValueError as auth_err:
+        return jsonify({"error": str(auth_err)}), 401
+    except Exception as e:
+        print(f"Error during IGETC auth check: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Authentication failed."}), 500
+    # --- End Auth ---
+
+    sending_institution_id = request.args.get('sendingId')
+    academic_year_id = request.args.get('academicYearId')
+
+    if not sending_institution_id or not academic_year_id:
+        return jsonify({"error": "Missing sendingId or academicYearId parameter"}), 400
+
+    try:
+        # Call the correct function from the pdf_service instance
+        pdf_filename = pdf_service.get_igetc_courses( # Changed function call
+            int(academic_year_id), int(sending_institution_id)
+        )
+
+        if pdf_filename:
+            return jsonify({"pdfFilename": pdf_filename}), 200
+        else:
+            # pdf_service handles logging, return appropriate error
+            return jsonify({"error": "IGETC agreement PDF not found or could not be generated/saved."}), 404 # Or 500 if it implies an error
+
+    except ValueError:
+         return jsonify({"error": "Invalid ID format. IDs must be integers."}), 400
+    except Exception as e:
+        print(f"Error processing IGETC request for {sending_institution_id} / {academic_year_id}: {e}")
+        traceback.print_exc()
+        return jsonify({"error": "Failed to process IGETC agreement request"}), 500
diff --git a/backend/college_transfer_ai/utils.py b/backend/college_transfer_ai/utils.py
index 2736029..2ca33b2 100644
--- a/backend/college_transfer_ai/utils.py
+++ b/backend/college_transfer_ai/utils.py
@@ -180,4 +180,74 @@ def check_and_update_usage(user_data):
         print(f"Error updating usage count for user {google_user_id}: {e}")
         # Add traceback here if it's not already in the calling function's handler
         traceback.print_exc()
-        raise Exception(f"Failed to update usage count: {e}")
\ No newline at end of file
+        raise Exception(f"Failed to update usage count: {e}")
+
+# --- Helper Function for Intersection (Moved from college_transfer_API.py) ---
+def calculate_intersection(results):
+    """Calculates the intersection of values from multiple dictionary results."""
+    # Corrected syntax: Use Python's 'any' and 'is None'
+    if not results or any(res is None for res in results):
+        return {}
+
+    # Filter out any potentially empty results before processing
+    valid_results = [res for res in results if isinstance(res, dict) and res]
+
+    if not valid_results:
+        return {} # No valid data to intersect
+
+    # Get IDs (values) from the first valid result as the starting point
+    try:
+        # Ensure values are hashable (like strings or ints) before adding to set
+        common_ids = set(str(v) for v in valid_results[0].values())
+    except Exception as e:
+        print(f"Error processing first result for intersection: {e}")
+        return {} # First result wasn't as expected
+
+    # Intersect with IDs (values) from subsequent valid results
+    for i in range(1, len(valid_results)):
+        try:
+            current_ids = set(str(v) for v in valid_results[i].values())
+            common_ids.intersection_update(current_ids) # More efficient intersection
+        except Exception as e:
+            print(f"Error processing result {i} for intersection: {e}")
+            continue # Skip if a result is malformed
+
+    print(f"Common IDs after intersection: {common_ids}")
+
+    # Rebuild the result object using common IDs
+    intersection = {}
+    # Use the first valid result to map IDs back to names (keys)
+    name_map_source = valid_results[0]
+    # Create a reverse map (id -> name) for efficiency
+    try:
+        # Ensure values are hashable before creating the reverse map
+        id_to_name_map = {str(v): k for k, v in name_map_source.items()}
+    except Exception as e:
+        print(f"Error creating reverse map for intersection: {e}")
+        id_to_name_map = {} # Handle potential errors if source isn't dict
+
+    for common_id in common_ids:
+        # common_id is already a string from the set creation
+        name = id_to_name_map.get(common_id)
+        if name:
+            # Find the original ID type if needed, assuming it matches the source value type
+            original_id = next((v for v in name_map_source.values() if str(v) == common_id), common_id)
+            intersection[name] = original_id
+        else:
+            # Fallback: Search other results if name not in first one (less efficient)
+            print(f"Warning: Could not find name for common ID {common_id} in first source. Searching others...")
+            found = False
+            for res in valid_results:
+                 try:
+                    for k, v in res.items():
+                        if str(v) == common_id:
+                            intersection[k] = v # Use original key and value
+                            found = True
+                            break
+                 except Exception:
+                     continue # Skip malformed results
+                 if found: break # Found it in this result dict
+
+    print(f"Intersection result: {intersection}")
+    return intersection
+# --- End Helper Function ---
\ No newline at end of file
diff --git a/src/App.jsx b/src/App.jsx
index f5e20b6..60d8d29 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react'; // Add useEffect
+import React, { useState, useEffect, useCallback } from 'react'; // Add useCallback
 import { Routes, Route, useNavigate } from 'react-router-dom';
 import { GoogleLogin, googleLogout } from '@react-oauth/google';
 import { jwtDecode } from "jwt-decode";
@@ -16,7 +16,8 @@ const stripePromise = loadStripe(import.meta.env.VITE_STRIPE_PUBLISHABLE_KEY);
 // --- End Stripe Imports ---
 
 
-const USER_STORAGE_KEY = 'collegeTransferUser';
+// Make USER_STORAGE_KEY exportable or move to constants.js
+export const USER_STORAGE_KEY = 'collegeTransferUser';
 
 // --- Simple Payment Status Components ---
 const PaymentSuccess = () => {
@@ -84,13 +85,49 @@ function App() {
 
   const navigate = useNavigate();
 
-  // --- Fetch User Status/Tier ---
+  // --- Wrap handleLogout in useCallback ---
+  const handleLogout = useCallback(() => {
+    googleLogout(); // Clear Google session
+    setUser(null); // Clear React state
+    try {
+      localStorage.removeItem(USER_STORAGE_KEY);
+      console.log("Removed user from localStorage");
+    } catch (storageError) {
+      console.error("Failed to remove user from localStorage:", storageError);
+    }
+    console.log("User logged out.");
+    navigate('/'); // Navigate to home
+    setUserTier('free'); // Reset tier
+  }, [navigate]); // Add navigate as dependency
+
+  // --- Effect to handle automatic logout on token expiry ---
+  useEffect(() => {
+    const handleAuthExpired = () => {
+      // Avoid logging out if already logged out
+      if (localStorage.getItem(USER_STORAGE_KEY)) {
+          console.log("Auth expired event received. Logging out.");
+          alert("Your session has expired. Please sign in again."); // Inform user
+          handleLogout();
+      }
+    };
+
+    window.addEventListener('auth-expired', handleAuthExpired);
+
+    // Cleanup listener on component unmount
+    return () => {
+      window.removeEventListener('auth-expired', handleAuthExpired);
+    };
+  }, [handleLogout]); // Add handleLogout dependency
+  // --- End Auto Logout Effect ---
+
+
+  // --- Fetch User Status/Tier Effect ---
   useEffect(() => {
     // Function to fetch status
     const fetchUserStatus = () => {
         if (user && user.idToken) {
             setIsLoadingTier(true);
-            fetchData('user-status', {
+            fetchData('/user-status', {
                 headers: { 'Authorization': `Bearer ${user.idToken}` }
             })
             .then(data => {
@@ -171,24 +208,12 @@ function App() {
     setUserTier('free'); // Reset tier on login error
   };
 
-  const handleLogout = () => {
-    googleLogout(); // Clear Google session
-    setUser(null); // Clear React state
-
-    // Remove user data from localStorage
-    try {
-      localStorage.removeItem(USER_STORAGE_KEY);
-      console.log("Removed user from localStorage");
-    } catch (storageError) {
-      console.error("Failed to remove user from localStorage:", storageError);
-    }
+  // --- Use useCallback version for manual logout button ---
+  const handleManualLogoutClick = useCallback(() => {
+      handleLogout();
+  }, [handleLogout]);
 
-    console.log("User logged out");
-    navigate('/');
-    setUserTier('free'); // Reset tier on logout
-  };
 
-  // --- Handle Upgrade Click ---
   const handleUpgradeClick = async () => {
       if (!user || !user.idToken) {
           alert("Please log in to upgrade.");
@@ -271,7 +296,7 @@ function App() {
                   </button>
               )}
 
-              <button onClick={handleLogout} className="btn btn-danger">
+              <button onClick={handleManualLogoutClick} className="btn btn-danger"> {/* Use useCallback version */}
                 Logout
               </button>
             </>
diff --git a/src/components/AgreementViewerPage.jsx b/src/components/AgreementViewerPage.jsx
index 68ae506..8162ae5 100644
--- a/src/components/AgreementViewerPage.jsx
+++ b/src/components/AgreementViewerPage.jsx
@@ -28,11 +28,17 @@ function AgreementViewerPage({ user, userTier }) {
     const { sendingId: initialSendingId, receivingId, yearId } = useParams();
     const location = useLocation();
 
+    // Memoize the array of institution objects
     const allSelectedSendingInstitutions = useMemo(() => {
         // Use the *first* selected institution for IGETC fetching logic
         return location.state?.allSelectedSendingInstitutions || [{ id: initialSendingId, name: 'Unknown Sending Institution' }];
     }, [location.state?.allSelectedSendingInstitutions, initialSendingId]);
 
+    // Memoize the array of institution IDs derived from the above
+    const memoizedAllSendingInstitutionIds = useMemo(() => {
+        return allSelectedSendingInstitutions.map(inst => inst.id);
+    }, [allSelectedSendingInstitutions]); // Dependency is the memoized object array
+
     // --- State for Majors Column Visibility ---
     const [isMajorsVisible, setIsMajorsVisible] = useState(true);
     const isMajorsVisibleRef = useRef(isMajorsVisible);
@@ -63,15 +69,35 @@ function AgreementViewerPage({ user, userTier }) {
 
     // --- Toggle Majors Visibility ---
     const toggleMajorsVisibility = () => {
-        const gapWidth = 16; // Assuming 1em = 16px
+        const gapWidth = 16; // Assuming 1em = 16px (sync with CSS if using em)
+        const majorsColumnTotalWidth = FIXED_MAJORS_WIDTH + gapWidth;
+
         setIsMajorsVisible(prevVisible => {
             const nextVisible = !prevVisible;
-            // Adjust chat width if hiding majors to prevent jump
-            if (!nextVisible && containerRef.current) {
+
+            if (containerRef.current) {
                 const containerWidth = containerRef.current.getBoundingClientRect().width;
                 const pdfMinWidth = MIN_COL_WIDTH;
-                const availableWidth = containerWidth - pdfMinWidth - gapWidth - 1; // 1 for divider
-                setChatColumnWidth(prevChatWidth => Math.min(prevChatWidth + FIXED_MAJORS_WIDTH + gapWidth, availableWidth));
+                const dividerWidth = 1; // Width of the draggable divider
+
+                if (!nextVisible) {
+                    // --- HIDING MAJORS ---
+                    // Calculate available width when majors are hidden
+                    const availableWidthForChatAndPdf = containerWidth - pdfMinWidth - dividerWidth - gapWidth; // Space left for Chat + PDF Min + Gaps
+                    // Target width: current chat width + space freed by majors
+                    const targetChatWidth = chatColumnWidth + majorsColumnTotalWidth;
+                    // New width is the smaller of the target or the max available space
+                    const newChatWidth = Math.min(targetChatWidth, availableWidthForChatAndPdf);
+                    // Ensure it doesn't go below min width (shouldn't happen when increasing, but good practice)
+                    setChatColumnWidth(Math.max(newChatWidth, MIN_COL_WIDTH));
+                } else {
+                    // --- SHOWING MAJORS ---
+                    // Target width: current chat width - space needed for majors
+                    const targetChatWidth = chatColumnWidth - majorsColumnTotalWidth;
+                    // New width is the larger of the target or the minimum allowed chat width
+                    const newChatWidth = Math.max(targetChatWidth, MIN_COL_WIDTH);
+                    setChatColumnWidth(newChatWidth);
+                }
             }
             return nextVisible;
         });
@@ -82,8 +108,22 @@ function AgreementViewerPage({ user, userTier }) {
     const userName = user?.name || user?.email || "You";
     const mainContentHeight = `calc(90vh - 53px)`; // Assuming nav height + padding
 
-    // Determine images for chat
-    const currentSendingId = (activeTabIndex >= 0 ? agreementData[activeTabIndex]?.sendingId : null) || allSelectedSendingInstitutions[0]?.id;
+    // Determine current sending ID based on the first selected institution
+    // Memoize this as well, although less critical than the array
+    const currentSendingId = useMemo(() => allSelectedSendingInstitutions[0]?.id, [allSelectedSendingInstitutions]);
+
+    // Memoize the COMPLETE list of image filenames for ALL agreements
+    // This list should remain stable unless the underlying agreements change
+    const allAgreementImageFilenames = useMemo(() => {
+        if (!agreementData) return [];
+        // Flatten the arrays of images from all agreements in agreementData
+        // Adjust this logic based on the actual structure of agreementData
+        return Object.values(agreementData).flatMap(data => data?.images || []);
+    }, [agreementData]); // Depends only on the overall agreement data
+
+    // Memoize image filenames for the chat (use the complete list)
+    // This replaces the previous memoization of imagesForActivePdf for the chat
+    const memoizedImageFilenamesForChat = allAgreementImageFilenames; // Already memoized
 
 
     return (
@@ -132,15 +172,17 @@ function AgreementViewerPage({ user, userTier }) {
                     transition: 'margin-left 0.3s ease' // Smooth transition for margin
                 }}>
                     <ChatInterface
+                        // Pass the memoized COMPLETE list of filenames to useChat
+                        imageFilenames={memoizedImageFilenamesForChat}
                         selectedMajorName={selectedMajorName}
                         userName={userName}
                         isMajorsVisible={isMajorsVisible} // Pass visibility state
                         toggleMajorsVisibility={toggleMajorsVisibility} // Pass toggle function
-                        sendingInstitutionId={currentSendingId}
-                        allSendingInstitutionIds={allSelectedSendingInstitutions.map(inst => inst.id)}
+                        sendingInstitutionId={currentSendingId} // Pass memoized current ID
+                        allSendingInstitutionIds={memoizedAllSendingInstitutionIds} // Pass memoized ID array
                         receivingInstitutionId={receivingId}
                         academicYearId={yearId}
-                        user={user}
+                        user={user} // Assuming user object reference is stable from parent/context
                     />
                 </div>
 
@@ -174,11 +216,11 @@ function AgreementViewerPage({ user, userTier }) {
                         agreementData={agreementData}
                         activeTabIndex={activeTabIndex}
                         handleTabClick={handleTabClick}
-                        allSelectedSendingInstitutions={allSelectedSendingInstitutions}
+                        allSelectedSendingInstitutions={allSelectedSendingInstitutions} // Pass original object array here
                         yearId={yearId}
                     />
                     <PdfViewer
-                        imageFilenames={imagesForActivePdf}
+                        imageFilenames={imagesForActivePdf} // PDF viewer uses the direct state value
                         // Refined loading state check
                         error={pdfError} // Pass PDF viewer error
                         filename={currentPdfFilename}
diff --git a/src/components/CollegeTransferForm.jsx b/src/components/CollegeTransferForm.jsx
index bf90117..ccc2a62 100644
--- a/src/components/CollegeTransferForm.jsx
+++ b/src/components/CollegeTransferForm.jsx
@@ -1,15 +1,16 @@
-import React, { useState, useEffect, useCallback } from 'react';
+import React, { useState, useEffect, useCallback, useRef } from 'react'; // Add useRef
 import { useNavigate } from 'react-router-dom';
 import { fetchData } from '../services/api';
 import '../App.css';
+import { useReceivingInstitutions } from '../hooks/useReceivingInstitutions';
+import { useAcademicYears } from '../hooks/useAcademicYears';
 
 const CollegeTransferForm = () => {
     const navigate = useNavigate();
 
     // --- State for fetched data ---
     const [institutions, setInstitutions] = useState({}); // All institutions (for sending dropdown)
-    const [availableReceivingInstitutions, setAvailableReceivingInstitutions] = useState({}); // NEW: Institutions available for the selected sender(s)
-    const [academicYears, setAcademicYears] = useState({});
+    // const [academicYears, setAcademicYears] = useState({});
 
     // --- State for input values and selections ---
     const [sendingInputValue, setSendingInputValue] = useState('');
@@ -33,8 +34,15 @@ const CollegeTransferForm = () => {
     // --- State for loading and results ---
     const [isLoading] = useState(false); // Consider separate loading states if needed
     const [error, setError] = useState(null);
-    const [isLoadingReceiving, setIsLoadingReceiving] = useState(false);
-    const [isLoadingYears, setIsLoadingYears] = useState(false); // New state for loading years
+
+    // --- Cache Ref for Institutions ---
+    const institutionsCacheRef = useRef(null); // In-memory cache
+
+    const { availableReceivingInstitutions, isLoading: isLoadingReceiving, error: receivingError } = useReceivingInstitutions(selectedSendingInstitutions);
+    const { academicYears, isLoading: isLoadingYears, error: yearsError } = useAcademicYears(selectedSendingInstitutions, selectedReceivingId);
+
+    // Combine errors if needed, or handle separately
+    const combinedError = receivingError || yearsError || error; // 'error' is the form's general error state
 
     // --- Helper Functions (resetForm - adjust state clearing) ---
     // const resetForm = useCallback(() => {
@@ -56,352 +64,161 @@ const CollegeTransferForm = () => {
 
     // --- Effects for Initial Data Loading (Institutions, Years) ---
     useEffect(() => {
-        const cacheInstitutionsKey = "instutions"
-        let cachedInstitutions = null
+        const cacheInstitutionsKey = "allInstitutions"; // More specific key
+        let cachedInstitutions = null;
 
+        // --- 1. Check In-Memory Cache ---
+        if (institutionsCacheRef.current) {
+            console.log("Loaded institutions from in-memory cache.");
+            setInstitutions(institutionsCacheRef.current);
+            setError(null);
+            return;
+        }
+
+        // --- 2. Check localStorage ---
         try {
             const cachedData = localStorage.getItem(cacheInstitutionsKey);
             if (cachedData) {
                 cachedInstitutions = JSON.parse(cachedData);
-                console.log("Loaded institutions from cache:", cacheInstitutionsKey);
+                console.log("Loaded institutions from localStorage:", cacheInstitutionsKey);
                 setInstitutions(cachedInstitutions);
+                institutionsCacheRef.current = cachedInstitutions; // Update in-memory cache
                 setError(null);
                 return;
             }
         } catch (e) {
-            console.error("Error loading institutions from cache:", e);
+            console.error("Error loading institutions from localStorage:", e);
             localStorage.removeItem(cacheInstitutionsKey); // Clear cache on error
         }
 
-        
-        fetchData('institutions')
+        // --- 3. Fetch from API ---
+        console.log("Cache miss for institutions. Fetching...");
+        fetchData('/institutions') // Ensure endpoint is correct
             .then(data => {
-                setInstitutions(data)
-                try {
-                    localStorage.setItem(cacheInstitutionsKey, JSON.stringify(data));
-                    console.log("Institutions cached successfully:", cacheInstitutionsKey);
-                } catch (e) {
-                    console.error("Error caching institutions:", e);
-                }
-            })
-            .catch(err => setError(`Failed to load institutions: ${err.message}`));
-        
-    }, []);
-
-    useEffect(() => {
-        // Only proceed if we have at least one sending institution AND a receiving institution selected
-        if (selectedSendingInstitutions.length > 0 && selectedReceivingId) {
-            const firstSendingId = selectedSendingInstitutions[0].id; // Use the first selected sender for the API call
-            const cacheAcademicYearsKey = `academic-years-${firstSendingId}-${selectedReceivingId}`;
-            let cachedAcademicYears = null;
-
-            console.log(`Attempting to load/fetch academic years for S=${firstSendingId}, R=${selectedReceivingId}`);
-
-            // --- Check Cache ---
-            try {
-                const cachedData = localStorage.getItem(cacheAcademicYearsKey);
-                if (cachedData) {
-                    cachedAcademicYears = JSON.parse(cachedData);
-                    console.log("Loaded academic years from cache:", cacheAcademicYearsKey);
-                    setAcademicYears(cachedAcademicYears);
-                    setError(null); // Clear previous errors if loaded from cache
-                    return; // Exit early if loaded from cache
-                }
-            } catch (e) {
-                console.error("Error loading academic years from cache:", e);
-                localStorage.removeItem(cacheAcademicYearsKey); // Clear potentially corrupted cache
-            }
-
-            // --- Fetch from API ---
-            // Add loading state if desired: setIsLoadingYears(true);
-            setError(null); // Clear previous errors before fetching
-            fetchData(`academic-years?sendingId=${firstSendingId}&receivingId=${selectedReceivingId}`)
-                .then(data => {
-                    if (data && Object.keys(data).length > 0) {
-                        setAcademicYears(data);
-                        // --- Cache Result ---
-                        try {
-                            localStorage.setItem(cacheAcademicYearsKey, JSON.stringify(data));
-                            console.log("Academic Years cached successfully:", cacheAcademicYearsKey);
-                        } catch (e) {
-                            console.error("Error caching academic years:", e);
-                        }
-                    } else {
-                        // Handle case where API returns no years for the combination
-                        setAcademicYears({});
-                        setError(`No academic years found for the selected combination.`);
-                        console.log("No academic years found from API.");
-                    }
-                })
-                .catch(err => {
-                    setError(`Failed to load academic years: ${err.message}`);
-                    setAcademicYears({}); // Clear years on fetch error
-                })
-                .finally(() => {
-                    // Add loading state if desired: setIsLoadingYears(false);
-                });
-
-        } else {
-            // If sending or receiving is not selected, clear academic years data
-            console.log("Clearing academic years because sending/receiving is not fully selected.");
-            setAcademicYears({});
-            // Optionally clear year input value as well, though it's handled elsewhere too
-            // setYearInputValue('');
-            // setSelectedYearId(null);
-        }
-        // Dependencies: Run this effect when the selected sending institutions OR the selected receiving ID changes.
-    }, [selectedSendingInstitutions, selectedReceivingId]);
-
-    // --- MODIFIED Effect for Fetching Receiving Institutions based on ALL Senders ---
-    useEffect(() => {
-        // Clear previous receiving selections and data whenever sending institutions change
-        setReceivingInputValue('');
-        setSelectedReceivingId(null);
-        // ALSO CLEAR YEAR SELECTION when sending institutions change
-        setYearInputValue('');
-        setSelectedYearId(null);
-        setAvailableReceivingInstitutions({});
-        setFilteredReceiving([]);
-        setError(null); // Clear previous errors
-
-        const fetchAndIntersectReceiving = async () => {
-            if (selectedSendingInstitutions.length === 0) {
-                setAvailableReceivingInstitutions({}); // No senders, no receivers
-                return;
-            }
-
-            setIsLoadingReceiving(true); // Start loading
-            setError(null);
-
-            try {
-                if (selectedSendingInstitutions.length === 1) {
-                    // --- Fetch for a single sender ---
-                    const firstSendingId = selectedSendingInstitutions[0].id;
-                    console.log("Fetching receiving for single sender:", firstSendingId);
-                    const data = await fetchData(`receiving-institutions?sendingId=${firstSendingId}`);
-                    if (data && Object.keys(data).length > 0) {
-                        setAvailableReceivingInstitutions(data);
-                    } else {
-                        setAvailableReceivingInstitutions({});
-                        setError(`No receiving institutions found with agreements for ${selectedSendingInstitutions[0].name}.`);
-                    }
-                } else {
-                    // --- Fetch for multiple senders and find intersection ---
-                    console.log("Fetching receiving for multiple senders:", selectedSendingInstitutions.map(s => s.id));
-                    const promises = selectedSendingInstitutions.map(sender =>
-                        fetchData(`receiving-institutions?sendingId=${sender.id}`)
-                            .catch(err => {
-                                // Handle individual fetch errors gracefully, maybe return empty object
-                                console.error(`Failed to fetch receiving for ${sender.name} (${sender.id}):`, err);
-                                return {}; // Return empty object on error for this sender
-                            })
-                    );
-
-                    const results = await Promise.all(promises);
-                    console.log("Raw results from multiple fetches:", results);
-
-                    // Check if any fetch failed completely (returned null/undefined instead of {})
-                    if (results.some(res => res === null || typeof res === 'undefined')) {
-                         throw new Error("One or more requests for receiving institutions failed.");
-                    }
-
-                    // Calculate intersection based on IDs
-                    if (results.length > 0) {
-                        // Get IDs from the first result as the starting point
-                        let commonIds = new Set(Object.values(results[0]));
-
-                        // Intersect with IDs from subsequent results
-                        for (let i = 1; i < results.length; i++) {
-                            const currentIds = new Set(Object.values(results[i]));
-                            commonIds = new Set([...commonIds].filter(id => currentIds.has(id)));
-                        }
-
-                        console.log("Common receiving institution IDs:", commonIds);
-
-                        // Rebuild the availableReceivingInstitutions object using common IDs
-                        // We need a way to map IDs back to names. We can use the first result
-                        // (or any result that isn't empty) that contains the common IDs.
-                        const intersection = {};
-                        let nameMapSource = results.find(res => Object.keys(res).length > 0) || {};
-                        // Create a reverse map (id -> name) from a source result for efficiency
-                        const idToNameMap = Object.entries(nameMapSource).reduce((acc, [name, id]) => {
-                            acc[id] = name;
-                            return acc;
-                        }, {});
-
-
-                        commonIds.forEach(id => {
-                            // Find the name corresponding to the common ID
-                            const name = idToNameMap[id];
-                            if (name) { // Ensure we found a name
-                                intersection[name] = id;
-                            } else {
-                                console.warn(`Could not find name for common receiving ID: ${id}. This might happen if the ID exists in later results but not the first.`);
-                                // As a fallback, you could try searching other results, but this indicates potential data inconsistency.
-                            }
-                        });
-
-
-                        if (Object.keys(intersection).length > 0) {
-                            setAvailableReceivingInstitutions(intersection);
-                            console.log("Intersection result:", intersection);
-                        } else {
-                            setAvailableReceivingInstitutions({});
-                            setError("No common receiving institutions found for the selected sending institutions.");
-                        }
-                    } else {
-                        // Should not happen if selectedSendingInstitutions.length > 1, but handle defensively
-                        setAvailableReceivingInstitutions({});
-                    }
-                }
-            } catch (err) {
-                console.error("Error processing receiving institutions:", err);
-                setError(`Failed to load or process receiving institutions: ${err.message}`);
-                setAvailableReceivingInstitutions({}); // Clear on error
-            } finally {
-                setIsLoadingReceiving(false); // Stop loading
-            }
-        };
-
-        fetchAndIntersectReceiving();
-
-    }, [selectedSendingInstitutions]); // Re-run when the list of selected senders changes
-
-    // --- MODIFIED Effect for Fetching Academic Years ---
-    useEffect(() => {
-        // Clear previous year selections and data whenever sending/receiving changes
-        setYearInputValue('');
-        setSelectedYearId(null);
-        setAcademicYears({});
-        setFilteredYears([]);
-        setError(null); // Clear previous errors related to years
-
-        const fetchAndIntersectYears = async () => {
-            // Only proceed if we have at least one sending institution AND a receiving institution selected
-            if (selectedSendingInstitutions.length === 0 || !selectedReceivingId) {
-                setAcademicYears({}); // Clear years if selections are incomplete
-                return;
-            }
-
-            setIsLoadingYears(true); // Start loading years
-            setError(null);
-
-            try {
-                if (selectedSendingInstitutions.length === 1) {
-                    // --- Fetch for a single sender ---
-                    const firstSendingId = selectedSendingInstitutions[0].id;
-                    console.log(`Fetching years for single sender S=${firstSendingId}, R=${selectedReceivingId}`);
-                    const cacheKey = `academic-years-${firstSendingId}-${selectedReceivingId}`;
-                    let cachedYears = null;
-
-                    // Check Cache
+                if (data && Object.keys(data).length > 0) {
+                    setInstitutions(data);
+                    institutionsCacheRef.current = data; // Store in in-memory cache
+                    // --- Cache Result in localStorage ---
                     try {
-                        const cachedData = localStorage.getItem(cacheKey);
-                        if (cachedData) {
-                            cachedYears = JSON.parse(cachedData);
-                            console.log("Loaded academic years from cache:", cacheKey);
-                            setAcademicYears(cachedYears);
-                            setIsLoadingYears(false); // Stop loading
-                            return;
-                        }
+                        localStorage.setItem(cacheInstitutionsKey, JSON.stringify(data));
+                        console.log("Institutions cached successfully:", cacheInstitutionsKey);
                     } catch (e) {
-                        console.error("Error loading academic years from cache:", e);
-                        localStorage.removeItem(cacheKey);
-                    }
-
-                    // Fetch from API
-                    const data = await fetchData(`academic-years?sendingId=${firstSendingId}&receivingId=${selectedReceivingId}`);
-                    if (data && Object.keys(data).length > 0) {
-                        setAcademicYears(data);
-                        // Cache Result
-                        try {
-                            localStorage.setItem(cacheKey, JSON.stringify(data));
-                            console.log("Academic Years cached successfully:", cacheKey);
-                        } catch (e) {
-                            console.error("Error caching academic years:", e);
-                        }
-                    } else {
-                        setAcademicYears({});
-                        setError(`No academic years found for ${selectedSendingInstitutions[0].name} and the selected receiving institution.`);
+                        console.error("Error caching institutions:", e);
                     }
                 } else {
-                    // --- Fetch for multiple senders and find intersection ---
-                    console.log(`Fetching years for multiple senders (Count: ${selectedSendingInstitutions.length}), R=${selectedReceivingId}`);
-                    const promises = selectedSendingInstitutions.map(sender =>
-                        fetchData(`academic-years?sendingId=${sender.id}&receivingId=${selectedReceivingId}`)
-                            .catch(err => {
-                                console.error(`Failed to fetch years for S=${sender.id}, R=${selectedReceivingId}:`, err);
-                                return {}; // Return empty object on error for this sender/receiver pair
-                            })
-                    );
-
-                    const results = await Promise.all(promises);
-                    console.log("Raw year results from multiple fetches:", results);
-
-                    // Check if any fetch failed completely
-                    if (results.some(res => res === null || typeof res === 'undefined')) {
-                        throw new Error("One or more requests for academic years failed.");
-                    }
-
-                    // Calculate intersection based on IDs
-                    if (results.length > 0 && results.every(res => typeof res === 'object' && res !== null)) {
-                        // Get IDs from the first valid result as the starting point
-                        let commonIds = new Set(Object.values(results[0]));
-
-                        // Intersect with IDs from subsequent results
-                        for (let i = 1; i < results.length; i++) {
-                            const currentIds = new Set(Object.values(results[i]));
-                            commonIds = new Set([...commonIds].filter(id => currentIds.has(id)));
-                        }
-
-                        console.log("Common academic year IDs:", commonIds);
-
-                        // Rebuild the academicYears object using common IDs
-                        const intersection = {};
-                        let nameMapSource = results.find(res => Object.keys(res).length > 0) || {};
-                        const idToNameMap = Object.entries(nameMapSource).reduce((acc, [name, id]) => {
-                            acc[id] = name;
-                            return acc;
-                        }, {});
-
-                        commonIds.forEach(id => {
-                            const name = idToNameMap[id];
-                            if (name) {
-                                intersection[name] = id;
-                            } else {
-                                console.warn(`Could not find name for common academic year ID: ${id}.`);
-                            }
-                        });
-
-                        if (Object.keys(intersection).length > 0) {
-                            setAcademicYears(intersection);
-                            console.log("Intersection year result:", intersection);
-                        } else {
-                            setAcademicYears({});
-                            setError("No common academic years found for the selected combination of institutions.");
-                        }
-                    } else {
-                        setAcademicYears({}); // Clear if results are invalid
-                        if (results.length > 0) { // Only set error if we expected results
-                           setError("Could not process academic years from one or more sources.");
-                        }
-                    }
+                    setInstitutions({});
+                    setError("No institutions found from API.");
                 }
-            } catch (err) {
-                console.error("Error processing academic years:", err);
-                setError(`Failed to load or process academic years: ${err.message}`);
-                setAcademicYears({}); // Clear on error
-            } finally {
-                setIsLoadingYears(false); // Stop loading
-            }
-        };
-
-        fetchAndIntersectYears();
+            })
+            .catch(err => setError(`Failed to load institutions: ${err.message}`));
 
-        // Cleanup function to potentially cancel fetches if component unmounts or dependencies change quickly
-        // return () => { /* Add cleanup logic if using AbortController */ };
+    }, []); // Runs only once on mount
 
-    }, [selectedSendingInstitutions, selectedReceivingId]); // Re-run when senders or receiver changes
+    // // --- MODIFIED Effect for Fetching Receiving Institutions based on ALL Senders ---
+    // useEffect(() => {
+    //     // Clear previous receiving selections and data whenever sending institutions change
+    //     setReceivingInputValue('');
+    //     setSelectedReceivingId(null);
+    //     // ALSO CLEAR YEAR SELECTION when sending institutions change
+    //     setYearInputValue('');
+    //     setSelectedYearId(null);
+    //     setFilteredReceiving([]);
+    //     setError(null); // Clear previous errors
+
+    //     const fetchAndIntersectReceiving = async () => {
+    //         if (selectedSendingInstitutions.length === 0) {
+    //             return;
+    //         }
+
+    //         setError(null);
+
+    //         try {
+    //             if (selectedSendingInstitutions.length === 1) {
+    //                 // --- Fetch for a single sender ---
+    //                 const firstSendingId = selectedSendingInstitutions[0].id;
+    //                 console.log("Fetching receiving for single sender:", firstSendingId);
+    //                 const data = await fetchData(`receiving-institutions?sendingId=${firstSendingId}`);
+    //                 if (data && Object.keys(data).length > 0) {
+    //                     setAvailableReceivingInstitutions(data);
+    //                 } else {
+    //                     setError(`No receiving institutions found with agreements for ${selectedSendingInstitutions[0].name}.`);
+    //                 }
+    //             } else {
+    //                 // --- Fetch for multiple senders and find intersection ---
+    //                 console.log("Fetching receiving for multiple senders:", selectedSendingInstitutions.map(s => s.id));
+    //                 const promises = selectedSendingInstitutions.map(sender =>
+    //                     fetchData(`receiving-institutions?sendingId=${sender.id}`)
+    //                         .catch(err => {
+    //                             // Handle individual fetch errors gracefully, maybe return empty object
+    //                             console.error(`Failed to fetch receiving for ${sender.name} (${sender.id}):`, err);
+    //                             return {}; // Return empty object on error for this sender
+    //                         })
+    //                 );
+
+    //                 const results = await Promise.all(promises);
+    //                 console.log("Raw results from multiple fetches:", results);
+
+    //                 // Check if any fetch failed completely (returned null/undefined instead of {})
+    //                 if (results.some(res => res === null || typeof res === 'undefined')) {
+    //                      throw new Error("One or more requests for receiving institutions failed.");
+    //                 }
+
+    //                 // Calculate intersection based on IDs
+    //                 if (results.length > 0) {
+    //                     // Get IDs from the first result as the starting point
+    //                     let commonIds = new Set(Object.values(results[0]));
+
+    //                     // Intersect with IDs from subsequent results
+    //                     for (let i = 1; i < results.length; i++) {
+    //                         const currentIds = new Set(Object.values(results[i]));
+    //                         commonIds = new Set([...commonIds].filter(id => currentIds.has(id)));
+    //                     }
+
+    //                     console.log("Common receiving institution IDs:", commonIds);
+
+    //                     // Rebuild the availableReceivingInstitutions object using common IDs
+    //                     // We need a way to map IDs back to names. We can use the first result
+    //                     // (or any result that isn't empty) that contains the common IDs.
+    //                     const intersection = {};
+    //                     let nameMapSource = results.find(res => Object.keys(res).length > 0) || {};
+    //                     // Create a reverse map (id -> name) from a source result for efficiency
+    //                     const idToNameMap = Object.entries(nameMapSource).reduce((acc, [name, id]) => {
+    //                         acc[id] = name;
+    //                         return acc;
+    //                     }, {});
+
+
+    //                     commonIds.forEach(id => {
+    //                         // Find the name corresponding to the common ID
+    //                         const name = idToNameMap[id];
+    //                         if (name) { // Ensure we found a name
+    //                             intersection[name] = id;
+    //                         } else {
+    //                             console.warn(`Could not find name for common receiving ID: ${id}. This might happen if the ID exists in later results but not the first.`);
+    //                             // As a fallback, you could try searching other results, but this indicates potential data inconsistency.
+    //                         }
+    //                     });
+
+
+    //                     if (Object.keys(intersection).length > 0) {
+    //                         setAvailableReceivingInstitutions(intersection);
+    //                         console.log("Intersection result:", intersection);
+    //                     } else {
+    //                         setError("No common receiving institutions found for the selected sending institutions.");
+    //                     }
+    //                 } else {
+    //                     // Should not happen if selectedSendingInstitutions.length > 1, but handle defensively
+    //                 }
+    //             }
+    //         } catch (err) {
+    //             console.error("Error processing receiving institutions:", err);
+    //             setError(`Failed to load or process receiving institutions: ${err.message}`);
+    //         }
+    //     };
+
+    //     fetchAndIntersectReceiving();
+
+    // }, [selectedSendingInstitutions]); // Re-run when the list of selected senders changes
 
     // --- Effects for Filtering Dropdowns ---
     const filter = useCallback(
@@ -494,7 +311,6 @@ const CollegeTransferForm = () => {
                 setYearInputValue('');
                 setSelectedYearId(null);
                 // Also clear existing academic years data as it's now invalid
-                setAcademicYears({});
                 setShowReceivingDropdown(false);
                 setFilteredReceiving([]);
                 break;
@@ -560,7 +376,7 @@ const CollegeTransferForm = () => {
     return (
         <div style={{ maxWidth: "960px"}}>
             <h1>College Transfer AI</h1>
-            {error && <div style={{ color: 'red', marginBottom: '1em' }}>Error: {error}</div>}
+            {combinedError && <div style={{ color: 'red', marginBottom: '1em' }}>Error: {combinedError}</div>}
 
             {/* Sending Institution Section */}
             <div className="form-group">
diff --git a/src/hooks/useAcademicYears.js b/src/hooks/useAcademicYears.js
index d02b1af..aa72193 100644
--- a/src/hooks/useAcademicYears.js
+++ b/src/hooks/useAcademicYears.js
@@ -1,66 +1,22 @@
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useRef } from 'react';
 import { fetchData } from '../services/api';
 
-// Helper function to calculate intersection of academic years
-const calculateYearIntersection = (results) => {
-    if (!results || results.length === 0 || results.some(res => res === null || typeof res === 'undefined')) {
-        return {};
-    }
-
-    const validResults = results.filter(res => typeof res === 'object' && res !== null && Object.keys(res).length > 0);
-
-    if (validResults.length === 0) {
-        return {};
-    }
-
-    let commonIds = new Set(Object.values(validResults[0]));
-
-    for (let i = 1; i < validResults.length; i++) {
-        const currentIds = new Set(Object.values(validResults[i]));
-        commonIds = new Set([...commonIds].filter(id => currentIds.has(id)));
-    }
-
-    console.log("Common academic year IDs:", commonIds);
-
-    const intersection = {};
-    const nameMapSource = validResults[0];
-    const idToNameMap = Object.entries(nameMapSource).reduce((acc, [name, id]) => {
-        acc[id] = name;
-        return acc;
-    }, {});
-
-    commonIds.forEach(id => {
-        const name = idToNameMap[id];
-        if (name) {
-            intersection[name] = id;
-        } else {
-            console.warn(`Could not find name for common academic year ID: ${id}.`);
-             // Attempt fallback search in other results
-            for (const res of validResults) {
-                const foundEntry = Object.entries(res).find(([, resId]) => resId === id);
-                if (foundEntry) {
-                    intersection[foundEntry[0]] = id;
-                    break;
-                }
-            }
-        }
-    });
-
-    console.log("Intersection year result:", intersection);
-    return intersection;
-};
-
+const LOCAL_STORAGE_PREFIX = 'ctaCache_';
 
 export function useAcademicYears(selectedSendingInstitutions, selectedReceivingId) {
     const [academicYears, setAcademicYears] = useState({});
     const [isLoading, setIsLoading] = useState(false);
     const [error, setError] = useState(null);
+    const cacheRef = useRef({}); // Simple in-memory cache
+
+    // Define senderIds and key outside useEffect
+    const senderIds = selectedSendingInstitutions.map(s => s.id);
+    const senderIdsString = senderIds.sort().join(',');
+    const contextKey = `${senderIdsString}_${selectedReceivingId}`; // Key for cache/localStorage
 
     useEffect(() => {
         let isMounted = true;
-        const senderIds = selectedSendingInstitutions.map(s => s.id);
 
-        // Only proceed if we have at least one sending institution AND a receiving institution selected
         if (senderIds.length === 0 || !selectedReceivingId) {
             setAcademicYears({});
             setIsLoading(false);
@@ -68,92 +24,77 @@ export function useAcademicYears(selectedSendingInstitutions, selectedReceivingI
             return; // Clear years if selections are incomplete
         }
 
-        const fetchAndIntersect = async () => {
+        const fetchCommonYears = async () => {
             if (!isMounted) return;
             setIsLoading(true);
             setError(null);
             setAcademicYears({}); // Clear previous results
 
-            // const cacheKeyBase = `academic-years-${selectedReceivingId}`;
-            // let combinedCacheKey = cacheKeyBase + '-' + senderIds.sort().join(','); // Create a consistent key for multiple senders - Not currently used for multi-sender caching
+            const localStorageKey = `${LOCAL_STORAGE_PREFIX}years_intersection_${contextKey}`;
+            const memoryCacheKey = `years_${contextKey}`;
+
+            // 1. Check In-Memory Cache
+            if (cacheRef.current[memoryCacheKey]) {
+                console.log(`In-memory cache hit for years intersection: ${contextKey}`);
+                setAcademicYears(cacheRef.current[memoryCacheKey]);
+                setIsLoading(false);
+                return;
+            }
 
+            // 2. Check localStorage
             try {
-                // --- Check Cache for the specific combination ---
-                // Note: Caching intersection results might be complex if senders change frequently.
-                // We'll cache individual results for single senders, but recalculate intersection for multiple.
-                if (senderIds.length === 1) {
-                    const singleCacheKey = `academic-years-${senderIds[0]}-${selectedReceivingId}`;
-                    try {
-                        const cachedData = localStorage.getItem(singleCacheKey);
-                        if (cachedData) {
-                            const parsedData = JSON.parse(cachedData);
-                            console.log("Loaded academic years from cache:", singleCacheKey);
-                            if (isMounted) {
-                                setAcademicYears(parsedData);
-                                setIsLoading(false);
-                            }
-                            return; // Exit early
-                        }
-                    } catch (e) {
-                        console.error("Error loading academic years from cache:", e);
-                        localStorage.removeItem(singleCacheKey);
-                    }
+                const cachedDataString = localStorage.getItem(localStorageKey);
+                if (cachedDataString) {
+                    console.log(`LocalStorage hit for years intersection (${localStorageKey})`);
+                    const cachedData = JSON.parse(cachedDataString);
+                    cacheRef.current[memoryCacheKey] = cachedData; // Update in-memory
+                    setAcademicYears(cachedData);
+                    setIsLoading(false);
+                    return;
                 }
+            } catch (e) {
+                console.error(`Error reading years intersection from localStorage (${localStorageKey}):`, e);
+                localStorage.removeItem(localStorageKey);
+            }
 
+            // 3. Fetch from API (Single Call)
+            console.log(`Cache miss for years intersection (${contextKey}). Fetching...`);
+            try {
+                // Pass comma-separated sending IDs and single receiving ID
+                const data = await fetchData(`academic-years?sendingId=${senderIdsString}&receivingId=${selectedReceivingId}`);
+
+                if (!isMounted) return;
 
-                // --- Fetch from API ---
-                if (senderIds.length === 1) {
-                    const sendingId = senderIds[0];
-                    console.log(`Fetching years for single sender S=${sendingId}, R=${selectedReceivingId}`);
-                    const data = await fetchData(`academic-years?sendingId=${sendingId}&receivingId=${selectedReceivingId}`);
-                    if (!isMounted) return;
-
-                    if (data && Object.keys(data).length > 0) {
-                        setAcademicYears(data);
-                        // Cache Result for single sender
-                        const singleCacheKey = `academic-years-${sendingId}-${selectedReceivingId}`;
-                        try {
-                            localStorage.setItem(singleCacheKey, JSON.stringify(data));
-                            console.log("Academic Years cached successfully:", singleCacheKey);
-                        } catch (e) {
-                            console.error("Error caching academic years:", e);
-                        }
-                    } else {
-                        setAcademicYears({});
-                        setError(`No academic years found for the selected combination.`);
-                    }
+                let finalData = {};
+                let warnings = null;
+
+                // Handle potential 207 Multi-Status response
+                if (data && data.years !== undefined) {
+                    finalData = data.years || {};
+                    warnings = data.warnings;
+                    if (warnings) console.warn("Partial fetch failure for academic years:", warnings);
                 } else {
-                    // --- Fetch for multiple senders and find intersection ---
-                    console.log(`Fetching years for multiple senders (Count: ${senderIds.length}), R=${selectedReceivingId}`);
-                    const promises = senderIds.map(id =>
-                        fetchData(`academic-years?sendingId=${id}&receivingId=${selectedReceivingId}`)
-                            .catch(err => {
-                                console.error(`Failed to fetch years for S=${id}, R=${selectedReceivingId}:`, err);
-                                return {}; // Return empty object on error
-                            })
-                    );
-
-                    const results = await Promise.all(promises);
-                    if (!isMounted) return;
-                    console.log("Raw year results from multiple fetches:", results);
-
-                    if (results.some(res => res === null || typeof res === 'undefined')) {
-                        throw new Error("One or more requests for academic years failed.");
-                    }
-
-                    const intersection = calculateYearIntersection(results);
-
-                    if (Object.keys(intersection).length > 0) {
-                        setAcademicYears(intersection);
-                    } else {
-                        setAcademicYears({});
-                        setError("No common academic years found for the selected combination of institutions.");
-                    }
+                    finalData = data || {}; // Assume direct object if not 207 structure
+                }
+
+                 if (Object.keys(finalData).length === 0 && !warnings) {
+                     setError("No common academic years found for the selected combination.");
+                 }
+
+                setAcademicYears(finalData);
+                cacheRef.current[memoryCacheKey] = finalData; // Store in memory
+
+                // Store in localStorage
+                try {
+                    localStorage.setItem(localStorageKey, JSON.stringify(finalData));
+                } catch (e) {
+                    console.error(`Error writing years intersection to localStorage (${localStorageKey}):`, e);
                 }
+
             } catch (err) {
-                console.error("Error processing academic years:", err);
+                console.error("Error fetching common academic years:", err);
                 if (isMounted) {
-                    setError(`Failed to load or process academic years: ${err.message}`);
+                    setError(`Failed to load common academic years: ${err.message}`);
                     setAcademicYears({}); // Clear on error
                 }
             } finally {
@@ -163,14 +104,14 @@ export function useAcademicYears(selectedSendingInstitutions, selectedReceivingI
             }
         };
 
-        fetchAndIntersect();
+        fetchCommonYears();
 
         return () => {
             isMounted = false; // Cleanup
         };
-    // Re-run when senders or receiver changes
+    // Depend on the sorted string of sender IDs and the receiver ID
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [JSON.stringify(selectedSendingInstitutions.map(s => s.id)), selectedReceivingId]);
+    }, [senderIdsString, selectedReceivingId]);
 
     return { academicYears, isLoading, error };
 }
diff --git a/src/hooks/useAgreementData.js b/src/hooks/useAgreementData.js
index 5fea021..74b7967 100644
--- a/src/hooks/useAgreementData.js
+++ b/src/hooks/useAgreementData.js
@@ -2,6 +2,7 @@ import { useState, useEffect, useRef, useCallback, useMemo } from 'react';
 import { fetchData } from '../services/api'; // Assuming api.js is in services
 
 const IGETC_ID = 'IGETC';
+const LOCAL_STORAGE_PREFIX = 'ctaCache_'; // Prefix for local storage keys
 
 export function useAgreementData(initialSendingId, receivingId, yearId, user, allSelectedSendingInstitutions) {
     // --- State for Agreement Data ---
@@ -22,10 +23,10 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
     const [agreementData, setAgreementData] = useState([]); // Will include IGETC if available
     const [activeTabIndex, setActiveTabIndex] = useState(0); // Start potentially at IGETC (index 0)
     const [imagesForActivePdf, setImagesForActivePdf] = useState([]);
-    // const [allAgreementsImageFilenames, setAllAgreementsImageFilenames] = useState([]); // Removed: Not directly used/needed if caching by filename
 
-    // --- Cache Ref for Images ---
+    // --- Cache Refs ---
     const imageCacheRef = useRef({}); // Store images keyed by PDF filename
+    const categoryCacheRef = useRef({}); // In-memory cache for majors/depts
 
     // --- Derived state ---
     const currentAgreement = activeTabIndex >= 0 && activeTabIndex < agreementData.length ? agreementData[activeTabIndex] : null;
@@ -43,13 +44,38 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
         setHasMajorsAvailable(false); // Reset on change
         setHasDepartmentsAvailable(false);
 
+        // --- Add Cache Key for Availability ---
+        const availabilityContextKey = `availability_${initialSendingId}-${receivingId}-${yearId}`;
+
         const checkAvailability = async (category) => {
+            // --- Check localStorage for specific category availability ---
+            const availabilityLocalStorageKey = `${availabilityContextKey}_${category}`;
+            try {
+                const cachedAvailability = localStorage.getItem(availabilityLocalStorageKey);
+                if (cachedAvailability !== null) { // Check for null, as 'false' is a valid cached value
+                    console.log(`Cache hit for availability (${availabilityLocalStorageKey}): ${cachedAvailability}`);
+                    return cachedAvailability === 'true'; // Convert stored string back to boolean
+                }
+            } catch (e) {
+                 console.error("Error reading availability from localStorage:", e);
+                 localStorage.removeItem(availabilityLocalStorageKey);
+            }
+
+            // --- Fetch if not in cache ---
+            console.log(`Cache miss for availability (${availabilityLocalStorageKey}). Fetching...`);
             try {
                 const data = await fetchData(`/majors?sendingId=${initialSendingId}&receivingId=${receivingId}&academicYearId=${yearId}&categoryCode=${category}`);
-                return Object.keys(data || {}).length > 0;
+                const exists = Object.keys(data || {}).length > 0;
+                // --- Store result in localStorage ---
+                try {
+                    localStorage.setItem(availabilityLocalStorageKey, exists ? 'true' : 'false');
+                } catch (e) {
+                    console.error("Error writing availability to localStorage:", e);
+                }
+                return exists;
             } catch (err) {
                 console.error(`Error checking availability for ${category}:`, err);
-                return false;
+                return false; // Don't cache errors for availability check
             }
         };
 
@@ -68,13 +94,16 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
     }, [initialSendingId, receivingId, yearId, selectedCategory]);
 
 
-    // --- Fetch Majors/Departments ---
+    // --- Fetch Majors/Departments (with Caching: localStorage -> useRef -> Fetch) ---
     useEffect(() => {
         if (isLoadingAvailability || !initialSendingId || !receivingId || !yearId) {
             if (!initialSendingId || !receivingId || !yearId) setError("Missing selection criteria.");
+            setMajors({}); // Clear majors if context is missing
+            setIsLoadingMajors(false); // Not loading if no context
             return;
         }
 
+        // Check availability before attempting fetch or cache lookup
         if ((selectedCategory === 'major' && !hasMajorsAvailable) || (selectedCategory === 'dept' && !hasDepartmentsAvailable)) {
             setError(`No ${selectedCategory}s found for the selected combination.`);
             setIsLoadingMajors(false);
@@ -82,24 +111,81 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
             return;
         }
 
+        // --- Create Cache Keys ---
+        const contextKey = `${initialSendingId}-${receivingId}-${yearId}`; // Key for institution/year combo
+        const categoryKey = selectedCategory; // Key for 'major' or 'dept' within the context
+        const localStorageKey = `${LOCAL_STORAGE_PREFIX}${contextKey}_${categoryKey}`; // Full localStorage key
+
+        // --- 1. Check localStorage ---
+        try {
+            const cachedDataString = localStorage.getItem(localStorageKey);
+            if (cachedDataString) {
+                console.log(`LocalStorage hit for ${localStorageKey}.`);
+                const cachedData = JSON.parse(cachedDataString);
+                // Update in-memory cache as well
+                if (!categoryCacheRef.current[contextKey]) {
+                    categoryCacheRef.current[contextKey] = {};
+                }
+                categoryCacheRef.current[contextKey][categoryKey] = cachedData;
+                setMajors(cachedData);
+                setError(null);
+                setIsLoadingMajors(false);
+                return; // Skip further checks/fetch
+            }
+        } catch (e) {
+            console.error("Error reading from localStorage:", e);
+            // Clear potentially corrupted item
+            localStorage.removeItem(localStorageKey);
+        }
+
+        // --- 2. Check In-Memory Cache (useRef) ---
+        if (categoryCacheRef.current[contextKey]?.[categoryKey]) {
+            console.log(`In-memory cache hit for ${categoryKey} in context ${contextKey}.`);
+            setMajors(categoryCacheRef.current[contextKey][categoryKey]);
+            setError(null);
+            setIsLoadingMajors(false);
+            return; // Skip fetch
+        }
+
+        // --- 3. Fetch if not in cache ---
+        console.log(`Cache miss for ${localStorageKey}. Fetching...`);
         setIsLoadingMajors(true);
         setError(null);
-        setMajors({});
+        setMajors({}); // Clear majors before fetching new ones
 
         const fetchCategoryData = async () => {
             try {
                 const data = await fetchData(`/majors?sendingId=${initialSendingId}&receivingId=${receivingId}&academicYearId=${yearId}&categoryCode=${selectedCategory}`);
-                setMajors(data || {});
+                const fetchedData = data || {};
+                setMajors(fetchedData);
+                // --- Store in In-Memory Cache ---
+                if (!categoryCacheRef.current[contextKey]) {
+                    categoryCacheRef.current[contextKey] = {};
+                }
+                categoryCacheRef.current[contextKey][categoryKey] = fetchedData;
+
+                // --- Store in localStorage ---
+                try {
+                    localStorage.setItem(localStorageKey, JSON.stringify(fetchedData));
+                    console.log(`Fetched and cached ${categoryKey}s in localStorage (${localStorageKey}).`);
+                } catch (e) {
+                    console.error("Error writing to localStorage:", e);
+                    // Handle potential storage full errors if necessary
+                }
+
             } catch (err) {
                 console.error(`Error fetching ${selectedCategory}s:`, err);
                 setError(`Failed to load ${selectedCategory}s.`);
                 setMajors({});
+                // Optionally clear cache entry on error? Or keep stale? For now, don't cache errors.
+                // delete categoryCacheRef.current[cacheKey];
             } finally {
                 setIsLoadingMajors(false);
             }
         };
 
         fetchCategoryData();
+    // Dependencies now include selectedCategory directly
     }, [initialSendingId, receivingId, yearId, selectedCategory, isLoadingAvailability, hasMajorsAvailable, hasDepartmentsAvailable]);
 
 
@@ -138,7 +224,8 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
             // 1. Fetch IGETC Agreement Filename (if logged in and context available)
             if (user && user.idToken && contextSendingId && yearId) {
                 try {
-                    const igetcResponse = await fetchData(`/igetc-agreement?sendingId=${contextSendingId}&academicYearId=${yearId}`, {
+                    // Remove the leading slash from the endpoint path
+                    const igetcResponse = await fetchData(`igetc-agreement?sendingId=${contextSendingId}&academicYearId=${yearId}`, {
                         headers: { 'Authorization': `Bearer ${user.idToken}` }
                     });
                     if (igetcResponse?.pdfFilename) {
@@ -162,7 +249,8 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
 
             // 2. Fetch Major Articulation Agreements
             const sendingIds = allSelectedSendingInstitutions.map(inst => inst.id);
-            const response = await fetchData('/articulation-agreements', {
+            // Remove the leading slash here too if fetchData is used similarly
+            const response = await fetchData('articulation-agreements', {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify({ sending_ids: sendingIds, receiving_id: receivingId, year_id: yearId, major_key: majorKey }) // Use passed majorKey
@@ -251,6 +339,7 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
     // Dependencies: All inputs that should trigger a full refetch when they change.
     // Note: `majorKey` is passed as an argument, so it doesn't need to be a dependency here.
     // `user` dependency ensures refetch if login state changes (for IGETC).
+    // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [allSelectedSendingInstitutions, receivingId, yearId, initialSendingId, user?.idToken]); // Refined dependencies
 
 
@@ -302,14 +391,36 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
         console.log("Core context changed (URL params), resetting selections and agreement data.");
         setSelectedMajorKey(null); setSelectedMajorName('');
         setAgreementData([]);
-        // setAllAgreementsImageFilenames([]); // Removed state
-        setActiveTabIndex(0); // Default back to index 0
+        setActiveTabIndex(0);
         setImagesForActivePdf([]);
-        setPdfError(null); // Clear errors
-        setIsLoadingPdf(false); // Ensure loading is off
-        // Clear image cache when core context changes, as agreements might be different
+        setPdfError(null);
+        setIsLoadingPdf(false);
+        // Clear image cache
         imageCacheRef.current = {};
         console.log("Image cache cleared due to context change.");
+        // --- Clear In-Memory Category Cache ---
+        // We clear the whole ref when context changes
+        categoryCacheRef.current = {};
+        console.log("In-memory category cache cleared due to context change.");
+        // --- Clear Relevant localStorage ---
+        // Option 1: Clear ALL cache related to this app (simpler)
+        // Object.keys(localStorage).forEach(key => {
+        //     if (key.startsWith(LOCAL_STORAGE_PREFIX)) {
+        //         localStorage.removeItem(key);
+        //     }
+        // });
+        // console.log("Cleared all app-related localStorage cache.");
+        // Option 2: Be more specific (requires knowing old keys, harder)
+        // For now, let stale data exist; new context will use new keys.
+        // Reset availability states and trigger re-check
+        setHasMajorsAvailable(true); // Assume available until checked
+        setHasDepartmentsAvailable(true);
+        setIsLoadingAvailability(true); // Trigger availability check
+        // Reset majors state immediately
+        setMajors({});
+        setError(null);
+        setIsLoadingMajors(true); // Will be set correctly by fetch/cache logic
+
     }, [initialSendingId, receivingId, yearId]);
 
     // --- Handlers ---
@@ -335,19 +446,23 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
 
     const handleCategoryChange = useCallback((event) => {
         const newCategory = event.target.value;
+        // Only update state if category actually changes
+        if (newCategory === selectedCategory) return;
+
+        console.log("Category changed to:", newCategory);
         setSelectedCategory(newCategory);
         // Reset major selection and agreement data when category changes
         setSelectedMajorKey(null); setSelectedMajorName('');
         setMajorSearchTerm('');
         setAgreementData([]);
-        // setAllAgreementsImageFilenames([]); // Removed state
         setImagesForActivePdf([]);
         setActiveTabIndex(0);
-        setError(null);
+        // setError(null); // Error will be handled by the fetch/cache useEffect
         setPdfError(null);
-        setIsLoadingPdf(false); // Ensure loading is off
-        // Keep image cache, category change doesn't invalidate PDFs for same context
-    }, []);
+        setIsLoadingPdf(false);
+        // DO NOT clear category cache here - we want to reuse it if switching back
+        // The useEffect for fetching majors will handle loading/cache check
+    }, [selectedCategory]); // Added selectedCategory dependency
 
     const handleTabClick = useCallback((index) => {
         if (index === activeTabIndex) return;
diff --git a/src/hooks/useChat.js b/src/hooks/useChat.js
index 0f016fa..e7bcbc2 100644
--- a/src/hooks/useChat.js
+++ b/src/hooks/useChat.js
@@ -2,7 +2,7 @@ import { useState, useEffect, useRef, useCallback } from 'react';
 import { fetchData } from '../services/api';
 
 export function useChat(
-    imageFilenames,
+    imageFilenames, // This holds the list of all relevant image filenames
     selectedMajorName,
     user,
     sendingInstitutionId,
@@ -27,30 +27,54 @@ export function useChat(
         setUserInput('');
         setChatError(null);
         initialAnalysisSentRef.current = false;
-        console.log("Chat cleared due to new context or user change.");
-    }, [imageFilenames, selectedMajorName, user]);
+        console.log("DEBUG: Chat cleared and initialAnalysisSentRef reset due to context/user change.");
+    }, [imageFilenames, selectedMajorName, user, sendingInstitutionId, receivingInstitutionId, academicYearId]); // Added more dependencies to ensure reset
 
     // Effect to send initial analysis request
     useEffect(() => {
+        console.log("DEBUG: Initial analysis effect triggered.");
+        console.log("DEBUG: User:", user ? `Logged in (ID: ${user.uid})` : "Not logged in");
+        // Use the stable list of all image filenames passed in
+        console.log("DEBUG: imageFilenames (for initial analysis):", imageFilenames);
+        console.log("DEBUG: initialAnalysisSentRef.current:", initialAnalysisSentRef.current);
+        console.log("DEBUG: isLoading:", isLoading);
+
         if (!user) {
-            initialAnalysisSentRef.current = false;
+            console.log("DEBUG: Skipping initial analysis - User not logged in.");
+            initialAnalysisSentRef.current = false; // Ensure it's false if user logs out
             return;
         }
 
-        if (imageFilenames && imageFilenames.length > 0 && !initialAnalysisSentRef.current && !isLoading) {
+        // Check the condition for sending using the stable imageFilenames list
+        const shouldSend = imageFilenames && imageFilenames.length > 0 && !initialAnalysisSentRef.current && !isLoading;
+        console.log("DEBUG: Should send initial analysis?", shouldSend);
+
+        // --- Temporarily disabled initial analysis sending ---
+        // if (shouldSend) {
+        if (shouldSend) { 
+        // --- End temporary disable ---
             const sendInitialAnalysis = async () => {
+                // Double-check user and token right before sending
                 if (!user || !user.idToken) {
-                    console.error("Cannot send initial analysis: User not logged in or token missing.");
+                    console.error("DEBUG: Cannot send initial analysis: User logged out or token missing just before sending.");
                     setChatError("Authentication error. Please log in again.");
                     setMessages([{ type: 'system', text: "Authentication error. Please log in again." }]);
-                    initialAnalysisSentRef.current = false;
+                    initialAnalysisSentRef.current = false; // Reset if auth fails here
                     return;
                 }
 
-                console.log("Sending initial analysis request...");
+                console.log("DEBUG: Conditions met. Calling sendInitialAnalysis function...");
                 setIsLoading(true);
                 setChatError(null);
-                initialAnalysisSentRef.current = true;
+                initialAnalysisSentRef.current = true; // Set flag immediately
+                console.log("DEBUG: initialAnalysisSentRef.current set to true.");
+
+                // Log context variables used in the prompt
+                console.log("DEBUG: Context for prompt - academicYearId:", academicYearId);
+                console.log("DEBUG: Context for prompt - sendingInstitutionId:", sendingInstitutionId);
+                console.log("DEBUG: Context for prompt - receivingInstitutionId:", receivingInstitutionId);
+                console.log("DEBUG: Context for prompt - selectedMajorName:", selectedMajorName);
+                console.log("DEBUG: Context for prompt - allSendingInstitutionIds:", allSendingInstitutionIds);
 
                 const currentContextInfo = `The user is viewing an articulation agreement for the academic year ${academicYearId || 'N/A'} between sending institution ID ${sendingInstitutionId || 'N/A'} (the 'current' agreement) and receiving institution ID ${receivingInstitutionId || 'N/A'}. The selected major/department is "${selectedMajorName || 'N/A'}".`;
                 const overallContextInfo = allSendingInstitutionIds && allSendingInstitutionIds.length > 1
@@ -64,23 +88,28 @@ ${overallContextInfo ? `**Overall Context:** ${overallContextInfo}` : ''}
 
 Analyze the provided agreement images thoroughly. Perform the following steps:
 1.  **Focus on the Current Context:** Analyze the agreement for the major between the **current sending institution** and the receiving institution.
-2.  **Explicitly state the current context:** Start your response with: "Analyzing the agreement for the [Major Name] (bold) major between [Current Sending Instituion Name] (bold) and [Receiving Institution Name] (bold) for the [academic year name] (bold) academic year."
-3.  **Provide a concise summary** of the key details for the **current** agreement (articulated courses, requirements, etc.). Identify any required courses for the major at the receiving institution that are **not articulated** by the current sending institution.
-4.  **Compare Articulation (If Applicable):** If you identified non-articulated courses in step 3 AND other sending institutions were selected (see Overall Context), examine the provided images for the **other** agreements (Sending IDs: ${allSendingInstitutionIds.filter(id => id !== sendingInstitutionId).join(', ') || 'None'}). For each non-articulated course from the current agreement, state whether it **is articulated** by any of the **other** sending institutions based on their respective agreements. Present this comparison clearly, perhaps in a separate section or list.
+2.  **Explicitly state the current context:** Start your response with: "Analyzing the agreement for the **[Major Name]** major between **[Current Sending Institution Name]** and **[Receiving Institution Name]** for the **[academic year name]** academic year." (Replace bracketed placeholders with actual names/year).
+3.  **Provide a detailed, accurate, yet concise summary** of the key details for the **current** agreement. This summary should include:
+    *   All articulated courses (sending course -> receiving course).
+    *   Any specific GPA requirements mentioned.
+    *   Any other critical requirements or notes from the agreement.
+    *   Crucially, identify any required courses for the major at the receiving institution that are **not articulated** by the current sending institution according to this agreement. List these clearly.
+4.  **Compare Articulation (If Applicable):** If you identified non-articulated courses in step 3 AND other sending institutions were selected (see Overall Context), examine the provided images for the **other** agreements (Sending IDs: ${allSendingInstitutionIds?.filter(id => id !== sendingInstitutionId).join(', ') || 'None'}). For each non-articulated course from the current agreement, state whether it **is articulated** by any of the **other** sending institutions based on their respective agreements. Present this comparison clearly, perhaps in a separate section or list (e.g., "Comparison with Other Selected Colleges:").
 5.  **Suggest Next Steps:** Conclude with relevant advice or next steps for the student based on the analysis and comparison.
+6.  **Offer Education Plan:** After providing the analysis and next steps, ask the user: "Would you like me to generate a potential 2-year education plan based on this information? If yes, I will outline courses semester-by-semester (Year 1 Fall, Year 1 Spring, Year 1 Summer, Year 2 Fall, Year 2 Spring, Year 2 Summer) aiming for approximately 4 classes per Fall/Spring semester and 2 classes during the Summer. This plan will incorporate courses from the **[Sending Institution(s) names]** to meet the requirements for the **[Receiving Institution name]**. For each course, I will include its *unit count* and *check for common prerequisites* using my knowledge base. If the prerequisite information isn't readily available, I can perform a web search to find it. Importantly, I will ensure that any identified prerequisite course is placed in a semester *before* the course that requires it."
 
-**Formatting:** Use bullet points (* or -) for lists, **bold** for emphasis, and \`italic\` for course codes/titles.`;
+**Formatting:** Use bullet points (* or -) for lists, **bold** for emphasis (especially names and key terms), and \`italic\` for course codes/titles. Ensure the summary in step 3 is well-organized and easy to read.`;
 
                 setMessages([{ type: 'system', text: "Analyzing agreements and generating summary..." }]);
 
                 const payload = {
                     new_message: initialPrompt,
                     history: [],
-                    image_filenames: imageFilenames
+                    image_filenames: imageFilenames // Use the stable list here
                 };
 
                 try {
-                    console.log("Sending initial analysis to /chat:", payload);
+                    console.log("DEBUG: Sending initial analysis to /chat with payload:", payload);
                     const response = await fetchData('chat', {
                         method: 'POST',
                         headers: {
@@ -89,6 +118,7 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
                         },
                         body: JSON.stringify(payload)
                     });
+                    console.log("DEBUG: Received response from /chat:", response);
 
                     if (response && response.reply) {
                         setMessages([{ type: 'bot', text: response.reply }]);
@@ -99,20 +129,33 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
                         throw new Error(response?.error || "No reply received for initial analysis.");
                     }
                 } catch (err) {
-                    console.error("Initial analysis API error:", err);
+                    console.error("DEBUG: Initial analysis API error:", err);
                     const errorMsg = `Failed initial analysis: ${err.message}`;
                     setChatError(errorMsg);
                     setMessages([{ type: 'system', text: `Error during analysis: ${err.message}` }]);
                     if (err.message.includes("Authorization")) {
-                        initialAnalysisSentRef.current = false;
+                        console.log("DEBUG: Resetting initialAnalysisSentRef due to Authorization error.");
+                        initialAnalysisSentRef.current = false; // Reset if auth fails
+                    } else {
+                        // Consider if other errors should also reset the flag,
+                        // maybe allow retry? For now, keep it true on other errors.
+                        console.log("DEBUG: Keeping initialAnalysisSentRef true despite non-auth error.");
                     }
                 } finally {
+                    console.log("DEBUG: Initial analysis finished (success or error). Setting isLoading to false.");
                     setIsLoading(false);
                 }
             };
 
             sendInitialAnalysis();
+        } else {
+            console.log("DEBUG: Conditions not met for sending initial analysis.");
+            if (!imageFilenames || imageFilenames.length === 0) console.log("Reason: No image filenames provided.");
+            if (initialAnalysisSentRef.current) console.log("Reason: Initial analysis already sent.");
+            if (isLoading) console.log("Reason: Already loading.");
         }
+    // Ensure all relevant context variables are dependencies
+    // Use the stable imageFilenames list in the dependency array
     }, [imageFilenames, isLoading, selectedMajorName, sendingInstitutionId, allSendingInstitutionIds, receivingInstitutionId, academicYearId, user]);
 
     const handleSend = useCallback(async () => {
@@ -140,9 +183,11 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
                 content: msg.text
             }));
 
+        // Include image_filenames in the payload for every message
         const payload = {
             new_message: currentInput,
-            history: apiHistory
+            history: apiHistory,
+            image_filenames: imageFilenames // Add the list of all image filenames here
         };
 
         try {
@@ -171,7 +216,8 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
         } finally {
             setIsLoading(false);
         }
-    }, [userInput, isLoading, user, messages]); // Dependencies for handleSend
+    // Add imageFilenames to the dependency array for useCallback
+    }, [userInput, isLoading, user, messages, imageFilenames]);
 
     return {
         userInput,
diff --git a/src/hooks/useReceivingInstitutions.js b/src/hooks/useReceivingInstitutions.js
index fe83ffc..7e97f36 100644
--- a/src/hooks/useReceivingInstitutions.js
+++ b/src/hooks/useReceivingInstitutions.js
@@ -1,69 +1,21 @@
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useRef } from 'react';
 import { fetchData } from '../services/api';
 
-// Helper function to calculate intersection of receiving institutions
-const calculateIntersection = (results) => {
-    if (!results || results.length === 0 || results.some(res => res === null || typeof res === 'undefined')) {
-        return {};
-    }
-
-    // Filter out any potentially empty results before processing
-    const validResults = results.filter(res => typeof res === 'object' && res !== null && Object.keys(res).length > 0);
-
-    if (validResults.length === 0) {
-        return {}; // No valid data to intersect
-    }
-
-    // Get IDs from the first valid result as the starting point
-    let commonIds = new Set(Object.values(validResults[0]));
-
-    // Intersect with IDs from subsequent valid results
-    for (let i = 1; i < validResults.length; i++) {
-        const currentIds = new Set(Object.values(validResults[i]));
-        commonIds = new Set([...commonIds].filter(id => currentIds.has(id)));
-    }
-
-    console.log("Common receiving institution IDs:", commonIds);
-
-    // Rebuild the availableReceivingInstitutions object using common IDs
-    const intersection = {};
-    // Use the first valid result to map IDs back to names
-    const nameMapSource = validResults[0];
-    const idToNameMap = Object.entries(nameMapSource).reduce((acc, [name, id]) => {
-        acc[id] = name;
-        return acc;
-    }, {});
-
-    commonIds.forEach(id => {
-        const name = idToNameMap[id];
-        if (name) {
-            intersection[name] = id;
-        } else {
-            console.warn(`Could not find name for common receiving ID: ${id}.`);
-            // Attempt to find name in other results as a fallback (more robust but less efficient)
-            for (const res of validResults) {
-                const foundEntry = Object.entries(res).find(([, resId]) => resId === id);
-                if (foundEntry) {
-                    intersection[foundEntry[0]] = id;
-                    break;
-                }
-            }
-        }
-    });
-
-    console.log("Intersection result:", intersection);
-    return intersection;
-};
-
+const LOCAL_STORAGE_PREFIX = 'ctaCache_';
+// Remove calculateIntersection helper from frontend
 
 export function useReceivingInstitutions(selectedSendingInstitutions) {
     const [availableReceivingInstitutions, setAvailableReceivingInstitutions] = useState({});
     const [isLoading, setIsLoading] = useState(false);
     const [error, setError] = useState(null);
+    const cacheRef = useRef({}); // Simple in-memory cache for this hook instance
+
+    // Define senderIds outside useEffect to use in dependency array
+    const senderIds = selectedSendingInstitutions.map(s => s.id);
+    const senderIdsString = senderIds.sort().join(','); // Create sorted, comma-separated string for cache key & query
 
     useEffect(() => {
         let isMounted = true;
-        const senderIds = selectedSendingInstitutions.map(s => s.id);
 
         if (senderIds.length === 0) {
             setAvailableReceivingInstitutions({});
@@ -72,60 +24,79 @@ export function useReceivingInstitutions(selectedSendingInstitutions) {
             return; // No senders, no need to fetch
         }
 
-        const fetchAndIntersect = async () => {
+        const fetchCommonReceiving = async () => {
             if (!isMounted) return;
             setIsLoading(true);
             setError(null);
             setAvailableReceivingInstitutions({}); // Clear previous results
 
+            const localStorageKey = `${LOCAL_STORAGE_PREFIX}receiving_intersection_${senderIdsString}`;
+            const memoryCacheKey = `receiving_${senderIdsString}`;
+
+            // 1. Check In-Memory Cache
+            if (cacheRef.current[memoryCacheKey]) {
+                console.log(`In-memory cache hit for receiving intersection: ${senderIdsString}`);
+                setAvailableReceivingInstitutions(cacheRef.current[memoryCacheKey]);
+                setIsLoading(false);
+                return;
+            }
+
+            // 2. Check localStorage
+            try {
+                const cachedDataString = localStorage.getItem(localStorageKey);
+                if (cachedDataString) {
+                    console.log(`LocalStorage hit for receiving intersection (${localStorageKey})`);
+                    const cachedData = JSON.parse(cachedDataString);
+                    cacheRef.current[memoryCacheKey] = cachedData; // Update in-memory
+                    setAvailableReceivingInstitutions(cachedData);
+                    setIsLoading(false);
+                    return;
+                }
+            } catch (e) {
+                console.error(`Error reading receiving intersection from localStorage (${localStorageKey}):`, e);
+                localStorage.removeItem(localStorageKey);
+            }
+
+            // 3. Fetch from API (Single Call)
+            console.log(`Cache miss for receiving intersection (${senderIdsString}). Fetching...`);
             try {
-                let data;
-                if (senderIds.length === 1) {
-                    // --- Fetch for a single sender ---
-                    const sendingId = senderIds[0];
-                    console.log("Fetching receiving for single sender:", sendingId);
-                    data = await fetchData(`receiving-institutions?sendingId=${sendingId}`);
-                    if (!isMounted) return;
-                    if (data && Object.keys(data).length > 0) {
-                        setAvailableReceivingInstitutions(data);
-                    } else {
-                        setAvailableReceivingInstitutions({});
-                        setError(`No receiving institutions found with agreements for the selected sender.`);
-                    }
+                // Pass comma-separated string
+                const data = await fetchData(`receiving-institutions?sendingId=${senderIdsString}`);
+
+                if (!isMounted) return;
+
+                let finalData = {};
+                let warnings = null;
+
+                // Handle potential 207 Multi-Status response
+                if (data && data.institutions !== undefined) {
+                    finalData = data.institutions || {};
+                    warnings = data.warnings;
+                    if (warnings) console.warn("Partial fetch failure for receiving institutions:", warnings);
                 } else {
-                    // --- Fetch for multiple senders and find intersection ---
-                    console.log("Fetching receiving for multiple senders:", senderIds);
-                    const promises = senderIds.map(id =>
-                        fetchData(`receiving-institutions?sendingId=${id}`)
-                            .catch(err => {
-                                console.error(`Failed to fetch receiving for sender ${id}:`, err);
-                                return {}; // Return empty object on error for this sender
-                            })
-                    );
-
-                    const results = await Promise.all(promises);
-                    if (!isMounted) return;
-                    console.log("Raw results from multiple fetches:", results);
-
-                    if (results.some(res => res === null || typeof res === 'undefined')) {
-                         throw new Error("One or more requests for receiving institutions failed.");
-                    }
-
-                    const intersection = calculateIntersection(results);
-
-                    if (Object.keys(intersection).length > 0) {
-                        setAvailableReceivingInstitutions(intersection);
-                    } else {
-                        setAvailableReceivingInstitutions({});
-                        setError("No common receiving institutions found for the selected sending institutions.");
-                    }
+                    finalData = data || {}; // Assume direct object if not 207 structure
+                }
+
+                if (Object.keys(finalData).length === 0 && !warnings) {
+                     setError("No common receiving institutions found for the selected sending institutions.");
                 }
+
+                setAvailableReceivingInstitutions(finalData);
+                cacheRef.current[memoryCacheKey] = finalData; // Store in memory
+
+                // Store in localStorage
+                try {
+                    localStorage.setItem(localStorageKey, JSON.stringify(finalData));
+                } catch (e) {
+                    console.error(`Error writing receiving intersection to localStorage (${localStorageKey}):`, e);
+                }
+
             } catch (err) {
-                console.error("Error processing receiving institutions:", err);
-                 if (isMounted) {
-                    setError(`Failed to load or process receiving institutions: ${err.message}`);
+                console.error("Error fetching common receiving institutions:", err);
+                if (isMounted) {
+                    setError(`Failed to load common receiving institutions: ${err.message}`);
                     setAvailableReceivingInstitutions({}); // Clear on error
-                 }
+                }
             } finally {
                 if (isMounted) {
                     setIsLoading(false); // Stop loading
@@ -133,14 +104,14 @@ export function useReceivingInstitutions(selectedSendingInstitutions) {
             }
         };
 
-        fetchAndIntersect();
+        fetchCommonReceiving();
 
         return () => {
             isMounted = false; // Cleanup
         };
-    // Re-run when the list of selected senders changes (deep comparison isn't perfect here, but IDs changing is the key)
+    // Depend on the sorted string representation of sender IDs
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [JSON.stringify(selectedSendingInstitutions.map(s => s.id))]);
+    }, [senderIdsString]);
 
     return { availableReceivingInstitutions, isLoading, error };
 }
diff --git a/src/services/api.js b/src/services/api.js
index 7216e9c..5a441f1 100644
--- a/src/services/api.js
+++ b/src/services/api.js
@@ -1,4 +1,3 @@
-
 /**
  * Fetches data from a backend endpoint via the /api proxy.
  * @param {string} endpoint - The API endpoint *without* the leading /api/ (e.g., 'institutions', 'chat', 'pdf-images/filename.pdf').
@@ -7,58 +6,83 @@
  * @throws {Error} - Throws an error if the fetch fails or response is not ok.
  */
 
+// filepath: src/services/api.js
+// Assuming USER_STORAGE_KEY is accessible, e.g., imported from a constants file or App.jsx
+// If App.jsx defines it, you might need to move it to a shared constants file.
+// For example: import { USER_STORAGE_KEY } from '../constants';
+const USER_STORAGE_KEY = 'collegeTransferUser'; // Or import from constants
+const API_BASE_URL = '/api'; // Ensure no trailing slash
+
 export async function fetchData(endpoint, options = {}) {
-    // Construct the full URL, always prepending /api/
-    // Ensure no double slashes if endpoint accidentally starts with one
+    // Ensure endpoint doesn't start with '/' OR base URL doesn't end with '/'
     const cleanEndpoint = endpoint.startsWith('/') ? endpoint.substring(1) : endpoint;
-    const url = `/api/${cleanEndpoint}`; // Use relative path for the proxy
+    const url = `${API_BASE_URL}/${cleanEndpoint}`;
 
+    // Get token from storage
+    let token = null;
     try {
-        // *** Pass the options object as the second argument to fetch ***
-        const response = await fetch(url, options);
-
-        if (!response.ok) {
-            // Try to get error details from response body if available
-            let errorBody = null;
-            try {
-                // Use .text() first in case the error isn't JSON
-                const text = await response.text();
-                if (text) {
-                    errorBody = JSON.parse(text); // Try parsing as JSON
-                }
-            } catch (e) {
-                // Ignore if response body is not JSON or empty
-                console.warn("Could not parse error response body as JSON:", e);
+        const storedUser = localStorage.getItem(USER_STORAGE_KEY);
+        if (storedUser) {
+            const parsedUser = JSON.parse(storedUser);
+            // Basic check if token exists
+            if (parsedUser?.idToken) {
+                 // You could add a preliminary expiry check here using jwtDecode,
+                 // but the backend check (401) is the definitive one.
+                token = parsedUser.idToken;
             }
-            // Use error from body if available, otherwise use status text
-            const errorMessage = errorBody?.error || response.statusText || `HTTP error! status: ${response.status}`;
-            throw new Error(errorMessage);
         }
+    } catch (e) { console.error("Error reading user token from localStorage", e); }
 
-        // Handle cases where response might be empty (e.g., 204 No Content)
-        if (response.status === 204) {
-            return null; // Return null for empty successful responses
+    const headers = {
+        'Content-Type': 'application/json', // Default content type
+        ...options.headers
+    };
+    if (token) {
+        headers['Authorization'] = `Bearer ${token}`;
+    }
+
+    try {
+        const response = await fetch(url, {
+            ...options,
+            headers: headers,
+        });
+
+        // --- Check for 401 Unauthorized ---
+        if (response.status === 401) {
+            console.warn(`API request to ${url} resulted in 401 Unauthorized. Token likely expired or invalid.`);
+            // Dispatch custom event to notify the App component to handle logout
+            window.dispatchEvent(new CustomEvent('auth-expired'));
+            // Throw an error to stop further processing in the calling code
+            throw new Error("Authentication required or session expired.");
+        }
+        // --- End 401 Check ---
+
+        if (!response.ok) {
+            // Handle other non-OK responses
+            const errorData = await response.json().catch(() => ({ message: response.statusText }));
+            throw new Error(errorData.error || errorData.message || `HTTP error! status: ${response.status}`);
         }
 
-        // Check content type before assuming JSON
+        // Handle potential empty responses or non-JSON responses if necessary
         const contentType = response.headers.get("content-type");
+        if (response.status === 204 || !contentType) { // Handle No Content or missing content type
+            return null; // Or appropriate response
+        }
         if (contentType && contentType.indexOf("application/json") !== -1) {
-            const data = await response.json();
-            return data;
+            return response.json();
         } else {
-            // Handle non-JSON responses if necessary, or throw an error
-            console.warn(`Received non-JSON response from ${url}`);
-            return await response.text(); // Or handle differently
+            return response.text(); // Handle plain text response
         }
 
     } catch (error) {
-        console.error(`Error fetching ${url}:`, error);
-        // Re-throw the error so the component can handle it
-        // Ensure it's an actual Error object
-        if (error instanceof Error) {
-            throw error;
-        } else {
-            throw new Error(String(error));
+        console.error(`Fetch error for ${url}:`, error.message);
+        // Re-throw the error so calling code (hooks, components) can potentially handle it
+        // (e.g., display specific error messages), unless it was the auth error we already handled.
+        if (error.message !== "Authentication required or session expired.") {
+             throw error;
         }
+        // If it was the auth error, we don't need to re-throw, as logout is triggered.
+        // Return null or a specific marker if needed by calling code.
+        return null;
     }
 }

From 1ee39fd1c5f5770738cb44b55b70d937dd30ed81 Mon Sep 17 00:00:00 2001
From: Ahmon <ahmonembaye@gmail.com>
Date: Tue, 6 May 2025 22:41:48 -0700
Subject: [PATCH 15/16] Refactor: Centralize image filename state for initial
 chat analysis

- `useAgreementData` now manages `allAgreementsImageFilenamesState`, updated after all image fetches.
- `AgreementViewerPage` consumes this state directly, removing its `useMemo` derivation for the full image list. This ensures `useChat` receives the correct `imageFilenames` prop.
- Temporarily disable initial analysis sending in `useChat` for further testing.
- Improve user object debug logging in `useChat`.
---
 src/components/AgreementViewerPage.jsx | 22 ++++++++++------------
 src/hooks/useAgreementData.js          | 22 +++++++++++++++++++---
 src/hooks/useChat.js                   |  6 ++++--
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/components/AgreementViewerPage.jsx b/src/components/AgreementViewerPage.jsx
index 8162ae5..8c40653 100644
--- a/src/components/AgreementViewerPage.jsx
+++ b/src/components/AgreementViewerPage.jsx
@@ -62,6 +62,7 @@ function AgreementViewerPage({ user, userTier }) {
         hasMajorsAvailable, hasDepartmentsAvailable, isLoadingAvailability,
         agreementData, activeTabIndex, imagesForActivePdf,
         currentPdfFilename, filteredMajors,
+        allAgreementsImageFilenames, // <-- This now comes directly from useAgreementData's state
 
         // Handlers & Setters
         handleMajorSelect, handleCategoryChange, handleTabClick, setMajorSearchTerm,
@@ -112,18 +113,15 @@ function AgreementViewerPage({ user, userTier }) {
     // Memoize this as well, although less critical than the array
     const currentSendingId = useMemo(() => allSelectedSendingInstitutions[0]?.id, [allSelectedSendingInstitutions]);
 
-    // Memoize the COMPLETE list of image filenames for ALL agreements
-    // This list should remain stable unless the underlying agreements change
-    const allAgreementImageFilenames = useMemo(() => {
-        if (!agreementData) return [];
-        // Flatten the arrays of images from all agreements in agreementData
-        // Adjust this logic based on the actual structure of agreementData
-        return Object.values(agreementData).flatMap(data => data?.images || []);
-    }, [agreementData]); // Depends only on the overall agreement data
-
-    // Memoize image filenames for the chat (use the complete list)
-    // This replaces the previous memoization of imagesForActivePdf for the chat
-    const memoizedImageFilenamesForChat = allAgreementImageFilenames; // Already memoized
+    // Use the state from the hook directly and memoize it
+    const memoizedImageFilenamesForChat = useMemo(() => {
+        return allAgreementsImageFilenames || []; // Default to [] if it's somehow undefined initially
+    }, [allAgreementsImageFilenames]);
+
+    // Log to see when it updates
+    useEffect(() => {
+        console.log("AgreementViewerPage: memoizedImageFilenamesForChat updated:", memoizedImageFilenamesForChat);
+    }, [memoizedImageFilenamesForChat]);
 
 
     return (
diff --git a/src/hooks/useAgreementData.js b/src/hooks/useAgreementData.js
index 74b7967..1b032c5 100644
--- a/src/hooks/useAgreementData.js
+++ b/src/hooks/useAgreementData.js
@@ -21,6 +21,7 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
 
     // --- State for Multiple PDFs/Tabs ---
     const [agreementData, setAgreementData] = useState([]); // Will include IGETC if available
+    const [allAgreementsImageFilenamesState, setAllAgreementsImageFilenamesState] = useState([]); // <-- NEW/REINSTATED STATE
     const [activeTabIndex, setActiveTabIndex] = useState(0); // Start potentially at IGETC (index 0)
     const [imagesForActivePdf, setImagesForActivePdf] = useState([]);
 
@@ -197,7 +198,7 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
         if (!majorKey || allSelectedSendingInstitutions.length === 0 || !receivingId || !yearId) {
              console.warn("Skipping agreement fetch: Missing major key or context.");
              setAgreementData([]);
-             // setAllAgreementsImageFilenames([]); // Removed state
+             setAllAgreementsImageFilenamesState([]); // <-- Reset this new state
              setImagesForActivePdf([]);
              setActiveTabIndex(0);
              setPdfError("Select a major/department and ensure all institutions/year are set.");
@@ -209,9 +210,8 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
         setIsLoadingPdf(true); // START loading indicator for the entire process
         setPdfError(null);
         setAgreementData([]); // Clear previous agreements
-        // setAllAgreementsImageFilenames([]); // Removed state
+        setAllAgreementsImageFilenamesState([]); // <-- Reset this new state
         setImagesForActivePdf([]); // Clear viewer
-        setActiveTabIndex(0); // Reset tab index temporarily
 
         // Determine the sending ID to use for the IGETC check (prefer initial, fallback to first selected)
         const contextSendingId = initialSendingId || allSelectedSendingInstitutions[0]?.id;
@@ -279,6 +279,7 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
                 setPdfError("No agreements found for this major/department.");
                 // No need to fetch images if no agreements
                 setIsLoadingPdf(false); // STOP loading
+                setAllAgreementsImageFilenamesState([]); // <-- Ensure reset
                 return;
             }
 
@@ -314,6 +315,18 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
             await Promise.allSettled(imageFetchPromises);
             console.log("All image fetch attempts completed.");
 
+            // ----> DERIVE AND SET THE NEW STATE HERE <----
+            const newAllFilenames = combinedAgreements.reduce((acc, agreement) => {
+                if (agreement.pdfFilename && imageCacheRef.current[agreement.pdfFilename]) {
+                    acc.push(...imageCacheRef.current[agreement.pdfFilename]);
+                }
+                return acc;
+            }, []);
+            const uniqueFilenames = [...new Set(newAllFilenames)];
+            setAllAgreementsImageFilenamesState(uniqueFilenames); // <-- UPDATE THE STATE
+            console.log("Derived and set allAgreementsImageFilenamesState:", uniqueFilenames);
+            // ----> END DERIVATION <----
+
             // 5. Determine initial active tab index (first non-IGETC, or 0 if only IGETC/none)
             const firstRealAgreementIndex = combinedAgreements.findIndex(a => !a.isIgetc);
             initialActiveIndex = firstRealAgreementIndex !== -1 ? firstRealAgreementIndex : 0;
@@ -330,6 +343,7 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
             // setAllAgreementsImageFilenames([]); // Removed state
             setImagesForActivePdf([]);
             setActiveTabIndex(0); // Reset index
+            setAllAgreementsImageFilenamesState([]); // <-- Reset on error
         } finally {
             // Loading stops AFTER all fetches (agreements + images) are attempted and initial tab is set.
             // The useEffect watching activeTabIndex will then display the images for that tab from the cache.
@@ -420,6 +434,7 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
         setMajors({});
         setError(null);
         setIsLoadingMajors(true); // Will be set correctly by fetch/cache logic
+        setAllAgreementsImageFilenamesState([]); // <-- Reset
 
     }, [initialSendingId, receivingId, yearId]);
 
@@ -497,6 +512,7 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
         hasDepartmentsAvailable,
         isLoadingAvailability,
         agreementData, // Includes IGETC + Major agreements
+        allAgreementsImageFilenames: allAgreementsImageFilenamesState, // <-- EXPOSE THE NEW STATE
         activeTabIndex,
         imagesForActivePdf, // Images for the currently selected tab
 
diff --git a/src/hooks/useChat.js b/src/hooks/useChat.js
index e7bcbc2..4c24879 100644
--- a/src/hooks/useChat.js
+++ b/src/hooks/useChat.js
@@ -33,7 +33,9 @@ export function useChat(
     // Effect to send initial analysis request
     useEffect(() => {
         console.log("DEBUG: Initial analysis effect triggered.");
-        console.log("DEBUG: User:", user ? `Logged in (ID: ${user.uid})` : "Not logged in");
+        console.log("DEBUG: User object:", user);
+        console.log("DEBUG: User ID:", user ? user.id : "N/A");
+        console.log("DEBUG: User ID Token:", user ? (user.idToken ? "Present" : "MISSING") : "N/A");
         // Use the stable list of all image filenames passed in
         console.log("DEBUG: imageFilenames (for initial analysis):", imageFilenames);
         console.log("DEBUG: initialAnalysisSentRef.current:", initialAnalysisSentRef.current);
@@ -51,7 +53,7 @@ export function useChat(
 
         // --- Temporarily disabled initial analysis sending ---
         // if (shouldSend) {
-        if (shouldSend) { 
+        if (shouldSend && false) { // Set to false to disable sending for now
         // --- End temporary disable ---
             const sendInitialAnalysis = async () => {
                 // Double-check user and token right before sending

From 7ab43f5afbacf7875d4055beb9e7ca551b07184b Mon Sep 17 00:00:00 2001
From: Ahmon <ahmonembaye@gmail.com>
Date: Thu, 8 May 2025 14:56:45 -0700
Subject: [PATCH 16/16] [change] Improved overall readability

---
 .gitignore                                    |   6 -
 backend/college_transfer_ai/__init__.py       |  23 +-
 .../college_transfer_ai/assist_api_client.py  | 289 ++++--------------
 backend/college_transfer_ai/config.py         |  67 ++--
 backend/college_transfer_ai/database.py       |  63 +---
 .../helpers/mongo_helper.py                   |  14 +-
 backend/college_transfer_ai/pdf_service.py    | 267 +++++-----------
 .../college_transfer_ai/routes/__init__.py    |   7 +-
 .../routes/agreement_pdf_routes.py            |  39 +--
 .../routes/api_info_routes.py                 | 248 ++++++++-------
 .../college_transfer_ai/routes/chat_routes.py |  51 +---
 .../routes/course_map_routes.py               |  72 ++---
 .../routes/igetc_routes.py                    |  18 +-
 .../routes/stripe_routes.py                   |  63 +---
 .../college_transfer_ai/routes/user_routes.py |  13 +-
 backend/college_transfer_ai/utils.py          | 172 ++++-------
 backend/run.py                                |   7 -
 backend/tests/test_app.py                     |   1 -
 src/App.css                                   | 110 +++----
 src/App.jsx                                   |  96 ++----
 src/components/AgreementViewerPage.jsx        | 105 ++-----
 .../AgreementViewerPage/AgreementTabs.jsx     |   1 -
 .../AgreementViewerPage/MajorsList.jsx        |  10 +-
 .../UsageStatusDisplay.jsx                    |   2 +-
 src/components/ChatInterface.jsx              |   5 -
 src/components/ChatInterface/ChatMessage.jsx  |   7 +-
 src/components/ChatInterface/MessageList.jsx  |   5 +-
 src/components/CollegeTransferForm.jsx        | 207 ++-----------
 src/components/CourseMap.jsx                  | 245 +++++----------
 src/components/CustomCourseNode.jsx           |  18 +-
 src/components/PdfViewer.jsx                  |  10 +-
 src/hooks/useAcademicYears.js                 |  35 +--
 src/hooks/useAgreementData.js                 | 252 ++++-----------
 src/hooks/useChat.js                          |  38 +--
 src/hooks/useInstitutionData.js               |  15 +-
 src/hooks/useReceivingInstitutions.js         |  29 +-
 src/hooks/useResizeHandler.js                 |  19 +-
 src/hooks/useUsageStatus.js                   |  15 +-
 src/main.jsx                                  |   5 -
 src/services/api.js                           |  43 +--
 src/utils/formatText.jsx                      |  30 +-
 vite.config.js                                |  13 +-
 42 files changed, 808 insertions(+), 1927 deletions(-)

diff --git a/.gitignore b/.gitignore
index a9b9c9a..aaa53b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-# Logs
 logs
 *.log
 npm-debug.log*
@@ -7,18 +6,15 @@ yarn-error.log*
 pnpm-debug.log*
 lerna-debug.log*
 
-# Node/Frontend Dependencies and Build Output
 node_modules
 dist
 dist-ssr
 *.local
 
-# Environment Variables
 env
 .env*
 !.env.example
 
-# Editor directories and files
 .vscode/*
 !.vscode/extensions.json
 .idea
@@ -29,7 +25,6 @@ env
 *.sln
 *.sw?
 
-# Python Caches and Bytecode
 __pycache__/
 *.pyc
 *.pyo
@@ -38,5 +33,4 @@ __pycache__/
 .mypy_cache/
 .ruff_cache/
 
-# General Caches
 .cache/
diff --git a/backend/college_transfer_ai/__init__.py b/backend/college_transfer_ai/__init__.py
index 886df96..e26e98e 100644
--- a/backend/college_transfer_ai/__init__.py
+++ b/backend/college_transfer_ai/__init__.py
@@ -3,57 +3,46 @@
 from flask import Flask
 from flask_cors import CORS
 
-# Import configuration, database setup, and blueprints
 from college_transfer_ai.config import load_configuration
-# Import init_db and close_db specifically
 from college_transfer_ai.database import init_db, close_db
 from college_transfer_ai.routes.stripe_routes import stripe_bp
 from college_transfer_ai.routes.agreement_pdf_routes import agreement_pdf_bp
-from college_transfer_ai.routes.chat_routes import init_chat_routes # Keep this import
+from college_transfer_ai.routes.chat_routes import init_chat_routes
 from college_transfer_ai.routes.course_map_routes import course_map_bp
 from college_transfer_ai.routes.user_routes import user_bp
 from college_transfer_ai.routes.api_info_routes import api_info_bp
 from college_transfer_ai.routes.igetc_routes import igetc_bp
 
 def create_app():
-    """Flask application factory."""
     app = Flask(__name__)
 
     print("--- Creating Flask App ---")
 
     try:
-        # Load configuration
         config = load_configuration()
-        app.config['APP_CONFIG'] = config # Store config for access in blueprints
+        app.config['APP_CONFIG'] = config
     except Exception as config_err:
         print(f"!!! CRITICAL: Failed to load configuration: {config_err}")
         traceback.print_exc()
         exit(1)
 
-    # Initialize CORS
     cors_origins = config.get("FRONTEND_URL", "*")
     CORS(app, resources={r"/*": {"origins": cors_origins}})
     print(f"--- CORS Initialized (Origins: {cors_origins}) ---")
 
-    # Initialize Database (but don't register teardown here)
     try:
         init_db(app, config.get('MONGO_URI'))
-    except (ConnectionError, ValueError, Exception) as db_err: # Catch specific errors from init_db
+    except (ConnectionError, ValueError, Exception) as db_err:
         print(f"!!! CRITICAL: Database initialization failed: {db_err}")
-        # Optionally print traceback for unexpected errors
         if not isinstance(db_err, (ConnectionError, ValueError)):
              traceback.print_exc()
-        exit(1) # Exit if DB is essential
+        exit(1)
 
-    # Initialize Chat Routes (Pass the app object)
     try:
-        # Pass the app object to init_chat_routes
-        init_chat_routes(app) # This might still print the GridFS error if it needs it prematurely
+        init_chat_routes(app)
     except Exception as gemini_err:
         print(f"!!! WARNING: Failed to initialize Gemini/Chat: {gemini_err}")
-        # App can likely continue without Chat, just log the warning
 
-    # Register Blueprints with optional API prefix
     api_prefix = '/api'
     app.register_blueprint(stripe_bp, url_prefix=api_prefix)
     app.register_blueprint(agreement_pdf_bp, url_prefix=api_prefix)
@@ -63,12 +52,10 @@ def create_app():
     app.register_blueprint(igetc_bp, url_prefix=api_prefix)
     print(f"--- Blueprints Registered (Prefix: {api_prefix}) ---")
 
-    # Optional: Add a simple root route for health check or basic info
     @app.route('/')
     def index():
         return "College Transfer AI Backend is running."
 
-    # Register the database teardown function HERE, at the end of app setup
     app.teardown_appcontext(close_db)
     print("--- Database teardown function registered ---")
 
diff --git a/backend/college_transfer_ai/assist_api_client.py b/backend/college_transfer_ai/assist_api_client.py
index 4d908a5..36f2b4a 100644
--- a/backend/college_transfer_ai/assist_api_client.py
+++ b/backend/college_transfer_ai/assist_api_client.py
@@ -1,237 +1,78 @@
 import requests
-import json
+import time
 import os
-import traceback
 
 class AssistApiClient:
-    """
-    Client for interacting with the Assist.org JSON API endpoints.
-    Handles fetching data and in-memory caching.
-    """
-    def __init__(self):
-        self.base_url = "https://assist.org/api/"
-        # --- Simple In-Memory Cache ---
-        self._institution_name_cache = {} # Key: inst_id (str), Value: name
-        self._year_id_cache = {}        # Key: year_id (str), Value: year_string
-        self._receiving_cache = {}      # Key: sending_id (str), Value: {name: id, ...}
-        self._academic_years_cache = {} # Key: f"{send_id}-{recv_id}", Value: {year_string: id, ...}
-        self._majors_cache = {}         # Key: f"{send_id}-{recv_id}-{year_id}-{cat}", Value: {label: key, ...}
-        # Consider using a more robust caching library like cachetools for TTL etc.
-        # --- End Cache ---
-
-    def _make_request(self, endpoint, params=None):
-        """Helper function to make requests to the Assist API."""
-        url = self.base_url + endpoint
-        try:
-            response = requests.get(url, params=params, timeout=15) # Add timeout
-            response.raise_for_status() # Raise HTTPError for bad responses (4xx or 5xx)
-            return response.json()
-        except requests.exceptions.RequestException as e:
-            print(f"Error fetching {url} with params {params}: {e}")
-            return None # Return None on request errors
-        except json.JSONDecodeError as e:
-            print(f"Error decoding JSON from {url}: {e}")
-            return None # Return None on JSON errors
-
-    def get_academic_years(self, sending_institution_id, receiving_institution_id):
-        """Fetches academic years for which agreements exist between the two institutions."""
-        sending_id_str = str(sending_institution_id)
-        receiving_id_str = str(receiving_institution_id)
-        cache_key = f"{sending_id_str}-{receiving_id_str}"
-
-        if cache_key in self._academic_years_cache:
-            print(f"API Cache hit for academic years: {cache_key}")
-            return self._academic_years_cache[cache_key]
-
-        print(f"API Cache miss for academic years: {cache_key}. Fetching...")
-        endpoint = f"institutions/{sending_id_str}/agreements"
-        agreement_list = self._make_request(endpoint)
-
-        if not agreement_list or not isinstance(agreement_list, list):
-            print(f"No valid agreement list found for sending institution {sending_id_str} at endpoint {endpoint}")
-            self._academic_years_cache[cache_key] = {}
-            return {}
-
-        academic_years = {}
-        found_receiving_inst = False
-        for agreement_info in agreement_list:
-            inst_parent_id = agreement_info.get("institutionParentId")
-            if str(inst_parent_id) == receiving_id_str:
-                found_receiving_inst = True
-                year_ids = agreement_info.get("receivingYearIds", [])
-                if not year_ids:
-                    print(f"Receiving institution {receiving_id_str} found, but no receivingYearIds listed.")
-                    break
-
-                for year_id in year_ids:
-                    year_string = self.get_year_from_id(year_id)
-                    if year_id and year_string and year_string not in academic_years:
-                        academic_years[year_string] = year_id
-                break
-
-        if not found_receiving_inst:
-            print(f"Receiving institution {receiving_id_str} not found in agreement list for sending institution {sending_id_str}.")
-
-        print(f"Found {len(academic_years)} academic years for {cache_key}")
-        self._academic_years_cache[cache_key] = academic_years
-        return academic_years
-
-    def get_institution_name(self, id):
-        cache_key = str(id)
-        if cache_key in self._institution_name_cache:
-            return self._institution_name_cache[cache_key]
-
-        print(f"Cache MISS for institution name: {id}. Fetching from API...")
-        data = self._make_request("institutions")
-        if not data:
-            return None
-
-        name_to_return = None
-        for item in data:
-            if str(item.get("id")) == cache_key:
-                if item.get("names"):
-                    name_to_return = item["names"][0].get("name")
-                    if name_to_return:
-                        self._institution_name_cache[cache_key] = name_to_return
-                        break
-
-        if not name_to_return:
-             print(f"Institution name not found for ID: {id}")
-        return name_to_return
-
-    def get_year_from_id(self, id):
-        cache_key = str(id)
-        if cache_key in self._year_id_cache:
-            return self._year_id_cache[cache_key]
-
-        print(f"Cache MISS for year ID: {id}. Fetching from API...")
-        data = self._make_request("AcademicYears")
-        if not data:
-            return None
-
-        year_str_to_return = None
-        for year_data in data:
-            if str(year_data.get("Id")) == cache_key:
-                fall_year = year_data.get("FallYear")
-                if fall_year:
-                    year_str_to_return = str(fall_year) + "-" + str(fall_year + 1)
-                    self._year_id_cache[cache_key] = year_str_to_return
-                    break
-
-        if not year_str_to_return:
-            print(f"Year string not found for ID: {id}")
-        return year_str_to_return
-
-    def get_receiving_institutions(self, sending_institution_id):
-        """Fetches receiving institutions that have agreements with the sending institution."""
-        cache_key = str(sending_institution_id)
-        if cache_key in self._receiving_cache:
-            print(f"API Cache hit for receiving institutions: {sending_institution_id}")
-            return self._receiving_cache[cache_key]
-
-        print(f"API Cache miss for receiving institutions: {sending_institution_id}. Fetching...")
-        endpoint = f"institutions/{sending_institution_id}/agreements"
-        agreement_list = self._make_request(endpoint)
-
-        if not agreement_list or not isinstance(agreement_list, list):
-             print(f"No valid agreement list found for sending institution {sending_institution_id} at endpoint {endpoint}")
-             self._receiving_cache[cache_key] = {}
-             return {}
-
-        receiving_institutions = {}
-        for agreement_info in agreement_list:
-            receiving_id = agreement_info.get("institutionParentId")
-            receiving_name = agreement_info.get("institutionName")
-            if not receiving_id or not receiving_name:
-                print(f"Skipping entry with missing ID or Name: {agreement_info}")
-                continue
-            if receiving_id not in receiving_institutions.values():
-                 receiving_institutions[receiving_name] = receiving_id
-
-        print(f"Found {len(receiving_institutions)} unique receiving institutions for {sending_institution_id}")
-        self._receiving_cache[cache_key] = receiving_institutions
-        return receiving_institutions
-
-    def get_majors_or_departments(self, sending_institution_id, receiving_institution_id, academic_year_id, category_code):
-        cache_key = f"{sending_institution_id}-{receiving_institution_id}-{academic_year_id}-{category_code}"
-        if cache_key in self._majors_cache:
-            return self._majors_cache[cache_key]
-
-        print(f"Cache MISS for majors/depts: {cache_key}. Fetching from API...")
+    BASE_URL = "https://assist.org/api"
+
+    def __init__(self, api_key=None):
+        self.api_key = api_key or os.getenv("ASSIST_API_KEY")
+        if not self.api_key:
+            raise ValueError("ASSIST_API_KEY not found in environment variables.")
+        self.headers = {"Authorization": f"Bearer {self.api_key}"}
+        self.institution_cache = {}
+        self.agreement_cache = {}
+
+    def _make_request(self, endpoint, params=None, use_cache=True, cache_key=None, cache_type=None):
+        if use_cache and cache_key:
+            if cache_type == 'institution' and cache_key in self.institution_cache:
+                print(f"Cache hit for institution: {cache_key}")
+                return self.institution_cache[cache_key]
+            elif cache_type == 'agreement' and cache_key in self.agreement_cache:
+                print(f"Cache hit for agreement: {cache_key}")
+                return self.agreement_cache[cache_key]
+
+        url = f"{self.BASE_URL}/{endpoint}"
+        max_retries = 3
+        for attempt in range(max_retries):
+            try:
+                response = requests.get(url, headers=self.headers, params=params)
+                response.raise_for_status()
+                data = response.json()
+                if use_cache and cache_key:
+                    if cache_type == 'institution':
+                        self.institution_cache[cache_key] = data
+                    elif cache_type == 'agreement':
+                        self.agreement_cache[cache_key] = data
+                return data
+            except requests.exceptions.HTTPError as e:
+                if e.response.status_code == 429:
+                    print(f"Rate limit exceeded. Retrying in {2 ** attempt} seconds...")
+                    time.sleep(2 ** attempt)
+                else:
+                    print(f"HTTP error: {e} for URL: {url} with params: {params}")
+                    return None
+            except requests.exceptions.RequestException as e:
+                print(f"Request failed: {e} for URL: {url} with params: {params}")
+                return None
+        return None
+
+    def get_institutions(self):
+        return self._make_request("institutions")
+
+    def get_institution_name(self, institution_id):
+        cache_key = str(institution_id)
+        if cache_key in self.institution_cache and 'name' in self.institution_cache[cache_key]:
+            print(f"Cache hit for institution name: {institution_id}")
+            return self.institution_cache[cache_key]['name']
+
+        data = self._make_request(f"institutions/{institution_id}", use_cache=True, cache_key=cache_key, cache_type='institution')
+        return data.get('name') if data else None
+
+    def get_academic_years(self, institution_id):
+        return self._make_request(f"institutions/{institution_id}/academic-years")
+
+    def get_agreements(self, receiving_institution_id, sending_institution_id, academic_year_id, category_code=None):
+        cache_key = f"{receiving_institution_id}_{sending_institution_id}_{academic_year_id}_{category_code or 'all'}"
         params = {
             "receivingInstitutionId": receiving_institution_id,
             "sendingInstitutionId": sending_institution_id,
             "academicYearId": academic_year_id,
             "categoryCode": category_code
         }
-        data = self._make_request("agreements", params=params)
-
-        if not data or not data.get("reports"):
-             print(f"No majors/depts found for {cache_key}")
-             self._majors_cache[cache_key] = {}
-             return {}
-
-        majors_dict = {}
-        for report in data["reports"]:
-             label = report.get("label")
-             key = report.get("key")
-             if label and key:
-                 majors_dict[label] = key
-
-        self._majors_cache[cache_key] = majors_dict
-        return majors_dict
-
-    def get_major_from_key(self, key):
-        """Resolves a major/dept label from its key by fetching the relevant agreement list."""
-        try:
-            keyArray = key.split("/")
-            if len(keyArray) < 4: # Basic validation
-                print(f"Invalid key format: {key}")
-                return "Invalid Key Format"
-
-            sending_institution_id = int(keyArray[1])
-            receiving_institution_id = int(keyArray[3])
-            academic_year_id = int(keyArray[0])
-            category_code = "dept" if "Department" in key else "major"
-
-            # Fetch the list using the existing method
-            majors_dict = self.get_majors_or_departments(
-                sending_institution_id,
-                receiving_institution_id,
-                academic_year_id,
-                category_code
-            )
-
-            # Find the label corresponding to the key
-            for label, k in majors_dict.items():
-                if k == key:
-                    return label
-
-            print(f"Major label not found for key: {key}")
-            return "Label Not Found" # Consistent return value
-
-        except Exception as e:
-            print(f"Error resolving major from key {key}: {e}")
-            traceback.print_exc()
-            return "Resolution Error" # Consistent return value
-
-    def get_sending_institutions(self):
-        """Fetches all sending institutions."""
-        # Note: This doesn't use the cache as it's typically fetched once
-        print("Fetching sending institutions list...")
-        data = self._make_request("institutions")
-        if not data:
-            return {}
-
-        result_dict_colleges = {}
-        for institution in data:
-            inst_id = institution.get("id")
-            if inst_id and institution.get("names") and isinstance(institution["names"], list) and institution["names"]:
-                 first_name_obj = institution["names"][0]
-                 if first_name_obj and first_name_obj.get("name"):
-                     result_dict_colleges[first_name_obj["name"]] = inst_id
+        return self._make_request("agreements", params=params, use_cache=True, cache_key=cache_key, cache_type='agreement')
 
-        return result_dict_colleges
+    def get_agreement_details(self, agreement_key):
+        return self._make_request(f"agreements/{agreement_key}/content")
 
-# Create a single instance for the application to use
 assist_client = AssistApiClient()
diff --git a/backend/college_transfer_ai/config.py b/backend/college_transfer_ai/config.py
index 13e8906..5cae597 100644
--- a/backend/college_transfer_ai/config.py
+++ b/backend/college_transfer_ai/config.py
@@ -1,37 +1,50 @@
 import os
-from dotenv import load_dotenv
+import json
+import traceback
 
 def load_configuration():
-    """Loads environment variables and returns them in a dictionary."""
-    # Assuming .env is at the project root (two levels up from this file's directory)
-    dotenv_path = os.path.join(os.path.dirname(__file__), '..', '..', '.env')
-    load_dotenv(dotenv_path=dotenv_path)
+    env = os.getenv('FLASK_ENV', 'development')
+    config_filename = f"config.{env}.json"
+    print(f"--- Loading configuration for environment: {env} from {config_filename} ---")
 
-    config = {
+    config = {}
+    try:
+        with open(config_filename, 'r') as f:
+            config = json.load(f)
+        print("--- Configuration loaded successfully from JSON file ---")
+    except FileNotFoundError:
+        print(f"!!! WARNING: {config_filename} not found. Attempting to load from environment variables.")
+    except json.JSONDecodeError as e:
+        print(f"!!! ERROR: Failed to parse {config_filename}: {e}. Attempting to load from environment variables.")
+        traceback.print_exc()
+
+    env_vars = {
         "MONGO_URI": os.getenv("MONGO_URI"),
-        "GOOGLE_CLIENT_ID": os.getenv("GOOGLE_CLIENT_ID"),
-        "GOOGLE_API_KEY": os.getenv("GOOGLE_API_KEY"), # For Gemini if needed
-        "PERPLEXITY_API_KEY": os.getenv("PERPLEXITY_API_KEY"),
+        "ASSIST_API_KEY": os.getenv("ASSIST_API_KEY"),
+        "GEMINI_API_KEY": os.getenv("GEMINI_API_KEY"),
+        "FRONTEND_URL": os.getenv("FRONTEND_URL"),
         "STRIPE_SECRET_KEY": os.getenv("STRIPE_SECRET_KEY"),
-        "STRIPE_PRICE_ID": os.getenv("STRIPE_PRICE_ID"),
+        "STRIPE_PUBLISHABLE_KEY": os.getenv("STRIPE_PUBLISHABLE_KEY"),
         "STRIPE_WEBHOOK_SECRET": os.getenv("STRIPE_WEBHOOK_SECRET"),
-        "FRONTEND_URL": os.getenv("FRONTEND_URL", "http://localhost:5173"),
-        # Add other config variables as needed
+        "GOOGLE_CLIENT_ID": os.getenv("GOOGLE_CLIENT_ID")
     }
-    # Basic validation
-    if not config["MONGO_URI"]:
-        raise ValueError("MONGO_URI not set in environment variables.")
-    if not config["GOOGLE_CLIENT_ID"]:
-        raise ValueError("GOOGLE_CLIENT_ID not set in environment variables.")
-    # Add more checks as needed
 
-    print("--- Configuration Loaded ---")
-    # Print loaded values for debugging (consider removing sensitive keys in production logs)
-    # print(f"MONGO_URI: {'Set' if config['MONGO_URI'] else 'Not Set'}")
-    # print(f"GOOGLE_CLIENT_ID: {'Set' if config['GOOGLE_CLIENT_ID'] else 'Not Set'}")
-    # print(f"STRIPE_SECRET_KEY: {'Set' if config['STRIPE_SECRET_KEY'] else 'Not Set'}")
-    # print(f"STRIPE_WEBHOOK_SECRET: {'Set' if config['STRIPE_WEBHOOK_SECRET'] else 'Not Set'}")
-    # print(f"FRONTEND_URL: {config['FRONTEND_URL']}")
-    return config
+    loaded_from_env = False
+    for key, value in env_vars.items():
+        if value is not None:
+            config[key] = value
+            if not loaded_from_env:
+                print("--- Loading/Overriding configuration from environment variables ---")
+                loaded_from_env = True
+            print(f"    Loaded {key} from environment.")
+
+    required_keys = ["MONGO_URI", "ASSIST_API_KEY", "GEMINI_API_KEY", "FRONTEND_URL", "STRIPE_SECRET_KEY", "GOOGLE_CLIENT_ID"]
+    missing_keys = [key for key in required_keys if not config.get(key)]
 
-# config = load_configuration() # Optionally load here if needed globally at import time
\ No newline at end of file
+    if missing_keys:
+        error_message = f"Missing required configuration keys: {', '.join(missing_keys)}"
+        print(f"!!! CRITICAL: {error_message}")
+        raise ValueError(error_message)
+
+    print("--- Final configuration loaded ---")
+    return config
diff --git a/backend/college_transfer_ai/database.py b/backend/college_transfer_ai/database.py
index 4cb0214..20db1a4 100644
--- a/backend/college_transfer_ai/database.py
+++ b/backend/college_transfer_ai/database.py
@@ -1,4 +1,4 @@
-from flask import current_app, g # Keep g for request context
+from flask import current_app, g 
 from pymongo import MongoClient
 from pymongo.errors import ConnectionFailure
 import gridfs
@@ -6,8 +6,6 @@
 from urllib.parse import urlparse
 import traceback
 
-# Global variables to hold the single instances initialized by init_db
-# These represent the main connection pool/client setup at startup.
 client = None
 db = None
 fs = None
@@ -15,13 +13,9 @@
 course_maps_collection = None
 
 def init_db(app, mongo_uri):
-    """
-    Initializes the MongoDB connection and GridFS using global variables.
-    DOES NOT register the teardown function here anymore.
-    """
     global client, db, fs, users_collection, course_maps_collection
 
-    if client: # Avoid re-initialization if called multiple times
+    if client: 
         print("--- Database already initialized ---")
         return
 
@@ -30,18 +24,18 @@ def init_db(app, mongo_uri):
         raise ValueError("MONGO_URI is required for database initialization.")
 
     try:
-        print(f"--- Attempting MongoDB Connection to URI specified ---") # Log URI being used
+        print(f"--- Attempting MongoDB Connection to URI specified ---") 
         client = MongoClient(mongo_uri)
-        client.admin.command('ismaster') # Verify connection
+        client.admin.command('ismaster') 
         db_name = urlparse(mongo_uri).path.lstrip('/')
         if not db_name:
-            db_name = 'college_transfer_ai_db' # Default DB name if not in URI
+            db_name = 'college_transfer_ai_db' 
             print(f"Warning: Database name not found in MONGO_URI path, defaulting to '{db_name}'.")
-        db = client[db_name] # Assign to global db
-        fs = gridfs.GridFS(db) # Assign to global fs
+        db = client[db_name] 
+        fs = gridfs.GridFS(db) 
 
-        users_collection = db['users'] # Assign to global users_collection
-        course_maps_collection = db['course_maps'] # Assign to global course_maps_collection
+        users_collection = db['users'] 
+        course_maps_collection = db['course_maps'] 
 
         print(f"--- MongoDB Connected & GridFS Initialized (DB: {db_name}) ---")
         print(f"--- Collections Initialized: {users_collection.name}, {course_maps_collection.name} ---")
@@ -56,38 +50,24 @@ def init_db(app, mongo_uri):
         client = None; db = None; fs = None; users_collection = None; course_maps_collection = None
         raise
 
-# --- Accessor Functions ---
-# Use Flask's 'g' object for request-scoped resources.
 
 def get_db():
-    """
-    Returns the database instance for the current request context.
-    Uses the globally initialized 'db' if not already in 'g'.
-    """
     if 'db' not in g:
-        if db is None: # Check if global db was initialized
+        if db is None: 
              raise Exception("Global database not initialized. Ensure init_db() was called successfully at app startup.")
-        g.db = db # Store the global db instance in g for this request
+        g.db = db 
         print("--- Attaching global DB to request context 'g' ---")
     return g.db
 
 def get_gridfs():
-    """
-    Returns the GridFS instance for the current request context.
-    Uses the globally initialized 'fs' if not already in 'g'.
-    """
     if 'fs' not in g:
-        if fs is None: # Check if global fs was initialized
+        if fs is None: 
              raise Exception("Global GridFS not initialized. Ensure init_db() was called successfully at app startup.")
-        g.fs = fs # Store the global fs instance in g for this request
+        g.fs = fs 
         print("--- Attaching global GridFS to request context 'g' ---")
     return g.fs
 
 def get_users_collection():
-    """
-    Returns the users collection instance for the current request context.
-    Uses the globally initialized 'users_collection' if not already in 'g'.
-    """
     if 'users_collection' not in g:
         if users_collection is None:
             raise Exception("Global Users collection not initialized. Ensure init_db() was called successfully.")
@@ -96,10 +76,6 @@ def get_users_collection():
     return g.users_collection
 
 def get_course_maps_collection():
-    """
-    Returns the course maps collection instance for the current request context.
-    Uses the globally initialized 'course_maps_collection' if not already in 'g'.
-    """
     if 'course_maps_collection' not in g:
         if course_maps_collection is None:
              raise Exception("Global Course maps collection not initialized. Ensure init_db() was called successfully.")
@@ -107,29 +83,16 @@ def get_course_maps_collection():
         print("--- Attaching global Course Maps Collection to request context 'g' ---")
     return g.course_maps_collection
 
-# --- Teardown Function ---
 
 def close_db(e=None):
-    """
-    Cleans up resources from the request context 'g'.
-    Does NOT close the global client connection.
-    """
-    # Pop resources from 'g' if they exist. No need to explicitly close them
-    # as they are just references to the globally managed instances.
     db_instance = g.pop('db', None)
     fs_instance = g.pop('fs', None)
-    users_coll_instance = g.pop('users_collection', None)
-    course_maps_coll_instance = g.pop('course_maps_collection', None)
 
     if db_instance is not None or fs_instance is not None:
          print("--- Cleaning up DB/GridFS references from request context 'g' ---")
 
-    # DO NOT close the global client here:
-    # if client is not None: client.close()
 
-# --- Standalone Client Getter (Remains unchanged) ---
 def get_mongo_client():
-    """Creates a new MongoDB client instance. Caller is responsible for closing."""
     MONGO_URI = os.getenv("MONGO_URI")
     if not MONGO_URI:
          try:
diff --git a/backend/college_transfer_ai/helpers/mongo_helper.py b/backend/college_transfer_ai/helpers/mongo_helper.py
index 1758823..fd06884 100644
--- a/backend/college_transfer_ai/helpers/mongo_helper.py
+++ b/backend/college_transfer_ai/helpers/mongo_helper.py
@@ -1,10 +1,8 @@
-import os
 from pymongo import MongoClient
 
-# --- MongoDB Connection Helper ---
-def get_mongo_client():
-    MONGO_URI = os.getenv("MONGO_URI")
-    if not MONGO_URI:
-        raise ValueError("MONGO_URI environment variable not set.")
-    # Consider managing client lifetime or using a connection pool in a real application
-    return MongoClient(MONGO_URI)
+def get_mongo_client(uri):
+    return MongoClient(uri)
+
+def close_mongo_client(client):
+    if client:
+        client.close()
diff --git a/backend/college_transfer_ai/pdf_service.py b/backend/college_transfer_ai/pdf_service.py
index 895acb5..e816eaa 100644
--- a/backend/college_transfer_ai/pdf_service.py
+++ b/backend/college_transfer_ai/pdf_service.py
@@ -1,202 +1,83 @@
-from playwright.sync_api import sync_playwright
-import gridfs
+import os
+import fitz 
+import io
 import traceback
-# Use absolute import
-from .helpers.mongo_helper import get_mongo_client
-# Use absolute import
-from college_transfer_ai.assist_api_client import AssistApiClient
+from .database import get_gridfs
+from .assist_api_client import AssistApiClient
 
 class PdfService:
-    def __init__(self, assist_api_client: AssistApiClient):
-        self.assist_api_client = assist_api_client
-        # Initialize GridFS connection here or pass db/fs instance
-        # For simplicity, getting client on demand, but consider managing lifetime
-        # self.mongo_client = get_mongo_client()
-        # self.db = self.mongo_client["CollegeTransferAICluster"]
-        # self.fs = gridfs.GridFS(self.db)
-
-    def _get_gridfs_instance(self):
-        """Helper to get a GridFS instance, managing client connection."""
-        client = get_mongo_client()
-        db = client["CollegeTransferAICluster"] # Use correct DB name if needed
-        fs = gridfs.GridFS(db)
-        return client, fs # Return client to close it later
-
-    def get_articulation_agreement(self, academic_year_id, sending_institution_id, receiving_institution_id, key):
-        print(f"Fetching articulation agreement for key: {key}")
-        mongo_client = None # Initialize client to None outside try
-        try:
-            print(f"Academic Year ID: {academic_year_id}, Sending Institution ID: {sending_institution_id}, Receiving Institution ID: {receiving_institution_id}")
-
-            # Use the injected assist_api_client instance
-            college_name = self.assist_api_client.get_institution_name(sending_institution_id)
-            receiving_name = self.assist_api_client.get_institution_name(receiving_institution_id)
-            major_name = self.assist_api_client.get_major_from_key(key)
-            year_name = self.assist_api_client.get_year_from_id(academic_year_id)
-
-            # Check for failure indicators from get_major_from_key
-            major_lookup_failed = major_name in ["Request Failed", "No Reports Found", "Key Not Found", "Label Not Found"]
-
-            if not all([college_name, receiving_name, major_name, year_name]) or major_lookup_failed:
-                 print(f"Warning: Could not resolve all names for key {key}. Using fallback names.")
-                 college_name = college_name or f"sending_{sending_institution_id}"
-                 receiving_name = receiving_name or f"receiving_{receiving_institution_id}"
-                 major_name = major_name if not major_lookup_failed else f"major_{key.split('/')[-1]}"
-                 year_name = year_name or f"year_{academic_year_id}"
-
-            # Sanitize names for filename
-            college_name_safe = college_name.replace(" ", "_").replace("/", "_")
-            receiving_name_safe = receiving_name.replace(" ", "_").replace("/", "_")
-            major_name_safe = major_name.replace(" ", "_").replace("/", "_")
-            year_name_safe = year_name.replace(" ", "_").replace("/", "_")
-
-            filename = (
-                f"{college_name_safe}_to_"
-                f"{receiving_name_safe}_"
-                f"{major_name_safe}_"
-                f"{year_name_safe}.pdf"
-            )
-            filename = filename.replace('/', '_').replace('\\', '_') # Basic sanitization
-            print(f"Generated filename: {filename}")
-
-            # --- Check if already exists in GridFS ---
-            mongo_client, fs = self._get_gridfs_instance() # Get client and fs
-            if fs.find_one({"filename": filename}):
-                print(f"PDF '{filename}' already exists in GridFS. Skipping download.")
-                return filename # Return existing filename (client closed in finally)
-
-            # --- Construct URL ---
-            viewBy = "major"
-            if "Department" in key: viewBy = "dept"
-
-            # Simplified URL construction
-            base_url_part = (
-                f"https://assist.org/transfer/results?year={academic_year_id}"
-                f"&institution={sending_institution_id}"
-                f"&agreement={receiving_institution_id}"
-                f"&agreementType=to&viewAgreementsOptions=true&view=agreement"
-                f"&viewBy={viewBy}&viewByKey={key}"
-            )
-            if viewBy == "dept" and "SendingDepartment" in key:
-                 url = base_url_part + "&viewSendingAgreements=true"
-            else:
-                 url = base_url_part
-
-            print(f"Attempting to fetch PDF from URL: {url}")
-
-            pdf_bytes = None
-            with sync_playwright() as p:
-                browser = None
-                try:
-                    browser = p.chromium.launch(headless=True)
-                    page = browser.new_page()
-                    page.goto(url, wait_until="networkidle", timeout=60000)
-                    header_selector = '//*[@id="view-results"]/app-report-preview/div[2]/awc-agreement/div/awc-report-header/div[3]/h1'
-                    print(f"Waiting for selector '{header_selector}' indicating page load...")
-                    page.wait_for_selector(header_selector, timeout=30000)
-                    print("Selector found. Proceeding with PDF generation.")
-                    pdf_bytes = page.pdf(format="A4")
-                    print(f"Successfully downloaded PDF bytes (size: {len(pdf_bytes)} bytes)")
-                except Exception as playwright_err:
-                     print(f"Playwright error fetching PDF from {url}: {playwright_err}")
-                     # No need to return here, let finally handle client close
-                finally:
-                    if browser: browser.close()
-
-            if pdf_bytes:
-                try:
-                    fs.put(pdf_bytes, filename=filename, contentType='application/pdf')
-                    print(f"Successfully saved PDF '{filename}' to GridFS.")
-                    return filename # Return filename on success (client closed in finally)
-                except Exception as gridfs_err:
-                    print(f"Error saving PDF '{filename}' to GridFS: {gridfs_err}")
-                    return None # Return None on GridFS error (client closed in finally)
-            else:
-                 print("Failed to obtain PDF bytes, cannot save.")
-                 return None # Return None if PDF download failed (client closed in finally)
-
-        except Exception as e:
-            print(f"General error in get_articulation_agreement for key {key}: {e}")
-            traceback.print_exc()
+    def __init__(self, assist_client: AssistApiClient):
+        self.assist_client = assist_client
+        self.fs = get_gridfs()
+        if self.fs is None:
+            print("!!! CRITICAL: GridFS not available at PdfService initialization.")
+            raise ConnectionError("GridFS is not initialized. Cannot proceed with PdfService.")
+
+    def _generate_pdf_filename(self, type_prefix, year_id, sending_id, receiving_id=None, major_key=None):
+        parts = [type_prefix, str(year_id), str(sending_id)]
+        if receiving_id is not None:
+            parts.append(str(receiving_id))
+        if major_key:
+            safe_major_key = major_key.replace("/", "_").replace(" ", "-")
+            parts.append(safe_major_key)
+        return "_".join(parts) + ".pdf"
+
+    def _fetch_and_store_pdf(self, filename, api_call_func, *args):
+        if self.fs.exists({"filename": filename}):
+            print(f"PDF {filename} already exists in GridFS.")
+            return filename
+
+        print(f"Fetching PDF content for {filename} from Assist.org...")
+        pdf_content_response = api_call_func(*args)
+
+        if pdf_content_response is None:
+            print(f"Failed to fetch PDF content for {filename} (API returned None).")
             return None
-        finally:
-            if mongo_client: # Close client if it was successfully created
-                print("Closing MongoDB client connection.")
-                mongo_client.close()
+        
+        if not isinstance(pdf_content_response, bytes):
+            print(f"API response for {filename} is not bytes, attempting to encode.")
+            try:
+                if hasattr(pdf_content_response, 'text'): 
+                    pdf_content_response = pdf_content_response.text.encode('utf-8')
+                elif isinstance(pdf_content_response, str):
+                    pdf_content_response = pdf_content_response.encode('utf-8')
+                else:
+                    raise TypeError("Unsupported response type for PDF content.")
+            except Exception as e:
+                print(f"Error encoding PDF content for {filename}: {e}")
+                return None
 
-    def get_igetc_courses(self, academic_year_id, sending_institution_id):
-        print("Fetching IGETC agreement for")
-        mongo_client = None # Initialize client to None outside try
         try:
-            # Use the injected assist_api_client instance
-            college_name = self.assist_api_client.get_institution_name(sending_institution_id)
-            year_name = self.assist_api_client.get_year_from_id(academic_year_id)
-
-            if not all([college_name, year_name]):
-                 college_name = college_name or f"sending_{sending_institution_id}"
-                 year_name = year_name or f"year_{academic_year_id}"
-
-            college_name_safe = college_name.replace(" ", "_").replace("/", "_")
-            year_name_safe = year_name.replace(" ", "_").replace("/", "_")
-
-            filename = (
-                f"{college_name_safe}_IGETC_"
-                f"{year_name_safe}.pdf"
-            )
-            filename = filename.replace('/', '_').replace('\\', '_')
-            print(f"Generated filename: {filename}")
-
-            mongo_client, fs = self._get_gridfs_instance() # Get client and fs
-            if fs.find_one({"filename": filename}):
-                print(f"PDF '{filename}' already exists in GridFS. Skipping download.")
-                return filename # Return existing filename (client closed in finally)
-
-            url = (
-                f"https://assist.org/transfer/results?year={academic_year_id}"
-                f"&institution={sending_institution_id}"
-                f"&type=IGETC&view=transferability&viewBy=igetcArea"
-                f"&viewSendingAgreements=false&viewByKey=all"
-            )
-            print(f"Attempting to fetch IGETC from URL: {url}")
-
-            pdf_bytes = None
-            with sync_playwright() as p:
-                browser = None
-                try:
-                    browser = p.chromium.launch(headless=True)
-                    page = browser.new_page()
-                    page.goto(url, wait_until="networkidle", timeout=60000)
-                    # --- Improved Wait Condition ---
-                    igetc_content_selector = 'div > div > div > awc-print-header > table > tbody > tr > td > div > div:nth-child(1) > h4.areaTitle'
-                    print(f"Waiting for selector '{igetc_content_selector}' indicating IGETC page load...")
-                    page.wait_for_selector(igetc_content_selector, timeout=30000)
-                    print("Selector found. Proceeding with PDF generation.")
-                    # --- End Improved Wait ---
-                    pdf_bytes = page.pdf(format="A4")
-                    print(f"Successfully downloaded PDF bytes (size: {len(pdf_bytes)} bytes)")
-                except Exception as playwright_err:
-                     print(f"Playwright error fetching PDF from {url}: {playwright_err}")
-                     # Let finally handle client close
-                finally:
-                    if browser: browser.close()
-
-            if pdf_bytes:
-                try:
-                    fs.put(pdf_bytes, filename=filename, contentType='application/pdf')
-                    print(f"Successfully saved PDF '{filename}' to GridFS.")
-                    return filename # Return filename on success (client closed in finally)
-                except Exception as gridfs_err:
-                    print(f"Error saving PDF '{filename}' to GridFS: {gridfs_err}")
-                    return None # Return None on GridFS error (client closed in finally)
-            else:
-                 print("Failed to obtain PDF bytes, cannot save.")
-                 return None # Return None if PDF download failed (client closed in finally)
-
+            with io.BytesIO(pdf_content_response) as pdf_stream:
+                doc = fitz.open(stream=pdf_stream, filetype="pdf") 
+                if not doc.is_pdf or doc.page_count == 0:
+                    print(f"Invalid or empty PDF received for {filename}. Content starts with: {pdf_content_response[:100]}")
+                    return None 
+                doc.close()
+
+            self.fs.put(pdf_content_response, filename=filename, contentType="application/pdf")
+            print(f"Stored PDF {filename} in GridFS.")
+            return filename
+        except fitz.errors.FitzError as fe:
+            print(f"FitzError validating PDF {filename}: {fe}. Content starts with: {pdf_content_response[:200]}")
+            return None
         except Exception as e:
-            print(f"General error in get_igetc_courses: {e}")
+            print(f"Error storing PDF {filename} in GridFS: {e}")
             traceback.print_exc()
             return None
-        finally:
-            if mongo_client: # Close client if it was successfully created
-                print("Closing MongoDB client connection.")
-                mongo_client.close()
+
+    def get_articulation_agreement(self, year_id, sending_id, receiving_id, major_key):
+        filename = self._generate_pdf_filename("agreement", year_id, sending_id, receiving_id, major_key)
+        return self._fetch_and_store_pdf(
+            filename,
+            self.assist_client.get_agreement_details,
+            major_key
+        )
+
+    def get_igetc_courses(self, year_id, sending_institution_id):
+        filename = self._generate_pdf_filename("igetc", year_id, sending_institution_id)
+        return self._fetch_and_store_pdf(
+            filename,
+            self.assist_client.get_agreement_details, 
+            f"igetc/{year_id}/{sending_institution_id}" 
+        )
diff --git a/backend/college_transfer_ai/routes/__init__.py b/backend/college_transfer_ai/routes/__init__.py
index 2f65f73..539621a 100644
--- a/backend/college_transfer_ai/routes/__init__.py
+++ b/backend/college_transfer_ai/routes/__init__.py
@@ -1 +1,6 @@
-# This file makes the routes directory a Python package
\ No newline at end of file
+from .agreement_pdf_routes import agreement_pdf_bp
+from .chat_routes import chat_bp
+from .course_map_routes import course_map_bp
+from .user_routes import user_bp
+from .api_info_routes import api_info_bp
+from .igetc_routes import igetc_bp
\ No newline at end of file
diff --git a/backend/college_transfer_ai/routes/agreement_pdf_routes.py b/backend/college_transfer_ai/routes/agreement_pdf_routes.py
index dfdc94a..34594c6 100644
--- a/backend/college_transfer_ai/routes/agreement_pdf_routes.py
+++ b/backend/college_transfer_ai/routes/agreement_pdf_routes.py
@@ -1,20 +1,13 @@
-# filepath: backend/college_transfer_ai/routes/agreement_pdf_routes.py
 import traceback
 import io
-import fitz # PyMuPDF - Keep import here for image generation
+import fitz 
 from flask import Blueprint, jsonify, request, send_file, make_response
-from ..database import get_gridfs # Keep for serving images
-# Import the specific PDF fetching function and the client for name resolution
+from ..database import get_gridfs 
 from ..pdf_service import PdfService
 from ..assist_api_client import assist_client
 
-agreement_pdf_bp = Blueprint('agreement_pdf_bp', __name__) # Removed url_prefix, assuming it's added during registration
+agreement_pdf_bp = Blueprint('agreement_pdf_bp', __name__) 
 
-# Remove global fs variable: fs = None
-# Remove unused init function: def init_pdf_routes(app): ...
-
-# Initialize the PDF service instance (assuming assist_client is available globally or passed appropriately)
-# If assist_client relies on app context, this might need adjustment or lazy initialization.
 pdf_service_instance = PdfService(assist_client)
 
 @agreement_pdf_bp.route('/articulation-agreements', methods=['POST'])
@@ -82,20 +75,15 @@ def get_articulation_agreements():
 
 @agreement_pdf_bp.route('/pdf-images/<path:filename>', methods=['GET'])
 def get_pdf_images(filename):
-    """
-    Checks if images for a PDF exist in GridFS. If not, generates, stores,
-    and returns them. If they exist, returns the existing filenames.
-    """
-    fs = get_gridfs() # Get GridFS instance directly
+    fs = get_gridfs() 
     if fs is None:
-        print("Error: GridFS not available when requested in get_pdf_images.") # More specific log
+        print("Error: GridFS not available when requested in get_pdf_images.") 
         return jsonify({"error": "Storage service not available."}), 503
 
     try:
-        # Check for existing sorted images
         existing_images_cursor = fs.find(
             {"metadata.original_pdf": filename, "contentType": "image/png"},
-            sort=[("metadata.page_number", 1)] # Sort by page number
+            sort=[("metadata.page_number", 1)] 
         )
         existing_images = list(existing_images_cursor)
 
@@ -104,7 +92,7 @@ def get_pdf_images(filename):
             print(f"Found {len(image_filenames)} existing images for {filename} (sorted)")
             return jsonify({"image_filenames": image_filenames})
 
-        # If not found, generate images
+        
         print(f"Generating images for {filename}...")
         grid_out = fs.find_one({"filename": filename})
         if not grid_out:
@@ -113,16 +101,15 @@ def get_pdf_images(filename):
         pdf_data = grid_out.read()
         doc = fitz.open(stream=pdf_data, filetype="pdf")
         image_filenames = []
-        zoom = 2 # Increase resolution
+        zoom = 2 
         mat = fitz.Matrix(zoom, zoom)
-        generated_files_metadata = [] # Store metadata to sort later
+        generated_files_metadata = [] 
 
         for i, page in enumerate(doc):
             try:
                 pix = page.get_pixmap(matrix=mat)
                 img_bytes = pix.tobytes("png")
                 image_filename = f"{filename}_page_{i}.png"
-                # Store with metadata including original PDF and page number
                 fs.put(
                     img_bytes,
                     filename=image_filename,
@@ -132,11 +119,9 @@ def get_pdf_images(filename):
                 generated_files_metadata.append({"filename": image_filename, "page_number": i})
             except Exception as page_err:
                  print(f"Error processing page {i} for {filename}: {page_err}")
-                 # Decide if you want to skip the page or fail the whole process
 
         doc.close()
 
-        # Sort the generated filenames by page number before returning
         generated_files_metadata.sort(key=lambda x: x["page_number"])
         image_filenames = [item["filename"] for item in generated_files_metadata]
 
@@ -151,10 +136,9 @@ def get_pdf_images(filename):
 
 @agreement_pdf_bp.route('/image/<path:filename>', methods=['GET'])
 def get_image(filename):
-    """Serves an image file directly from GridFS with cache headers."""
-    fs = get_gridfs() # Get GridFS instance directly
+    fs = get_gridfs() 
     if fs is None:
-        print("Error: GridFS not available when requested in get_image.") # More specific log
+        print("Error: GridFS not available when requested in get_image.") 
         return jsonify({"error": "Storage service not available."}), 503
 
     grid_out = None
@@ -170,7 +154,6 @@ def get_image(filename):
             as_attachment=False,
             download_name=grid_out.filename
         ))
-        # Set cache headers for immutable content
         response.headers['Cache-Control'] = 'public, immutable, max-age=31536000'
         return response
 
diff --git a/backend/college_transfer_ai/routes/api_info_routes.py b/backend/college_transfer_ai/routes/api_info_routes.py
index 50a9e8f..8fde5fe 100644
--- a/backend/college_transfer_ai/routes/api_info_routes.py
+++ b/backend/college_transfer_ai/routes/api_info_routes.py
@@ -1,141 +1,159 @@
-# filepath: backend/college_transfer_ai/routes/api_info_routes.py
 import traceback
-from flask import Blueprint, jsonify, request, make_response
-# Import the client instance and the helper function
+from flask import Blueprint, jsonify, request, current_app
 from ..assist_api_client import assist_client
-from ..utils import calculate_intersection # Moved to utils
+from ..utils import calculate_intersection
 
 api_info_bp = Blueprint('api_info_bp', __name__)
 
 @api_info_bp.route('/institutions', methods=['GET'])
 def get_institutions():
     try:
-        # Use the imported client instance
-        institutions = assist_client.get_sending_institutions()
-        return jsonify(institutions)
+        institutions = assist_client.get_institutions()
+        if institutions:
+            return jsonify(institutions), 200
+        else:
+            return jsonify({"error": "Failed to fetch institutions from Assist.org"}), 502
     except Exception as e:
         print(f"Error fetching institutions: {e}")
         traceback.print_exc()
-        return jsonify({"error": "Failed to fetch institutions"}), 500
-
-@api_info_bp.route('/receiving-institutions', methods=['GET'])
-def get_receiving_institutions():
-    """
-    Gets common receiving institutions for one or more sending institutions.
-    Accepts comma-separated 'sendingId' query parameter.
-    """
-    sending_ids_str = request.args.get('sendingId')
-    if not sending_ids_str:
-        return jsonify({"error": "Missing required parameter 'sendingId'"}), 400
-
-    sending_ids = [s_id.strip() for s_id in sending_ids_str.split(',') if s_id.strip()]
-    if not sending_ids:
-        return jsonify({"error": "Invalid 'sendingId' parameter"}), 400
+        return jsonify({"error": "An internal error occurred"}), 500
+
+@api_info_bp.route('/academic-years', methods=['GET'])
+def get_academic_years_route():
+    sending_id_str = request.args.get('sendingId')
+    receiving_id_str = request.args.get('receivingId')
+
+    if not sending_id_str or not receiving_id_str:
+        return jsonify({"error": "Missing sendingId or receivingId parameter"}), 400
 
     try:
-        all_results = []
-        errors = []
-        for s_id in sending_ids:
-            try:
-                # Use the imported client instance
-                data = assist_client.get_receiving_institutions(s_id)
-                all_results.append(data or {})
-            except Exception as e:
-                print(f"Error fetching receiving institutions for sender {s_id}: {e}")
-                errors.append({"sendingId": s_id, "error": str(e)})
-                all_results.append({})
-
-        if not all_results and errors:
-             return jsonify({"error": "Failed to fetch receiving institutions for all senders.", "details": errors}), 500
-
-        # Use imported calculate_intersection
-        intersection = calculate_intersection(all_results)
-
-        response_data = intersection
-        status_code = 200
-        if errors:
-            response_data = {"institutions": intersection, "warnings": errors}
-            status_code = 207 # Multi-Status
-
-        response = make_response(jsonify(response_data), status_code)
-        response.headers['Cache-Control'] = 'public, max-age=3600000'
-        return response
+        sending_ids = [int(id_str) for id_str in sending_id_str.split(',')]
+        receiving_id = int(receiving_id_str)
+    except ValueError:
+        return jsonify({"error": "Invalid ID format. IDs must be integers."}), 400
+
+    all_results = []
+    errors = []
+    warnings = []
+
+    for s_id in sending_ids:
+        try:
+            years = assist_client.get_academic_years(s_id)
+            if years:
+                all_results.append(years)
+            else:
+                warnings.append(f"No academic years found for sending institution {s_id}.")
+        except Exception as e:
+            error_msg = f"Error fetching academic years for sending institution {s_id}: {e}"
+            print(error_msg)
+            traceback.print_exc()
+            errors.append(error_msg)
 
+    try:
+        receiving_years = assist_client.get_academic_years(receiving_id)
+        if receiving_years:
+            all_results.append(receiving_years)
+        else:
+            warnings.append(f"No academic years found for receiving institution {receiving_id}.")
     except Exception as e:
-        print(f"Error processing receiving institutions intersection: {e}")
+        error_msg = f"Error fetching academic years for receiving institution {receiving_id}: {e}"
+        print(error_msg)
         traceback.print_exc()
-        return jsonify({"error": "Failed to process receiving institutions"}), 500
+        errors.append(error_msg)
 
-@api_info_bp.route('/academic-years', methods=['GET'])
-def get_academic_years():
-    """
-    Gets common academic years for one or more sending institutions and one receiving institution.
-    Accepts comma-separated 'sendingId' and single 'receivingId'.
-    """
-    sending_ids_str = request.args.get('sendingId')
-    receiving_id = request.args.get('receivingId')
+    if errors and not all_results:
+        return jsonify({"error": "Failed to fetch any academic years.", "details": errors}), 502
 
-    if not sending_ids_str or not receiving_id:
-        return jsonify({"error": "Missing required parameters 'sendingId' and 'receivingId'"}), 400
+    common_years = calculate_intersection(all_results)
 
-    sending_ids = [s_id.strip() for s_id in sending_ids_str.split(',') if s_id.strip()]
-    if not sending_ids:
-        return jsonify({"error": "Invalid 'sendingId' parameter"}), 400
+    response_data = {"years": common_years}
+    status_code = 200
 
-    try:
-        all_results = []
-        errors = []
-        for s_id in sending_ids:
-            try:
-                # Use the imported client instance
-                data = assist_client.get_academic_years(s_id, receiving_id)
-                all_results.append(data or {})
-            except Exception as e:
-                print(f"Error fetching academic years for sender {s_id}, receiver {receiving_id}: {e}")
-                errors.append({"sendingId": s_id, "receivingId": receiving_id, "error": str(e)})
-                all_results.append({})
-
-        if not all_results and errors:
-             return jsonify({"error": "Failed to fetch academic years for all combinations.", "details": errors}), 500
-
-        # Use imported calculate_intersection
-        intersection = calculate_intersection(all_results)
-
-        response_data = intersection
-        status_code = 200
-        if errors:
-            response_data = {"years": intersection, "warnings": errors}
-            status_code = 207 # Multi-Status
-
-        response = make_response(jsonify(response_data), status_code)
-        response.headers['Cache-Control'] = 'public, max-age=3600000'
-        return response
+    if warnings:
+        response_data["warnings"] = warnings
+        if not common_years:
+            status_code = 207 
+    if errors:
+        response_data["errors"] = errors
+        status_code = 207 if common_years else 500 
+
+    if not common_years and not warnings and not errors:
+        response_data["message"] = "No common academic years found for the selected combination."
+
+    return jsonify(response_data), status_code
 
-    except Exception as e:
-        print(f"Error processing academic years intersection: {e}")
-        traceback.print_exc()
-        return jsonify({"error": "Failed to process academic years"}), 500
 
 @api_info_bp.route('/majors', methods=['GET'])
-def get_majors():
-    sending_institution_id = request.args.get('sendingId')
-    receiving_institution_id = request.args.get('receivingId')
-    academic_year_id = request.args.get('academicYearId')
-    category_code = request.args.get('categoryCode', 'major') # Default to major
+def get_majors_route():
+    sending_id_str = request.args.get('sendingId')
+    receiving_id_str = request.args.get('receivingId')
+    year_id_str = request.args.get('yearId')
 
-    if not sending_institution_id or not receiving_institution_id or not academic_year_id:
-        return jsonify({"error": "Missing required parameters (sending, receiving, year)"}), 400
+    if not sending_id_str or not receiving_id_str or not year_id_str:
+        return jsonify({"error": "Missing sendingId, receivingId, or yearId parameter"}), 400
 
     try:
-        # Use the imported client instance
-        majors = assist_client.get_majors_or_departments(
-            sending_institution_id,
-            receiving_institution_id,
-            academic_year_id,
-            category_code
-        )
-        return jsonify(majors)
-    except Exception as e:
-        print(f"Error fetching {category_code}s: {e}")
-        traceback.print_exc()
-        return jsonify({"error": f"Failed to fetch {category_code}s"}), 500
+        sending_ids = [int(id_str) for id_str in sending_id_str.split(',')]
+        receiving_id = int(receiving_id_str)
+        year_id = int(year_id_str)
+    except ValueError:
+        return jsonify({"error": "Invalid ID format. IDs must be integers."}), 400
+
+    all_majors_results = []
+    errors = []
+    warnings = []
+
+    for s_id in sending_ids:
+        try:
+            majors = assist_client.get_agreements(receiving_id, s_id, year_id)
+            if majors and majors.get('reports'):
+                all_majors_results.append(majors)
+            else:
+                warnings.append(f"No majors found for sending institution {s_id} with receiving {receiving_id} for year {year_id}.")
+        except Exception as e:
+            error_msg = f"Error fetching majors for sending institution {s_id}: {e}"
+            print(error_msg)
+            traceback.print_exc()
+            errors.append(error_msg)
+
+    if errors and not all_majors_results:
+        return jsonify({"error": "Failed to fetch any majors.", "details": errors}), 502
+
+    if not all_majors_results:
+        response_data = {"majors": [], "message": "No majors found for the selected criteria."}
+        if warnings: response_data["warnings"] = warnings
+        if errors: response_data["errors"] = errors
+        return jsonify(response_data), 200 if not errors else 500
+
+    combined_majors = {}
+    if len(sending_ids) == 1 and all_majors_results:
+        combined_majors = {report['label']: report['key'] for report in all_majors_results[0].get('reports', [])}
+    else:
+        major_label_to_keys = {}
+        for result_set in all_majors_results:
+            for report in result_set.get('reports', []):
+                label = report['label']
+                key = report['key']
+                if label not in major_label_to_keys:
+                    major_label_to_keys[label] = []
+                major_label_to_keys[label].append(key)
+        
+        for label, keys in major_label_to_keys.items():
+            if len(keys) == len(sending_ids):
+                combined_majors[label] = keys[0]
+
+    response_data = {"majors": combined_majors}
+    status_code = 200
+
+    if warnings:
+        response_data["warnings"] = warnings
+        if not combined_majors:
+            status_code = 207
+    if errors:
+        response_data["errors"] = errors
+        status_code = 207 if combined_majors else 500
+    
+    if not combined_majors and not warnings and not errors:
+         response_data["message"] = "No common majors found across all selected sending institutions for the specified receiving institution and year."
+
+    return jsonify(response_data), status_code
diff --git a/backend/college_transfer_ai/routes/chat_routes.py b/backend/college_transfer_ai/routes/chat_routes.py
index a87c705..e86d196 100644
--- a/backend/college_transfer_ai/routes/chat_routes.py
+++ b/backend/college_transfer_ai/routes/chat_routes.py
@@ -1,21 +1,17 @@
-# filepath: backend/college_transfer_ai/routes/chat_routes.py
 import traceback
 import requests
 import json
 from flask import Blueprint, jsonify, request, current_app
 from datetime import datetime, timedelta, time, timezone
 
-# --- Google AI Imports ---
 import google.generativeai as genai
-# Try importing FunctionResponse from content_types
 from google.generativeai.types import HarmCategory, HarmBlockThreshold, Tool, FunctionDeclaration
-from google.generativeai.types import content_types # Import the module
-# --- End Google AI Imports ---
+from google.generativeai.types import content_types 
 
 from ..utils import verify_google_token, get_or_create_user, check_and_update_usage
-from ..database import get_gridfs, get_db # Import necessary accessors
+from ..database import get_gridfs, get_db 
 
-chat_bp = Blueprint('chat_bp', __name__) # Removed url_prefix, assuming added during registration
+chat_bp = Blueprint('chat_bp', __name__) 
 
 FREE_TIER_LIMIT = 10
 PREMIUM_TIER_LIMIT = 50
@@ -23,7 +19,6 @@
 gemini_model = None
 perplexity_api_key = None
 
-# --- Define the Web Search Tool for Gemini ---
 search_web_func = FunctionDeclaration(
     name="search_web",
     description="Search the web specifically for course prerequisite information. Use this tool when generating an educational plan to find prerequisites for a given course at a specific institution. If a prerequisite course is found, use this tool again to find *its* prerequisites, continuing recursively until no further prerequisites are found or a reasonable depth is reached (e.g., 2-3 levels deep). Only use this for finding prerequisite chains.",
@@ -39,37 +34,29 @@
     }
 )
 search_tool = Tool(function_declarations=[search_web_func])
-# --- End Tool Definition ---
 
 def init_chat_routes(app):
-    """Initialize Gemini model, Perplexity key, and GridFS for chat routes."""
     global gemini_model, perplexity_api_key
 
-    config = app.config['APP_CONFIG'] # Access config directly from the passed 'app' object
+    config = app.config['APP_CONFIG'] 
     google_api_key = config.get('GOOGLE_API_KEY')
-    perplexity_api_key = config.get('PERPLEXITY_API_KEY') # Load Perplexity key
+    perplexity_api_key = config.get('PERPLEXITY_API_KEY') 
 
-    # --- Add app context specifically for DB/GridFS access during init ---
     try:
-        with app.app_context(): # Push context for the 'get_gridfs' call
-            fs_instance = get_gridfs() # Use the accessor function
+        with app.app_context(): 
+            fs_instance = get_gridfs() 
             if fs_instance:
                 print("--- GridFS accessed successfully in init_chat_routes (within context) ---")
-                # Use fs_instance here if needed during init
             else:
-                # This path shouldn't be hit if init_db runs first and succeeds
                 print("!!! WARNING: get_gridfs() returned None in init_chat_routes.")
     except Exception as e:
         print(f"Error during chat routes initialization related to DB/GridFS: {e}")
-        # Handle error appropriately
-    # --- End app context block ---
 
     if not google_api_key:
         print("Warning: GOOGLE_API_KEY not set. Gemini features will be disabled.")
-        return # Exit initialization if key is missing
+        return 
     if not perplexity_api_key:
         print("Warning: PERPLEXITY_API_KEY not set. Web search tool will be disabled.")
-        # Continue initialization even if Perplexity key is missing
 
     try:
         genai.configure(api_key=google_api_key)
@@ -82,12 +69,9 @@ def init_chat_routes(app):
     except Exception as e:
         print(f"!!! Gemini Initialization Error: {e}")
         gemini_model = None
-        # Decide if you want to clear perplexity_api_key here too
 
 
-# --- Helper Function for Perplexity API ---
 def call_perplexity_api(query: str) -> dict:
-    """Calls the Perplexity API with a search query."""
     if not perplexity_api_key:
         print("Error: Perplexity API key not configured.")
         return {"error": "Web search tool not configured."}
@@ -133,10 +117,8 @@ def call_perplexity_api(query: str) -> dict:
         return {"error": "An unexpected error occurred during web search."}
 
 
-# --- Chat Endpoint ---
 @chat_bp.route('/chat', methods=['POST'])
 def chat_endpoint():
-    # Inside the request handler, it's safe to use get_gridfs() which uses 'g'
     fs_request = get_gridfs()
     if fs_request is None:
          print("Error: GridFS not available for this request.")
@@ -147,13 +129,11 @@ def chat_endpoint():
 
     if not GOOGLE_CLIENT_ID:
          print("Error: GOOGLE_CLIENT_ID not configured.")
-         return jsonify({"error": "Server configuration error"}), 500 # Return error
+         return jsonify({"error": "Server configuration error"}), 500 
     if not gemini_model:
          print("Error: Gemini model not initialized.")
-         return jsonify({"error": "Chat service unavailable"}), 500 # Return error
-    # Removed the fs check here, using fs_request obtained via get_gridfs()
+         return jsonify({"error": "Chat service unavailable"}), 500 
 
-    # 1. Authentication & Authorization
     try:
         auth_header = request.headers.get('Authorization')
         if not auth_header or not auth_header.startswith('Bearer '):
@@ -162,7 +142,6 @@ def chat_endpoint():
         user_info = verify_google_token(token, GOOGLE_CLIENT_ID)
         user_data = get_or_create_user(user_info)
 
-        # 2. Rate Limiting / Usage Check
         if not check_and_update_usage(user_data):
             now = datetime.now(timezone.utc)
             tomorrow = now.date() + timedelta(days=1)
@@ -180,7 +159,6 @@ def chat_endpoint():
         traceback.print_exc()
         return jsonify({"error": "Could not verify usage limits."}), 500
 
-    # 3. Process Request Data
     data = request.get_json()
     if not data or 'new_message' not in data:
         return jsonify({"error": "Missing 'new_message' in request body"}), 400
@@ -189,7 +167,6 @@ def chat_endpoint():
     history = data.get('history', [])
     image_filenames = data.get('image_filenames', [])
 
-    # 4. Prepare Content for Gemini
     prompt_parts = []
     if image_filenames:
         print(f"Processing {len(image_filenames)} images for chat...")
@@ -207,7 +184,6 @@ def chat_endpoint():
 
     prompt_parts.append(new_message_text)
 
-    # 5. Call Gemini API (with Tool Handling)
     try:
         print("Sending initial request to Gemini...")
         api_history = []
@@ -228,7 +204,6 @@ def chat_endpoint():
             }
         )
 
-        # --- Tool Handling Loop ---
         while response.candidates and response.candidates[0].content.parts and isinstance(response.candidates[0].content.parts[0], genai.types.FunctionCall):
             function_call = response.candidates[0].content.parts[0].function_call
             print(f"--- Gemini requested Function Call: {function_call.name} ---")
@@ -237,35 +212,29 @@ def chat_endpoint():
                 query = function_call.args.get("query")
                 if not query:
                     print("Error: Gemini function call 'search_web' missing 'query' argument.")
-                    # Use the imported module to access FunctionResponse
                     function_response_part = content_types.FunctionResponse(
                         name="search_web",
                         response={"error": "Missing 'query' argument in function call."}
                     )
                 else:
                     search_results = call_perplexity_api(query)
-                    # Use the imported module to access FunctionResponse
                     function_response_part = content_types.FunctionResponse(
                         name="search_web",
                         response=search_results
                     )
 
                 print(f"--- Sending Function Response back to Gemini for {function_call.name} ---")
-                # Pass the FunctionResponse object directly
                 response = chat_session.send_message(content_types.to_content(function_response_part), stream=False)
 
 
             else:
                 print(f"Error: Unknown function call requested by Gemini: {function_call.name}")
-                 # Use the imported module to access FunctionResponse
                 function_response_part = content_types.FunctionResponse(
                     name=function_call.name,
                     response={"error": f"Function '{function_call.name}' is not implemented."}
                 )
-                # Pass the FunctionResponse object directly
                 response = chat_session.send_message(content_types.to_content(function_response_part), stream=False)
 
-        # --- Process Final Response ---
         if not response.candidates or not response.candidates[0].content.parts:
              print("Gemini response blocked or empty after processing. Feedback:", response.prompt_feedback if hasattr(response, 'prompt_feedback') else "N/A")
              try:
diff --git a/backend/college_transfer_ai/routes/course_map_routes.py b/backend/college_transfer_ai/routes/course_map_routes.py
index f481722..a04bc09 100644
--- a/backend/college_transfer_ai/routes/course_map_routes.py
+++ b/backend/college_transfer_ai/routes/course_map_routes.py
@@ -2,11 +2,10 @@
 import traceback
 from flask import Blueprint, jsonify, request, current_app
 from bson.objectid import ObjectId
-from datetime import datetime, timezone # Import timezone
+from datetime import datetime, timezone
 
-# Import necessary functions/objects from other modules
-from ..utils import verify_google_token, get_or_create_user # Removed check_and_update_usage if not used here
-from ..database import get_course_maps_collection # Use getter
+from ..utils import verify_google_token, get_or_create_user
+from ..database import get_course_maps_collection
 
 course_map_bp = Blueprint('course_map_bp', __name__)
 
@@ -17,50 +16,42 @@ def save_course_map():
     if not GOOGLE_CLIENT_ID:
          return jsonify({"error": "Google Client ID not configured."}), 500
 
-    course_maps_collection = get_course_maps_collection() # Get collection
+    course_maps_collection = get_course_maps_collection()
 
-    # 1. Authentication
     try:
         auth_header = request.headers.get('Authorization')
         if not auth_header or not auth_header.startswith('Bearer '):
             return jsonify({"error": "Authorization token missing or invalid"}), 401
         token = auth_header.split(' ')[1]
         user_info = verify_google_token(token, GOOGLE_CLIENT_ID)
-        user_data = get_or_create_user(user_info) # Ensure user exists
+        user_data = get_or_create_user(user_info)
         google_user_id = user_data['google_user_id']
 
-        # 2. Rate Limiting (Optional - decide if saving maps counts towards usage)
-        # Consider if saving maps should be rate-limited. If so, uncomment below.
-        # if not check_and_update_usage(user_data):
-        #     return jsonify({"error": "Usage limit exceeded"}), 429
-
     except ValueError as auth_err:
         return jsonify({"error": str(auth_err)}), 401
-    except Exception as usage_err: # Catch general exceptions from get_or_create_user too
+    except Exception as usage_err:
         print(f"Error during auth/user check for saving map: {usage_err}")
         traceback.print_exc()
         return jsonify({"error": "Could not verify user or usage limits."}), 500
 
-    # 3. Get Map Data
     data = request.get_json()
     nodes = data.get('nodes')
     edges = data.get('edges')
-    map_name = data.get('name', 'Untitled Course Map') # Default name
+    map_name = data.get('name', 'Untitled Course Map')
 
     if nodes is None or edges is None:
         return jsonify({"error": "Missing 'nodes' or 'edges' in request body"}), 400
 
-    # 4. Save to Database
     try:
-        map_id = str(uuid.uuid4()) # Generate a unique ID for the map
+        map_id = str(uuid.uuid4())
         map_document = {
-            "_id": map_id, # Use the generated UUID as the primary key
+            "_id": map_id,
             "google_user_id": google_user_id,
             "name": map_name,
             "nodes": nodes,
             "edges": edges,
-            "created_at": datetime.now(timezone.utc), # Use timezone-aware
-            "updated_at": datetime.now(timezone.utc)  # Use timezone-aware
+            "created_at": datetime.now(timezone.utc),
+            "updated_at": datetime.now(timezone.utc)
         }
         course_maps_collection.insert_one(map_document)
         print(f"Course map '{map_name}' ({map_id}) saved for user {google_user_id}")
@@ -78,9 +69,7 @@ def get_user_course_maps():
     if not GOOGLE_CLIENT_ID:
          return jsonify({"error": "Google Client ID not configured."}), 500
 
-    course_maps_collection = get_course_maps_collection() # Get collection
-
-    # 1. Authentication
+    course_maps_collection = get_course_maps_collection()
     try:
         auth_header = request.headers.get('Authorization')
         if not auth_header or not auth_header.startswith('Bearer '):
@@ -96,15 +85,11 @@ def get_user_course_maps():
         traceback.print_exc()
         return jsonify({"error": "Authentication failed."}), 500
 
-    # 2. Fetch Maps from Database
     try:
-        # Find maps by google_user_id, exclude nodes/edges, sort by updated_at descending
         user_maps = list(course_maps_collection.find(
             {"google_user_id": google_user_id},
-            {"nodes": 0, "edges": 0} # Exclude nodes/edges from the list view
-        ).sort("updated_at", -1)) # Sort by most recently updated
-
-        # _id is already a string UUID, no conversion needed
+            {"nodes": 0, "edges": 0}
+        ).sort("updated_at", -1))
 
         print(f"Found {len(user_maps)} course maps for user {google_user_id}")
         return jsonify(user_maps), 200
@@ -114,7 +99,6 @@ def get_user_course_maps():
         traceback.print_exc()
         return jsonify({"error": "Failed to fetch course maps"}), 500
 
-
 @course_map_bp.route('/course-map/<map_id>', methods=['GET'])
 def get_course_map_details(map_id):
     config = current_app.config['APP_CONFIG']
@@ -122,9 +106,8 @@ def get_course_map_details(map_id):
     if not GOOGLE_CLIENT_ID:
          return jsonify({"error": "Google Client ID not configured."}), 500
 
-    course_maps_collection = get_course_maps_collection() # Get collection
+    course_maps_collection = get_course_maps_collection()
 
-    # 1. Authentication
     try:
         auth_header = request.headers.get('Authorization')
         if not auth_header or not auth_header.startswith('Bearer '):
@@ -140,21 +123,17 @@ def get_course_map_details(map_id):
         traceback.print_exc()
         return jsonify({"error": "Authentication failed."}), 500
 
-    # 2. Fetch Specific Map from Database
     try:
-        # Find map by its custom _id (which is a string UUID)
         course_map = course_maps_collection.find_one({"_id": map_id})
 
         if not course_map:
             return jsonify({"error": "Course map not found"}), 404
 
-        # 3. Authorization Check: Ensure the map belongs to the authenticated user
         if course_map.get("google_user_id") != google_user_id:
             print(f"Authorization failed: User {google_user_id} tried to access map {map_id} owned by {course_map.get('google_user_id')}")
-            return jsonify({"error": "Not authorized to access this course map"}), 403 # Forbidden
+            return jsonify({"error": "Not authorized to access this course map"}), 403
 
         print(f"Fetched details for course map {map_id}")
-        # _id is already a string UUID, no conversion needed
         return jsonify(course_map), 200
 
     except Exception as e:
@@ -162,7 +141,6 @@ def get_course_map_details(map_id):
         traceback.print_exc()
         return jsonify({"error": "Failed to fetch course map details"}), 500
 
-# --- Add PUT endpoint for updating maps ---
 @course_map_bp.route('/course-map/<map_id>', methods=['PUT'])
 def update_course_map(map_id):
     config = current_app.config['APP_CONFIG']
@@ -170,9 +148,8 @@ def update_course_map(map_id):
     if not GOOGLE_CLIENT_ID:
          return jsonify({"error": "Google Client ID not configured."}), 500
 
-    course_maps_collection = get_course_maps_collection() # Get collection
+    course_maps_collection = get_course_maps_collection()
 
-    # 1. Authentication
     try:
         auth_header = request.headers.get('Authorization')
         if not auth_header or not auth_header.startswith('Bearer '):
@@ -188,16 +165,14 @@ def update_course_map(map_id):
         traceback.print_exc()
         return jsonify({"error": "Authentication failed."}), 500
 
-    # 2. Get Update Data
     data = request.get_json()
     nodes = data.get('nodes')
     edges = data.get('edges')
-    map_name = data.get('name') # Optional: allow renaming
+    map_name = data.get('name')
 
     if nodes is None and edges is None and map_name is None:
         return jsonify({"error": "No update data provided (nodes, edges, or name)"}), 400
 
-    # 3. Fetch Map and Authorize
     try:
         existing_map = course_maps_collection.find_one({"_id": map_id})
         if not existing_map:
@@ -210,7 +185,6 @@ def update_course_map(map_id):
         traceback.print_exc()
         return jsonify({"error": "Failed to find course map for update"}), 500
 
-    # 4. Perform Update
     try:
         update_fields = {"updated_at": datetime.now(timezone.utc)}
         if nodes is not None: update_fields["nodes"] = nodes
@@ -223,7 +197,6 @@ def update_course_map(map_id):
         )
 
         if result.matched_count == 0:
-             # Should have been caught above, but double-check
              return jsonify({"error": "Course map not found during update"}), 404
 
         print(f"Course map {map_id} updated successfully by user {google_user_id}")
@@ -234,7 +207,6 @@ def update_course_map(map_id):
         traceback.print_exc()
         return jsonify({"error": "Failed to update course map"}), 500
 
-# --- Add DELETE endpoint for deleting maps ---
 @course_map_bp.route('/course-map/<map_id>', methods=['DELETE'])
 def delete_course_map(map_id):
     config = current_app.config['APP_CONFIG']
@@ -242,9 +214,8 @@ def delete_course_map(map_id):
     if not GOOGLE_CLIENT_ID:
          return jsonify({"error": "Google Client ID not configured."}), 500
 
-    course_maps_collection = get_course_maps_collection() # Get collection
+    course_maps_collection = get_course_maps_collection()
 
-    # 1. Authentication
     try:
         auth_header = request.headers.get('Authorization')
         if not auth_header or not auth_header.startswith('Bearer '):
@@ -260,7 +231,6 @@ def delete_course_map(map_id):
         traceback.print_exc()
         return jsonify({"error": "Authentication failed."}), 500
 
-    # 2. Fetch Map and Authorize
     try:
         existing_map = course_maps_collection.find_one({"_id": map_id})
         if not existing_map:
@@ -273,16 +243,14 @@ def delete_course_map(map_id):
         traceback.print_exc()
         return jsonify({"error": "Failed to find course map for deletion"}), 500
 
-    # 3. Perform Deletion
     try:
         result = course_maps_collection.delete_one({"_id": map_id})
 
         if result.deleted_count == 0:
-            # Should have been caught above, but double-check
             return jsonify({"error": "Course map not found during deletion"}), 404
 
         print(f"Course map {map_id} deleted successfully by user {google_user_id}")
-        return jsonify({"message": "Course map deleted successfully"}), 200 # Or 204 No Content
+        return jsonify({"message": "Course map deleted successfully"}), 200
 
     except Exception as e:
         print(f"Error deleting course map {map_id}: {e}")
diff --git a/backend/college_transfer_ai/routes/igetc_routes.py b/backend/college_transfer_ai/routes/igetc_routes.py
index e72031b..6cdc8d7 100644
--- a/backend/college_transfer_ai/routes/igetc_routes.py
+++ b/backend/college_transfer_ai/routes/igetc_routes.py
@@ -1,22 +1,15 @@
 import traceback
 from flask import Blueprint, jsonify, request, current_app
-# Import the specific PDF fetching function
 from ..pdf_service import PdfService
 from ..utils import verify_google_token
-# Import the Assist API client if needed by PdfService initialization (check your __init__.py or app factory)
-from ..assist_api_client import assist_client # Assuming you have this
+from ..assist_api_client import assist_client 
 
 igetc_bp = Blueprint('igetc_bp', __name__)
 
-# Initialize PdfService instance - This might be done in your app factory (__init__.py) instead.
-# If it's initialized globally in the app factory and passed via current_app.extensions or similar,
-# you would access it differently, e.g., pdf_service = current_app.extensions['pdf_service']
-# For this example, we assume direct instantiation here or that it's correctly imported.
-pdf_service = PdfService(assist_client) # Ensure assist_client is available
+pdf_service = PdfService(assist_client) 
 
 @igetc_bp.route('/igetc-agreement', methods=['GET'])
 def get_igetc_agreement():
-    # --- Authentication/Authorization ---
     config = current_app.config['APP_CONFIG']
     GOOGLE_CLIENT_ID = config.get('GOOGLE_CLIENT_ID')
     if not GOOGLE_CLIENT_ID:
@@ -36,7 +29,6 @@ def get_igetc_agreement():
         print(f"Error during IGETC auth check: {e}")
         traceback.print_exc()
         return jsonify({"error": "Authentication failed."}), 500
-    # --- End Auth ---
 
     sending_institution_id = request.args.get('sendingId')
     academic_year_id = request.args.get('academicYearId')
@@ -45,16 +37,14 @@ def get_igetc_agreement():
         return jsonify({"error": "Missing sendingId or academicYearId parameter"}), 400
 
     try:
-        # Call the correct function from the pdf_service instance
-        pdf_filename = pdf_service.get_igetc_courses( # Changed function call
+        pdf_filename = pdf_service.get_igetc_courses( 
             int(academic_year_id), int(sending_institution_id)
         )
 
         if pdf_filename:
             return jsonify({"pdfFilename": pdf_filename}), 200
         else:
-            # pdf_service handles logging, return appropriate error
-            return jsonify({"error": "IGETC agreement PDF not found or could not be generated/saved."}), 404 # Or 500 if it implies an error
+            return jsonify({"error": "IGETC agreement PDF not found or could not be generated/saved."}), 404 
 
     except ValueError:
          return jsonify({"error": "Invalid ID format. IDs must be integers."}), 400
diff --git a/backend/college_transfer_ai/routes/stripe_routes.py b/backend/college_transfer_ai/routes/stripe_routes.py
index d819c8c..5ef8eea 100644
--- a/backend/college_transfer_ai/routes/stripe_routes.py
+++ b/backend/college_transfer_ai/routes/stripe_routes.py
@@ -4,15 +4,13 @@
 from bson.objectid import ObjectId
 from datetime import datetime, timezone
 
-# Import necessary functions/objects from other modules
 from ..utils import verify_google_token, get_or_create_user
-from ..database import get_users_collection # Use getter function
+from ..database import get_users_collection 
 
 stripe_bp = Blueprint('stripe_bp', __name__)
 
 @stripe_bp.route('/create-checkout-session', methods=['POST'])
 def create_checkout_session():
-    # Access config from the current app context
     config = current_app.config['APP_CONFIG']
     STRIPE_PRICE_ID = config.get('STRIPE_PRICE_ID')
     FRONTEND_URL = config.get('FRONTEND_URL')
@@ -28,11 +26,9 @@ def create_checkout_session():
     if not STRIPE_SECRET_KEY:
          return jsonify({"error": "Stripe Secret Key not configured."}), 500
 
-    # Initialize stripe API key for this request context
     stripe.api_key = STRIPE_SECRET_KEY
 
     try:
-        # 1. Authenticate User
         auth_header = request.headers.get('Authorization')
         if not auth_header or not auth_header.startswith('Bearer '):
             return jsonify({"error": "Authorization token missing or invalid"}), 401
@@ -40,16 +36,15 @@ def create_checkout_session():
         user_info = verify_google_token(token, GOOGLE_CLIENT_ID)
         user_data = get_or_create_user(user_info)
         google_user_id = user_data['google_user_id']
-        mongo_user_id = str(user_data['_id']) # Use MongoDB _id as client_reference_id
+        mongo_user_id = str(user_data['_id']) 
 
         print(f"Creating checkout session for user: {google_user_id} (Mongo ID: {mongo_user_id})")
         print(f'Frontend url: {FRONTEND_URL}')
 
-        # --- Refactored Parameter Logic ---
         checkout_session_params = {
             'line_items': [
                 {
-                    'price': STRIPE_PRICE_ID, # Price ID from .env
+                    'price': STRIPE_PRICE_ID, 
                     'quantity': 1,
                 },
             ],
@@ -72,7 +67,6 @@ def create_checkout_session():
                     'google_user_id': google_user_id
                 }
             }
-        # --- End Refactored Parameter Logic ---
 
         checkout_session = stripe.checkout.Session.create(**checkout_session_params)
 
@@ -84,7 +78,6 @@ def create_checkout_session():
         return jsonify({"error": str(auth_err)}), 401
     except stripe.error.StripeError as e:
         print(f"Stripe error creating checkout session: {e}")
-        # Check if the error has a user-friendly message
         user_message = getattr(e, 'user_message', str(e))
         return jsonify({'error': f'Stripe error: {user_message}'}), e.http_status or 500
     except Exception as e:
@@ -105,9 +98,8 @@ def stripe_webhook():
         print("Webhook Error: STRIPE_SECRET_KEY not set.")
         return jsonify({'error': 'Stripe secret key not configured'}), 500
 
-    # Set API key for potential Stripe calls within the handler
     stripe.api_key = STRIPE_SECRET_KEY
-    users_collection = get_users_collection() # Get collection
+    users_collection = get_users_collection() 
 
     payload = request.data
     sig_header = request.headers.get('Stripe-Signature')
@@ -130,7 +122,6 @@ def stripe_webhook():
         print(f"Webhook Error: Unexpected error constructing event - {e}")
         return jsonify({'error': 'Webhook construction error'}), 500
 
-    # --- Handle the event ---
     try:
         event_type = event['type']
         event_data = event['data']['object']
@@ -155,7 +146,7 @@ def stripe_webhook():
                     {"$set": {
                         "stripe_customer_id": stripe_customer_id,
                         "stripe_subscription_id": stripe_subscription_id,
-                        "subscription_status": "processing" # Indicate checkout complete but not fully active yet
+                        "subscription_status": "processing" 
                     }}
                 )
                 if update_result.matched_count == 0:
@@ -183,13 +174,12 @@ def stripe_webhook():
                 print(f"Downgrading user associated with subscription {stripe_subscription_id}")
                 update_data["tier"] = "free"
                 update_data["subscription_expires"] = None
-                if subscription_status != 'canceled': # Mark as ending if not fully canceled yet
+                if subscription_status != 'canceled': 
                     update_data["subscription_status"] = "ending"
             elif subscription_status == 'active' and not cancel_at_period_end:
                  subscription_expires_ts = subscription.current_period_end
                  subscription_expires_dt = datetime.fromtimestamp(subscription_expires_ts, tz=timezone.utc) if subscription_expires_ts else None
                  update_data["subscription_expires"] = subscription_expires_dt
-                 # Ensure tier is premium if subscription becomes active again
                  update_data["tier"] = "premium"
 
             update_result = users_collection.update_one(
@@ -205,7 +195,6 @@ def stripe_webhook():
         elif event_type == 'invoice.payment_succeeded':
             print("Invoice payment succeeded event received.")
             invoice = event_data
-            # --- Get Customer ID and Billing Reason ---
             stripe_customer_id = invoice.get('customer')
             billing_reason = invoice.billing_reason
 
@@ -213,38 +202,31 @@ def stripe_webhook():
             print(f"  Customer ID (from invoice): {stripe_customer_id}")
             print(f"  Billing Reason: {billing_reason}")
 
-            # --- Proceed only if we have the Customer ID ---
             if stripe_customer_id:
                 print(f"Attempting to find user by Stripe Customer ID: {stripe_customer_id}")
                 try:
-                    # Find the user document using the customer ID from the invoice
                     user_doc = users_collection.find_one({"stripe_customer_id": stripe_customer_id})
 
                     if user_doc:
-                        # User found, now check if subscription ID is linked
                         stripe_subscription_id = user_doc.get('stripe_subscription_id')
 
                         if stripe_subscription_id:
-                            # --- Subscription ID found in DB - Proceed with upgrade ---
                             print(f"  User found (Mongo ID: {user_doc['_id']}) with linked Sub ID: {stripe_subscription_id}.")
                             try:
-                                # Retrieve subscription object to get expiration and confirm status
                                 print(f"    Retrieving subscription details for {stripe_subscription_id}...")
                                 subscription = stripe.Subscription.retrieve(stripe_subscription_id)
-                                print(f"    Retrieved subscription object: {subscription}") # Log the full object for inspection
+                                print(f"    Retrieved subscription object: {subscription}") 
 
-                               # --- Get period end from the first subscription item ---
                                 subscription_expires_ts = None
-                                subscription_status = subscription.get('status', 'unknown') # Get status first
+                                subscription_status = subscription.get('status', 'unknown') 
 
                                 if subscription.get('items') and subscription['items'].get('data'):
                                     first_item = subscription['items']['data'][0]
                                     subscription_expires_ts = first_item.get('current_period_end')
-                                # --- End getting period end ---
 
                                 if subscription_expires_ts is None:
                                      print(f"    Webhook Warning: 'current_period_end' not found on first subscription item for {stripe_subscription_id}. Cannot set expiration.")
-                                     subscription_expires_dt = None # Handle missing timestamp
+                                     subscription_expires_dt = None 
                                 else:
                                      subscription_expires_dt = datetime.fromtimestamp(subscription_expires_ts, tz=timezone.utc)
 
@@ -254,28 +236,23 @@ def stripe_webhook():
 
                                 update_data = {
                                     "subscription_status": subscription_status,
-                                    "subscription_expires": subscription_expires_dt, # Will be None if timestamp was missing
-                                    "tier": "premium" # Set/confirm premium tier
+                                    "subscription_expires": subscription_expires_dt, 
+                                    "tier": "premium" 
                                 }
 
-                                # Reset usage on initial creation or renewal
                                 if billing_reason in ['subscription_create', 'subscription_cycle']:
                                     print(f"  Subscription payment ({billing_reason}). Resetting usage.")
                                     update_data["requests_used_this_period"] = 0
                                     update_data["period_start_date"] = datetime.now(timezone.utc)
 
-                                # Update the user document
                                 update_result = users_collection.update_one(
-                                    {"stripe_subscription_id": stripe_subscription_id}, # Find user by subscription ID
+                                    {"stripe_subscription_id": stripe_subscription_id}, 
                                     {"$set": update_data}
                                 )
                                 if update_result.matched_count > 0:
                                     print(f"  Successfully updated subscription details/tier for user associated with {stripe_subscription_id}.")
-                                    # Success - return 200
-                                    # return jsonify({'success': True}), 200 # This will be handled by the final return
                                 else:
                                     print(f"Webhook Warning: User update failed for subscription {stripe_subscription_id} during {billing_reason} update, even after finding user.")
-                                    # Return 500 as something went wrong during update
                                     return jsonify({'error': 'Internal server error updating user'}), 500
 
                             except stripe.error.StripeError as sub_err:
@@ -286,25 +263,18 @@ def stripe_webhook():
                                 traceback.print_exc()
                                 return jsonify({'error': 'Internal server error processing subscription'}), 500
                         else:
-                            # --- User found BUT Subscription ID NOT linked yet ---
                             print(f"Webhook Info: User found for customer {stripe_customer_id}, but stripe_subscription_id not linked yet. Requesting retry.")
-                            # Return 503 to ask Stripe to retry later
                             return jsonify({'error': 'Subscription data not ready, please retry'}), 503
                     else:
-                        # --- User NOT found by Customer ID ---
                         print(f"Webhook Info: No user found in DB for Stripe Customer ID: {stripe_customer_id}. Checkout session likely not processed yet. Requesting retry.")
-                        # Return 503 to ask Stripe to retry later
                         return jsonify({'error': 'User data not ready, please retry'}), 503
 
                 except Exception as db_err:
                     print(f"Webhook Error: Database error finding user by customer ID {stripe_customer_id}: {db_err}")
                     traceback.print_exc()
-                    # Return 500 to indicate a server error during DB lookup
                     return jsonify({'error': 'Internal server error finding user'}), 500
             else:
-                # Log if the customer ID wasn't on the invoice object itself (highly unlikely)
                 print(f"Webhook Error: Skipping invoice.payment_succeeded because 'customer' ID was missing from the invoice object.")
-                # Return 400 Bad Request as the event data is incomplete
                 return jsonify({'error': 'Missing customer ID in invoice event'}), 400
 
         elif event_type == 'invoice.payment_failed':
@@ -313,12 +283,11 @@ def stripe_webhook():
             if stripe_subscription_id:
                 print(f"Invoice payment failed for subscription {stripe_subscription_id}.")
                 try:
-                    # Retrieve subscription to get the latest status (e.g., 'past_due')
                     subscription = stripe.Subscription.retrieve(stripe_subscription_id)
                     subscription_status = subscription.status
                     update_result = users_collection.update_one(
                         {"stripe_subscription_id": stripe_subscription_id},
-                        {"$set": {"subscription_status": subscription_status}} # Update status, don't change tier yet
+                        {"$set": {"subscription_status": subscription_status}} 
                     )
                     if update_result.matched_count > 0:
                         print(f"Updated subscription status to '{subscription_status}' for user associated with {stripe_subscription_id}.")
@@ -331,9 +300,7 @@ def stripe_webhook():
                      traceback.print_exc()
 
         else:
-            # Optional: Log other events if needed for debugging
-            # print(f"Unhandled event type {event_type}")
-            pass # Ignore other event types silently
+            pass 
 
     except KeyError as e:
         print(f"Webhook Error: Missing expected key in event data - {e}")
@@ -341,9 +308,7 @@ def stripe_webhook():
     except Exception as e:
         print(f"Webhook Error: Error handling event {event.get('type', 'N/A')} - {e}")
         traceback.print_exc()
-        # Return 500 but let Stripe retry if possible
         return jsonify({'error': 'Internal server error handling webhook'}), 500
 
-    # Acknowledge receipt of the event if no error response was sent earlier
     print("Webhook processing complete, acknowledging event.")
     return jsonify({'success': True}), 200
diff --git a/backend/college_transfer_ai/routes/user_routes.py b/backend/college_transfer_ai/routes/user_routes.py
index 9be0fd0..aaffe1e 100644
--- a/backend/college_transfer_ai/routes/user_routes.py
+++ b/backend/college_transfer_ai/routes/user_routes.py
@@ -2,14 +2,13 @@
 from datetime import datetime, timedelta, time, timezone
 import traceback
 
-# Import necessary functions/objects from other modules
 from ..utils import verify_google_token, get_or_create_user, FREE_TIER_LIMIT, PREMIUM_TIER_LIMIT
 
 user_bp = Blueprint('user_bp', __name__)
 
 @user_bp.route('/user-status', methods=['GET'])
 def get_user_status():
-    print("--- !!! GET /api/user-status endpoint hit !!! ---") # Add this line
+    print("--- !!! GET /api/user-status endpoint hit !!! ---") 
     config = current_app.config['APP_CONFIG']
     GOOGLE_CLIENT_ID = config.get('GOOGLE_CLIENT_ID')
     if not GOOGLE_CLIENT_ID:
@@ -29,26 +28,24 @@ def get_user_status():
         requests_used = user_data.get('requests_used_this_period', 0)
         period_start = user_data.get('period_start_date')
 
-        now = datetime.now(timezone.utc) # Use timezone-aware
+        now = datetime.now(timezone.utc) 
         reset_time_iso = None
 
-        # Calculate reset time (assuming daily reset at UTC midnight)
         try:
             tomorrow = now.date() + timedelta(days=1)
             tomorrow_midnight_utc = datetime.combine(tomorrow, time(0, 0), tzinfo=timezone.utc)
-            reset_time_iso = tomorrow_midnight_utc.isoformat(timespec='seconds') # Use ISO format with seconds
+            reset_time_iso = tomorrow_midnight_utc.isoformat(timespec='seconds') 
         except Exception as time_err:
             print(f"Error calculating reset time: {time_err}")
             reset_time_iso = "Error calculating reset time"
 
 
-        # Check if usage needs reset for display purposes (doesn't update DB here)
         display_requests_used = requests_used
         if period_start and isinstance(period_start, datetime):
              if period_start.tzinfo is None:
                  period_start = period_start.replace(tzinfo=timezone.utc)
              if period_start.date() < now.date():
-                 display_requests_used = 0 # Display as 0 if period has reset
+                 display_requests_used = 0 
 
         print(f"User status requested for {user_data.get('google_user_id')}: Used={display_requests_used}, Limit={limit}, Tier={tier}, Resets={reset_time_iso}")
 
@@ -56,7 +53,7 @@ def get_user_status():
             "tier": tier,
             "usageCount": display_requests_used,
             "usageLimit": limit,
-            "resetTime": reset_time_iso # ISO 8601 format string (UTC)
+            "resetTime": reset_time_iso 
         }), 200
 
     except ValueError as auth_err:
diff --git a/backend/college_transfer_ai/utils.py b/backend/college_transfer_ai/utils.py
index 2ca33b2..263cd18 100644
--- a/backend/college_transfer_ai/utils.py
+++ b/backend/college_transfer_ai/utils.py
@@ -4,39 +4,28 @@
 from google.oauth2 import id_token
 from google.auth.transport import requests as google_requests
 from bson.objectid import ObjectId
-# Import collection getter functions instead of direct collection objects
 from .database import get_users_collection
 
-# --- Rate Limits (Example: Daily) ---
 FREE_TIER_LIMIT = 10
-PREMIUM_TIER_LIMIT = 100 # Example limit for paid users
+PREMIUM_TIER_LIMIT = 100
 
-# --- Helper: Verify Google Token ---
 def verify_google_token(token, client_id):
-    """Verifies Google ID token and returns user info."""
-    if not client_id:
-        raise ValueError("Google Client ID not configured for verification.")
     try:
-        idinfo = id_token.verify_oauth2_token(
-            token, google_requests.Request(), client_id
-        )
-        print(f"Token verified for user: {idinfo.get('sub')}")
+        idinfo = id_token.verify_oauth2_token(token, google_requests.Request(), client_id)
+        if idinfo['iss'] not in ['accounts.google.com', 'https://accounts.google.com']:
+            raise ValueError('Wrong issuer.')
         return idinfo
-    except ValueError as e:
-        print(f"Token verification failed: {e}")
-        raise ValueError(f"Invalid token: {e}")
+    except ValueError as ve:
+        print(f"Google token verification failed: {ve}")
+        traceback.print_exc()
+        raise ValueError(f"Invalid token: {ve}")
     except Exception as e:
-        print(f"Unexpected error during token verification: {e}")
-        raise Exception(f"Token verification error: {e}")
+        print(f"An unexpected error occurred during Google token verification: {e}")
+        traceback.print_exc()
+        raise Exception(f"Token verification failed due to an unexpected error: {e}")
 
-# --- Helper: Get or Create User ---
 def get_or_create_user(idinfo):
-    """
-    Finds a user by google_user_id or creates a new one with default free tier.
-    Ensures Stripe-related fields exist.
-    Returns the user document from MongoDB.
-    """
-    users_collection = get_users_collection() # Get collection via function
+    users_collection = get_users_collection()
 
     google_user_id = idinfo.get('sub')
     if not google_user_id:
@@ -45,17 +34,15 @@ def get_or_create_user(idinfo):
     user = users_collection.find_one({'google_user_id': google_user_id})
 
     if not user:
-        print(f"User {google_user_id} not found. Creating new user.")
         new_user_data = {
             'google_user_id': google_user_id,
             'email': idinfo.get('email'),
             'name': idinfo.get('name'),
-            'tier': 'free', # Default tier
+            'tier': 'free',
             'requests_used_this_period': 0,
-            'period_start_date': datetime.now(timezone.utc), # Use timezone-aware
-            'created_at': datetime.now(timezone.utc), # Use timezone-aware
-            'last_login': datetime.now(timezone.utc), # Use timezone-aware
-            # Add Stripe fields with defaults
+            'period_start_date': datetime.now(timezone.utc),
+            'created_at': datetime.now(timezone.utc),
+            'last_login': datetime.now(timezone.utc),
             "stripe_customer_id": None,
             "stripe_subscription_id": None,
             "subscription_status": None,
@@ -63,17 +50,13 @@ def get_or_create_user(idinfo):
         }
         try:
             insert_result = users_collection.insert_one(new_user_data)
-            print(f"Successfully created new user: {google_user_id} with ID: {insert_result.inserted_id}")
-            # Fetch the newly created user to return it
             user = users_collection.find_one({'_id': insert_result.inserted_id})
             if not user:
-                 raise Exception(f"Failed to retrieve newly created user {google_user_id}")
+                raise Exception(f"Failed to retrieve newly created user {google_user_id}")
         except Exception as e:
-            print(f"Error creating user {google_user_id}: {e}")
             raise Exception(f"Database error creating user: {e}")
     else:
-        # Ensure essential fields exist for older users & update last_login
-        update_query = {'last_login': datetime.now(timezone.utc)} # Use timezone-aware
+        update_query = {'last_login': datetime.now(timezone.utc)}
         set_fields = {}
         if 'tier' not in user: set_fields['tier'] = 'free'
         if 'requests_used_this_period' not in user: set_fields['requests_used_this_period'] = 0
@@ -83,34 +66,23 @@ def get_or_create_user(idinfo):
         if 'subscription_status' not in user: set_fields['subscription_status'] = None
         if 'subscription_expires' not in user: set_fields['subscription_expires'] = None
 
-        if set_fields: # Only update if fields were missing
-             update_query.update(set_fields)
-             users_collection.update_one(
-                 {'google_user_id': google_user_id},
-                 {'$set': update_query}
-             )
-             # Re-fetch user data after update if fields were added
-             user = users_collection.find_one({"google_user_id": google_user_id})
-        else: # Just update last_login if no fields were missing
-             users_collection.update_one(
-                 {'google_user_id': google_user_id},
-                 {'$set': {'last_login': update_query['last_login']}}
-             )
-
-
-        print(f"Found existing user: {google_user_id}, Tier: {user.get('tier')}")
+        if set_fields:
+            update_query.update(set_fields)
+            users_collection.update_one(
+                {'google_user_id': google_user_id},
+                {'$set': update_query}
+            )
+            user = users_collection.find_one({"google_user_id": google_user_id})
+        else:
+            users_collection.update_one(
+                {'google_user_id': google_user_id},
+                {'$set': {'last_login': update_query['last_login']}}
+            )
 
     return user
 
-# --- Helper: Check and Update Usage ---
 def check_and_update_usage(user_data):
-    """
-    Checks if the user is within their usage limit based on tier.
-    Resets daily usage if necessary. Increments usage count if within limit.
-    Returns True if usage is allowed, False otherwise.
-    Raises Exception on database error.
-    """
-    users_collection = get_users_collection() # Get collection via function
+    users_collection = get_users_collection()
 
     tier = user_data.get('tier', 'free')
     limit = PREMIUM_TIER_LIMIT if tier == 'premium' else FREE_TIER_LIMIT
@@ -118,136 +90,96 @@ def check_and_update_usage(user_data):
     period_start = user_data.get('period_start_date')
     google_user_id = user_data.get('google_user_id')
 
-    now = datetime.now(timezone.utc) # Use timezone-aware
+    now = datetime.now(timezone.utc)
     reset_usage = False
 
-    # --- Check if usage period needs reset (daily reset logic) ---
     if period_start and isinstance(period_start, datetime):
-        # Ensure period_start is timezone-aware for comparison
         if period_start.tzinfo is None:
-             period_start = period_start.replace(tzinfo=timezone.utc)
+            period_start = period_start.replace(tzinfo=timezone.utc)
 
         if period_start.date() < now.date():
-            print(f"Resetting daily usage for user {google_user_id}")
             requests_used = 0
-            period_start = now # Use timezone-aware now
+            period_start = now
             reset_usage = True
     else:
-        # If period_start is missing or invalid, reset it
-        print(f"Initializing/Resetting usage period for user {google_user_id}")
         requests_used = 0
-        period_start = now # Use timezone-aware now
+        period_start = now
         reset_usage = True
 
-    # --- Check if limit is exceeded ---
     if requests_used >= limit:
-        print(f"Usage limit exceeded for user {google_user_id} (Tier: {tier}, Used: {requests_used}, Limit: {limit})")
-        return False # Limit exceeded
+        return False
 
-    # --- If limit is not exceeded, increment count ---
     try:
-        # Construct update_fields based on whether usage is being reset
         if reset_usage:
-            # If resetting, SET the count to 1 and update the start date
             update_fields = {
                 '$set': {
                     'requests_used_this_period': 1,
-                    'period_start_date': period_start, # Use timezone-aware period_start
-                    'last_request_timestamp': now # Use timezone-aware now
+                    'period_start_date': period_start,
+                    'last_request_timestamp': now
                 }
             }
-            print(f"  Applying reset update for user {google_user_id}") # Debugging print
         else:
-            # If not resetting, just INCREMENT the count and update the timestamp
             update_fields = {
                 '$inc': {'requests_used_this_period': 1},
-                '$set': {'last_request_timestamp': now} # Use timezone-aware now
+                '$set': {'last_request_timestamp': now}
             }
-            print(f"  Applying increment update for user {google_user_id}") # Debugging print
-
 
         result = users_collection.update_one(
             {'google_user_id': google_user_id},
             update_fields
         )
         if result.matched_count == 0:
-             # This case should ideally not happen if get_or_create_user worked
-             raise Exception(f"User {google_user_id} not found during usage update.")
+            raise Exception(f"User {google_user_id} not found during usage update.")
 
-        print(f"Usage updated for user {google_user_id}: {requests_used + 1}/{limit}")
-        return True # Usage allowed and updated
+        return True
     except Exception as e:
-        print(f"Error updating usage count for user {google_user_id}: {e}")
-        # Add traceback here if it's not already in the calling function's handler
         traceback.print_exc()
         raise Exception(f"Failed to update usage count: {e}")
 
-# --- Helper Function for Intersection (Moved from college_transfer_API.py) ---
 def calculate_intersection(results):
-    """Calculates the intersection of values from multiple dictionary results."""
-    # Corrected syntax: Use Python's 'any' and 'is None'
     if not results or any(res is None for res in results):
         return {}
 
-    # Filter out any potentially empty results before processing
     valid_results = [res for res in results if isinstance(res, dict) and res]
 
     if not valid_results:
-        return {} # No valid data to intersect
+        return {}
 
-    # Get IDs (values) from the first valid result as the starting point
     try:
-        # Ensure values are hashable (like strings or ints) before adding to set
         common_ids = set(str(v) for v in valid_results[0].values())
     except Exception as e:
-        print(f"Error processing first result for intersection: {e}")
-        return {} # First result wasn't as expected
+        return {}
 
-    # Intersect with IDs (values) from subsequent valid results
     for i in range(1, len(valid_results)):
         try:
             current_ids = set(str(v) for v in valid_results[i].values())
-            common_ids.intersection_update(current_ids) # More efficient intersection
+            common_ids.intersection_update(current_ids)
         except Exception as e:
-            print(f"Error processing result {i} for intersection: {e}")
-            continue # Skip if a result is malformed
-
-    print(f"Common IDs after intersection: {common_ids}")
+            continue
 
-    # Rebuild the result object using common IDs
     intersection = {}
-    # Use the first valid result to map IDs back to names (keys)
     name_map_source = valid_results[0]
-    # Create a reverse map (id -> name) for efficiency
     try:
-        # Ensure values are hashable before creating the reverse map
         id_to_name_map = {str(v): k for k, v in name_map_source.items()}
     except Exception as e:
-        print(f"Error creating reverse map for intersection: {e}")
-        id_to_name_map = {} # Handle potential errors if source isn't dict
+        id_to_name_map = {}
 
     for common_id in common_ids:
-        # common_id is already a string from the set creation
         name = id_to_name_map.get(common_id)
         if name:
-            # Find the original ID type if needed, assuming it matches the source value type
             original_id = next((v for v in name_map_source.values() if str(v) == common_id), common_id)
             intersection[name] = original_id
         else:
-            # Fallback: Search other results if name not in first one (less efficient)
-            print(f"Warning: Could not find name for common ID {common_id} in first source. Searching others...")
             found = False
             for res in valid_results:
-                 try:
+                try:
                     for k, v in res.items():
                         if str(v) == common_id:
-                            intersection[k] = v # Use original key and value
+                            intersection[k] = v
                             found = True
                             break
-                 except Exception:
-                     continue # Skip malformed results
-                 if found: break # Found it in this result dict
+                except Exception:
+                    continue
+                if found: break
 
-    print(f"Intersection result: {intersection}")
-    return intersection
-# --- End Helper Function ---
\ No newline at end of file
+    return intersection
\ No newline at end of file
diff --git a/backend/run.py b/backend/run.py
index 8d50190..8453cf0 100644
--- a/backend/run.py
+++ b/backend/run.py
@@ -1,7 +1,5 @@
 import os
 import traceback
-# Ensure the college_transfer_ai package is importable
-# This might require adjusting PYTHONPATH or running from the correct directory
 try:
     from college_transfer_ai import create_app
 except ImportError as e:
@@ -19,11 +17,8 @@
 
 
 if __name__ == '__main__':
-    # Use environment variables for host, port, and debug mode is recommended
     host = os.environ.get('FLASK_RUN_HOST', '0.0.0.0')
-    # Default port to 5000 if not set
     port = int(os.environ.get('FLASK_RUN_PORT', os.environ.get('PORT', 5000)))
-    # Default debug to True if FLASK_DEBUG is not 'false' or '0'
     debug_str = os.environ.get('FLASK_DEBUG', 'True').lower()
     debug = debug_str not in ['false', '0', 'f']
 
@@ -33,11 +28,9 @@
     print(f"Debug Mode: {debug}")
 
     try:
-        # Use waitress or gunicorn in production instead of app.run
         if debug:
             app.run(debug=True, host=host, port=port)
         else:
-            # Example using waitress (install waitress first: pip install waitress)
             try:
                 from waitress import serve
                 print("Running in production mode using waitress...")
diff --git a/backend/tests/test_app.py b/backend/tests/test_app.py
index 9e5ff06..d006c39 100644
--- a/backend/tests/test_app.py
+++ b/backend/tests/test_app.py
@@ -34,4 +34,3 @@ def test_get_academic_years(client):
     data = response.get_json()
     assert isinstance(data, (dict))
 
-# Add more tests for other endpoints as needed
diff --git a/src/App.css b/src/App.css
index 7749adb..1da4689 100644
--- a/src/App.css
+++ b/src/App.css
@@ -1,4 +1,3 @@
-/* Reset and Base Styles */
 @keyframes fadeIn {
   from { opacity: 0; transform: translateY(10px); }
   to { opacity: 1; transform: translateY(0); }
@@ -6,176 +5,165 @@
 
 
 body {
-  /* Use a modern system font stack */
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   margin: 0;
   padding: 0;
-  /* Placeholder background - replace with actual college images */
   background-size: cover;
   background-position: center;
-  background-attachment: fixed; /* Keep background fixed during scroll */
+  background-attachment: fixed; 
   color: #333;
   line-height: 1.6;
-  font-size: 16px; /* Slightly larger base font */
+  font-size: 16px; 
 }
 
-/* Container for centering content */
-#root > div { /* Target the main div rendered by React */
-  margin: 40px auto; /* More vertical margin */
-  padding: 30px 40px; /* Increased padding */
-  /* Slightly transparent white background */
+#root > div { 
+  margin: 40px auto; 
+  padding: 30px 40px; 
   background-color: rgba(255, 255, 255, 0.95);
-  border: 1px solid #e0e0e0; /* Softer border */
-  border-radius: 8px; /* Rounded corners */
-  box-shadow: 0 6px 18px rgba(0,0,0,0.12); /* Slightly stronger shadow */
-  /* Add a subtle fade-in animation */
+  border: 1px solid #e0e0e0; 
+  border-radius: 8px; 
+  box-shadow: 0 6px 18px rgba(0,0,0,0.12); 
   animation: fadeIn 0.5s ease-out forwards;
 }
 
 h1, h2, h3 {
-  color: #1a2b4d; /* Darker, less saturated blue */
+  color: #1a2b4d; 
   margin-top: 0;
-  margin-bottom: 1em; /* Consistent bottom margin */
-  font-weight: 600; /* Slightly bolder */
+  margin-bottom: 1em; 
+  font-weight: 600; 
 }
 
 h1 {
-  font-size: 2.2em; /* Larger H1 */
-  text-align: center; /* Center main title */
+  font-size: 2.2em; 
+  text-align: center; 
   margin-bottom: 1.5em;
 }
 
-/* Form Styling */
 .form-group {
-  margin-bottom: 1.5rem; /* Increased spacing */
+  margin-bottom: 1.5rem; 
   position: relative;
-  /* Add transition for potential future effects */
   transition: all 0.3s ease-in-out;
 }
 
 label {
   display: block;
   margin-bottom: 0.6rem;
-  font-weight: 500; /* Medium weight */
+  font-weight: 500; 
   color: #555;
   font-size: 0.95em;
 }
 
 input[type="text"],
 select {
-  padding: 12px 15px; /* More padding */
+  padding: 12px 15px; 
   width: 100%;
-  border: 1px solid #d1d5db; /* Slightly darker border */
-  border-radius: 6px; /* More rounded corners */
+  border: 1px solid #d1d5db; 
+  border-radius: 6px; 
   box-sizing: border-box;
   font-size: 1rem;
-  transition: border-color 0.2s ease, box-shadow 0.2s ease; /* Smooth transitions */
+  transition: border-color 0.2s ease, box-shadow 0.2s ease; 
 }
 
 input[type="text"]:focus,
 select:focus {
   outline: none;
-  border-color: #3b82f6; /* Blue focus border */
-  box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.3); /* Subtle blue glow */
+  border-color: #3b82f6; 
+  box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.3); 
 }
 
 input[type="text"]:disabled {
-  background-color: #f3f4f6; /* Lighter disabled background */
+  background-color: #f3f4f6; 
   cursor: not-allowed;
   color: #9ca3af;
 }
 
-/* Button Styling */
 button {
-  background-image: linear-gradient(to right, #3b82f6, #2563eb); /* Blue gradient */
+  background-image: linear-gradient(to right, #3b82f6, #2563eb); 
   color: white;
   border: none;
-  padding: 12px 25px; /* More padding */
+  padding: 12px 25px; 
   border-radius: 6px;
   cursor: pointer;
-  font-size: 1.05rem; /* Slightly larger font */
+  font-size: 1.05rem; 
   font-weight: 500;
-  transition: all 0.2s ease; /* Transition all properties */
+  transition: all 0.2s ease; 
   display: inline-block;
   width: auto;
   margin-bottom: 0;
-  box-shadow: 0 2px 4px rgba(0,0,0,0.1); /* Subtle shadow */
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1); 
 }
 
 button:hover {
-  background-image: linear-gradient(to right, #2563eb, #1d4ed8); /* Darker gradient on hover */
-  box-shadow: 0 4px 8px rgba(0,0,0,0.15); /* Slightly larger shadow on hover */
-  transform: translateY(-2px); /* Slightly more lift effect */
+  background-image: linear-gradient(to right, #2563eb, #1d4ed8); 
+  box-shadow: 0 4px 8px rgba(0,0,0,0.15); 
+  transform: translateY(-2px); 
 }
 
 button:active {
-    transform: translateY(0); /* Remove lift on click */
+    transform: translateY(0);
     box-shadow: 0 1px 2px rgba(0,0,0,0.1);
 }
 
 button:disabled {
-  background-image: none; /* Remove gradient */
-  background-color: #9ca3af; /* Gray out disabled button */
+  background-image: none; 
+  background-color: #9ca3af; 
   cursor: not-allowed;
   box-shadow: none;
   transform: none;
 }
 
-/* Result Area */
 .result {
   margin-top: 25px;
-  padding: 20px; /* Increased padding */
+  padding: 20px; 
   border: 1px solid #ddd;
-  background-color: #f8f9fa; /* Slightly different background */
-  border-radius: 6px; /* Match other elements */
-  animation: fadeIn 0.5s ease-out forwards; /* Fade in results */
+  background-color: #f8f9fa; 
+  border-radius: 6px; 
+  animation: fadeIn 0.5s ease-out forwards; 
 }
 
 .result h3 {
   margin-top: 0;
-  color: #495057; /* Slightly darker heading */
+  color: #495057; 
 }
 
-/* Dropdown Styling */
 .dropdown {
   position: absolute;
   background-color: white;
-  border: 1px solid #d1d5db; /* Match input border */
+  border: 1px solid #d1d5db; 
   border-top: none;
   max-height: 250px;
   overflow-y: auto;
   width: 100%;
   box-sizing: border-box;
   z-index: 1000;
-  box-shadow: 0 6px 12px rgba(0,0,0,0.1); /* Slightly larger shadow */
-  border-radius: 0 0 6px 6px; /* Match input rounding */
-  margin-top: -1px; /* Overlap slightly with input */
+  box-shadow: 0 6px 12px rgba(0,0,0,0.1); 
+  border-radius: 0 0 6px 6px; 
+  margin-top: -1px; 
 }
 
 .dropdown-item {
-  padding: 10px 15px; /* More padding */
+  padding: 10px 15px; 
   cursor: pointer;
   font-size: 0.95rem;
-  border-bottom: 1px solid #f3f4f6; /* Lighter separator */
-  transition: background-color 0.15s ease, color 0.15s ease; /* Smooth hover */
+  border-bottom: 1px solid #f3f4f6; 
+  transition: background-color 0.15s ease, color 0.15s ease; 
 }
 .dropdown-item:last-child {
   border-bottom: none;
 }
 
 .dropdown-item:hover {
-  background-color: #eff6ff; /* Very light blue hover */
-  color: #1d4ed8; /* Darker blue text on hover */
+  background-color: #eff6ff; 
+  color: #1d4ed8; 
 }
 
-/* Link Styling */
 a {
-  color: #2563eb; /* Match button blue */
+  color: #2563eb; 
   text-decoration: none;
   transition: color 0.2s ease;
 }
 
 a:hover {
-  color: #1d4ed8; /* Darker blue on hover */
+  color: #1d4ed8; 
   text-decoration: underline;
 }
\ No newline at end of file
diff --git a/src/App.jsx b/src/App.jsx
index 60d8d29..80aa82d 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useCallback } from 'react'; // Add useCallback
+import React, { useState, useEffect, useCallback } from 'react'; 
 import { Routes, Route, useNavigate } from 'react-router-dom';
 import { GoogleLogin, googleLogout } from '@react-oauth/google';
 import { jwtDecode } from "jwt-decode";
@@ -6,22 +6,16 @@ import CollegeTransferForm from './components/CollegeTransferForm';
 import AgreementViewerPage from './components/AgreementViewerPage';
 import CourseMap from './components/CourseMap';
 import './App.css';
-import { fetchData } from './services/api'; // Import fetchData
+import { fetchData } from './services/api'; 
 
-// --- Stripe Imports ---
 import { loadStripe } from '@stripe/stripe-js';
 
-// Load Stripe outside component to avoid recreating on render
 const stripePromise = loadStripe(import.meta.env.VITE_STRIPE_PUBLISHABLE_KEY);
-// --- End Stripe Imports ---
 
 
-// Make USER_STORAGE_KEY exportable or move to constants.js
 export const USER_STORAGE_KEY = 'collegeTransferUser';
 
-// --- Simple Payment Status Components ---
 const PaymentSuccess = () => {
-    // You could fetch session details here to show more info if needed
     return (
         <div style={{ padding: '20px', textAlign: 'center' }}>
             <h2>Payment Successful!</h2>
@@ -40,7 +34,6 @@ const PaymentCancel = () => {
         </div>
     );
 };
-// --- End Payment Status Components ---
 
 
 function App() {
@@ -50,45 +43,39 @@ function App() {
       if (storedUser) {
         const parsedUser = JSON.parse(storedUser);
 
-        // *** Check Token Expiration ***
         if (parsedUser.idToken) {
           const decoded = jwtDecode(parsedUser.idToken);
-          const isExpired = decoded.exp * 1000 < Date.now(); // Convert exp (seconds) to milliseconds
+          const isExpired = decoded.exp * 1000 < Date.now(); 
 
           if (isExpired) {
             console.log("Stored token expired, clearing storage.");
             localStorage.removeItem(USER_STORAGE_KEY);
-            return null; // Treat as logged out
+            return null; 
           }
         } else {
-           // Handle case where token might be missing in stored data
            console.warn("Stored user data missing idToken, clearing storage.");
            localStorage.removeItem(USER_STORAGE_KEY);
            return null;
         }
-        // *** End Check ***
 
         console.log("Loaded valid user from localStorage");
         return parsedUser;
       }
     } catch (error) {
       console.error("Failed to load or validate user from localStorage:", error);
-      localStorage.removeItem(USER_STORAGE_KEY); // Clear corrupted/invalid data
+      localStorage.removeItem(USER_STORAGE_KEY); 
     }
-    return null; // Default to null
+    return null; 
   });
 
-  // --- Add User Tier State ---
-  const [userTier, setUserTier] = useState('free'); // Default to free
+  const [userTier, setUserTier] = useState('free'); 
   const [isLoadingTier, setIsLoadingTier] = useState(false);
-  // --- End User Tier State ---
 
   const navigate = useNavigate();
 
-  // --- Wrap handleLogout in useCallback ---
   const handleLogout = useCallback(() => {
-    googleLogout(); // Clear Google session
-    setUser(null); // Clear React state
+    googleLogout(); 
+    setUser(null); 
     try {
       localStorage.removeItem(USER_STORAGE_KEY);
       console.log("Removed user from localStorage");
@@ -96,34 +83,28 @@ function App() {
       console.error("Failed to remove user from localStorage:", storageError);
     }
     console.log("User logged out.");
-    navigate('/'); // Navigate to home
-    setUserTier('free'); // Reset tier
-  }, [navigate]); // Add navigate as dependency
+    navigate('/'); 
+    setUserTier('free'); 
+  }, [navigate]); 
 
-  // --- Effect to handle automatic logout on token expiry ---
   useEffect(() => {
     const handleAuthExpired = () => {
-      // Avoid logging out if already logged out
       if (localStorage.getItem(USER_STORAGE_KEY)) {
           console.log("Auth expired event received. Logging out.");
-          alert("Your session has expired. Please sign in again."); // Inform user
+          alert("Your session has expired. Please sign in again."); 
           handleLogout();
       }
     };
 
     window.addEventListener('auth-expired', handleAuthExpired);
 
-    // Cleanup listener on component unmount
     return () => {
       window.removeEventListener('auth-expired', handleAuthExpired);
     };
-  }, [handleLogout]); // Add handleLogout dependency
-  // --- End Auto Logout Effect ---
+  }, [handleLogout]); 
 
 
-  // --- Fetch User Status/Tier Effect ---
   useEffect(() => {
-    // Function to fetch status
     const fetchUserStatus = () => {
         if (user && user.idToken) {
             setIsLoadingTier(true);
@@ -133,43 +114,34 @@ function App() {
             .then(data => {
                 if (data && data.tier) {
                     setUserTier(data.tier);
-                    console.log("User tier updated:", data.tier); // Log update
+                    console.log("User tier updated:", data.tier); 
                 } else {
                     console.warn("Could not fetch user tier:", data?.error);
-                    setUserTier('free'); // Fallback
+                    setUserTier('free'); 
                 }
             })
             .catch(err => {
                 console.error("Error fetching user status:", err);
-                setUserTier('free'); // Fallback on error
+                setUserTier('free'); 
             })
             .finally(() => {
                 setIsLoadingTier(false);
             });
         } else {
-            // If no user, ensure tier is reset to free and not loading
             setUserTier('free');
             setIsLoadingTier(false);
         }
     };
 
-    // Call fetchUserStatus immediately when the effect runs
     fetchUserStatus();
 
-    // OPTIONAL: Add a listener to refetch when the window gains focus
-    // This helps if the user switches tabs and comes back after the webhook has processed
     window.addEventListener('focus', fetchUserStatus);
 
-    // Cleanup listener on unmount or when user changes
     return () => {
         window.removeEventListener('focus', fetchUserStatus);
     };
 
-  // Re-run this effect ONLY when the user object (specifically idToken) changes.
-  // The fetchUserStatus function itself will handle the logic based on the current user state.
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [user?.idToken]); // Depend only on user.idToken
-  // --- End Fetch User Status/Tier ---
+  }, [user?.idToken]); 
 
 
   const handleLoginSuccess = (credentialResponse) => {
@@ -183,9 +155,8 @@ function App() {
         name: decoded.name,
         email: decoded.email,
       };
-      setUser(newUser); // Update React state
+      setUser(newUser); 
 
-      // Save user data to localStorage
       try {
         localStorage.setItem(USER_STORAGE_KEY, JSON.stringify(newUser));
         console.log("Saved user to localStorage");
@@ -196,19 +167,17 @@ function App() {
     } catch (error) {
       console.error("Error decoding JWT:", error);
       setUser(null);
-      localStorage.removeItem(USER_STORAGE_KEY); // Clear storage on error
+      localStorage.removeItem(USER_STORAGE_KEY); 
     }
-    // User state update will trigger the useEffect to fetch tier
   };
 
   const handleLoginError = () => {
     console.error("Google Login Failed");
     setUser(null);
-    localStorage.removeItem(USER_STORAGE_KEY); // Clear storage on login error
-    setUserTier('free'); // Reset tier on login error
+    localStorage.removeItem(USER_STORAGE_KEY); 
+    setUserTier('free'); 
   };
 
-  // --- Use useCallback version for manual logout button ---
   const handleManualLogoutClick = useCallback(() => {
       handleLogout();
   }, [handleLogout]);
@@ -222,14 +191,12 @@ function App() {
 
       try {
           console.log("Requesting checkout session...");
-          // Call your backend to create the checkout session
           const response = await fetchData('create-checkout-session', {
               method: 'POST',
               headers: {
                   'Authorization': `Bearer ${user.idToken}`,
-                  'Content-Type': 'application/json' // Ensure content type is set if sending body (though not needed here)
+                  'Content-Type': 'application/json' 
               },
-              // body: JSON.stringify({ priceId: 'YOUR_STRIPE_PRICE_ID' }) // If sending priceId from frontend
           });
 
           if (response && response.sessionId) {
@@ -238,7 +205,6 @@ function App() {
               const { error } = await stripe.redirectToCheckout({
                   sessionId: response.sessionId,
               });
-              // If `redirectToCheckout` fails due to browser blocking, display an error
               if (error) {
                   console.error("Stripe redirect failed:", error);
                   alert(`Payment redirect failed: ${error.message}`);
@@ -251,23 +217,19 @@ function App() {
           alert(`Could not initiate payment: ${error.message}`);
       }
   };
-  // --- End Handle Upgrade Click ---
 
 
   return (
     <>
-      {/* Navigation/Header remains the same */}
       <nav style={{ padding: '10px 20px', backgroundColor: '#eee', borderBottom: '1px solid #ccc', display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
         <div>
-          {/* Replace Link with button and onClick */}
           <button 
             onClick={() => navigate('/')} 
             className="btn btn-primary" 
-            style={{ marginRight: '15px' }} // Keep margin separate if needed
+            style={{ marginRight: '15px' }} 
           >
             Home
           </button>
-          {/* Replace Link with button and onClick */}
           <button 
             onClick={() => navigate('/course-map')}
             className="btn btn-secondary"
@@ -280,23 +242,21 @@ function App() {
             <>
               <span style={{ marginRight: '10px', fontSize: '0.9em' }}>
                   Welcome, {user.name || user.email}!
-                  {/* Display Tier */}
                   {!isLoadingTier && ` (Tier: ${userTier})`}
                   {isLoadingTier && ` (Loading tier...)`}
               </span>
 
-              {/* Conditionally show Upgrade Button */}
               {userTier === 'free' && !isLoadingTier && (
                   <button
                       onClick={handleUpgradeClick}
-                      className="btn btn-success" // Use a different color for upgrade
+                      className="btn btn-success" 
                       style={{ margin: '0 10px' }}
                   >
                       Upgrade to Premium
                   </button>
               )}
 
-              <button onClick={handleManualLogoutClick} className="btn btn-danger"> {/* Use useCallback version */}
+              <button onClick={handleManualLogoutClick} className="btn btn-danger"> 
                 Logout
               </button>
             </>
@@ -309,20 +269,16 @@ function App() {
         </div>
       </nav>
 
-      {/* Routes remain the same */}
       <Routes>
         <Route path="/" element={<CollegeTransferForm />} />
         <Route
           path="/agreement/:sendingId/:receivingId/:yearId"
-          // Pass user and tier to AgreementViewerPage
           element={<AgreementViewerPage user={user} userTier={userTier} />}
         />
         <Route
           path="/course-map"
-          // Always render CourseMap, pass user (null if not logged in)
           element={<CourseMap user={user} />}
         />
-        {/* Add routes for payment status */}
         <Route path="/payment-success" element={<PaymentSuccess />} />
         <Route path="/payment-cancel" element={<PaymentCancel />} />
       </Routes>
diff --git a/src/components/AgreementViewerPage.jsx b/src/components/AgreementViewerPage.jsx
index 8c40653..0ea32fd 100644
--- a/src/components/AgreementViewerPage.jsx
+++ b/src/components/AgreementViewerPage.jsx
@@ -1,53 +1,37 @@
 import React, { useState, useEffect, useRef, useMemo } from 'react';
 import { useParams, useLocation } from 'react-router-dom';
-
-// Import Components
 import PdfViewer from './PdfViewer';
 import ChatInterface from './ChatInterface';
-import MajorsList from './AgreementViewerPage/MajorsList'; // Adjusted path
-import AgreementTabs from './AgreementViewerPage/AgreementTabs'; // Adjusted path
-import UsageStatusDisplay from './AgreementViewerPage/UsageStatusDisplay'; // Adjusted path
-
-// Import Hooks
-import { useResizeHandler } from '../hooks/useResizeHandler'; // Adjusted path
-import { useUsageStatus } from '../hooks/useUsageStatus'; // Adjusted path
-import { useAgreementData } from '../hooks/useAgreementData'; // Adjusted path
-
-// Import CSS
-import '../App.css'; // Keep general styles if needed
+import MajorsList from './AgreementViewerPage/MajorsList';
+import AgreementTabs from './AgreementViewerPage/AgreementTabs';
+import UsageStatusDisplay from './AgreementViewerPage/UsageStatusDisplay';
+import { useResizeHandler } from '../hooks/useResizeHandler';
+import { useUsageStatus } from '../hooks/useUsageStatus';
+import { useAgreementData } from '../hooks/useAgreementData';
+import '../App.css';
 
-// Constants
 const MIN_COL_WIDTH = 150;
 const FIXED_MAJORS_WIDTH = 300;
 
-// Helper function to format remaining time (moved to useUsageStatus hook)
-// function formatRemainingTime(resetTimestamp) { ... }
-
-
 function AgreementViewerPage({ user, userTier }) {
     const { sendingId: initialSendingId, receivingId, yearId } = useParams();
     const location = useLocation();
 
-    // Memoize the array of institution objects
     const allSelectedSendingInstitutions = useMemo(() => {
-        // Use the *first* selected institution for IGETC fetching logic
         return location.state?.allSelectedSendingInstitutions || [{ id: initialSendingId, name: 'Unknown Sending Institution' }];
     }, [location.state?.allSelectedSendingInstitutions, initialSendingId]);
 
-    // Memoize the array of institution IDs derived from the above
     const memoizedAllSendingInstitutionIds = useMemo(() => {
         return allSelectedSendingInstitutions.map(inst => inst.id);
-    }, [allSelectedSendingInstitutions]); // Dependency is the memoized object array
+    }, [allSelectedSendingInstitutions]);
 
-    // --- State for Majors Column Visibility ---
     const [isMajorsVisible, setIsMajorsVisible] = useState(true);
     const isMajorsVisibleRef = useRef(isMajorsVisible);
     useEffect(() => { isMajorsVisibleRef.current = isMajorsVisible; }, [isMajorsVisible]);
 
-    // --- Custom Hooks ---
     const {
         chatColumnWidth,
-        setChatColumnWidth, // Get setter from hook
+        setChatColumnWidth,
         dividerRef,
         containerRef,
         handleMouseDown,
@@ -56,21 +40,17 @@ function AgreementViewerPage({ user, userTier }) {
     const { usageStatus, countdown } = useUsageStatus(user, userTier);
 
     const {
-        // State & Derived State
         selectedCategory, majors, isLoadingMajors, error, pdfError,
         selectedMajorKey, selectedMajorName, isLoadingPdf, majorSearchTerm,
         hasMajorsAvailable, hasDepartmentsAvailable, isLoadingAvailability,
         agreementData, activeTabIndex, imagesForActivePdf,
         currentPdfFilename, filteredMajors,
-        allAgreementsImageFilenames, // <-- This now comes directly from useAgreementData's state
-
-        // Handlers & Setters
+        allAgreementsImageFilenames,
         handleMajorSelect, handleCategoryChange, handleTabClick, setMajorSearchTerm,
     } = useAgreementData(initialSendingId, receivingId, yearId, user, allSelectedSendingInstitutions);
 
-    // --- Toggle Majors Visibility ---
     const toggleMajorsVisibility = () => {
-        const gapWidth = 16; // Assuming 1em = 16px (sync with CSS if using em)
+        const gapWidth = 16;
         const majorsColumnTotalWidth = FIXED_MAJORS_WIDTH + gapWidth;
 
         setIsMajorsVisible(prevVisible => {
@@ -79,23 +59,15 @@ function AgreementViewerPage({ user, userTier }) {
             if (containerRef.current) {
                 const containerWidth = containerRef.current.getBoundingClientRect().width;
                 const pdfMinWidth = MIN_COL_WIDTH;
-                const dividerWidth = 1; // Width of the draggable divider
+                const dividerWidth = 1;
 
                 if (!nextVisible) {
-                    // --- HIDING MAJORS ---
-                    // Calculate available width when majors are hidden
-                    const availableWidthForChatAndPdf = containerWidth - pdfMinWidth - dividerWidth - gapWidth; // Space left for Chat + PDF Min + Gaps
-                    // Target width: current chat width + space freed by majors
+                    const availableWidthForChatAndPdf = containerWidth - pdfMinWidth - dividerWidth - gapWidth;
                     const targetChatWidth = chatColumnWidth + majorsColumnTotalWidth;
-                    // New width is the smaller of the target or the max available space
                     const newChatWidth = Math.min(targetChatWidth, availableWidthForChatAndPdf);
-                    // Ensure it doesn't go below min width (shouldn't happen when increasing, but good practice)
                     setChatColumnWidth(Math.max(newChatWidth, MIN_COL_WIDTH));
                 } else {
-                    // --- SHOWING MAJORS ---
-                    // Target width: current chat width - space needed for majors
                     const targetChatWidth = chatColumnWidth - majorsColumnTotalWidth;
-                    // New width is the larger of the target or the minimum allowed chat width
                     const newChatWidth = Math.max(targetChatWidth, MIN_COL_WIDTH);
                     setChatColumnWidth(newChatWidth);
                 }
@@ -104,21 +76,16 @@ function AgreementViewerPage({ user, userTier }) {
         });
     };
 
-    // --- Layout Calculation ---
     const currentChatFlexBasis = `${chatColumnWidth}px`;
     const userName = user?.name || user?.email || "You";
-    const mainContentHeight = `calc(90vh - 53px)`; // Assuming nav height + padding
+    const mainContentHeight = `calc(90vh - 53px)`;
 
-    // Determine current sending ID based on the first selected institution
-    // Memoize this as well, although less critical than the array
     const currentSendingId = useMemo(() => allSelectedSendingInstitutions[0]?.id, [allSelectedSendingInstitutions]);
 
-    // Use the state from the hook directly and memoize it
     const memoizedImageFilenamesForChat = useMemo(() => {
-        return allAgreementsImageFilenames || []; // Default to [] if it's somehow undefined initially
+        return allAgreementsImageFilenames || [];
     }, [allAgreementsImageFilenames]);
 
-    // Log to see when it updates
     useEffect(() => {
         console.log("AgreementViewerPage: memoizedImageFilenamesForChat updated:", memoizedImageFilenamesForChat);
     }, [memoizedImageFilenamesForChat]);
@@ -139,7 +106,6 @@ function AgreementViewerPage({ user, userTier }) {
             >
                 <UsageStatusDisplay user={user} usageStatus={usageStatus} countdown={countdown} />
 
-                {/* Pass isMajorsVisible directly */}
                 <MajorsList
                     isMajorsVisible={isMajorsVisible}
                     toggleMajorsVisibility={toggleMajorsVisibility}
@@ -147,80 +113,73 @@ function AgreementViewerPage({ user, userTier }) {
                     handleCategoryChange={handleCategoryChange}
                     majorSearchTerm={majorSearchTerm}
                     setMajorSearchTerm={setMajorSearchTerm}
-                    filteredMajors={filteredMajors} // Pass filtered list
+                    filteredMajors={filteredMajors}
                     handleMajorSelect={handleMajorSelect}
                     isLoadingMajors={isLoadingMajors}
-                    error={error} // Pass majors list error
+                    error={error}
                     hasMajorsAvailable={hasMajorsAvailable}
                     hasDepartmentsAvailable={hasDepartmentsAvailable}
                     isLoadingAvailability={isLoadingAvailability}
                     selectedMajorKey={selectedMajorKey}
-                    isLoadingPdf={isLoadingPdf} // Pass PDF loading state for indicator
-                    majors={majors} // Pass raw majors for checking length in component
+                    isLoadingPdf={isLoadingPdf}
+                    majors={majors}
                 />
 
-                {/* Middle Column (Chat Interface) */}
                 <div style={{
                     flex: `0 0 ${currentChatFlexBasis}`,
                     display: 'flex',
                     flexDirection: 'column',
                     minWidth: `${MIN_COL_WIDTH}px`,
-                    // Add margin if majors are visible
                     marginLeft: isMajorsVisible ? '1em' : '0',
-                    transition: 'margin-left 0.3s ease' // Smooth transition for margin
+                    transition: 'margin-left 0.3s ease'
                 }}>
                     <ChatInterface
-                        // Pass the memoized COMPLETE list of filenames to useChat
                         imageFilenames={memoizedImageFilenamesForChat}
                         selectedMajorName={selectedMajorName}
                         userName={userName}
-                        isMajorsVisible={isMajorsVisible} // Pass visibility state
-                        toggleMajorsVisibility={toggleMajorsVisibility} // Pass toggle function
-                        sendingInstitutionId={currentSendingId} // Pass memoized current ID
-                        allSendingInstitutionIds={memoizedAllSendingInstitutionIds} // Pass memoized ID array
+                        isMajorsVisible={isMajorsVisible}
+                        toggleMajorsVisibility={toggleMajorsVisibility}
+                        sendingInstitutionId={currentSendingId}
+                        allSendingInstitutionIds={memoizedAllSendingInstitutionIds}
                         receivingInstitutionId={receivingId}
                         academicYearId={yearId}
-                        user={user} // Assuming user object reference is stable from parent/context
+                        user={user}
                     />
                 </div>
 
-                {/* Draggable Divider */}
                 <div
                     ref={dividerRef}
                     style={{
-                        width: `1px`, // Fixed width
+                        width: `1px`,
                         cursor: 'col-resize',
                         backgroundColor: '#e0e0e0',
                         borderLeft: '1px solid #ccc',
                         borderRight: '1px solid #ccc',
                         alignSelf: 'stretch',
                         flexShrink: 0,
-                        // Adjust margin based on majors visibility
-                        marginLeft: '1em', // Always have margin before PDF viewer
+                        marginLeft: '1em',
                         transition: 'margin-left 0.3s ease'
                     }}
                     onMouseDown={handleMouseDown}
                 />
 
-                {/* Right Column (PDF Viewer) */}
                 <div style={{
-                    flex: '1 1 0', // Takes remaining space
+                    flex: '1 1 0',
                     display: 'flex',
                     flexDirection: 'column',
                     minWidth: `${MIN_COL_WIDTH}px`,
-                    marginLeft: '1em' // Always have margin after divider
+                    marginLeft: '1em'
                 }}>
                     <AgreementTabs
                         agreementData={agreementData}
                         activeTabIndex={activeTabIndex}
                         handleTabClick={handleTabClick}
-                        allSelectedSendingInstitutions={allSelectedSendingInstitutions} // Pass original object array here
+                        allSelectedSendingInstitutions={allSelectedSendingInstitutions}
                         yearId={yearId}
                     />
                     <PdfViewer
-                        imageFilenames={imagesForActivePdf} // PDF viewer uses the direct state value
-                        // Refined loading state check
-                        error={pdfError} // Pass PDF viewer error
+                        imageFilenames={imagesForActivePdf}
+                        error={pdfError}
                         filename={currentPdfFilename}
                     />
                 </div>
diff --git a/src/components/AgreementViewerPage/AgreementTabs.jsx b/src/components/AgreementViewerPage/AgreementTabs.jsx
index c45e6b5..ec07031 100644
--- a/src/components/AgreementViewerPage/AgreementTabs.jsx
+++ b/src/components/AgreementViewerPage/AgreementTabs.jsx
@@ -40,7 +40,6 @@ function AgreementTabs({
 
     return (
         <div style={{ display: 'flex', borderBottom: '1px solid #ccc', flexShrink: 0, background: '#e9ecef' }}>
-            {/* Dynamic Major Agreement Tabs */}
             {agreementData.map((agreement, index) => (
                 <button
                     key={agreement.sendingId}
diff --git a/src/components/AgreementViewerPage/MajorsList.jsx b/src/components/AgreementViewerPage/MajorsList.jsx
index 50ce253..a335242 100644
--- a/src/components/AgreementViewerPage/MajorsList.jsx
+++ b/src/components/AgreementViewerPage/MajorsList.jsx
@@ -4,7 +4,7 @@ function MajorsList({
     isMajorsVisible,
     toggleMajorsVisibility,
     selectedCategory,
-    handleCategoryChange, // Pass the handler
+    handleCategoryChange, 
     majorSearchTerm,
     setMajorSearchTerm,
     filteredMajors,
@@ -16,18 +16,18 @@ function MajorsList({
     isLoadingAvailability,
     selectedMajorKey,
     isLoadingPdf,
-    majors // Pass raw majors for checking length
+    majors 
 }) {
     if (!isMajorsVisible) return null;
 
     return (
         <div style={{
-            flex: `0 0 300px`, // Use fixed width directly
+            flex: `0 0 300px`, 
             display: 'flex',
             flexDirection: 'column',
-            minWidth: '150px', // Keep minWidth
+            minWidth: '150px', 
             overflow: 'hidden',
-            transition: 'flex-basis 0.3s ease, min-width 0.3s ease', // flex-basis might not be needed if fixed
+            transition: 'flex-basis 0.3s ease, min-width 0.3s ease', 
             marginRight: '1em',
             position: 'relative',
             paddingTop: '2.5em'
diff --git a/src/components/AgreementViewerPage/UsageStatusDisplay.jsx b/src/components/AgreementViewerPage/UsageStatusDisplay.jsx
index b2bf4c0..e8f6ee8 100644
--- a/src/components/AgreementViewerPage/UsageStatusDisplay.jsx
+++ b/src/components/AgreementViewerPage/UsageStatusDisplay.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 function UsageStatusDisplay({ user, usageStatus, countdown }) {
     if (!user || (usageStatus.usageLimit === null && !usageStatus.error)) {
-        return null; // Don't display if not logged in or status not loaded (and no error)
+        return null; 
     }
 
     return (
diff --git a/src/components/ChatInterface.jsx b/src/components/ChatInterface.jsx
index 82ad696..eaa4bcb 100644
--- a/src/components/ChatInterface.jsx
+++ b/src/components/ChatInterface.jsx
@@ -1,11 +1,7 @@
 import React from 'react';
-
-// Import Components
 import ChatHeader from './ChatInterface/ChatHeader';
 import MessageList from './ChatInterface/MessageList';
 import MessageInput from './ChatInterface/MessageInput';
-
-// Import Hook
 import { useChat } from '../hooks/useChat';
 
 function ChatInterface({
@@ -37,7 +33,6 @@ function ChatInterface({
         academicYearId
     );
 
-    // Determine disabled states and placeholder text
     const isInteractionDisabled = isLoading || !user || !imageFilenames || imageFilenames.length === 0;
     const isSendDisabled = isInteractionDisabled || !userInput.trim();
 
diff --git a/src/components/ChatInterface/ChatMessage.jsx b/src/components/ChatInterface/ChatMessage.jsx
index a78d63e..70c50c7 100644
--- a/src/components/ChatInterface/ChatMessage.jsx
+++ b/src/components/ChatInterface/ChatMessage.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { formatText } from '../../utils/formatText'; // Import the helper
+import { formatText } from '../../utils/formatText'; 
 
 function ChatMessage({ msg, userName }) {
     return (
@@ -13,13 +13,10 @@ function ChatMessage({ msg, userName }) {
                 border: msg.type === 'system' ? '1px solid #f5c6cb' : 'none',
                 maxWidth: '80%',
                 wordWrap: 'break-word',
-                whiteSpace: 'pre-wrap' // Crucial for rendering newlines and spaces correctly
+                whiteSpace: 'pre-wrap' 
             }}>
-                {/* Add Prefix based on type */}
                 {msg.type === 'bot' && <strong style={{ marginRight: '5px' }}>AI:</strong>}
-                {/* Use userName prop if available, otherwise fallback */}
                 {msg.type === 'user' && <strong style={{ marginRight: '5px' }}>{userName || 'You'}:</strong>}
-                {/* Render formatted text */}
                 {formatText(msg.text)}
             </span>
         </div>
diff --git a/src/components/ChatInterface/MessageList.jsx b/src/components/ChatInterface/MessageList.jsx
index f6501e3..5076f13 100644
--- a/src/components/ChatInterface/MessageList.jsx
+++ b/src/components/ChatInterface/MessageList.jsx
@@ -5,7 +5,6 @@ import SignInPrompt from './SignInPrompt';
 function MessageList({ messages, isLoading, chatError, user, userName, placeholderText }) {
     const messagesEndRef = useRef(null);
 
-    // Scroll to bottom effect
     useEffect(() => {
         messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
     }, [messages]);
@@ -16,11 +15,10 @@ function MessageList({ messages, isLoading, chatError, user, userName, placehold
             overflowY: 'auto',
             padding: '10px',
             minHeight: 0,
-            backgroundColor: !user ? '#e9ecef' : '#f9f9f9' // Subtle background change if not logged in
+            backgroundColor: !user ? '#e9ecef' : '#f9f9f9' 
         }}>
             {!user && <SignInPrompt />}
 
-            {/* Display messages only if user is logged in */}
             {user && messages.length === 0 && !isLoading && (
                 <div style={{ textAlign: 'center', color: '#888', marginTop: '20px' }}>
                     {placeholderText}
@@ -30,7 +28,6 @@ function MessageList({ messages, isLoading, chatError, user, userName, placehold
                 <ChatMessage key={index} msg={msg} userName={userName} />
             ))}
             <div ref={messagesEndRef} />
-            {/* Error Indicator (only show if user is logged in) */}
             {user && chatError && !isLoading && <p style={{ color: 'red', textAlign: 'center', fontWeight: 'bold' }}>{chatError}</p>}
         </div>
     );
diff --git a/src/components/CollegeTransferForm.jsx b/src/components/CollegeTransferForm.jsx
index ccc2a62..841fae5 100644
--- a/src/components/CollegeTransferForm.jsx
+++ b/src/components/CollegeTransferForm.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useCallback, useRef } from 'react'; // Add useRef
+import React, { useState, useEffect, useCallback, useRef } from 'react'; 
 import { useNavigate } from 'react-router-dom';
 import { fetchData } from '../services/api';
 import '../App.css';
@@ -8,51 +8,42 @@ import { useAcademicYears } from '../hooks/useAcademicYears';
 const CollegeTransferForm = () => {
     const navigate = useNavigate();
 
-    // --- State for fetched data ---
-    const [institutions, setInstitutions] = useState({}); // All institutions (for sending dropdown)
-    // const [academicYears, setAcademicYears] = useState({});
+    const [institutions, setInstitutions] = useState({}); 
 
-    // --- State for input values and selections ---
     const [sendingInputValue, setSendingInputValue] = useState('');
     const [receivingInputValue, setReceivingInputValue] = useState('');
     const [yearInputValue, setYearInputValue] = useState('');
 
-    const [selectedSendingInstitutions, setSelectedSendingInstitutions] = useState([]); // Array for multiple sending
-    const [selectedReceivingId, setSelectedReceivingId] = useState(null); // Single receiving ID
+    const [selectedSendingInstitutions, setSelectedSendingInstitutions] = useState([]); 
+    const [selectedReceivingId, setSelectedReceivingId] = useState(null); 
     const [selectedYearId, setSelectedYearId] = useState(null);
 
-    // --- State for dropdown visibility and filtered options ---
     const [showSendingDropdown, setShowSendingDropdown] = useState(false);
     const [showReceivingDropdown, setShowReceivingDropdown] = useState(false);
     const [showYearDropdown, setShowYearDropdown] = useState(false);
 
-    // const [filteredInstitutions, setFilteredInstitutions] = useState([]); // No longer needed?
-    const [filteredSending, setFilteredSending] = useState([]); // Options for the *current* sending input
-    const [filteredReceiving, setFilteredReceiving] = useState([]); // Options for receiving input
+    const [filteredSending, setFilteredSending] = useState([]); 
+    const [filteredReceiving, setFilteredReceiving] = useState([]); 
     const [filteredYears, setFilteredYears] = useState([]);
 
-    // --- State for loading and results ---
-    const [isLoading] = useState(false); // Consider separate loading states if needed
+    const [isLoading] = useState(false); 
     const [error, setError] = useState(null);
 
-    // --- Cache Ref for Institutions ---
-    const institutionsCacheRef = useRef(null); // In-memory cache
+    const institutionsCacheRef = useRef(null); 
 
     const { availableReceivingInstitutions, isLoading: isLoadingReceiving, error: receivingError } = useReceivingInstitutions(selectedSendingInstitutions);
     const { academicYears, isLoading: isLoadingYears, error: yearsError } = useAcademicYears(selectedSendingInstitutions, selectedReceivingId);
 
-    // Combine errors if needed, or handle separately
-    const combinedError = receivingError || yearsError || error; // 'error' is the form's general error state
+    const combinedError = receivingError || yearsError || error; 
 
-    // --- Helper Functions (resetForm - adjust state clearing) ---
     // const resetForm = useCallback(() => {
     //     setSendingInputValue('');
     //     setReceivingInputValue('');
     //     setYearInputValue('');
-    //     setSelectedSendingInstitutions([]); // Clear array
-    //     setSelectedReceivingId(null); // Clear single ID
+    //     setSelectedSendingInstitutions([]); 
+    //     setSelectedReceivingId(null); 
     //     setSelectedYearId(null);
-    //     setAvailableReceivingInstitutions({}); // Clear available receiving
+    //     setAvailableReceivingInstitutions({}); 
     //     setFilteredSending([]);
     //     setFilteredReceiving([]);
     //     setFilteredYears([]);
@@ -62,12 +53,10 @@ const CollegeTransferForm = () => {
     //     setError(null);
     // }, []);
 
-    // --- Effects for Initial Data Loading (Institutions, Years) ---
     useEffect(() => {
-        const cacheInstitutionsKey = "allInstitutions"; // More specific key
+        const cacheInstitutionsKey = "allInstitutions"; 
         let cachedInstitutions = null;
 
-        // --- 1. Check In-Memory Cache ---
         if (institutionsCacheRef.current) {
             console.log("Loaded institutions from in-memory cache.");
             setInstitutions(institutionsCacheRef.current);
@@ -75,30 +64,27 @@ const CollegeTransferForm = () => {
             return;
         }
 
-        // --- 2. Check localStorage ---
         try {
             const cachedData = localStorage.getItem(cacheInstitutionsKey);
             if (cachedData) {
                 cachedInstitutions = JSON.parse(cachedData);
                 console.log("Loaded institutions from localStorage:", cacheInstitutionsKey);
                 setInstitutions(cachedInstitutions);
-                institutionsCacheRef.current = cachedInstitutions; // Update in-memory cache
+                institutionsCacheRef.current = cachedInstitutions; 
                 setError(null);
                 return;
             }
         } catch (e) {
             console.error("Error loading institutions from localStorage:", e);
-            localStorage.removeItem(cacheInstitutionsKey); // Clear cache on error
+            localStorage.removeItem(cacheInstitutionsKey); 
         }
 
-        // --- 3. Fetch from API ---
         console.log("Cache miss for institutions. Fetching...");
-        fetchData('/institutions') // Ensure endpoint is correct
+        fetchData('/institutions') 
             .then(data => {
                 if (data && Object.keys(data).length > 0) {
                     setInstitutions(data);
-                    institutionsCacheRef.current = data; // Store in in-memory cache
-                    // --- Cache Result in localStorage ---
+                    institutionsCacheRef.current = data; 
                     try {
                         localStorage.setItem(cacheInstitutionsKey, JSON.stringify(data));
                         console.log("Institutions cached successfully:", cacheInstitutionsKey);
@@ -112,115 +98,9 @@ const CollegeTransferForm = () => {
             })
             .catch(err => setError(`Failed to load institutions: ${err.message}`));
 
-    }, []); // Runs only once on mount
+    }, []); 
 
-    // // --- MODIFIED Effect for Fetching Receiving Institutions based on ALL Senders ---
-    // useEffect(() => {
-    //     // Clear previous receiving selections and data whenever sending institutions change
-    //     setReceivingInputValue('');
-    //     setSelectedReceivingId(null);
-    //     // ALSO CLEAR YEAR SELECTION when sending institutions change
-    //     setYearInputValue('');
-    //     setSelectedYearId(null);
-    //     setFilteredReceiving([]);
-    //     setError(null); // Clear previous errors
-
-    //     const fetchAndIntersectReceiving = async () => {
-    //         if (selectedSendingInstitutions.length === 0) {
-    //             return;
-    //         }
-
-    //         setError(null);
-
-    //         try {
-    //             if (selectedSendingInstitutions.length === 1) {
-    //                 // --- Fetch for a single sender ---
-    //                 const firstSendingId = selectedSendingInstitutions[0].id;
-    //                 console.log("Fetching receiving for single sender:", firstSendingId);
-    //                 const data = await fetchData(`receiving-institutions?sendingId=${firstSendingId}`);
-    //                 if (data && Object.keys(data).length > 0) {
-    //                     setAvailableReceivingInstitutions(data);
-    //                 } else {
-    //                     setError(`No receiving institutions found with agreements for ${selectedSendingInstitutions[0].name}.`);
-    //                 }
-    //             } else {
-    //                 // --- Fetch for multiple senders and find intersection ---
-    //                 console.log("Fetching receiving for multiple senders:", selectedSendingInstitutions.map(s => s.id));
-    //                 const promises = selectedSendingInstitutions.map(sender =>
-    //                     fetchData(`receiving-institutions?sendingId=${sender.id}`)
-    //                         .catch(err => {
-    //                             // Handle individual fetch errors gracefully, maybe return empty object
-    //                             console.error(`Failed to fetch receiving for ${sender.name} (${sender.id}):`, err);
-    //                             return {}; // Return empty object on error for this sender
-    //                         })
-    //                 );
-
-    //                 const results = await Promise.all(promises);
-    //                 console.log("Raw results from multiple fetches:", results);
-
-    //                 // Check if any fetch failed completely (returned null/undefined instead of {})
-    //                 if (results.some(res => res === null || typeof res === 'undefined')) {
-    //                      throw new Error("One or more requests for receiving institutions failed.");
-    //                 }
-
-    //                 // Calculate intersection based on IDs
-    //                 if (results.length > 0) {
-    //                     // Get IDs from the first result as the starting point
-    //                     let commonIds = new Set(Object.values(results[0]));
-
-    //                     // Intersect with IDs from subsequent results
-    //                     for (let i = 1; i < results.length; i++) {
-    //                         const currentIds = new Set(Object.values(results[i]));
-    //                         commonIds = new Set([...commonIds].filter(id => currentIds.has(id)));
-    //                     }
-
-    //                     console.log("Common receiving institution IDs:", commonIds);
-
-    //                     // Rebuild the availableReceivingInstitutions object using common IDs
-    //                     // We need a way to map IDs back to names. We can use the first result
-    //                     // (or any result that isn't empty) that contains the common IDs.
-    //                     const intersection = {};
-    //                     let nameMapSource = results.find(res => Object.keys(res).length > 0) || {};
-    //                     // Create a reverse map (id -> name) from a source result for efficiency
-    //                     const idToNameMap = Object.entries(nameMapSource).reduce((acc, [name, id]) => {
-    //                         acc[id] = name;
-    //                         return acc;
-    //                     }, {});
-
-
-    //                     commonIds.forEach(id => {
-    //                         // Find the name corresponding to the common ID
-    //                         const name = idToNameMap[id];
-    //                         if (name) { // Ensure we found a name
-    //                             intersection[name] = id;
-    //                         } else {
-    //                             console.warn(`Could not find name for common receiving ID: ${id}. This might happen if the ID exists in later results but not the first.`);
-    //                             // As a fallback, you could try searching other results, but this indicates potential data inconsistency.
-    //                         }
-    //                     });
-
-
-    //                     if (Object.keys(intersection).length > 0) {
-    //                         setAvailableReceivingInstitutions(intersection);
-    //                         console.log("Intersection result:", intersection);
-    //                     } else {
-    //                         setError("No common receiving institutions found for the selected sending institutions.");
-    //                     }
-    //                 } else {
-    //                     // Should not happen if selectedSendingInstitutions.length > 1, but handle defensively
-    //                 }
-    //             }
-    //         } catch (err) {
-    //             console.error("Error processing receiving institutions:", err);
-    //             setError(`Failed to load or process receiving institutions: ${err.message}`);
-    //         }
-    //     };
-
-    //     fetchAndIntersectReceiving();
-
-    // }, [selectedSendingInstitutions]); // Re-run when the list of selected senders changes
-
-    // --- Effects for Filtering Dropdowns ---
+    
     const filter = useCallback(
         ((value, data, setFiltered, setShowDropdown, excludeIds = []) => {
             const lowerCaseValue = value.toLowerCase();
@@ -236,13 +116,11 @@ const CollegeTransferForm = () => {
         []
     );
 
-    // Modified useEffect for sending dropdown
     useEffect(() => {
         const alreadySelectedIds = selectedSendingInstitutions.map(inst => inst.id);
         if (sendingInputValue) {
             filter(sendingInputValue, institutions, setFilteredSending, setShowSendingDropdown, alreadySelectedIds);
         } else {
-            // Show all available (not already selected) options on focus/empty
             const allAvailable = Object.entries(institutions)
                 .filter(([, id]) => !alreadySelectedIds.includes(id))
                 .map(([name, id]) => ({ name, id }));
@@ -251,12 +129,11 @@ const CollegeTransferForm = () => {
                 setShowSendingDropdown(false);
             }
         }
-    }, [sendingInputValue, institutions, selectedSendingInstitutions, filter]); // Add selectedSendingInstitutions
+    }, [sendingInputValue, institutions, selectedSendingInstitutions, filter]); 
 
-    // --- MODIFIED useEffect for receiving dropdown filtering ---
     useEffect(() => {
         const sourceData = availableReceivingInstitutions;
-        const excludeIds = []; // No need to exclude senders here
+        const excludeIds = []; 
 
         if (receivingInputValue) {
             filter(receivingInputValue, sourceData, setFilteredReceiving, setShowReceivingDropdown, excludeIds);
@@ -268,12 +145,9 @@ const CollegeTransferForm = () => {
                  setShowReceivingDropdown(false);
              }
         }
-    // Depend on the potentially updated availableReceivingInstitutions
     }, [receivingInputValue, availableReceivingInstitutions, filter]);
 
-    // --- MODIFIED useEffect for year dropdown filtering ---
     useEffect(() => {
-        // Only filter if year input is enabled
         const isYearInputEnabled = selectedSendingInstitutions.length > 0 && selectedReceivingId;
         if (yearInputValue && isYearInputEnabled) {
             filter(yearInputValue, academicYears, setFilteredYears, setShowYearDropdown);
@@ -281,36 +155,29 @@ const CollegeTransferForm = () => {
              if (!document.activeElement || document.activeElement.id !== 'academicYears') {
                  setShowYearDropdown(false);
              }
-             // Only set filtered years if input is enabled, otherwise keep it empty
              setFilteredYears(isYearInputEnabled ? Object.entries(academicYears).map(([name, id]) => ({ name, id })).reverse() : []);
         }
-    }, [yearInputValue, academicYears, filter, selectedSendingInstitutions, selectedReceivingId]); // Add dependencies
+    }, [yearInputValue, academicYears, filter, selectedSendingInstitutions, selectedReceivingId]); 
 
-    // --- Event Handlers ---
     const handleInputChange = (e, setInputValue) => {
         setInputValue(e.target.value);
         setError(null);
     };
 
-    // Modified handleDropdownSelect
     const handleDropdownSelect = (item, inputId) => {
         setError(null);
         switch (inputId) {
             case 'sending':
-                // Add to the array, clear input
                 setSelectedSendingInstitutions(prev => [...prev, item]);
-                setSendingInputValue(''); // Clear input after selection
+                setSendingInputValue(''); 
                 setShowSendingDropdown(false);
                 setFilteredSending([]);
                 break;
             case 'receiving':
-                // Set single receiving ID and value
                 setReceivingInputValue(item.name);
                 setSelectedReceivingId(item.id);
-                // Clear year selection if receiving institution changes
                 setYearInputValue('');
                 setSelectedYearId(null);
-                // Also clear existing academic years data as it's now invalid
                 setShowReceivingDropdown(false);
                 setFilteredReceiving([]);
                 break;
@@ -325,12 +192,10 @@ const CollegeTransferForm = () => {
         }
     };
 
-    // NEW: Handler to remove a selected sending institution
     const handleRemoveSending = (idToRemove) => {
         setSelectedSendingInstitutions(prev => prev.filter(inst => inst.id !== idToRemove));
     };
 
-    // Modified handleViewMajors
     const handleViewMajors = () => {
         if (selectedSendingInstitutions.length === 0) {
             setError("Please select at least one sending institution.");
@@ -341,27 +206,22 @@ const CollegeTransferForm = () => {
             return;
         }
         setError(null);
-        // Use the FIRST selected sending institution for the initial URL path
         const firstSendingId = selectedSendingInstitutions[0].id;
 
-        // Navigate, passing the full list of selected sending institutions in state
         navigate(`/agreement/${firstSendingId}/${selectedReceivingId}/${selectedYearId}`, {
             state: {
-                // Pass the full array of selected sending institutions objects
                 allSelectedSendingInstitutions: selectedSendingInstitutions
             }
         });
     };
 
-    // --- Render Dropdown ---
     const renderDropdown = (items, show, inputId) => {
-        // Ensure items is an array before mapping
         if (!show || !Array.isArray(items) || items.length === 0) return null;
         return (
             <div className="dropdown">
                 {items.map((item) => (
                     <div
-                        key={`${inputId}-${item.id}-${item.name}`} // Ensure unique key
+                        key={`${inputId}-${item.id}-${item.name}`} 
                         className="dropdown-item"
                         onMouseDown={() => handleDropdownSelect(item, inputId)}
                     >
@@ -372,17 +232,14 @@ const CollegeTransferForm = () => {
         );
     };
 
-    // --- Component JSX ---
     return (
         <div style={{ maxWidth: "960px"}}>
             <h1>College Transfer AI</h1>
             {combinedError && <div style={{ color: 'red', marginBottom: '1em' }}>Error: {combinedError}</div>}
 
-            {/* Sending Institution Section */}
             <div className="form-group">
                 <label htmlFor="searchInstitution">Sending Institution(s):</label>
 
-                {/* Display Selected Institutions as Tags */}
                 <div style={{ marginBottom: selectedSendingInstitutions.length > 0 ? '0.5em' : '0', display: 'flex', flexWrap: 'wrap', gap: '0.5em' }}>
                     {selectedSendingInstitutions.map(inst => (
                         <span key={inst.id} className="tag" style={{ display: 'inline-flex', alignItems: 'center', background: '#e0e0e0', padding: '3px 8px', borderRadius: '12px', fontSize: '0.9em' }}>
@@ -398,10 +255,9 @@ const CollegeTransferForm = () => {
                     ))}
                 </div>
 
-                {/* Input for adding next sending institution */}
                 <input
                     type="text"
-                    id="searchInstitution" // Keep ID for focus logic if needed
+                    id="searchInstitution" 
                     placeholder="Type to search and add..."
                     value={sendingInputValue}
                     onChange={(e) => handleInputChange(e, setSendingInputValue)}
@@ -419,13 +275,11 @@ const CollegeTransferForm = () => {
                 {renderDropdown(filteredSending, showSendingDropdown, 'sending')}
             </div>
 
-            {/* Receiving Institution Section (Single Selection) */}
             <div className="form-group">
                 <label htmlFor="receivingInstitution">Receiving Institution:</label>
                 <input
                     type="text"
                     id="receivingInstitution"
-                    // Update placeholder based on loading state and availability
                     placeholder={
                         isLoadingReceiving ? "Loading common institutions..." :
                         selectedSendingInstitutions.length === 0 ? "Select sending institution(s) first..." :
@@ -435,7 +289,6 @@ const CollegeTransferForm = () => {
                     value={receivingInputValue}
                     onChange={(e) => handleInputChange(e, setReceivingInputValue)}
                     onFocus={() => {
-                        // Populate dropdown from 'availableReceivingInstitutions' on focus
                         if (!isLoadingReceiving && selectedSendingInstitutions.length > 0) {
                             const sourceData = availableReceivingInstitutions;
                             const allAvailable = Object.entries(sourceData)
@@ -445,15 +298,12 @@ const CollegeTransferForm = () => {
                         }
                     }}
                     onBlur={() => setShowReceivingDropdown(false)}
-                    // Disable if loading, no senders selected, or (after loading) no common institutions available
                     disabled={isLoadingReceiving || selectedSendingInstitutions.length === 0 || (!isLoadingReceiving && Object.keys(availableReceivingInstitutions).length === 0)}
                     autoComplete="off"
                 />
-                {/* Uses 'filteredReceiving' for display */}
                 {renderDropdown(filteredReceiving, showReceivingDropdown, 'receiving')}
             </div>
 
-            {/* Academic Year */}
             <div className="form-group">
                 <label htmlFor="academicYear">Academic Year:</label>
                 <input
@@ -469,29 +319,24 @@ const CollegeTransferForm = () => {
                     value={yearInputValue}
                     onChange={(e) => handleInputChange(e, setYearInputValue)}
                     onFocus={() => {
-                        // Only show dropdown if input is enabled and not loading
                         if (!isLoadingYears && selectedSendingInstitutions.length > 0 && selectedReceivingId) {
                             const allOptions = Object.entries(academicYears)
                                 .map(([name, id]) => ({ name, id }))
-                                .sort((a, b) => b.name.localeCompare(a.name)); // Sort descending
+                                .sort((a, b) => b.name.localeCompare(a.name)); 
                             setFilteredYears(allOptions);
                             setShowYearDropdown(true);
                         }
                     }}
                     onBlur={() => setShowYearDropdown(false)}
-                    // Disable if loading years, or sending/receiving not selected, or (after loading) no years available
                     disabled={isLoadingYears || selectedSendingInstitutions.length === 0 || !selectedReceivingId || (!isLoadingYears && Object.keys(academicYears).length === 0)}
                     autoComplete="off"
                 />
-                {/* Render dropdown only if input is enabled and not loading */}
                 {(!isLoadingYears && selectedSendingInstitutions.length > 0 && selectedReceivingId) &&
                     renderDropdown(filteredYears, showYearDropdown, 'year')}
             </div>
 
-            {/* MODIFIED: Button - Adjust disabled logic */}
             <button
                 onClick={handleViewMajors}
-                // Disable if loading anything, or basic selections missing
                 disabled={isLoadingYears || isLoadingReceiving || selectedSendingInstitutions.length === 0 || !selectedReceivingId || !selectedYearId || isLoading}
                 title={
                     isLoadingYears ? "Loading common academic years..." :
diff --git a/src/components/CourseMap.jsx b/src/components/CourseMap.jsx
index dbeddd8..36a35a6 100644
--- a/src/components/CourseMap.jsx
+++ b/src/components/CourseMap.jsx
@@ -1,23 +1,19 @@
-// filepath: c:\Users\notto\Desktop\Desktop\Projects\CollegeTransferAI\src\components\CourseMap.jsx
-import React, { useState, useCallback, useRef, useEffect, useMemo } from 'react'; // Added useMemo
+import React, { useState, useCallback, useRef, useEffect, useMemo } from 'react'; 
 import ReactFlow, {
   Controls, Background, addEdge, MiniMap, BackgroundVariant,
   ReactFlowProvider, useReactFlow, useNodesState, useEdgesState,
-  Position // Import Position
+  Position 
 } from 'reactflow';
 import 'reactflow/dist/style.css';
 import { fetchData } from '../services/api';
-import CustomCourseNode from './CustomCourseNode'; // Import the custom node
+import CustomCourseNode from './CustomCourseNode'; 
 
-// --- Default/Initial Data (used for NEW maps) ---
-const defaultNodes = []; // Start new maps empty
+const defaultNodes = []; 
 const defaultEdges = [];
-// --- End Default Data ---
 
-let idCounter = 0; // Reset counter, will be updated based on loaded nodes
+let idCounter = 0; 
 const getUniqueNodeId = () => `new_node_${idCounter++}`;
 
-// --- Edit Input Component (remains the same) ---
 function EditInput({ element, value, onChange, onSave }) {
   const inputRef = useRef(null);
   useEffect(() => {
@@ -36,11 +32,9 @@ function EditInput({ element, value, onChange, onSave }) {
     </div>
   );
 }
-// --- End Edit Input Component ---
 
-// --- Helper Functions for Cache ---
 const getCacheKey = (base, userId, mapId = null) => {
-    if (!userId) return null; // Cannot generate key without user ID
+    if (!userId) return null; 
     return mapId ? `${base}-${userId}-${mapId}` : `${base}-${userId}`;
 };
 
@@ -54,7 +48,7 @@ const loadFromCache = (key) => {
         }
     } catch (e) {
         console.error(`Failed to read or parse cache for ${key}:`, e);
-        localStorage.removeItem(key); // Clear potentially corrupted cache
+        localStorage.removeItem(key); 
     }
     return null;
 };
@@ -66,7 +60,6 @@ const saveToCache = (key, data) => {
         console.log(`Saved to cache: ${key}`);
     } catch (e) {
         console.error(`Failed to save to cache for ${key}:`, e);
-        // Handle potential storage limits if necessary
     }
 };
 
@@ -79,10 +72,9 @@ const removeFromCache = (key) => {
         console.error(`Failed to remove cache for ${key}:`, e);
     }
 };
-// --- End Helper Functions for Cache ---
 
 
-function CourseMapFlow({ user }) { // user object now contains id, idToken, etc. or is null
+function CourseMapFlow({ user }) { 
   const reactFlowWrapper = useRef(null);
   const { screenToFlowPosition } = useReactFlow();
   const [nodes, setNodes, onNodesChange] = useNodesState(defaultNodes);
@@ -92,133 +84,116 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
   const [isLoading, setIsLoading] = useState(true);
   const [saveStatus, setSaveStatus] = useState('');
 
-  // --- State for Multiple Maps ---
-  const [mapList, setMapList] = useState([]); // List of { map_id, map_name, last_updated }
-  const [currentMapId, setCurrentMapId] = useState(null); // ID of the currently loaded map
-  const [currentMapName, setCurrentMapName] = useState('Untitled Map'); // Name of the current map
+  const [mapList, setMapList] = useState([]); 
+  const [currentMapId, setCurrentMapId] = useState(null); 
+  const [currentMapName, setCurrentMapName] = useState('Untitled Map'); 
   const [isMapListLoading, setIsMapListLoading] = useState(true);
-  // --- End State for Multiple Maps ---
 
-  const isLoggedIn = !!user; // Check if user object exists
+  const isLoggedIn = !!user; 
 
-  const userId = user?.id; // Get user ID for cache keys
+  const userId = user?.id; 
 
-  // --- Load Map List (with Cache) ---
   const loadMapList = useCallback(async (forceRefresh = false) => {
     const cacheKey = getCacheKey('courseMapList', userId);
-    // If not logged in, don't attempt to load or cache user-specific lists
     if (!isLoggedIn) {
         setMapList([]);
         setIsMapListLoading(false);
         return [];
     }
 
-    // Try loading from cache first unless forcing refresh
     if (!forceRefresh) {
         const cachedList = loadFromCache(cacheKey);
-        if (cachedList && Array.isArray(cachedList)) { // Added Array.isArray check for cache
+        if (cachedList && Array.isArray(cachedList)) { 
             setMapList(cachedList);
             setIsMapListLoading(false);
             return cachedList;
         } else if (cachedList) {
             console.warn("Cached map list was not an array, removing:", cachedList);
-            removeFromCache(cacheKey); // Remove invalid cache
+            removeFromCache(cacheKey); 
         }
     }
 
-    // If not cached or forcing refresh, fetch from API
     setIsMapListLoading(true);
     try {
       console.log("Fetching map list from API...");
-      const responseData = await fetchData('course-maps', { // Renamed 'list' to 'responseData'
+      const responseData = await fetchData('course-maps', { 
         headers: { 'Authorization': `Bearer ${user.idToken}` }
       });
-      console.log("Raw API response for map list:", responseData); // Log the raw response
+      console.log("Raw API response for map list:", responseData); 
 
-      // --- Added Check ---
-      // Ensure responseData is an array before setting state
       const validList = Array.isArray(responseData) ? responseData : [];
       if (!Array.isArray(responseData)) {
           console.warn("API response for map list was not an array:", responseData);
       }
-      // --- End Check ---
 
       setMapList(validList);
-      saveToCache(cacheKey, validList); // Save fetched list to cache
+      saveToCache(cacheKey, validList); 
       console.log("Map list fetched and cached:", validList);
       return validList;
     } catch (error) {
       console.error("Failed to load map list:", error);
       setSaveStatus(`Error loading map list: ${error.message}`);
-      setMapList([]); // Reset on error
-      removeFromCache(cacheKey); // Clear potentially stale cache on error
+      setMapList([]); 
+      removeFromCache(cacheKey); 
       return [];
     } finally {
       setIsMapListLoading(false);
     }
-  }, [userId, user?.idToken, isLoggedIn]); // Add isLoggedIn dependency
+  }, [userId, user?.idToken, isLoggedIn]); 
 
   const handleNewMap = useCallback(async () => {
-    // Check isLoggedIn first
     if (!isLoggedIn) {
       setSaveStatus("Please log in to create a new map.");
       return;
     }
 
     const mapName = prompt("Enter a name for the new map:", "Untitled Map");
-    if (mapName === null) { // User cancelled prompt
-      setSaveStatus(''); // Clear saving status
+    if (mapName === null) { 
+      setSaveStatus(''); 
       return;
     }
     console.log("Initiating new map creation via API...");
-    setIsLoading(true); // Show loading state for the map area
+    setIsLoading(true); 
     setSaveStatus("Creating new map...");
 
     try {
-      // Call the backend endpoint to create the empty map record
-      const newMapData = await fetchData('course-map', { // POST to the collection endpoint
+      const newMapData = await fetchData('course-map', { 
         method: 'POST',
         headers: {
           'Authorization': `Bearer ${user.idToken}`,
-          'Content-Type': 'application/json' // Good practice
+          'Content-Type': 'application/json' 
         },
-        // --- Send map_name AND empty nodes/edges ---
         body: JSON.stringify({
             map_name: mapName,
-            nodes: [], // Always send empty nodes array for new map
-            edges: []  // Always send empty edges array for new map
+            nodes: [], 
+            edges: []  
         })
-        // --- End Change ---
       });
 
-      // --- Response handling remains the same ---
       if (newMapData && newMapData.map_id) {
         console.log("New map record created:", newMapData);
 
-        // 1. Update Map List State & Cache
         const newMapEntry = {
           map_id: newMapData.map_id,
-          map_name: newMapData.map_name || mapName, // Use returned name or prompted name
-          last_updated: newMapData.last_updated || new Date().toISOString() // Use returned date or now
+          map_name: newMapData.map_name || mapName, 
+          last_updated: newMapData.last_updated || new Date().toISOString() 
         };
         setMapList(prevList => {
           const newList = [newMapEntry, ...prevList];
           newList.sort((a, b) => new Date(b.last_updated) - new Date(a.last_updated));
           const listCacheKey = getCacheKey('courseMapList', userId);
-          saveToCache(listCacheKey, newList); // Update list cache
+          saveToCache(listCacheKey, newList); 
           return newList;
         });
 
-        // 2. Update Current Map State
-        setNodes(defaultNodes); // Reset nodes/edges for the new map
+        setNodes(defaultNodes); 
         setEdges(defaultEdges);
-        setCurrentMapId(newMapData.map_id); // Set the new ID
-        setCurrentMapName(newMapEntry.map_name); // Set the name from newMapEntry
-        idCounter = 0; // Reset node counter
+        setCurrentMapId(newMapData.map_id); 
+        setCurrentMapName(newMapEntry.map_name); 
+        idCounter = 0; 
 
-        // 3. Update Specific Map Cache (optional but good practice)
         const mapCacheKey = getCacheKey('courseMap', userId, newMapData.map_id);
-        saveToCache(mapCacheKey, { // Cache the initial empty state
+        saveToCache(mapCacheKey, { 
             nodes: defaultNodes,
             edges: defaultEdges,
             map_id: newMapData.map_id,
@@ -232,22 +207,18 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
       } else {
         throw new Error("Failed to create map record: Invalid response from server.");
       }
-      // --- End Response handling ---
 
     } catch (error) {
       console.error("Failed to create new map:", error);
       setSaveStatus(`Error creating map: ${error.message}`);
-      // Don't reset state here, keep the user's current view
     } finally {
-      setIsLoading(false); // Hide loading state
+      setIsLoading(false); 
     }
-  }, [userId, user?.idToken, setNodes, setEdges, setMapList, isLoggedIn]); // Add isLoggedIn dependency
+  }, [userId, user?.idToken, setNodes, setEdges, setMapList, isLoggedIn]); 
 
-  // --- Load Specific Map (with Cache) ---
   const loadSpecificMap = useCallback(async (mapId, forceRefresh = false) => {
     const cacheKey = getCacheKey('courseMap', userId, mapId);
 
-    // If not logged in, always show the default empty state
     if (!isLoggedIn) {
       setNodes(defaultNodes);
       setEdges(defaultEdges);
@@ -255,31 +226,30 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
       setCurrentMapName('Untitled Map');
       idCounter = 0;
       setIsLoading(false);
-      setSaveStatus(''); // Clear any previous status
+      setSaveStatus(''); 
       return;
     }
 
-    if (!userId || !mapId) { // Handle new map case
+    if (!userId || !mapId) { 
       setNodes(defaultNodes);
       setEdges(defaultEdges);
       setCurrentMapId(null);
       setCurrentMapName('Untitled Map');
       idCounter = 0;
       setIsLoading(false);
-      setSaveStatus(''); // Clear any previous status
+      setSaveStatus(''); 
       return;
     }
 
     setIsLoading(true);
     setSaveStatus('');
 
-    // Try loading from cache first unless forcing refresh
     if (!forceRefresh) {
         const cachedMap = loadFromCache(cacheKey);
         if (cachedMap && cachedMap.nodes && cachedMap.edges) {
             const loadedNodes = cachedMap.nodes.map(node => ({
                 ...node,
-                type: node.type || 'courseNode' // Assign 'courseNode' if type is missing or default
+                type: node.type || 'courseNode' 
             }));
             setNodes(loadedNodes);
             setEdges(cachedMap.edges);
@@ -290,11 +260,10 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
                 return match ? Math.max(maxId, parseInt(match[1], 10) + 1) : maxId;
             }, cachedMap.nodes.length);
             setIsLoading(false);
-            return; // Exit early if loaded from cache
+            return; 
         }
     }
 
-    // If not cached or forcing refresh, fetch from API
     console.log(`Fetching map data for ID: ${mapId} from API...`);
     try {
       const data = await fetchData(`course-map/${mapId}`, {
@@ -304,7 +273,7 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
         console.log("Loaded map data from API:", data);
         const loadedNodes = data.nodes.map(node => ({
             ...node,
-            type: node.type || 'courseNode' // Assign 'courseNode' if type is missing or default
+            type: node.type || 'courseNode' 
         }));
         setNodes(loadedNodes);
         setEdges(data.edges);
@@ -314,44 +283,39 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
             const match = node.id.match(/^new_node_(\d+)$/);
             return match ? Math.max(maxId, parseInt(match[1], 10) + 1) : maxId;
         }, data.nodes.length);
-        saveToCache(cacheKey, data); // Save fetched map to cache
+        saveToCache(cacheKey, data); 
       } else {
         console.warn(`Map ${mapId} not found or invalid data from API.`);
         setSaveStatus(`Error: Map ${mapId} not found.`);
-        removeFromCache(cacheKey); // Remove potentially invalid cache entry
-        handleNewMap(); // Reset to a new map state
+        removeFromCache(cacheKey); 
+        handleNewMap(); 
       }
     } catch (error) {
       console.error(`Failed to load course map ${mapId}:`, error);
       setSaveStatus(`Error loading map: ${error.message}`);
-      removeFromCache(cacheKey); // Remove potentially invalid cache entry
-      handleNewMap(); // Reset to a new map state on error
+      removeFromCache(cacheKey); 
+      handleNewMap(); 
     } finally {
       setIsLoading(false);
     }
-  }, [userId, user?.idToken, setNodes, setEdges, handleNewMap, isLoggedIn]); // Add isLoggedIn dependency
+  }, [userId, user?.idToken, setNodes, setEdges, handleNewMap, isLoggedIn]); 
 
-  // --- Initial Load Effect ---
   useEffect(() => {
-    setIsLoading(true); // Set loading true initially
-    // If logged in, load the list and then the appropriate map
+    setIsLoading(true); 
     if (isLoggedIn) {
         loadMapList().then((list) => {
             if (list && list.length > 0) {
                 loadSpecificMap(list[0].map_id);
             } else {
-                loadSpecificMap(null); // Load empty state if no maps found
+                loadSpecificMap(null); 
             }
         });
     } else {
-        // If not logged in, just load the empty state directly
         loadSpecificMap(null);
     }
-  }, [loadMapList, loadSpecificMap, isLoggedIn]); // Add isLoggedIn dependency
+  }, [loadMapList, loadSpecificMap, isLoggedIn]); 
 
-  // --- Save Map Data (Create or Update) ---
   const handleSave = useCallback(async () => {
-    // Check isLoggedIn first
     if (!isLoggedIn) {
       setSaveStatus("Please log in to save changes.");
       return;
@@ -359,29 +323,22 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
     setSaveStatus("Saving...");
     console.log(`Attempting to save map: ${currentMapId || '(new)'}`);
 
-    // --- Track if it's a new map being saved ---
     const isNewMapInitially = !currentMapId;
-    // --- End Track ---
 
-    // Prompt for name if it's a new map or untitled
     let mapNameToSave = currentMapName;
     if (currentMapName === 'Untitled Map') {
         const newName = prompt("Enter a name for this map:", currentMapName);
-        if (newName === null) { // User cancelled prompt
-            setSaveStatus(''); // Clear saving status
+        if (newName === null) { 
+            setSaveStatus(''); 
             return;
         }
-        mapNameToSave = newName.trim() || 'Untitled Map'; // Use new name or default
-        setCurrentMapName(mapNameToSave); // Update state immediately
+        mapNameToSave = newName.trim() || 'Untitled Map'; 
+        setCurrentMapName(mapNameToSave); 
     }
 
     if (!currentMapId) {
-      // This case should ideally not happen if handleNewMap always creates an ID first.
-      // But as a fallback, maybe call handleNewMap first? Or show an error.
       console.error("Save attempted without a currentMapId. Please create a new map first.");
       setSaveStatus("Error: Cannot save, no map selected/created.");
-      // OR potentially trigger handleNewMap here, though it might be confusing UX.
-      // await handleNewMap(); // This would create it, then the rest of save would update it immediately.
       return;
     }
 
@@ -389,8 +346,8 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
       const payload = {
         nodes,
         edges,
-        map_name: mapNameToSave, // Send the potentially updated name
-        map_id: currentMapId // Send currentMapId (null if new)
+        map_name: mapNameToSave, 
+        map_id: currentMapId 
       };
       const result = await fetchData('course-map', {
         method: 'POST',
@@ -403,48 +360,39 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
 
       console.log("Map saved successfully:", result);
       setSaveStatus("Map saved!");
-      const savedMapId = result?.map_id; // Use returned ID if new, else current
+      const savedMapId = result?.map_id; 
 
       if (savedMapId) {
-        setCurrentMapId(savedMapId); // Update state if it was a new map
+        setCurrentMapId(savedMapId); 
 
-        // Update specific map cache
         const mapCacheKey = getCacheKey('courseMap', userId, savedMapId);
         const updatedMapData = {
              nodes,
              edges,
              map_id: savedMapId,
              map_name: mapNameToSave,
-             last_updated: new Date().toISOString() // Add current timestamp
+             last_updated: new Date().toISOString() 
          };
         saveToCache(mapCacheKey, updatedMapData);
 
-        // --- Update mapList state directly if it was a new map ---
         if (isNewMapInitially) {
             const newMapEntry = {
                 map_id: savedMapId,
                 map_name: mapNameToSave,
-                last_updated: updatedMapData.last_updated // Use the same timestamp
+                last_updated: updatedMapData.last_updated 
             };
             setMapList(prevList => {
-                // Add the new map and re-sort by date descending
                 const newList = [newMapEntry, ...prevList];
                 newList.sort((a, b) => new Date(b.last_updated) - new Date(a.last_updated));
-                // Update cache for the list as well
                 const listCacheKey = getCacheKey('courseMapList', userId);
                 saveToCache(listCacheKey, newList);
                 return newList;
             });
         } else {
-            // If updating an existing map, just refresh the list from API
-            // to get potentially updated 'last_updated' timestamp and ensure consistency.
-             loadMapList(true); // Force refresh map list cache from API
+             loadMapList(true); 
         }
-        // --- End Update ---
 
       } else if (!isNewMapInitially) {
-          // If it wasn't a new map but we didn't get an ID back (shouldn't happen on update success)
-          // still refresh the list just in case something changed (like the name)
           loadMapList(true);
       }
 
@@ -454,12 +402,10 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
       console.error("Failed to save course map:", error);
       setSaveStatus(`Error saving map: ${error.message}`);
     }
-  }, [userId, user?.idToken, nodes, edges, currentMapId, currentMapName, loadMapList, setMapList, isLoggedIn]); // Add isLoggedIn dependency
+  }, [userId, user?.idToken, nodes, edges, currentMapId, currentMapName, loadMapList, setMapList, isLoggedIn]); 
   
 
-  // --- Handle Map Selection Change ---
   const handleMapSelectChange = (event) => {
-    // If not logged in, selecting anything should just show the empty map
     if (!isLoggedIn) {
         loadSpecificMap(null);
         return;
@@ -469,14 +415,11 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
         console.log("Selected [Untitled Map], resetting view.");
         loadSpecificMap(null);
     } else {
-        // Load existing map (check cache first)
         loadSpecificMap(selectedId);
     }
   };
 
-    // --- Handle Delete Map ---
     const handleDeleteMap = useCallback(async () => {
-      // Check isLoggedIn first
       if (!isLoggedIn) {
           setSaveStatus("Please log in to delete maps.");
           return;
@@ -491,78 +434,63 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
           return;
       }
 
-      const mapToDeleteId = currentMapId; // Capture ID before state changes
+      const mapToDeleteId = currentMapId; 
       const mapCacheKey = getCacheKey('courseMap', userId, mapToDeleteId);
-      const listCacheKey = getCacheKey('courseMapList', userId); // Cache key for the list
+      const listCacheKey = getCacheKey('courseMapList', userId); 
 
       console.log(`[Delete Attempt] User ID: ${userId}, Map ID: ${mapToDeleteId}`);
       setSaveStatus("Deleting...");
 
       try {
-          // --- Call Backend DELETE ---
           await fetchData(`course-map/${mapToDeleteId}`, {
               method: 'DELETE',
               headers: {
                   'Authorization': `Bearer ${user.idToken}`
               }
           });
-          // --- Backend Delete Successful ---
 
           console.log("Map deleted successfully from backend.");
           setSaveStatus("Map deleted.");
 
-          // --- Frontend Cleanup ---
-          // 1. Remove from specific map cache
           removeFromCache(mapCacheKey);
 
-          // 2. Update mapList state and list cache
           let nextMapIdToLoad = null;
           setMapList(prevList => {
               const newList = prevList.filter(map => map.map_id !== mapToDeleteId);
-              // Determine which map to load next (e.g., the first one in the updated list)
               if (newList.length > 0) {
-                  newList.sort((a, b) => new Date(b.last_updated) - new Date(a.last_updated)); // Re-sort just in case
+                  newList.sort((a, b) => new Date(b.last_updated) - new Date(a.last_updated)); 
                   nextMapIdToLoad = newList[0].map_id;
               }
-              saveToCache(listCacheKey, newList); // Update list cache
+              saveToCache(listCacheKey, newList); 
               return newList;
           });
 
-          // 3. Load the next map (or reset if list is empty)
           if (nextMapIdToLoad) {
               loadSpecificMap(nextMapIdToLoad);
           } else {
-              // No maps left, reset to a new, unsaved state
               setNodes(defaultNodes);
               setEdges(defaultEdges);
               setCurrentMapId(null);
               setCurrentMapName('Untitled Map');
               idCounter = 0;
-              // Optionally, call handleNewMap() if you want to immediately prompt for a name
-              // handleNewMap();
           }
-          // --- End Frontend Cleanup ---
 
           setTimeout(() => setSaveStatus(''), 2000);
 
       } catch (error) {
           console.error(`[Delete Failed] User ID: ${userId}, Map ID: ${mapToDeleteId}`, error);
           setSaveStatus(`Error deleting map: ${error.message}`);
-          // Optionally, force refresh the list from API on error to ensure consistency
           loadMapList(true);
       }
-  }, [userId, user?.idToken, currentMapId, currentMapName, loadMapList, loadSpecificMap, setMapList, setNodes, setEdges, isLoggedIn]); // Add isLoggedIn dependency
+  }, [userId, user?.idToken, currentMapId, currentMapName, loadMapList, loadSpecificMap, setMapList, setNodes, setEdges, isLoggedIn]);
 
 
-  // --- Other Callbacks (onConnect, addNode, startEditing, handleEditChange, saveEdit, onPaneClick) remain the same ---
    const onConnect = useCallback((connection) => {
-       // Allow connecting nodes even when not logged in
        const newEdge = { ...connection, label: 'Prereq' };
        setEdges((eds) => addEdge(newEdge, eds));
      }, [setEdges]);
 
    const addNode = useCallback(() => {
-     // Allow adding nodes even when not logged in
      const newNodeId = getUniqueNodeId();
      const position = screenToFlowPosition({
        x: reactFlowWrapper.current.clientWidth / 2,
@@ -570,7 +498,7 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
      });
      const newNode = {
        id: newNodeId,
-       type: 'courseNode', // Specify the custom node type here
+       type: 'courseNode', 
        position,
        data: { label: `New Course ${idCounter}` }
      };
@@ -599,44 +527,33 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
    }, [editingElement, editValue, setNodes, setEdges]);
 
    const onPaneClick = useCallback(() => saveEdit(), [saveEdit]);
-  // --- End Other Callbacks ---
 
-  // --- Define Node Types ---
-  // Use useMemo to prevent this object from being recreated on every render
   const nodeTypes = useMemo(() => ({
-      courseNode: CustomCourseNode, // Map 'courseNode' type to your component
-      // You can add other custom node types here if needed
+      courseNode: CustomCourseNode, 
   }), []);
 
-  // Render loading state for the whole map area
   if (isMapListLoading || isLoading) {
-    // Show loading only if logged in and actually loading data
     if (isLoggedIn) {
         return <p>Loading course maps...</p>;
     }
-    // If not logged in, loading is instant (just showing default state)
-    // so don't show loading message, let the component render below.
   }
 
   return (
     <div style={{ height: 'calc(100vh - 60px)', width: '100%', border: '1px solid #ccc', position: 'relative' }} ref={reactFlowWrapper}>
       {editingElement && <EditInput element={editingElement} value={editValue} onChange={handleEditChange} onSave={saveEdit} />}
 
-      {/* --- Login Required Note --- */}
       {!isLoggedIn && (
         <div style={{ padding: '10px', background: '#fff3cd', color: '#856404', borderBottom: '1px solid #ffeeba', textAlign: 'center', fontWeight: 'bold' }}>
           Please log in to save your course map or access saved maps.
         </div>
       )}
 
-      {/* --- Map Management Bar --- */}
       <div style={{ padding: '10px', borderBottom: '1px solid #eee', display: 'flex', gap: '10px', alignItems: 'center', flexWrap: 'wrap', background: '#f8f8f8' }}>
-        {/* Display the current map name */}
         <span style={{fontWeight: 'bold'}}>Editing:</span>
         <span style={{ fontStyle: currentMapId || !isLoggedIn ? 'italic' : 'normal' }}>
             {currentMapName} {currentMapId || !isLoggedIn ? '(unsaved)' : ''}
         </span>
-        <span style={{margin: '0 5px'}}>|</span> {/* Separator */}
+        <span style={{margin: '0 5px'}}>|</span> 
 
         <label htmlFor="map-select" style={{fontWeight: 'bold'}}>Load Map:</label>
         <select
@@ -644,11 +561,11 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
             value={currentMapId || "__NEW__"}
             onChange={handleMapSelectChange}
             style={{maxWidth: '250px', padding: '5px'}}
-            disabled={!isLoggedIn} // Disable dropdown if not logged in
+            disabled={!isLoggedIn} 
             title={!isLoggedIn ? "Log in to load saved maps" : ""}
         >
             <option value="__NEW__">[Untitled Map]</option>
-            {isLoggedIn && mapList.map(map => ( // Only show list if logged in
+            {isLoggedIn && mapList.map(map => ( 
                 <option key={map.map_id} value={map.map_id}>
                     {map.map_name} ({new Date(map.last_updated).toLocaleDateString()})
                 </option>
@@ -660,29 +577,23 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
 
         {saveStatus && <span style={{ fontSize: '0.9em', color: saveStatus.startsWith('Error') ? 'red' : (saveStatus.includes('log in') ? 'orange' : 'green') }}>{saveStatus}</span>}
       </div>
-      {/* --- End Map Management Bar --- */}
 
-      {/* --- Instructions Bar --- */}
-      {/* Instructions are always visible */}
       <div style={{ padding: '5px 10px', borderBottom: '1px solid #eee', display: 'flex', gap: '15px', alignItems: 'center', flexWrap: 'wrap', fontSize: '0.9em', color: '#555' }}>
         <button onClick={addNode} title="Add a new course node to the map">Add Course</button>
         <span>| Double-click to rename | Select + Backspace/Delete to remove | Drag handles to connect</span>
       </div>
-       {/* --- End Instructions Bar --- */}
 
       <ReactFlow
         nodes={nodes} edges={edges} onNodesChange={onNodesChange} onEdgesChange={onEdgesChange}
         onConnect={onConnect} onNodeDoubleClick={onNodeDoubleClick} onEdgeDoubleClick={onEdgeDoubleClick}
         onPaneClick={onPaneClick} fitView attributionPosition="bottom-left"
         deleteKeyCode={['Backspace', 'Delete']} nodesDraggable={true} nodesConnectable={true} elementsSelectable={true}
-        nodeTypes={nodeTypes} // Pass the nodeTypes object here
-        // Prevent interaction if loading user data? Maybe not necessary.
+        nodeTypes={nodeTypes} 
       >
         <Controls />
         <Background variant={BackgroundVariant.Dots} gap={12} size={1} />
         <MiniMap nodeStrokeWidth={3} zoomable pannable />
       </ReactFlow>
-      {/* Note about custom nodes remains the same */}
       <div style={{ padding: '5px', fontSize: '0.8em', color: '#666', borderTop: '1px solid #eee' }}>
          <strong>Note:</strong> To add multiple input/output handles, create a <a href="https://reactflow.dev/docs/guides/custom-nodes/" target="_blank" rel="noopener noreferrer">Custom Node component</a>.
        </div>
@@ -690,11 +601,9 @@ function CourseMapFlow({ user }) { // user object now contains id, idToken, etc.
   );
 }
 
-// Wrap with Provider
-export default function CourseMap({ user }) { // Receive user prop
+export default function CourseMap({ user }) { 
   return (
     <ReactFlowProvider>
-      {/* Pass user down to the actual flow component */}
       <CourseMapFlow user={user} />
     </ReactFlowProvider>
   );
diff --git a/src/components/CustomCourseNode.jsx b/src/components/CustomCourseNode.jsx
index b2e5392..772a50a 100644
--- a/src/components/CustomCourseNode.jsx
+++ b/src/components/CustomCourseNode.jsx
@@ -1,31 +1,27 @@
-// filepath: src/components/CustomCourseNode.jsx
 import React, { memo } from 'react';
 import { Handle, Position } from 'reactflow';
 
-// Style for the node container - Light Theme
 const nodeStyle = {
   padding: '12px 18px',
-  background: '#ffffff', // White background
-  border: '1px solid #ddd', // Light grey border
+  background: '#ffffff', 
+  border: '1px solid #ddd', 
   borderRadius: '8px',
   textAlign: 'center',
   minWidth: '120px',
   fontSize: '14px',
-  color: '#333', // Dark text color
-  fontFamily: '"Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif', // Use Roboto font
-  boxShadow: '0 2px 8px rgba(0, 0, 0, 0.1)', // Soft shadow
+  color: '#333', 
+  fontFamily: '"Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif', 
+  boxShadow: '0 2px 8px rgba(0, 0, 0, 0.1)', 
   position: 'relative',
 };
 
-// Style for handles - Light Theme
 const handleStyle = {
-    background: '#777', // Medium grey handle
+    background: '#777', 
     width: '8px',
     height: '8px',
-    border: '1px solid #fff', // White border for contrast on handle
+    border: '1px solid #fff', 
 };
 
-// memo prevents unnecessary re-renders
 const CustomCourseNode = ({ data }) => {
   return (
     <div style={nodeStyle}>
diff --git a/src/components/PdfViewer.jsx b/src/components/PdfViewer.jsx
index daf44f0..0393569 100644
--- a/src/components/PdfViewer.jsx
+++ b/src/components/PdfViewer.jsx
@@ -1,12 +1,9 @@
 import React from 'react';
 
-// Accept imageFilenames directly as a prop
-function PdfViewer({ imageFilenames, isLoading, error, filename }) { // Added isLoading, error, filename for context messages
+function PdfViewer({ imageFilenames, isLoading, error, filename }) { 
 
-  // Render content based on props
   return (
     <div style={{ height: '100%', display: 'flex', flexDirection: 'column' }}>
-      {/* Show messages passed from parent */}
       {!filename && <p style={{ textAlign: 'center', marginTop: '2em' }}>Select a major/department to view the agreement.</p>}
       {error && <p style={{ color: 'red' }}>Error loading agreement: {error}</p>}
 
@@ -14,7 +11,6 @@ function PdfViewer({ imageFilenames, isLoading, error, filename }) { // Added is
           <p>No images found or extracted for this agreement.</p>
       )}
 
-      {/* --- Scrollable Image Container --- */}
       {!isLoading && !error && filename && imageFilenames && imageFilenames.length > 0 && (
         <div
           style={{
@@ -26,12 +22,11 @@ function PdfViewer({ imageFilenames, isLoading, error, filename }) { // Added is
         >
           {imageFilenames.map((imgFilename) => {
             const imageUrl = `/api/image/${imgFilename}`;
-            // console.log("Rendering image:", imageUrl); // Keep this if needed
             return (
               <div key={imgFilename} style={{ marginBottom: '0.5em' }}>
                 <img
                   src={imageUrl}
-                  alt={`Page from ${filename || 'agreement'}`} // Use filename prop if available
+                  alt={`Page from ${filename || 'agreement'}`} 
                   style={{ maxWidth: '100%', display: 'block' }}
                 />
               </div>
@@ -39,7 +34,6 @@ function PdfViewer({ imageFilenames, isLoading, error, filename }) { // Added is
           })}
         </div>
       )}
-      {/* --- End Scrollable Image Container --- */}
     </div>
   );
 }
diff --git a/src/hooks/useAcademicYears.js b/src/hooks/useAcademicYears.js
index aa72193..9912fb3 100644
--- a/src/hooks/useAcademicYears.js
+++ b/src/hooks/useAcademicYears.js
@@ -7,12 +7,10 @@ export function useAcademicYears(selectedSendingInstitutions, selectedReceivingI
     const [academicYears, setAcademicYears] = useState({});
     const [isLoading, setIsLoading] = useState(false);
     const [error, setError] = useState(null);
-    const cacheRef = useRef({}); // Simple in-memory cache
-
-    // Define senderIds and key outside useEffect
+    const cacheRef = useRef({});
     const senderIds = selectedSendingInstitutions.map(s => s.id);
     const senderIdsString = senderIds.sort().join(',');
-    const contextKey = `${senderIdsString}_${selectedReceivingId}`; // Key for cache/localStorage
+    const contextKey = `${senderIdsString}_${selectedReceivingId}`;
 
     useEffect(() => {
         let isMounted = true;
@@ -21,33 +19,29 @@ export function useAcademicYears(selectedSendingInstitutions, selectedReceivingI
             setAcademicYears({});
             setIsLoading(false);
             setError(null);
-            return; // Clear years if selections are incomplete
+            return;
         }
 
         const fetchCommonYears = async () => {
             if (!isMounted) return;
             setIsLoading(true);
             setError(null);
-            setAcademicYears({}); // Clear previous results
+            setAcademicYears({});
 
             const localStorageKey = `${LOCAL_STORAGE_PREFIX}years_intersection_${contextKey}`;
             const memoryCacheKey = `years_${contextKey}`;
-
-            // 1. Check In-Memory Cache
             if (cacheRef.current[memoryCacheKey]) {
                 console.log(`In-memory cache hit for years intersection: ${contextKey}`);
                 setAcademicYears(cacheRef.current[memoryCacheKey]);
                 setIsLoading(false);
                 return;
             }
-
-            // 2. Check localStorage
             try {
                 const cachedDataString = localStorage.getItem(localStorageKey);
                 if (cachedDataString) {
                     console.log(`LocalStorage hit for years intersection (${localStorageKey})`);
                     const cachedData = JSON.parse(cachedDataString);
-                    cacheRef.current[memoryCacheKey] = cachedData; // Update in-memory
+                    cacheRef.current[memoryCacheKey] = cachedData;
                     setAcademicYears(cachedData);
                     setIsLoading(false);
                     return;
@@ -56,25 +50,20 @@ export function useAcademicYears(selectedSendingInstitutions, selectedReceivingI
                 console.error(`Error reading years intersection from localStorage (${localStorageKey}):`, e);
                 localStorage.removeItem(localStorageKey);
             }
-
-            // 3. Fetch from API (Single Call)
             console.log(`Cache miss for years intersection (${contextKey}). Fetching...`);
             try {
-                // Pass comma-separated sending IDs and single receiving ID
                 const data = await fetchData(`academic-years?sendingId=${senderIdsString}&receivingId=${selectedReceivingId}`);
 
                 if (!isMounted) return;
 
                 let finalData = {};
                 let warnings = null;
-
-                // Handle potential 207 Multi-Status response
                 if (data && data.years !== undefined) {
                     finalData = data.years || {};
                     warnings = data.warnings;
                     if (warnings) console.warn("Partial fetch failure for academic years:", warnings);
                 } else {
-                    finalData = data || {}; // Assume direct object if not 207 structure
+                    finalData = data || {};
                 }
 
                  if (Object.keys(finalData).length === 0 && !warnings) {
@@ -82,9 +71,7 @@ export function useAcademicYears(selectedSendingInstitutions, selectedReceivingI
                  }
 
                 setAcademicYears(finalData);
-                cacheRef.current[memoryCacheKey] = finalData; // Store in memory
-
-                // Store in localStorage
+                cacheRef.current[memoryCacheKey] = finalData;
                 try {
                     localStorage.setItem(localStorageKey, JSON.stringify(finalData));
                 } catch (e) {
@@ -95,11 +82,11 @@ export function useAcademicYears(selectedSendingInstitutions, selectedReceivingI
                 console.error("Error fetching common academic years:", err);
                 if (isMounted) {
                     setError(`Failed to load common academic years: ${err.message}`);
-                    setAcademicYears({}); // Clear on error
+                    setAcademicYears({});
                 }
             } finally {
                 if (isMounted) {
-                    setIsLoading(false); // Stop loading
+                    setIsLoading(false);
                 }
             }
         };
@@ -107,10 +94,8 @@ export function useAcademicYears(selectedSendingInstitutions, selectedReceivingI
         fetchCommonYears();
 
         return () => {
-            isMounted = false; // Cleanup
+            isMounted = false;
         };
-    // Depend on the sorted string of sender IDs and the receiver ID
-    // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [senderIdsString, selectedReceivingId]);
 
     return { academicYears, isLoading, error };
diff --git a/src/hooks/useAgreementData.js b/src/hooks/useAgreementData.js
index 1b032c5..0f658b1 100644
--- a/src/hooks/useAgreementData.js
+++ b/src/hooks/useAgreementData.js
@@ -1,39 +1,31 @@
 import { useState, useEffect, useRef, useCallback, useMemo } from 'react';
-import { fetchData } from '../services/api'; // Assuming api.js is in services
+import { fetchData } from '../services/api';
 
 const IGETC_ID = 'IGETC';
-const LOCAL_STORAGE_PREFIX = 'ctaCache_'; // Prefix for local storage keys
+const LOCAL_STORAGE_PREFIX = 'ctaCache_';
 
 export function useAgreementData(initialSendingId, receivingId, yearId, user, allSelectedSendingInstitutions) {
-    // --- State for Agreement Data ---
     const [selectedCategory, setSelectedCategory] = useState('major');
     const [majors, setMajors] = useState({});
     const [isLoadingMajors, setIsLoadingMajors] = useState(true);
-    const [error, setError] = useState(null); // Error for majors list
-    const [pdfError, setPdfError] = useState(null); // Error for PDF viewer area
+    const [error, setError] = useState(null);
+    const [pdfError, setPdfError] = useState(null);
     const [selectedMajorKey, setSelectedMajorKey] = useState(null);
     const [selectedMajorName, setSelectedMajorName] = useState('');
-    const [isLoadingPdf, setIsLoadingPdf] = useState(false); // General loading for PDF viewer area (controlled by fetch)
+    const [isLoadingPdf, setIsLoadingPdf] = useState(false);
     const [majorSearchTerm, setMajorSearchTerm] = useState('');
     const [hasMajorsAvailable, setHasMajorsAvailable] = useState(true);
     const [hasDepartmentsAvailable, setHasDepartmentsAvailable] = useState(true);
     const [isLoadingAvailability, setIsLoadingAvailability] = useState(true);
-
-    // --- State for Multiple PDFs/Tabs ---
-    const [agreementData, setAgreementData] = useState([]); // Will include IGETC if available
-    const [allAgreementsImageFilenamesState, setAllAgreementsImageFilenamesState] = useState([]); // <-- NEW/REINSTATED STATE
-    const [activeTabIndex, setActiveTabIndex] = useState(0); // Start potentially at IGETC (index 0)
+    const [agreementData, setAgreementData] = useState([]);
+    const [allAgreementsImageFilenamesState, setAllAgreementsImageFilenamesState] = useState([]);
+    const [activeTabIndex, setActiveTabIndex] = useState(0);
     const [imagesForActivePdf, setImagesForActivePdf] = useState([]);
-
-    // --- Cache Refs ---
-    const imageCacheRef = useRef({}); // Store images keyed by PDF filename
-    const categoryCacheRef = useRef({}); // In-memory cache for majors/depts
-
-    // --- Derived state ---
+    const imageCacheRef = useRef({});
+    const categoryCacheRef = useRef({});
     const currentAgreement = activeTabIndex >= 0 && activeTabIndex < agreementData.length ? agreementData[activeTabIndex] : null;
     const currentPdfFilename = currentAgreement?.pdfFilename;
 
-    // --- Availability Check ---
     useEffect(() => {
         if (!initialSendingId || !receivingId || !yearId) {
             setIsLoadingAvailability(false);
@@ -42,32 +34,26 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
             return;
         }
         setIsLoadingAvailability(true);
-        setHasMajorsAvailable(false); // Reset on change
+        setHasMajorsAvailable(false);
         setHasDepartmentsAvailable(false);
-
-        // --- Add Cache Key for Availability ---
         const availabilityContextKey = `availability_${initialSendingId}-${receivingId}-${yearId}`;
 
         const checkAvailability = async (category) => {
-            // --- Check localStorage for specific category availability ---
             const availabilityLocalStorageKey = `${availabilityContextKey}_${category}`;
             try {
                 const cachedAvailability = localStorage.getItem(availabilityLocalStorageKey);
-                if (cachedAvailability !== null) { // Check for null, as 'false' is a valid cached value
+                if (cachedAvailability !== null) {
                     console.log(`Cache hit for availability (${availabilityLocalStorageKey}): ${cachedAvailability}`);
-                    return cachedAvailability === 'true'; // Convert stored string back to boolean
+                    return cachedAvailability === 'true';
                 }
             } catch (e) {
                  console.error("Error reading availability from localStorage:", e);
                  localStorage.removeItem(availabilityLocalStorageKey);
             }
-
-            // --- Fetch if not in cache ---
             console.log(`Cache miss for availability (${availabilityLocalStorageKey}). Fetching...`);
             try {
                 const data = await fetchData(`/majors?sendingId=${initialSendingId}&receivingId=${receivingId}&academicYearId=${yearId}&categoryCode=${category}`);
                 const exists = Object.keys(data || {}).length > 0;
-                // --- Store result in localStorage ---
                 try {
                     localStorage.setItem(availabilityLocalStorageKey, exists ? 'true' : 'false');
                 } catch (e) {
@@ -76,7 +62,7 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
                 return exists;
             } catch (err) {
                 console.error(`Error checking availability for ${category}:`, err);
-                return false; // Don't cache errors for availability check
+                return false;
             }
         };
 
@@ -94,36 +80,27 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
 
     }, [initialSendingId, receivingId, yearId, selectedCategory]);
 
-
-    // --- Fetch Majors/Departments (with Caching: localStorage -> useRef -> Fetch) ---
     useEffect(() => {
         if (isLoadingAvailability || !initialSendingId || !receivingId || !yearId) {
             if (!initialSendingId || !receivingId || !yearId) setError("Missing selection criteria.");
-            setMajors({}); // Clear majors if context is missing
-            setIsLoadingMajors(false); // Not loading if no context
+            setMajors({});
+            setIsLoadingMajors(false);
             return;
         }
-
-        // Check availability before attempting fetch or cache lookup
         if ((selectedCategory === 'major' && !hasMajorsAvailable) || (selectedCategory === 'dept' && !hasDepartmentsAvailable)) {
             setError(`No ${selectedCategory}s found for the selected combination.`);
             setIsLoadingMajors(false);
             setMajors({});
             return;
         }
-
-        // --- Create Cache Keys ---
-        const contextKey = `${initialSendingId}-${receivingId}-${yearId}`; // Key for institution/year combo
-        const categoryKey = selectedCategory; // Key for 'major' or 'dept' within the context
-        const localStorageKey = `${LOCAL_STORAGE_PREFIX}${contextKey}_${categoryKey}`; // Full localStorage key
-
-        // --- 1. Check localStorage ---
+        const contextKey = `${initialSendingId}-${receivingId}-${yearId}`;
+        const categoryKey = selectedCategory;
+        const localStorageKey = `${LOCAL_STORAGE_PREFIX}${contextKey}_${categoryKey}`;
         try {
             const cachedDataString = localStorage.getItem(localStorageKey);
             if (cachedDataString) {
                 console.log(`LocalStorage hit for ${localStorageKey}.`);
                 const cachedData = JSON.parse(cachedDataString);
-                // Update in-memory cache as well
                 if (!categoryCacheRef.current[contextKey]) {
                     categoryCacheRef.current[contextKey] = {};
                 }
@@ -131,106 +108,84 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
                 setMajors(cachedData);
                 setError(null);
                 setIsLoadingMajors(false);
-                return; // Skip further checks/fetch
+                return;
             }
         } catch (e) {
             console.error("Error reading from localStorage:", e);
-            // Clear potentially corrupted item
             localStorage.removeItem(localStorageKey);
         }
-
-        // --- 2. Check In-Memory Cache (useRef) ---
         if (categoryCacheRef.current[contextKey]?.[categoryKey]) {
             console.log(`In-memory cache hit for ${categoryKey} in context ${contextKey}.`);
             setMajors(categoryCacheRef.current[contextKey][categoryKey]);
             setError(null);
             setIsLoadingMajors(false);
-            return; // Skip fetch
+            return;
         }
-
-        // --- 3. Fetch if not in cache ---
         console.log(`Cache miss for ${localStorageKey}. Fetching...`);
         setIsLoadingMajors(true);
         setError(null);
-        setMajors({}); // Clear majors before fetching new ones
+        setMajors({});
 
         const fetchCategoryData = async () => {
             try {
                 const data = await fetchData(`/majors?sendingId=${initialSendingId}&receivingId=${receivingId}&academicYearId=${yearId}&categoryCode=${selectedCategory}`);
                 const fetchedData = data || {};
                 setMajors(fetchedData);
-                // --- Store in In-Memory Cache ---
                 if (!categoryCacheRef.current[contextKey]) {
                     categoryCacheRef.current[contextKey] = {};
                 }
                 categoryCacheRef.current[contextKey][categoryKey] = fetchedData;
-
-                // --- Store in localStorage ---
                 try {
                     localStorage.setItem(localStorageKey, JSON.stringify(fetchedData));
                     console.log(`Fetched and cached ${categoryKey}s in localStorage (${localStorageKey}).`);
                 } catch (e) {
                     console.error("Error writing to localStorage:", e);
-                    // Handle potential storage full errors if necessary
                 }
 
             } catch (err) {
                 console.error(`Error fetching ${selectedCategory}s:`, err);
                 setError(`Failed to load ${selectedCategory}s.`);
                 setMajors({});
-                // Optionally clear cache entry on error? Or keep stale? For now, don't cache errors.
-                // delete categoryCacheRef.current[cacheKey];
             } finally {
                 setIsLoadingMajors(false);
             }
         };
 
         fetchCategoryData();
-    // Dependencies now include selectedCategory directly
     }, [initialSendingId, receivingId, yearId, selectedCategory, isLoadingAvailability, hasMajorsAvailable, hasDepartmentsAvailable]);
 
-
-    // --- Fetch Agreement Details and Images (including IGETC) ---
-    // This is the main function responsible for fetching ALL agreement data and images
-    // It is ONLY called when a major/department is selected via handleMajorSelect.
     const fetchAgreementDetailsAndImages = useCallback(async (majorKey) => {
-        // Guard against missing context needed for fetching
         if (!majorKey || allSelectedSendingInstitutions.length === 0 || !receivingId || !yearId) {
              console.warn("Skipping agreement fetch: Missing major key or context.");
              setAgreementData([]);
-             setAllAgreementsImageFilenamesState([]); // <-- Reset this new state
+             setAllAgreementsImageFilenamesState([]);
              setImagesForActivePdf([]);
              setActiveTabIndex(0);
              setPdfError("Select a major/department and ensure all institutions/year are set.");
-             setIsLoadingPdf(false); // Not loading if nothing to fetch
+             setIsLoadingPdf(false);
              return;
         }
 
         console.log(`Fetching agreements and images for majorKey: ${majorKey}`);
-        setIsLoadingPdf(true); // START loading indicator for the entire process
+        setIsLoadingPdf(true);
         setPdfError(null);
-        setAgreementData([]); // Clear previous agreements
-        setAllAgreementsImageFilenamesState([]); // <-- Reset this new state
-        setImagesForActivePdf([]); // Clear viewer
-
-        // Determine the sending ID to use for the IGETC check (prefer initial, fallback to first selected)
+        setAgreementData([]);
+        setAllAgreementsImageFilenamesState([]);
+        setImagesForActivePdf([]);
         const contextSendingId = initialSendingId || allSelectedSendingInstitutions[0]?.id;
-
         let combinedAgreements = [];
-        let initialActiveIndex = 0; // Default to 0
+        let initialActiveIndex = 0;
 
         try {
             let igetcAgreement = null;
-            // 1. Fetch IGETC Agreement Filename (if logged in and context available)
             if (user && user.idToken && contextSendingId && yearId) {
                 try {
-                    // Remove the leading slash from the endpoint path
                     const igetcResponse = await fetchData(`igetc-agreement?sendingId=${contextSendingId}&academicYearId=${yearId}`, {
                         headers: { 'Authorization': `Bearer ${user.idToken}` }
                     });
                     if (igetcResponse?.pdfFilename) {
                         igetcAgreement = {
-                            sendingId: IGETC_ID, // Special ID
+                            sendingId: IGETC_ID,
                             sendingName: 'IGETC',
                             pdfFilename: igetcResponse.pdfFilename,
                             isIgetc: true
@@ -241,19 +196,15 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
                     }
                 } catch (err) {
                     console.error("Error fetching IGETC filename:", err);
-                    // Log error but continue to fetch major agreements
                 }
             } else {
                  console.log("Skipping IGETC fetch: User not logged in or missing context.");
             }
-
-            // 2. Fetch Major Articulation Agreements
             const sendingIds = allSelectedSendingInstitutions.map(inst => inst.id);
-            // Remove the leading slash here too if fetchData is used similarly
             const response = await fetchData('articulation-agreements', {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ sending_ids: sendingIds, receiving_id: receivingId, year_id: yearId, major_key: majorKey }) // Use passed majorKey
+                body: JSON.stringify({ sending_ids: sendingIds, receiving_id: receivingId, year_id: yearId, major_key: majorKey })
             });
 
             let fetchedAgreements = [];
@@ -266,56 +217,47 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
                  console.log(`Fetched ${fetchedAgreements.length} major agreements.`);
             } else {
                  console.error("Invalid response format for major agreements:", response?.error || "No agreements array");
-                 if (!igetcAgreement) { // Only throw if IGETC also failed
+                 if (!igetcAgreement) {
                     throw new Error(response?.error || "Failed to load major agreements and no IGETC found.");
                  }
             }
-
-            // 3. Combine IGETC and Major Agreements
             combinedAgreements = igetcAgreement ? [igetcAgreement, ...fetchedAgreements] : fetchedAgreements;
-            setAgreementData(combinedAgreements); // Set the combined list
+            setAgreementData(combinedAgreements);
 
             if (combinedAgreements.length === 0) {
                 setPdfError("No agreements found for this major/department.");
-                // No need to fetch images if no agreements
-                setIsLoadingPdf(false); // STOP loading
-                setAllAgreementsImageFilenamesState([]); // <-- Ensure reset
+                setIsLoadingPdf(false);
+                setAllAgreementsImageFilenamesState([]);
                 return;
             }
-
-            // 4. Fetch Images for ALL agreements in parallel (check/populate cache)
             console.log("Fetching images for all agreements...");
             const imageFetchPromises = combinedAgreements
-                .filter(a => a.pdfFilename) // Only fetch for agreements with a PDF
+                .filter(a => a.pdfFilename)
                 .map(async (agreement) => {
                     const filename = agreement.pdfFilename;
                     if (imageCacheRef.current[filename]) {
                         console.log(`Cache hit for images: ${filename}`);
-                        return { filename, images: imageCacheRef.current[filename] }; // Return filename for mapping
+                        return { filename, images: imageCacheRef.current[filename] };
                     }
                     console.log(`Cache miss, fetching images for: ${filename}`);
                     try {
                         const imgResponse = await fetchData(`pdf-images/${encodeURIComponent(filename)}`);
                         if (imgResponse?.image_filenames) {
-                            imageCacheRef.current[filename] = imgResponse.image_filenames; // Cache the images
+                            imageCacheRef.current[filename] = imgResponse.image_filenames;
                             console.log(`Successfully fetched and cached images for: ${filename}`);
                             return { filename, images: imgResponse.image_filenames };
                         }
                          console.warn(`No image filenames received for ${filename}`);
-                         imageCacheRef.current[filename] = []; // Cache empty array if no images found
+                         imageCacheRef.current[filename] = [];
                          return { filename, images: [] };
                     } catch (imgErr) {
                          console.error(`Error fetching images for ${filename}:`, imgErr);
-                         imageCacheRef.current[filename] = []; // Cache empty array on error
-                         return { filename, images: [] }; // Indicate failure for this PDF
+                         imageCacheRef.current[filename] = [];
+                         return { filename, images: [] };
                     }
                 });
-
-            // Wait for all image fetches to settle
             await Promise.allSettled(imageFetchPromises);
             console.log("All image fetch attempts completed.");
-
-            // ----> DERIVE AND SET THE NEW STATE HERE <----
             const newAllFilenames = combinedAgreements.reduce((acc, agreement) => {
                 if (agreement.pdfFilename && imageCacheRef.current[agreement.pdfFilename]) {
                     acc.push(...imageCacheRef.current[agreement.pdfFilename]);
@@ -323,47 +265,28 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
                 return acc;
             }, []);
             const uniqueFilenames = [...new Set(newAllFilenames)];
-            setAllAgreementsImageFilenamesState(uniqueFilenames); // <-- UPDATE THE STATE
+            setAllAgreementsImageFilenamesState(uniqueFilenames);
             console.log("Derived and set allAgreementsImageFilenamesState:", uniqueFilenames);
-            // ----> END DERIVATION <----
-
-            // 5. Determine initial active tab index (first non-IGETC, or 0 if only IGETC/none)
             const firstRealAgreementIndex = combinedAgreements.findIndex(a => !a.isIgetc);
             initialActiveIndex = firstRealAgreementIndex !== -1 ? firstRealAgreementIndex : 0;
-            setActiveTabIndex(initialActiveIndex); // Set the final active tab index
-
-            // 6. Set images for the initially active PDF (using initialActiveIndex)
-            // This is now handled by the useEffect watching activeTabIndex
-            // We just need to ensure the cache is populated by this point.
+            setActiveTabIndex(initialActiveIndex);
 
         } catch (err) {
             console.error("Error during agreement details/images fetch:", err);
             setPdfError(`Failed to load agreement data: ${err.message}`);
-            setAgreementData([]); // Clear data on error
-            // setAllAgreementsImageFilenames([]); // Removed state
+            setAgreementData([]);
             setImagesForActivePdf([]);
-            setActiveTabIndex(0); // Reset index
-            setAllAgreementsImageFilenamesState([]); // <-- Reset on error
+            setActiveTabIndex(0);
+            setAllAgreementsImageFilenamesState([]);
         } finally {
-            // Loading stops AFTER all fetches (agreements + images) are attempted and initial tab is set.
-            // The useEffect watching activeTabIndex will then display the images for that tab from the cache.
-             setIsLoadingPdf(false); // STOP loading indicator
+             setIsLoadingPdf(false);
              console.log("Finished fetchAgreementDetailsAndImages. isLoadingPdf: false");
         }
-    // Dependencies: All inputs that should trigger a full refetch when they change.
-    // Note: `majorKey` is passed as an argument, so it doesn't need to be a dependency here.
-    // `user` dependency ensures refetch if login state changes (for IGETC).
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [allSelectedSendingInstitutions, receivingId, yearId, initialSendingId, user?.idToken]); // Refined dependencies
+    }, [allSelectedSendingInstitutions, receivingId, yearId, initialSendingId, user?.idToken]);
 
-
-    // --- Effect to Handle Active Tab Image Loading (Display Only) ---
     useEffect(() => {
-        // This effect ONLY sets the images for the currently active tab based on fetched data in the cache.
-        // It does NOT trigger fetches or manage the main isLoadingPdf state.
         if (agreementData.length === 0 || activeTabIndex < 0 || activeTabIndex >= agreementData.length) {
             setImagesForActivePdf([]);
-            // pdfError should be handled by the fetch function if data is missing or failed to load
             return;
         }
 
@@ -375,32 +298,18 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
         if (filename) {
             const cachedImages = imageCacheRef.current[filename];
             if (cachedImages) {
-                // Images are expected to be in the cache if fetchAgreementDetailsAndImages succeeded for this PDF
                 setImagesForActivePdf(cachedImages);
                 console.log(`Displaying ${cachedImages.length} cached images for active tab ${activeTabIndex} (${filename}).`);
-                // Clear transient errors maybe? Or rely on fetchAgreementDetailsAndImages to set persistent errors.
-                // setPdfError(null); // Let fetch manage persistent errors.
             } else {
-                // This case should ideally not happen if fetchAgreementDetailsAndImages completed successfully
-                // and the PDF had images. It might indicate an error during the image fetch for this specific PDF.
                 setImagesForActivePdf([]);
                 console.warn(`Images not found in cache for active tab ${activeTabIndex} (${filename}). This might indicate a fetch error for this specific PDF.`);
-                // Do not set pdfError here; rely on the error state set during the main fetch process.
-                // If isLoadingPdf is false here, it means the main fetch finished, but these images are missing.
-                // The UI should ideally reflect the error set by the fetch function (pdfError state).
             }
         } else {
-            // No PDF filename associated with this agreement tab
             setImagesForActivePdf([]);
             console.log(`No PDF filename for active tab ${activeTabIndex}. Clearing images.`);
-            // pdfError related to "No PDF available" should be handled by UI based on missing filename or set during fetch.
         }
-        // This effect does not manage isLoadingPdf.
-    // Depend only on the active tab index and the agreement data itself.
-    }, [activeTabIndex, agreementData]); // Correct dependencies for display logic
-
+    }, [activeTabIndex, agreementData]);
 
-    // --- Effect to reset selections when core context changes (URL params) ---
     useEffect(() => {
         console.log("Core context changed (URL params), resetting selections and agreement data.");
         setSelectedMajorKey(null); setSelectedMajorName('');
@@ -409,85 +318,55 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
         setImagesForActivePdf([]);
         setPdfError(null);
         setIsLoadingPdf(false);
-        // Clear image cache
         imageCacheRef.current = {};
         console.log("Image cache cleared due to context change.");
-        // --- Clear In-Memory Category Cache ---
-        // We clear the whole ref when context changes
         categoryCacheRef.current = {};
         console.log("In-memory category cache cleared due to context change.");
-        // --- Clear Relevant localStorage ---
-        // Option 1: Clear ALL cache related to this app (simpler)
-        // Object.keys(localStorage).forEach(key => {
-        //     if (key.startsWith(LOCAL_STORAGE_PREFIX)) {
-        //         localStorage.removeItem(key);
-        //     }
-        // });
-        // console.log("Cleared all app-related localStorage cache.");
-        // Option 2: Be more specific (requires knowing old keys, harder)
-        // For now, let stale data exist; new context will use new keys.
-        // Reset availability states and trigger re-check
-        setHasMajorsAvailable(true); // Assume available until checked
+        setHasMajorsAvailable(true);
         setHasDepartmentsAvailable(true);
-        setIsLoadingAvailability(true); // Trigger availability check
-        // Reset majors state immediately
+        setIsLoadingAvailability(true);
         setMajors({});
         setError(null);
-        setIsLoadingMajors(true); // Will be set correctly by fetch/cache logic
-        setAllAgreementsImageFilenamesState([]); // <-- Reset
+        setIsLoadingMajors(true);
+        setAllAgreementsImageFilenamesState([]);
 
     }, [initialSendingId, receivingId, yearId]);
 
-    // --- Handlers ---
     const handleMajorSelect = useCallback((majorKey, majorName) => {
-        if (majorKey === selectedMajorKey) return; // Avoid refetch if same major clicked
+        if (majorKey === selectedMajorKey) return;
 
         console.log("Major selected:", majorKey, majorName);
         setSelectedMajorKey(majorKey);
         setSelectedMajorName(majorName);
-
-        // Clear previous data immediately for responsiveness before fetch starts
         setAgreementData([]);
-        // setAllAgreementsImageFilenames([]); // Removed state
         setImagesForActivePdf([]);
-        setActiveTabIndex(0); // Reset to 0 temporarily
-        setPdfError(null); // Clear previous errors
-        // setIsLoadingPdf(true); // Set inside fetchAgreementDetailsAndImages
-
-        // Trigger the main fetch function for the new major
-        fetchAgreementDetailsAndImages(majorKey); // Pass majorKey directly
+        setActiveTabIndex(0);
+        setPdfError(null);
+        fetchAgreementDetailsAndImages(majorKey);
 
-    }, [selectedMajorKey, fetchAgreementDetailsAndImages]); // Dependency on fetch function is key
+    }, [selectedMajorKey, fetchAgreementDetailsAndImages]);
 
     const handleCategoryChange = useCallback((event) => {
         const newCategory = event.target.value;
-        // Only update state if category actually changes
         if (newCategory === selectedCategory) return;
 
         console.log("Category changed to:", newCategory);
         setSelectedCategory(newCategory);
-        // Reset major selection and agreement data when category changes
         setSelectedMajorKey(null); setSelectedMajorName('');
         setMajorSearchTerm('');
         setAgreementData([]);
         setImagesForActivePdf([]);
         setActiveTabIndex(0);
-        // setError(null); // Error will be handled by the fetch/cache useEffect
         setPdfError(null);
         setIsLoadingPdf(false);
-        // DO NOT clear category cache here - we want to reuse it if switching back
-        // The useEffect for fetching majors will handle loading/cache check
-    }, [selectedCategory]); // Added selectedCategory dependency
+    }, [selectedCategory]);
 
     const handleTabClick = useCallback((index) => {
         if (index === activeTabIndex) return;
         console.log("Tab clicked:", index, "Setting active tab index.");
         setActiveTabIndex(index);
-        // DO NOT trigger fetches or set isLoadingPdf here.
-        // The useEffect watching activeTabIndex will handle displaying cached images.
     }, [activeTabIndex]);
 
-    // --- Filtered Majors ---
     const filteredMajors = useMemo(() => {
         const lowerCaseSearchTerm = majorSearchTerm.toLowerCase();
         if (typeof majors !== 'object' || majors === null) return [];
@@ -498,7 +377,6 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
 
 
     return {
-        // State
         selectedCategory,
         majors,
         isLoadingMajors,
@@ -506,21 +384,17 @@ export function useAgreementData(initialSendingId, receivingId, yearId, user, al
         pdfError,
         selectedMajorKey,
         selectedMajorName,
-        isLoadingPdf, // Indicates loading of agreements/images AFTER major select
+        isLoadingPdf,
         majorSearchTerm,
         hasMajorsAvailable,
         hasDepartmentsAvailable,
         isLoadingAvailability,
-        agreementData, // Includes IGETC + Major agreements
-        allAgreementsImageFilenames: allAgreementsImageFilenamesState, // <-- EXPOSE THE NEW STATE
+        agreementData,
+        allAgreementsImageFilenames: allAgreementsImageFilenamesState,
         activeTabIndex,
-        imagesForActivePdf, // Images for the currently selected tab
-
-        // Derived State
+        imagesForActivePdf,
         currentPdfFilename,
         filteredMajors,
-
-        // Handlers
         handleMajorSelect,
         handleCategoryChange,
         handleTabClick,
diff --git a/src/hooks/useChat.js b/src/hooks/useChat.js
index 4c24879..8a96943 100644
--- a/src/hooks/useChat.js
+++ b/src/hooks/useChat.js
@@ -2,7 +2,7 @@ import { useState, useEffect, useRef, useCallback } from 'react';
 import { fetchData } from '../services/api';
 
 export function useChat(
-    imageFilenames, // This holds the list of all relevant image filenames
+    imageFilenames,
     selectedMajorName,
     user,
     sendingInstitutionId,
@@ -16,62 +16,49 @@ export function useChat(
     const [chatError, setChatError] = useState(null);
     const initialAnalysisSentRef = useRef(false);
 
-    // Log messages
     useEffect(() => {
         console.log("Current message history:", messages);
     }, [messages]);
 
-    // Clear chat and reset flag when context changes or user logs out
     useEffect(() => {
         setMessages([]);
         setUserInput('');
         setChatError(null);
         initialAnalysisSentRef.current = false;
         console.log("DEBUG: Chat cleared and initialAnalysisSentRef reset due to context/user change.");
-    }, [imageFilenames, selectedMajorName, user, sendingInstitutionId, receivingInstitutionId, academicYearId]); // Added more dependencies to ensure reset
+    }, [imageFilenames, selectedMajorName, user, sendingInstitutionId, receivingInstitutionId, academicYearId]);
 
-    // Effect to send initial analysis request
     useEffect(() => {
         console.log("DEBUG: Initial analysis effect triggered.");
         console.log("DEBUG: User object:", user);
         console.log("DEBUG: User ID:", user ? user.id : "N/A");
         console.log("DEBUG: User ID Token:", user ? (user.idToken ? "Present" : "MISSING") : "N/A");
-        // Use the stable list of all image filenames passed in
         console.log("DEBUG: imageFilenames (for initial analysis):", imageFilenames);
         console.log("DEBUG: initialAnalysisSentRef.current:", initialAnalysisSentRef.current);
         console.log("DEBUG: isLoading:", isLoading);
 
         if (!user) {
             console.log("DEBUG: Skipping initial analysis - User not logged in.");
-            initialAnalysisSentRef.current = false; // Ensure it's false if user logs out
+            initialAnalysisSentRef.current = false;
             return;
         }
-
-        // Check the condition for sending using the stable imageFilenames list
         const shouldSend = imageFilenames && imageFilenames.length > 0 && !initialAnalysisSentRef.current && !isLoading;
         console.log("DEBUG: Should send initial analysis?", shouldSend);
-
-        // --- Temporarily disabled initial analysis sending ---
-        // if (shouldSend) {
-        if (shouldSend && false) { // Set to false to disable sending for now
-        // --- End temporary disable ---
+        if (shouldSend && false) {
             const sendInitialAnalysis = async () => {
-                // Double-check user and token right before sending
                 if (!user || !user.idToken) {
                     console.error("DEBUG: Cannot send initial analysis: User logged out or token missing just before sending.");
                     setChatError("Authentication error. Please log in again.");
                     setMessages([{ type: 'system', text: "Authentication error. Please log in again." }]);
-                    initialAnalysisSentRef.current = false; // Reset if auth fails here
+                    initialAnalysisSentRef.current = false;
                     return;
                 }
 
                 console.log("DEBUG: Conditions met. Calling sendInitialAnalysis function...");
                 setIsLoading(true);
                 setChatError(null);
-                initialAnalysisSentRef.current = true; // Set flag immediately
+                initialAnalysisSentRef.current = true;
                 console.log("DEBUG: initialAnalysisSentRef.current set to true.");
-
-                // Log context variables used in the prompt
                 console.log("DEBUG: Context for prompt - academicYearId:", academicYearId);
                 console.log("DEBUG: Context for prompt - sendingInstitutionId:", sendingInstitutionId);
                 console.log("DEBUG: Context for prompt - receivingInstitutionId:", receivingInstitutionId);
@@ -107,7 +94,7 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
                 const payload = {
                     new_message: initialPrompt,
                     history: [],
-                    image_filenames: imageFilenames // Use the stable list here
+                    image_filenames: imageFilenames
                 };
 
                 try {
@@ -137,10 +124,8 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
                     setMessages([{ type: 'system', text: `Error during analysis: ${err.message}` }]);
                     if (err.message.includes("Authorization")) {
                         console.log("DEBUG: Resetting initialAnalysisSentRef due to Authorization error.");
-                        initialAnalysisSentRef.current = false; // Reset if auth fails
+                        initialAnalysisSentRef.current = false;
                     } else {
-                        // Consider if other errors should also reset the flag,
-                        // maybe allow retry? For now, keep it true on other errors.
                         console.log("DEBUG: Keeping initialAnalysisSentRef true despite non-auth error.");
                     }
                 } finally {
@@ -156,8 +141,6 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
             if (initialAnalysisSentRef.current) console.log("Reason: Initial analysis already sent.");
             if (isLoading) console.log("Reason: Already loading.");
         }
-    // Ensure all relevant context variables are dependencies
-    // Use the stable imageFilenames list in the dependency array
     }, [imageFilenames, isLoading, selectedMajorName, sendingInstitutionId, allSendingInstitutionIds, receivingInstitutionId, academicYearId, user]);
 
     const handleSend = useCallback(async () => {
@@ -184,12 +167,10 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
                 role: msg.type === 'bot' ? 'assistant' : msg.type,
                 content: msg.text
             }));
-
-        // Include image_filenames in the payload for every message
         const payload = {
             new_message: currentInput,
             history: apiHistory,
-            image_filenames: imageFilenames // Add the list of all image filenames here
+            image_filenames: imageFilenames
         };
 
         try {
@@ -218,7 +199,6 @@ Analyze the provided agreement images thoroughly. Perform the following steps:
         } finally {
             setIsLoading(false);
         }
-    // Add imageFilenames to the dependency array for useCallback
     }, [userInput, isLoading, user, messages, imageFilenames]);
 
     return {
diff --git a/src/hooks/useInstitutionData.js b/src/hooks/useInstitutionData.js
index 1cef707..6b5f53a 100644
--- a/src/hooks/useInstitutionData.js
+++ b/src/hooks/useInstitutionData.js
@@ -12,8 +12,6 @@ export function useInstitutionData() {
         let isMounted = true;
         setIsLoading(true);
         setError(null);
-
-        // --- Check Cache ---
         try {
             const cachedData = localStorage.getItem(CACHE_KEY);
             if (cachedData) {
@@ -23,19 +21,16 @@ export function useInstitutionData() {
                     setInstitutions(parsedData);
                     setIsLoading(false);
                 }
-                return; // Exit early if loaded from cache
+                return;
             }
         } catch (e) {
             console.error("Error loading institutions from cache:", e);
-            localStorage.removeItem(CACHE_KEY); // Clear cache on error
+            localStorage.removeItem(CACHE_KEY);
         }
-
-        // --- Fetch from API ---
         fetchData('institutions')
             .then(data => {
                 if (isMounted) {
                     setInstitutions(data);
-                    // --- Cache Result ---
                     try {
                         localStorage.setItem(CACHE_KEY, JSON.stringify(data));
                         console.log("Institutions cached successfully:", CACHE_KEY);
@@ -47,7 +42,7 @@ export function useInstitutionData() {
             .catch(err => {
                 if (isMounted) {
                     setError(`Failed to load institutions: ${err.message}`);
-                    setInstitutions({}); // Clear on error
+                    setInstitutions({});
                 }
             })
             .finally(() => {
@@ -57,9 +52,9 @@ export function useInstitutionData() {
             });
 
         return () => {
-            isMounted = false; // Cleanup function to prevent state updates on unmounted component
+            isMounted = false;
         };
-    }, []); // Empty dependency array means this runs once on mount
+    }, []);
 
     return { institutions, isLoading, error };
 }
diff --git a/src/hooks/useReceivingInstitutions.js b/src/hooks/useReceivingInstitutions.js
index 7e97f36..5b95768 100644
--- a/src/hooks/useReceivingInstitutions.js
+++ b/src/hooks/useReceivingInstitutions.js
@@ -2,17 +2,15 @@ import { useState, useEffect, useRef } from 'react';
 import { fetchData } from '../services/api';
 
 const LOCAL_STORAGE_PREFIX = 'ctaCache_';
-// Remove calculateIntersection helper from frontend
 
 export function useReceivingInstitutions(selectedSendingInstitutions) {
     const [availableReceivingInstitutions, setAvailableReceivingInstitutions] = useState({});
     const [isLoading, setIsLoading] = useState(false);
     const [error, setError] = useState(null);
-    const cacheRef = useRef({}); // Simple in-memory cache for this hook instance
+    const cacheRef = useRef({}); 
 
-    // Define senderIds outside useEffect to use in dependency array
     const senderIds = selectedSendingInstitutions.map(s => s.id);
-    const senderIdsString = senderIds.sort().join(','); // Create sorted, comma-separated string for cache key & query
+    const senderIdsString = senderIds.sort().join(','); 
 
     useEffect(() => {
         let isMounted = true;
@@ -21,19 +19,18 @@ export function useReceivingInstitutions(selectedSendingInstitutions) {
             setAvailableReceivingInstitutions({});
             setIsLoading(false);
             setError(null);
-            return; // No senders, no need to fetch
+            return; 
         }
 
         const fetchCommonReceiving = async () => {
             if (!isMounted) return;
             setIsLoading(true);
             setError(null);
-            setAvailableReceivingInstitutions({}); // Clear previous results
+            setAvailableReceivingInstitutions({}); 
 
             const localStorageKey = `${LOCAL_STORAGE_PREFIX}receiving_intersection_${senderIdsString}`;
             const memoryCacheKey = `receiving_${senderIdsString}`;
 
-            // 1. Check In-Memory Cache
             if (cacheRef.current[memoryCacheKey]) {
                 console.log(`In-memory cache hit for receiving intersection: ${senderIdsString}`);
                 setAvailableReceivingInstitutions(cacheRef.current[memoryCacheKey]);
@@ -41,13 +38,12 @@ export function useReceivingInstitutions(selectedSendingInstitutions) {
                 return;
             }
 
-            // 2. Check localStorage
             try {
                 const cachedDataString = localStorage.getItem(localStorageKey);
                 if (cachedDataString) {
                     console.log(`LocalStorage hit for receiving intersection (${localStorageKey})`);
                     const cachedData = JSON.parse(cachedDataString);
-                    cacheRef.current[memoryCacheKey] = cachedData; // Update in-memory
+                    cacheRef.current[memoryCacheKey] = cachedData; 
                     setAvailableReceivingInstitutions(cachedData);
                     setIsLoading(false);
                     return;
@@ -57,10 +53,8 @@ export function useReceivingInstitutions(selectedSendingInstitutions) {
                 localStorage.removeItem(localStorageKey);
             }
 
-            // 3. Fetch from API (Single Call)
             console.log(`Cache miss for receiving intersection (${senderIdsString}). Fetching...`);
             try {
-                // Pass comma-separated string
                 const data = await fetchData(`receiving-institutions?sendingId=${senderIdsString}`);
 
                 if (!isMounted) return;
@@ -68,13 +62,12 @@ export function useReceivingInstitutions(selectedSendingInstitutions) {
                 let finalData = {};
                 let warnings = null;
 
-                // Handle potential 207 Multi-Status response
                 if (data && data.institutions !== undefined) {
                     finalData = data.institutions || {};
                     warnings = data.warnings;
                     if (warnings) console.warn("Partial fetch failure for receiving institutions:", warnings);
                 } else {
-                    finalData = data || {}; // Assume direct object if not 207 structure
+                    finalData = data || {}; 
                 }
 
                 if (Object.keys(finalData).length === 0 && !warnings) {
@@ -82,9 +75,8 @@ export function useReceivingInstitutions(selectedSendingInstitutions) {
                 }
 
                 setAvailableReceivingInstitutions(finalData);
-                cacheRef.current[memoryCacheKey] = finalData; // Store in memory
+                cacheRef.current[memoryCacheKey] = finalData; 
 
-                // Store in localStorage
                 try {
                     localStorage.setItem(localStorageKey, JSON.stringify(finalData));
                 } catch (e) {
@@ -95,11 +87,11 @@ export function useReceivingInstitutions(selectedSendingInstitutions) {
                 console.error("Error fetching common receiving institutions:", err);
                 if (isMounted) {
                     setError(`Failed to load common receiving institutions: ${err.message}`);
-                    setAvailableReceivingInstitutions({}); // Clear on error
+                    setAvailableReceivingInstitutions({}); 
                 }
             } finally {
                 if (isMounted) {
-                    setIsLoading(false); // Stop loading
+                    setIsLoading(false); 
                 }
             }
         };
@@ -107,9 +99,8 @@ export function useReceivingInstitutions(selectedSendingInstitutions) {
         fetchCommonReceiving();
 
         return () => {
-            isMounted = false; // Cleanup
+            isMounted = false; 
         };
-    // Depend on the sorted string representation of sender IDs
     // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [senderIdsString]);
 
diff --git a/src/hooks/useResizeHandler.js b/src/hooks/useResizeHandler.js
index f507b81..f877885 100644
--- a/src/hooks/useResizeHandler.js
+++ b/src/hooks/useResizeHandler.js
@@ -5,7 +5,7 @@ export function useResizeHandler(initialWidth, minColWidth, fixedMajorsWidth, is
     const isResizingRef = useRef(false);
     const dividerRef = useRef(null);
     const containerRef = useRef(null);
-    const dividerWidth = 1; // Assuming divider width is 1px
+    const dividerWidth = 1;
 
     const handleMouseMove = useCallback((e) => {
         if (!isResizingRef.current || !containerRef.current) {
@@ -16,25 +16,17 @@ export function useResizeHandler(initialWidth, minColWidth, fixedMajorsWidth, is
         const mouseX = e.clientX;
         const containerLeft = containerRect.left;
         const totalWidth = containerRect.width;
-        const gapWidth = 16; // Assuming 1em = 16px gap
-
-        // Read the *current* visibility from the ref
+        const gapWidth = 16;
         const currentVisibility = isMajorsVisibleRef.current;
-
-        // Calculate the starting position of the chat column
         const majorsEffectiveWidth = currentVisibility ? fixedMajorsWidth : 0;
         const gap1EffectiveWidth = currentVisibility ? gapWidth : 0;
         const chatStartOffset = majorsEffectiveWidth + gap1EffectiveWidth;
-
-        // Calculate desired chat width based on mouse position relative to chat start
         let newChatWidth = mouseX - containerLeft - chatStartOffset;
-
-        // Constraints: ensure chat and PDF columns have minimum width
         const maxChatWidth = totalWidth - chatStartOffset - minColWidth - gapWidth - dividerWidth;
         newChatWidth = Math.max(minColWidth, Math.min(newChatWidth, maxChatWidth));
 
         setChatColumnWidth(newChatWidth);
-    }, [minColWidth, fixedMajorsWidth, isMajorsVisibleRef]); // Dependencies updated
+    }, [minColWidth, fixedMajorsWidth, isMajorsVisibleRef]);
 
     const handleMouseUp = useCallback(() => {
         if (isResizingRef.current) {
@@ -44,10 +36,9 @@ export function useResizeHandler(initialWidth, minColWidth, fixedMajorsWidth, is
             document.body.style.cursor = '';
             document.body.style.userSelect = '';
         }
-    }, [handleMouseMove]); // Dependency on handleMouseMove
+    }, [handleMouseMove]);
 
     useEffect(() => {
-        // Cleanup function to remove listeners if component unmounts while resizing
         return () => {
             if (isResizingRef.current) {
                 window.removeEventListener('mousemove', handleMouseMove);
@@ -67,7 +58,7 @@ export function useResizeHandler(initialWidth, minColWidth, fixedMajorsWidth, is
 
     return {
         chatColumnWidth,
-        setChatColumnWidth, // Expose setter if needed externally
+        setChatColumnWidth,
         dividerRef,
         containerRef,
         handleMouseDown,
diff --git a/src/hooks/useUsageStatus.js b/src/hooks/useUsageStatus.js
index a9411ec..b1e5d59 100644
--- a/src/hooks/useUsageStatus.js
+++ b/src/hooks/useUsageStatus.js
@@ -1,7 +1,6 @@
 import { useState, useEffect } from 'react';
-import { fetchData } from '../services/api'; // Assuming api.js is in services
+import { fetchData } from '../services/api'; 
 
-// Helper function (can be moved to a utils file)
 function formatRemainingTime(resetTimestamp) {
     if (!resetTimestamp) return '';
     const now = new Date();
@@ -27,7 +26,6 @@ export function useUsageStatus(user, userTier) {
     });
     const [countdown, setCountdown] = useState('');
 
-    // Fetch User Usage Status
     useEffect(() => {
         setUsageStatus(prev => ({ ...prev, tier: userTier }));
 
@@ -38,14 +36,13 @@ export function useUsageStatus(user, userTier) {
 
         const fetchStatus = async () => {
             try {
-                const status = await fetchData('/user-status', { // This path is likely correct if fetchData adds /api
+                const status = await fetchData('/user-status', { 
                     headers: { 'Authorization': `Bearer ${user.idToken}` }
                 });
-                // --- Use the correct keys from the backend response ---
                 setUsageStatus({
-                    usageCount: status.usageCount, // Use camelCase
-                    usageLimit: status.usageLimit, // Use camelCase
-                    resetTime: status.resetTime,   // Use camelCase
+                    usageCount: status.usageCount, 
+                    usageLimit: status.usageLimit, 
+                    resetTime: status.resetTime,   
                     tier: status.tier,
                     error: null,
                 });
@@ -58,7 +55,6 @@ export function useUsageStatus(user, userTier) {
         fetchStatus();
     }, [user, userTier]);
 
-    // Countdown Timer Logic
     useEffect(() => {
         if (!usageStatus.resetTime) {
             setCountdown('');
@@ -77,7 +73,6 @@ export function useUsageStatus(user, userTier) {
             setCountdown(remaining);
             if (remaining === 'Usage reset') {
                 clearInterval(intervalId);
-                // Optionally refetch usage status after reset
             }
         }, 1000);
 
diff --git a/src/main.jsx b/src/main.jsx
index 1f48bdc..28be2e4 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -3,18 +3,13 @@ import { createRoot } from 'react-dom/client';
 import { BrowserRouter } from 'react-router-dom';
 import { GoogleOAuthProvider } from '@react-oauth/google';
 import App from './App.jsx';
-// Remove dotenv imports - Vite handles .env files for the frontend
 
-// Access the variable using import.meta.env
-// Vite replaces this with the actual value during build/dev
 const googleClientId = import.meta.env.VITE_GOOGLE_CLIENT_ID;
 
-// Add a check to ensure the variable is loaded
 if (!googleClientId) {
   console.error("FATAL ERROR: VITE_GOOGLE_CLIENT_ID is not defined.");
   console.error("Ensure you have a .env file in the project root (where package.json is)");
   console.error("and the variable is named VITE_GOOGLE_CLIENT_ID=YOUR_ID");
-  // You might want to render an error message to the user here instead of proceeding
 }
 
 createRoot(document.getElementById('root')).render(
diff --git a/src/services/api.js b/src/services/api.js
index 5a441f1..9725dcc 100644
--- a/src/services/api.js
+++ b/src/services/api.js
@@ -1,40 +1,22 @@
-/**
- * Fetches data from a backend endpoint via the /api proxy.
- * @param {string} endpoint - The API endpoint *without* the leading /api/ (e.g., 'institutions', 'chat', 'pdf-images/filename.pdf').
- * @param {object} options - Optional fetch options (method, headers, body, etc.). Defaults to GET.
- * @returns {Promise<object|null>} - A promise that resolves with the JSON data or null for empty responses.
- * @throws {Error} - Throws an error if the fetch fails or response is not ok.
- */
-
-// filepath: src/services/api.js
-// Assuming USER_STORAGE_KEY is accessible, e.g., imported from a constants file or App.jsx
-// If App.jsx defines it, you might need to move it to a shared constants file.
-// For example: import { USER_STORAGE_KEY } from '../constants';
-const USER_STORAGE_KEY = 'collegeTransferUser'; // Or import from constants
-const API_BASE_URL = '/api'; // Ensure no trailing slash
+const USER_STORAGE_KEY = 'collegeTransferUser';
+const API_BASE_URL = '/api';
 
 export async function fetchData(endpoint, options = {}) {
-    // Ensure endpoint doesn't start with '/' OR base URL doesn't end with '/'
     const cleanEndpoint = endpoint.startsWith('/') ? endpoint.substring(1) : endpoint;
     const url = `${API_BASE_URL}/${cleanEndpoint}`;
-
-    // Get token from storage
     let token = null;
     try {
         const storedUser = localStorage.getItem(USER_STORAGE_KEY);
         if (storedUser) {
             const parsedUser = JSON.parse(storedUser);
-            // Basic check if token exists
             if (parsedUser?.idToken) {
-                 // You could add a preliminary expiry check here using jwtDecode,
-                 // but the backend check (401) is the definitive one.
                 token = parsedUser.idToken;
             }
         }
     } catch (e) { console.error("Error reading user token from localStorage", e); }
 
     const headers = {
-        'Content-Type': 'application/json', // Default content type
+        'Content-Type': 'application/json',
         ...options.headers
     };
     if (token) {
@@ -46,43 +28,30 @@ export async function fetchData(endpoint, options = {}) {
             ...options,
             headers: headers,
         });
-
-        // --- Check for 401 Unauthorized ---
         if (response.status === 401) {
             console.warn(`API request to ${url} resulted in 401 Unauthorized. Token likely expired or invalid.`);
-            // Dispatch custom event to notify the App component to handle logout
             window.dispatchEvent(new CustomEvent('auth-expired'));
-            // Throw an error to stop further processing in the calling code
             throw new Error("Authentication required or session expired.");
         }
-        // --- End 401 Check ---
-
         if (!response.ok) {
-            // Handle other non-OK responses
             const errorData = await response.json().catch(() => ({ message: response.statusText }));
             throw new Error(errorData.error || errorData.message || `HTTP error! status: ${response.status}`);
         }
-
-        // Handle potential empty responses or non-JSON responses if necessary
         const contentType = response.headers.get("content-type");
-        if (response.status === 204 || !contentType) { // Handle No Content or missing content type
-            return null; // Or appropriate response
+        if (response.status === 204 || !contentType) {
+            return null;
         }
         if (contentType && contentType.indexOf("application/json") !== -1) {
             return response.json();
         } else {
-            return response.text(); // Handle plain text response
+            return response.text();
         }
 
     } catch (error) {
         console.error(`Fetch error for ${url}:`, error.message);
-        // Re-throw the error so calling code (hooks, components) can potentially handle it
-        // (e.g., display specific error messages), unless it was the auth error we already handled.
         if (error.message !== "Authentication required or session expired.") {
              throw error;
         }
-        // If it was the auth error, we don't need to re-throw, as logout is triggered.
-        // Return null or a specific marker if needed by calling code.
         return null;
     }
 }
diff --git a/src/utils/formatText.jsx b/src/utils/formatText.jsx
index a7bdca6..ab2a656 100644
--- a/src/utils/formatText.jsx
+++ b/src/utils/formatText.jsx
@@ -1,65 +1,47 @@
 import React from 'react';
 
-// Helper function to parse basic markdown (bold/italic/bullets)
 export function formatText(text) {
-  if (!text) return ''; // Handle null or undefined text
-
-  // 1. Pre-process lines for bullets ('* ' -> '• ')
+  if (!text) return '';
   const lines = text.split('\n');
   const processedLines = lines.map(line => {
-    // Use trim() to handle potential leading whitespace before '*'
     if (line.trim().startsWith('* ')) {
-      // Replace '* ' with '• ' and keep the rest of the line content
-      // Use indexOf to find the first '*' to correctly handle indentation
       const starIndex = line.indexOf('*');
-      const prefix = line.substring(0, starIndex); // Keep indentation
+      const prefix = line.substring(0, starIndex);
       return prefix + '• ' + line.substring(starIndex + 2);
     }
     return line;
   });
   const textWithBullets = processedLines.join('\n');
-
-  // 2. Apply bold/italic formatting to the text with bullets
-  const regex = /(\*\*.*?\*\*|`.*?`)/g; // Regex to find **bold** or `italic`
+  const regex = /(\*\*.*?\*\*|`.*?`)/g;
   let lastIndex = 0;
   const result = [];
   let match;
 
   try {
-      // Use textWithBullets for bold/italic parsing
       while ((match = regex.exec(textWithBullets)) !== null) {
-        // Add text before the match
         if (match.index > lastIndex) {
           result.push(textWithBullets.substring(lastIndex, match.index));
         }
 
         const matchedText = match[0];
-        // Add bold or italic element
         if (matchedText.startsWith('**') && matchedText.endsWith('**')) {
-          // Ensure content exists before slicing
           const content = matchedText.length > 4 ? matchedText.slice(2, -2) : '';
-          result.push(<strong key={`bold-${lastIndex}`}>{content}</strong>); // Use unique keys
+          result.push(<strong key={`bold-${lastIndex}`}>{content}</strong>);
         } else if (matchedText.startsWith('`') && matchedText.endsWith('`')) {
-           // Ensure content exists before slicing
           const content = matchedText.length > 2 ? matchedText.slice(1, -1) : '';
-          result.push(<em key={`italic-${lastIndex}`}>{content}</em>); // Use unique keys
+          result.push(<em key={`italic-${lastIndex}`}>{content}</em>);
         } else {
-           // Should not happen with this regex, but as fallback, add the raw match
            result.push(matchedText);
         }
 
         lastIndex = regex.lastIndex;
       }
-
-      // Add any remaining text after the last match
       if (lastIndex < textWithBullets.length) {
         result.push(textWithBullets.substring(lastIndex));
       }
-
-      // Filter out potential empty strings and ensure valid React children
       return result.filter(part => part !== null && part !== '');
    } catch (error) {
        console.error("Error formatting text:", error, "Original text:", text);
-       return text; // Return original text on error
+       return text;
    }
 }
diff --git a/vite.config.js b/vite.config.js
index a5d1c29..faec4ad 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -2,33 +2,26 @@ import { defineConfig, loadEnv } from 'vite'
 import react from '@vitejs/plugin-react-swc'
 import dotenv from 'dotenv';
 
-// Load .env file
 dotenv.config();
 
-// https://vite.dev/config/
 export default defineConfig(({ mode }) => {
-  // Load env file based on `mode` in the current working directory.
-  // Set the third parameter to '' to load all env regardless of the `VITE_` prefix.
   // eslint-disable-next-line no-undef
   const env = loadEnv(mode, process.cwd(), '');
 
   return {
     plugins: [react()],
     define: {
-      // Expose environment variables to your client code
       'process.env.VITE_GOOGLE_CLIENT_ID': JSON.stringify(env.VITE_GOOGLE_CLIENT_ID),
     },
     server: {
-      // Configure headers for development server (useful for OAuth popups)
       headers: {
         'Cross-Origin-Opener-Policy': 'same-origin-allow-popups',
       },
       proxy: {
-        // Proxy API requests to the Flask backend
         '/api': {
-          target: 'http://127.0.0.1:5000', // Your Flask backend address
-          changeOrigin: true, // Recommended for virtual hosted sites
-          secure: false, // Set to true if your backend uses HTTPS with a valid cert
+          target: 'http://127.0.0.1:5000', 
+          changeOrigin: true, 
+          secure: false, 
         },
       },
     },