diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index ffa46888..d0ef6f75 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -8,10 +8,11 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./frontend
+      
     name: Build and lint
     steps:
       - name: Checkout repository
diff --git a/.gitignore b/.gitignore
index 5a2c9c1f..ba885016 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ node_modules/
 # Environment variables
 .env
 .env.*
+
diff --git a/algorithm-prototyping/brute-force-prototype/src/main/java/edu/uga/devdogs/bruteforceprototype/BruteForcePrototype.java b/algorithm-prototyping/brute-force-prototype/src/main/java/edu/uga/devdogs/bruteforceprototype/BruteForcePrototype.java
index 5c0a0a98..6eee1987 100644
--- a/algorithm-prototyping/brute-force-prototype/src/main/java/edu/uga/devdogs/bruteforceprototype/BruteForcePrototype.java
+++ b/algorithm-prototyping/brute-force-prototype/src/main/java/edu/uga/devdogs/bruteforceprototype/BruteForcePrototype.java
@@ -7,7 +7,6 @@
 import edu.uga.devdogs.sampledataparser.records.SConstraints;
 import edu.uga.devdogs.sampledataparser.records.Section;
 
-import java.sql.Array;
 import java.util.*;
 
 public class BruteForcePrototype {
@@ -42,9 +41,6 @@ public static int[][] algorithmDriver(Set<Course> inputCourses, Map<String, Map<
             return optimize(outputCourses, distances, softConstraints,false);
         } catch (Exception e){
             // If an exception arises from dataPreSoftFilter, we will call an overloaded version of optimize().
-            // The overloaded version is not written yet, so when it is actually implemented,
-            // this catch block will need updated accordingly.
-            System.out.println(e.getMessage());
             //outputCourses = BruteForceUtil.dayOfWeekConvert(outputCourses);
             return optimize(outputCourses, distances, softConstraints, true);
         }
@@ -76,7 +72,7 @@ public static int[][] optimize(Set<Course> inputCourses, Map<String, Map<String,
         List<Schedule> sortedSchedules = new ArrayList<>();
         List<Double> sortedOverallObjectives = new ArrayList<>();
 
-        
+
         // Makeshift Priority Queue; An array sorted by a variable (in this case, overallObjective).
         // Before an item is added, you find where it should be placed so that the List is still sorted correctly
         // Without having to call a special sorting function.
@@ -167,8 +163,8 @@ private static void generateValidSchedulesRecursive(Set<Section> sections, List<
             // Instantiates the set of sections for the next iteration
             HashSet<Section> nextSections = new HashSet<>(sections);
             nextSections.add(sectionToAdd);
-            
+
             generateValidSchedulesRecursive(nextSections, nextCoursesToAdd, validSchedules);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/algorithm-prototyping/brute-force-prototype/src/main/java/edu/uga/devdogs/bruteforceprototype/BruteForceUtil.java b/algorithm-prototyping/brute-force-prototype/src/main/java/edu/uga/devdogs/bruteforceprototype/BruteForceUtil.java
index 79675f4c..c6713237 100644
--- a/algorithm-prototyping/brute-force-prototype/src/main/java/edu/uga/devdogs/bruteforceprototype/BruteForceUtil.java
+++ b/algorithm-prototyping/brute-force-prototype/src/main/java/edu/uga/devdogs/bruteforceprototype/BruteForceUtil.java
@@ -2,6 +2,7 @@
 
 import edu.uga.devdogs.sampledataparser.records.*;
 import edu.uga.devdogs.sampledataparser.records.Class;
+import edu.uga.devdogs.bruteforceprototype.schedule.Schedule;
 
 import java.time.DayOfWeek;
 import java.util.ArrayList;
@@ -157,8 +158,9 @@ public static DayOfWeek daySwitch(String day) {
      *
      * @param inputCourses user inputted courses.
      * @param validSchedules a set of valid generated schedules
+     * @throws Exception if {@code courseInSchedule} if true
      */
-    public static void ensureInitialCourses(Set<Course> inputCourses, Set<Schedules> validSchedules) {
+    public static void ensureInitialCourses(Set<Course> inputCourses, Set<Schedule> validSchedules) throws Exception {
         boolean courseInSchedule = false;
         // for every user inputted course
         for (Course c : inputCourses) {
@@ -167,12 +169,12 @@ public static void ensureInitialCourses(Set<Course> inputCourses, Set<Schedules>
                 // for every section in said schedule
                 for (Section sect : s.sections()) {
                     // if the course the user inputted, c, is in the schedule, s
-                    if (c.courseCode == sect.courseCode) {
+                    if (c.courseCode().equals(sect.courseCode())) {
                         courseInSchedule = true;
                     } // if
                 } // for
                 if (!courseInSchedule) {
-                    throw new Exception("Schedule does not contain specified course.")
+                    throw new Exception("Schedule does not contain specified course.");
                 } // if
             } // for
         } // for
diff --git a/algorithm-prototyping/brute-force-prototype/src/main/java/edu/uga/devdogs/bruteforceprototype/schedule/Schedule.java b/algorithm-prototyping/brute-force-prototype/src/main/java/edu/uga/devdogs/bruteforceprototype/schedule/Schedule.java
index f7a09b73..c8499601 100644
--- a/algorithm-prototyping/brute-force-prototype/src/main/java/edu/uga/devdogs/bruteforceprototype/schedule/Schedule.java
+++ b/algorithm-prototyping/brute-force-prototype/src/main/java/edu/uga/devdogs/bruteforceprototype/schedule/Schedule.java
@@ -65,5 +65,4 @@ public Set<Section> sections() {
     public EnumMap<DayOfWeek, TreeSet<Class>> days() {
         return days;
     }
-}
-
+}
\ No newline at end of file
diff --git a/algorithm-prototyping/brute-force-prototype/src/main/java/edu/uga/devdogs/bruteforceprototype/schedule/ScheduleUtil.java b/algorithm-prototyping/brute-force-prototype/src/main/java/edu/uga/devdogs/bruteforceprototype/schedule/ScheduleUtil.java
index 9a1f9d72..fb130967 100644
--- a/algorithm-prototyping/brute-force-prototype/src/main/java/edu/uga/devdogs/bruteforceprototype/schedule/ScheduleUtil.java
+++ b/algorithm-prototyping/brute-force-prototype/src/main/java/edu/uga/devdogs/bruteforceprototype/schedule/ScheduleUtil.java
@@ -5,12 +5,20 @@
 import edu.uga.devdogs.sampledataparser.records.Class;
 import edu.uga.devdogs.sampledataparser.records.HConstraints;
 
+//import edu.uga.devdogs.course_information.service;
+//import org.springframework.beans.factory.annotation.Autowired;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeSet;
+import java.util.EnumMap;
 import java.util.Set;
 
+import java.time.DayOfWeek;
+import java.time.LocalTime;
+
+
 
 /**
  * Utility class for performing operations and calculations related to a Schedule.
@@ -22,6 +30,10 @@
  */
 public class ScheduleUtil {
 
+    // Used for bootstrap getting coords
+    //@Autowired
+    //private CourseInformationService courseInformationService;
+
     /**
      * Validates the given schedule by checking for any time conflicts between classes.
      * A time conflict occurs when two classes overlap in their scheduled times.
@@ -86,7 +98,7 @@ public static double computeAverageProfessorQuality(Schedule schedule) {
 
     /**
      * Checks if schedule or constraints is null and throws an exception if it is.
-     * 
+     *
      * @param schedule the schedule to validate
      * @param constraints the constraints to validate
      */
@@ -115,14 +127,36 @@ public static double computeMaxDistance(Schedule schedule, Map<String, Map<Strin
         // Iterates over each day in the schedule
         for (TreeSet<Class> day : schedule.days().values()) {
             // Converts the TreeSet to List for direct indexing
-            // TODO: Replace TreeSet with a sorted List for days in Schedule
             List<Class> dayList = new ArrayList<>(day);
 
             // Iterates over consecutive class pairs
             for (int i = 0; i < dayList.size() - 1; i++) {
                 Class currClass = dayList.get(i);
                 Class nextClass = dayList.get(i + 1);
-                double distance = distances.get(currClass.buildingName()).get(nextClass.buildingName());
+
+                double lat1 = 0.0;//courseInformationService.getLatitude(currClass.buildingNumber());
+                double lon1 = 0.0; //courseInformationService.getLongitude(currClass.buildingNumber());
+                double lon2 = 0.0; //courseInformationService.getLongitude(nextClass.buildingNumber());
+                double lat2 = 0.0; //courseInformationService.getLatitude(nextClass.buildingNumber());
+
+                // distance between latitudes and longitudes
+                double dLat = Math.toRadians(lat2 - lat1);
+                double dLon = Math.toRadians(lon2 - lon1);
+
+                // convert to radians
+                lat1 = Math.toRadians(lat1);
+                lat2 = Math.toRadians(lat2);
+
+                // apply Haversine formula
+                double a = Math.pow(Math.sin(dLat / 2), 2) +
+                        Math.pow(Math.sin(dLon / 2), 2) *
+                                Math.cos(lat1) *
+                                Math.cos(lat2);
+
+                // Earth's radius in miles
+                double rad = 3960;
+                double c = 2 * Math.asin(Math.sqrt(a));
+                double distance = rad * c;
 
                 if (distance > maxDistance) {
                     maxDistance = distance;
@@ -130,7 +164,9 @@ public static double computeMaxDistance(Schedule schedule, Map<String, Map<Strin
             }
         }
 
-        return maxDistance;
+        // dimensional analysis. Average human walking speed is 3 miles per hour.
+        // miles * (hours/miles) * (minutes/hours)
+        return maxDistance * (1/3) * (60);
     }
 
     /**
@@ -174,6 +210,63 @@ public static double computeAverageIdleTime(Schedule schedule) {
         return (double) sumOfTimeGaps / countOfClassGaps;
     }
 
+
+
+    /**
+     * Computes the earliest start time of all classes in a schedule
+     *
+     * @param schedule the schedule for which to compute the earliest start time
+     * @return the earliest start time (in hours) as a double. For example, 4:30 pm would be represented as 16.5
+     */
+    public static double computeStartTime(Schedule schedule) {
+        LocalTime earliestStartTime = LocalTime.of(23,59,59);
+        for (Section eachSection : schedule.sections()) {
+            for (Class eachClass : eachSection.classes()) {
+                if (eachClass.startTime().isBefore(earliestStartTime)) {
+                    earliestStartTime = eachClass.startTime();
+                }
+            }
+        }
+        return earliestStartTime.getHour() + (double) earliestStartTime.getMinute() / 60;
+    }
+
+
+
+    /**
+     * Computes the latest start time of all classes in a schedule
+     *
+     * @param schedule the schedule for which to compute the latest start time
+     * @return the latest start time (in hours) as a double. For example, 4:30 pm would be represented as 16.5
+     */
+    private static double computeEndTime(Schedule schedule) {
+        LocalTime latestStartTime = LocalTime.of(0,0,0);
+        for (Section eachSection : schedule.sections()) {
+            for (Class eachClass : eachSection.classes()) {
+                if (eachClass.startTime().isAfter(latestStartTime)) {
+                    latestStartTime = eachClass.startTime();
+                }
+            }
+        }
+        return latestStartTime.getHour() + (double) latestStartTime.getMinute() / 60;
+    }
+
+
+
+    /**
+     * Determines whether a given schedule has zero classes on a given day
+     *
+     * @param schedule the schedule for which to compute whether it has a gap day or not
+     * @param gapDay the day that is being checked as a gap day or not
+     * @return {@code true} if the given schedule has no classes on the given day, {@code false} if it has at least one class
+     */
+    private static boolean computeGapDay(Schedule schedule, DayOfWeek gapDay) {
+        EnumMap<DayOfWeek, TreeSet<Class>> days = schedule.days();
+        TreeSet<Class> classes = days.get(gapDay);
+        return classes.isEmpty();
+    }
+
+
+
     /**
      * Computes the overall objective score for the given schedule based on weighted objectives.
      * This method computes each objective, normalizes their values using min-max normalization, and computes a weighted sum.
@@ -185,10 +278,10 @@ public static double computeAverageIdleTime(Schedule schedule) {
      * @return the overall objective score for the schedule
      */
     public static double computeOverallObjective(Schedule schedule, Map<String, Map<String, Double>> distances) {
-       // Checks if the parameters are valid
-       if (schedule == null || distances == null) {
-           throw new IllegalArgumentException("Parameters cannot be null");
-       }
+        // Checks if the parameters are valid
+        if (schedule == null || distances == null) {
+            throw new IllegalArgumentException("Parameters cannot be null");
+        }
 
         // The minimum rating on rate my professor is 1.0(if they have ratings).
         final double professorQualityMinimum = 1.0;
@@ -251,7 +344,7 @@ public static double computeOverallObjectiveExtended(Schedule schedule, Map<Stri
             possSConstraintsCount++;
         }
         if (softConstraints.prefStartTime() != null) {
-            possSConstraintScore += normalizeValue(computeStartTime(schedule), prefTimeMinimum, prefTimeMaximum);;
+            possSConstraintScore += normalizeValue(computeStartTime(schedule), prefTimeMinimum, prefTimeMaximum);
             possSConstraintsCount++;
         }
         if (softConstraints.prefEndTime() != null) {
@@ -310,4 +403,4 @@ public static int[] sectionsToInts(Set<Section> sections) {
         return output;
     }
 
-}
+}
\ No newline at end of file
diff --git a/algorithm-prototyping/src/main/java/edu/uga/devdogs/Main.class b/algorithm-prototyping/src/main/java/edu/uga/devdogs/Main.class
new file mode 100644
index 00000000..54444e11
Binary files /dev/null and b/algorithm-prototyping/src/main/java/edu/uga/devdogs/Main.class differ
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 016ecdac..67b6ad17 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -15,8 +15,10 @@
         "@t3-oss/env-nextjs": "^0.11.1",
         "@tanstack/react-query": "^5.66.5",
         "date-fns": "^4.1.0",
+        "match-sorter": "^8.0.0",
         "motion": "^12.4.3",
         "next": "14.2.23",
+        "pnpm": "^10.6.3",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
         "react-icons": "^5.4.0",
@@ -33,10 +35,13 @@
         "eslint": "^8.57.1",
         "eslint-config-next": "14.2.13",
         "postcss": "^8.5.2",
-        "prettier": "^3.5.1",
+        "prettier": "3.5.3",
         "prettier-plugin-tailwindcss": "^0.6.11",
         "tailwindcss": "^3.4.17",
         "typescript": "^5.7.3"
+      },
+      "engines": {
+        "node": ">=20.0.0"
       }
     },
     "node_modules/@alloc/quick-lru": {
@@ -52,6 +57,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@babel/runtime": {
+      "version": "7.26.10",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.10.tgz",
+      "integrity": "sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==",
+      "license": "MIT",
+      "dependencies": {
+        "regenerator-runtime": "^0.14.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@emnapi/runtime": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.3.1.tgz",
@@ -4626,6 +4643,16 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/match-sorter": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/match-sorter/-/match-sorter-8.0.0.tgz",
+      "integrity": "sha512-bGJ6Zb+OhzXe+ptP5d80OLVx7AkqfRbtGEh30vNSfjNwllu+hHI+tcbMIT/fbkx/FKN1PmKuDb65+Oofg+XUxw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.23.8",
+        "remove-accents": "0.5.0"
+      }
+    },
     "node_modules/merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
@@ -5168,6 +5195,22 @@
         "node": ">= 6"
       }
     },
+    "node_modules/pnpm": {
+      "version": "10.6.3",
+      "resolved": "https://registry.npmjs.org/pnpm/-/pnpm-10.6.3.tgz",
+      "integrity": "sha512-u0XjTVCpp26FipWDcwG/tr1tNa6ixdUglPpJekZ8Q/XEQBA84lEengovicPWBxuqwzWPxorG+3XizrPSc2Bl5g==",
+      "license": "MIT",
+      "bin": {
+        "pnpm": "bin/pnpm.cjs",
+        "pnpx": "bin/pnpx.cjs"
+      },
+      "engines": {
+        "node": ">=18.12"
+      },
+      "funding": {
+        "url": "https://opencollective.com/pnpm"
+      }
+    },
     "node_modules/possible-typed-array-names": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
@@ -5339,9 +5382,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.2.tgz",
-      "integrity": "sha512-lc6npv5PH7hVqozBR7lkBNOGXV9vMwROAPlumdBkX0wTbbzPu/U1hk5yL8p2pt4Xoc+2mkT8t/sow2YrV/M5qg==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
+      "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -5630,6 +5673,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/regenerator-runtime": {
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+      "license": "MIT"
+    },
     "node_modules/regexp.prototype.flags": {
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz",
@@ -5649,6 +5698,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/remove-accents": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.5.0.tgz",
+      "integrity": "sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A==",
+      "license": "MIT"
+    },
     "node_modules/resolve": {
       "version": "1.22.8",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 14321899..5b8cc3dd 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -3,6 +3,9 @@
   "version": "0.1.0",
   "private": true,
   "type": "module",
+  "engines": {
+    "node": ">=20.0.0"
+  },
   "scripts": {
     "dev": "next dev",
     "build": "next build",
@@ -20,11 +23,13 @@
     "@radix-ui/react-popover": "^1.1.6",
     "@radix-ui/react-toast": "^1.2.6",
     "@t3-oss/env-nextjs": "^0.11.1",
+    "@tailwindcss/forms": "^0.5.10",
     "@tanstack/react-query": "^5.66.5",
     "date-fns": "^4.1.0",
     "match-sorter": "^8.0.0",
     "motion": "^12.4.3",
     "next": "14.2.23",
+    "pnpm": "^10.6.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-icons": "^5.4.0",
@@ -41,7 +46,7 @@
     "eslint": "^8.57.1",
     "eslint-config-next": "14.2.13",
     "postcss": "^8.5.2",
-    "prettier": "^3.5.1",
+    "prettier": "3.5.3",
     "prettier-plugin-tailwindcss": "^0.6.11",
     "tailwindcss": "^3.4.17",
     "typescript": "^5.7.3"
diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml
index 324c1f3c..c84a4d48 100644
--- a/frontend/pnpm-lock.yaml
+++ b/frontend/pnpm-lock.yaml
@@ -9,22 +9,25 @@ importers:
     dependencies:
       "@radix-ui/react-accordion":
         specifier: ^1.2.3
-        version: 1.2.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 1.2.4(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       "@radix-ui/react-dialog":
         specifier: ^1.1.6
-        version: 1.1.6(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 1.1.7(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       "@radix-ui/react-popover":
         specifier: ^1.1.6
-        version: 1.1.6(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 1.1.7(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       "@radix-ui/react-toast":
         specifier: ^1.2.6
-        version: 1.2.6(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 1.2.7(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       "@t3-oss/env-nextjs":
         specifier: ^0.11.1
-        version: 0.11.1(typescript@5.7.3)(zod@3.24.2)
+        version: 0.11.1(typescript@5.8.3)(zod@3.24.2)
+      "@tailwindcss/forms":
+        specifier: ^0.5.10
+        version: 0.5.10(tailwindcss@3.4.17)
       "@tanstack/react-query":
         specifier: ^5.66.5
-        version: 5.66.5(react@18.3.1)
+        version: 5.72.2(react@18.3.1)
       date-fns:
         specifier: ^4.1.0
         version: 4.1.0
@@ -33,10 +36,13 @@ importers:
         version: 8.0.0
       motion:
         specifier: ^12.4.3
-        version: 12.4.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 12.6.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       next:
         specifier: 14.2.23
         version: 14.2.23(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      pnpm:
+        specifier: ^10.6.3
+        version: 10.8.0
       react:
         specifier: ^18.3.1
         version: 18.3.1
@@ -45,7 +51,7 @@ importers:
         version: 18.3.1(react@18.3.1)
       react-icons:
         specifier: ^5.4.0
-        version: 5.4.0(react@18.3.1)
+        version: 5.5.0(react@18.3.1)
       sharp:
         specifier: ^0.33.5
         version: 0.33.5
@@ -58,40 +64,40 @@ importers:
         version: 8.56.12
       "@types/node":
         specifier: ^22.13.4
-        version: 22.13.4
+        version: 22.14.0
       "@types/react":
         specifier: ^18.3.18
-        version: 18.3.18
+        version: 18.3.20
       "@types/react-dom":
         specifier: ^18.3.5
-        version: 18.3.5(@types/react@18.3.18)
+        version: 18.3.6(@types/react@18.3.20)
       "@typescript-eslint/eslint-plugin":
         specifier: ^8.24.1
-        version: 8.24.1(@typescript-eslint/parser@8.24.1(eslint@8.57.1)(typescript@5.7.3))(eslint@8.57.1)(typescript@5.7.3)
+        version: 8.29.1(@typescript-eslint/parser@8.29.1(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(typescript@5.8.3)
       "@typescript-eslint/parser":
         specifier: ^8.24.1
-        version: 8.24.1(eslint@8.57.1)(typescript@5.7.3)
+        version: 8.29.1(eslint@8.57.1)(typescript@5.8.3)
       eslint:
         specifier: ^8.57.1
         version: 8.57.1
       eslint-config-next:
         specifier: 14.2.13
-        version: 14.2.13(eslint@8.57.1)(typescript@5.7.3)
+        version: 14.2.13(eslint@8.57.1)(typescript@5.8.3)
       postcss:
         specifier: ^8.5.2
-        version: 8.5.2
+        version: 8.5.3
       prettier:
-        specifier: ^3.5.1
-        version: 3.5.1
+        specifier: 3.5.3
+        version: 3.5.3
       prettier-plugin-tailwindcss:
         specifier: ^0.6.11
-        version: 0.6.11(prettier@3.5.1)
+        version: 0.6.11(prettier@3.5.3)
       tailwindcss:
         specifier: ^3.4.17
         version: 3.4.17
       typescript:
         specifier: ^5.7.3
-        version: 5.7.3
+        version: 5.8.3
 
 packages:
   "@alloc/quick-lru@5.2.0":
@@ -101,23 +107,35 @@ packages:
       }
     engines: { node: ">=10" }
 
-  "@babel/runtime@7.26.9":
+  "@babel/runtime@7.27.0":
     resolution:
       {
-        integrity: sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg==,
+        integrity: sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==,
       }
     engines: { node: ">=6.9.0" }
 
-  "@emnapi/runtime@1.3.1":
+  "@emnapi/core@1.4.0":
     resolution:
       {
-        integrity: sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==,
+        integrity: sha512-H+N/FqT07NmLmt6OFFtDfwe8PNygprzBikrEMyQfgqSmT0vzE515Pz7R8izwB9q/zsH/MA64AKoul3sA6/CzVg==,
       }
 
-  "@eslint-community/eslint-utils@4.4.1":
+  "@emnapi/runtime@1.4.0":
     resolution:
       {
-        integrity: sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==,
+        integrity: sha512-64WYIf4UYcdLnbKn/umDlNjQDSS8AgZrI/R9+x5ilkUVFxXcA1Ebl+gQLc/6mERA4407Xof0R7wEyEuj091CVw==,
+      }
+
+  "@emnapi/wasi-threads@1.0.1":
+    resolution:
+      {
+        integrity: sha512-iIBu7mwkq4UQGeMEM8bLwNK962nXdhodeScX4slfQnRhEMMzvYivHhutCIk8uojvmASXXPC2WNEjwxFWk72Oqw==,
+      }
+
+  "@eslint-community/eslint-utils@4.5.1":
+    resolution:
+      {
+        integrity: sha512-soEIOALTfTK6EjmKMMoLugwaP0rzkad90iIWd1hMO9ARkSAyjfMfkRRhLvD5qH7vvM0Cg72pieUfR6yh6XxC4w==,
       }
     engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
     peerDependencies:
@@ -395,6 +413,12 @@ packages:
         integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==,
       }
 
+  "@napi-rs/wasm-runtime@0.2.8":
+    resolution:
+      {
+        integrity: sha512-OBlgKdX7gin7OIq4fadsjpg+cp2ZphvAIKucHsNfTdJiqdOmOEwQd/bHi0VwNrcw5xpBJyUw6cK/QilCqy1BSg==,
+      }
+
   "@next/env@14.2.23":
     resolution:
       {
@@ -523,16 +547,16 @@ packages:
       }
     engines: { node: ">=14" }
 
-  "@radix-ui/primitive@1.1.1":
+  "@radix-ui/primitive@1.1.2":
     resolution:
       {
-        integrity: sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA==,
+        integrity: sha512-XnbHrrprsNqZKQhStrSwgRUQzoCI1glLzdw79xiZPoofhGICeZRSQ3dIxAKH1gb3OHfNf4d6f+vAv3kil2eggA==,
       }
 
-  "@radix-ui/react-accordion@1.2.3":
+  "@radix-ui/react-accordion@1.2.4":
     resolution:
       {
-        integrity: sha512-RIQ15mrcvqIkDARJeERSuXSry2N8uYnxkdDetpfmalT/+0ntOXLkFOsh9iwlAsCv+qcmhZjbdJogIm6WBa6c4A==,
+        integrity: sha512-SGCxlSBaMvEzDROzyZjsVNzu9XY5E28B3k8jOENyrz6csOv/pG1eHyYfLJai1n9tRjwG61coXDhfpgtxKxUv5g==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -545,10 +569,10 @@ packages:
       "@types/react-dom":
         optional: true
 
-  "@radix-ui/react-arrow@1.1.2":
+  "@radix-ui/react-arrow@1.1.3":
     resolution:
       {
-        integrity: sha512-G+KcpzXHq24iH0uGG/pF8LyzpFJYGD4RfLjCIBfGdSLXvjLHST31RUiRVrupIBMvIppMgSzQ6l66iAxl03tdlg==,
+        integrity: sha512-2dvVU4jva0qkNZH6HHWuSz5FN5GeU5tymvCgutF8WaXz9WnD1NgUhy73cqzkjkN4Zkn8lfTPv5JIfrC221W+Nw==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -561,10 +585,10 @@ packages:
       "@types/react-dom":
         optional: true
 
-  "@radix-ui/react-collapsible@1.1.3":
+  "@radix-ui/react-collapsible@1.1.4":
     resolution:
       {
-        integrity: sha512-jFSerheto1X03MUC0g6R7LedNW9EEGWdg9W1+MlpkMLwGkgkbUXLPBH/KIuWKXUoeYRVY11llqbTBDzuLg7qrw==,
+        integrity: sha512-u7LCw1EYInQtBNLGjm9nZ89S/4GcvX1UR5XbekEgnQae2Hkpq39ycJ1OhdeN1/JDfVNG91kWaWoest127TaEKQ==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -577,10 +601,10 @@ packages:
       "@types/react-dom":
         optional: true
 
-  "@radix-ui/react-collection@1.1.2":
+  "@radix-ui/react-collection@1.1.3":
     resolution:
       {
-        integrity: sha512-9z54IEKRxIa9VityapoEYMuByaG42iSy1ZXlY2KcuLSEtq8x4987/N6m15ppoMffgZX72gER2uHe1D9Y6Unlcw==,
+        integrity: sha512-mM2pxoQw5HJ49rkzwOs7Y6J4oYH22wS8BfK2/bBxROlI4xuR0c4jEenQP63LlTlDkO6Buj2Vt+QYAYcOgqtrXA==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -593,10 +617,10 @@ packages:
       "@types/react-dom":
         optional: true
 
-  "@radix-ui/react-compose-refs@1.1.1":
+  "@radix-ui/react-compose-refs@1.1.2":
     resolution:
       {
-        integrity: sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==,
+        integrity: sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -605,10 +629,10 @@ packages:
       "@types/react":
         optional: true
 
-  "@radix-ui/react-context@1.1.1":
+  "@radix-ui/react-context@1.1.2":
     resolution:
       {
-        integrity: sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==,
+        integrity: sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -617,10 +641,10 @@ packages:
       "@types/react":
         optional: true
 
-  "@radix-ui/react-dialog@1.1.6":
+  "@radix-ui/react-dialog@1.1.7":
     resolution:
       {
-        integrity: sha512-/IVhJV5AceX620DUJ4uYVMymzsipdKBzo3edo+omeskCKGm9FRHM0ebIdbPnlQVJqyuHbuBltQUOG2mOTq2IYw==,
+        integrity: sha512-EIdma8C0C/I6kL6sO02avaCRqi3fmWJpxH6mqbVScorW6nNktzKJT/le7VPho3o/7wCsyRg3z0+Q+Obr0Gy/VQ==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -633,10 +657,10 @@ packages:
       "@types/react-dom":
         optional: true
 
-  "@radix-ui/react-direction@1.1.0":
+  "@radix-ui/react-direction@1.1.1":
     resolution:
       {
-        integrity: sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==,
+        integrity: sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -645,10 +669,10 @@ packages:
       "@types/react":
         optional: true
 
-  "@radix-ui/react-dismissable-layer@1.1.5":
+  "@radix-ui/react-dismissable-layer@1.1.6":
     resolution:
       {
-        integrity: sha512-E4TywXY6UsXNRhFrECa5HAvE5/4BFcGyfTyK36gP+pAW1ed7UTK4vKwdr53gAJYwqbfCWC6ATvJa3J3R/9+Qrg==,
+        integrity: sha512-7gpgMT2gyKym9Jz2ZhlRXSg2y6cNQIK8d/cqBZ0RBCaps8pFryCWXiUKI+uHGFrhMrbGUP7U6PWgiXzIxoyF3Q==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -661,10 +685,10 @@ packages:
       "@types/react-dom":
         optional: true
 
-  "@radix-ui/react-focus-guards@1.1.1":
+  "@radix-ui/react-focus-guards@1.1.2":
     resolution:
       {
-        integrity: sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg==,
+        integrity: sha512-fyjAACV62oPV925xFCrH8DR5xWhg9KYtJT4s3u54jxp+L/hbpTY2kIeEFFbFe+a/HCE94zGQMZLIpVTPVZDhaA==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -673,10 +697,10 @@ packages:
       "@types/react":
         optional: true
 
-  "@radix-ui/react-focus-scope@1.1.2":
+  "@radix-ui/react-focus-scope@1.1.3":
     resolution:
       {
-        integrity: sha512-zxwE80FCU7lcXUGWkdt6XpTTCKPitG1XKOwViTxHVKIJhZl9MvIl2dVHeZENCWD9+EdWv05wlaEkRXUykU27RA==,
+        integrity: sha512-4XaDlq0bPt7oJwR+0k0clCiCO/7lO7NKZTAaJBYxDNQT/vj4ig0/UvctrRscZaFREpRvUTkpKR96ov1e6jptQg==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -689,10 +713,10 @@ packages:
       "@types/react-dom":
         optional: true
 
-  "@radix-ui/react-id@1.1.0":
+  "@radix-ui/react-id@1.1.1":
     resolution:
       {
-        integrity: sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==,
+        integrity: sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -701,10 +725,10 @@ packages:
       "@types/react":
         optional: true
 
-  "@radix-ui/react-popover@1.1.6":
+  "@radix-ui/react-popover@1.1.7":
     resolution:
       {
-        integrity: sha512-NQouW0x4/GnkFJ/pRqsIS3rM/k97VzKnVb2jB7Gq7VEGPy5g7uNV1ykySFt7eWSp3i2uSGFwaJcvIRJBAHmmFg==,
+        integrity: sha512-I38OYWDmJF2kbO74LX8UsFydSHWOJuQ7LxPnTefjxxvdvPLempvAnmsyX9UsBlywcbSGpRH7oMLfkUf+ij4nrw==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -717,10 +741,10 @@ packages:
       "@types/react-dom":
         optional: true
 
-  "@radix-ui/react-popper@1.2.2":
+  "@radix-ui/react-popper@1.2.3":
     resolution:
       {
-        integrity: sha512-Rvqc3nOpwseCyj/rgjlJDYAgyfw7OC1tTkKn2ivhaMGcYt8FSBlahHOZak2i3QwkRXUXgGgzeEe2RuqeEHuHgA==,
+        integrity: sha512-iNb9LYUMkne9zIahukgQmHlSBp9XWGeQQ7FvUGNk45ywzOb6kQa+Ca38OphXlWDiKvyneo9S+KSJsLfLt8812A==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -733,10 +757,10 @@ packages:
       "@types/react-dom":
         optional: true
 
-  "@radix-ui/react-portal@1.1.4":
+  "@radix-ui/react-portal@1.1.5":
     resolution:
       {
-        integrity: sha512-sn2O9k1rPFYVyKd5LAJfo96JlSGVFpa1fS6UuBJfrZadudiw5tAmru+n1x7aMRQ84qDM71Zh1+SzK5QwU0tJfA==,
+        integrity: sha512-ps/67ZqsFm+Mb6lSPJpfhRLrVL2i2fntgCmGMqqth4eaGUf+knAuuRtWVJrNjUhExgmdRqftSgzpf0DF0n6yXA==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -749,10 +773,10 @@ packages:
       "@types/react-dom":
         optional: true
 
-  "@radix-ui/react-presence@1.1.2":
+  "@radix-ui/react-presence@1.1.3":
     resolution:
       {
-        integrity: sha512-18TFr80t5EVgL9x1SwF/YGtfG+l0BS0PRAlCWBDoBEiDQjeKgnNZRVJp/oVBl24sr3Gbfwc/Qpj4OcWTQMsAEg==,
+        integrity: sha512-IrVLIhskYhH3nLvtcBLQFZr61tBG7wx7O3kEmdzcYwRGAEBmBicGGL7ATzNgruYJ3xBTbuzEEq9OXJM3PAX3tA==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -765,10 +789,10 @@ packages:
       "@types/react-dom":
         optional: true
 
-  "@radix-ui/react-primitive@2.0.2":
+  "@radix-ui/react-primitive@2.0.3":
     resolution:
       {
-        integrity: sha512-Ec/0d38EIuvDF+GZjcMU/Ze6MxntVJYO/fRlCPhCaVUyPY9WTalHJw54tp9sXeJo3tlShWpy41vQRgLRGOuz+w==,
+        integrity: sha512-Pf/t/GkndH7CQ8wE2hbkXA+WyZ83fhQQn5DDmwDiDo6AwN/fhaH8oqZ0jRjMrO2iaMhDi6P1HRx6AZwyMinY1g==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -781,10 +805,10 @@ packages:
       "@types/react-dom":
         optional: true
 
-  "@radix-ui/react-slot@1.1.2":
+  "@radix-ui/react-slot@1.2.0":
     resolution:
       {
-        integrity: sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ==,
+        integrity: sha512-ujc+V6r0HNDviYqIK3rW4ffgYiZ8g5DEHrGJVk4x7kTlLXRDILnKX9vAUYeIsLOoDpDJ0ujpqMkjH4w2ofuo6w==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -793,10 +817,10 @@ packages:
       "@types/react":
         optional: true
 
-  "@radix-ui/react-toast@1.2.6":
+  "@radix-ui/react-toast@1.2.7":
     resolution:
       {
-        integrity: sha512-gN4dpuIVKEgpLn1z5FhzT9mYRUitbfZq9XqN/7kkBMUgFTzTG8x/KszWJugJXHcwxckY8xcKDZPz7kG3o6DsUA==,
+        integrity: sha512-0IWTbAUKvzdpOaWDMZisXZvScXzF0phaQjWspK8RUMEUxjLbli+886mB/kXTIC3F+t5vQ0n0vYn+dsX8s+WdfA==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -809,10 +833,10 @@ packages:
       "@types/react-dom":
         optional: true
 
-  "@radix-ui/react-use-callback-ref@1.1.0":
+  "@radix-ui/react-use-callback-ref@1.1.1":
     resolution:
       {
-        integrity: sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==,
+        integrity: sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -821,10 +845,10 @@ packages:
       "@types/react":
         optional: true
 
-  "@radix-ui/react-use-controllable-state@1.1.0":
+  "@radix-ui/react-use-controllable-state@1.1.1":
     resolution:
       {
-        integrity: sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==,
+        integrity: sha512-YnEXIy8/ga01Y1PN0VfaNH//MhA91JlEGVBDxDzROqwrAtG5Yr2QGEPz8A/rJA3C7ZAHryOYGaUv8fLSW2H/mg==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -833,10 +857,10 @@ packages:
       "@types/react":
         optional: true
 
-  "@radix-ui/react-use-escape-keydown@1.1.0":
+  "@radix-ui/react-use-escape-keydown@1.1.1":
     resolution:
       {
-        integrity: sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==,
+        integrity: sha512-Il0+boE7w/XebUHyBjroE+DbByORGR9KKmITzbR7MyQ4akpORYP/ZmbhAr0DG7RmmBqoOnZdy2QlvajJ2QA59g==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -845,10 +869,10 @@ packages:
       "@types/react":
         optional: true
 
-  "@radix-ui/react-use-layout-effect@1.1.0":
+  "@radix-ui/react-use-layout-effect@1.1.1":
     resolution:
       {
-        integrity: sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==,
+        integrity: sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -857,10 +881,10 @@ packages:
       "@types/react":
         optional: true
 
-  "@radix-ui/react-use-rect@1.1.0":
+  "@radix-ui/react-use-rect@1.1.1":
     resolution:
       {
-        integrity: sha512-0Fmkebhr6PiseyZlYAOtLS+nb7jLmpqTrJyv61Pe68MKYW6OWdRE2kI70TaYY27u7H0lajqM3hSMMLFq18Z7nQ==,
+        integrity: sha512-QTYuDesS0VtuHNNvMh+CjlKJ4LJickCMUAqjlE3+j8w+RlRpwyX3apEQKGFzbZGdo7XNG1tXa+bQqIE7HIXT2w==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -869,10 +893,10 @@ packages:
       "@types/react":
         optional: true
 
-  "@radix-ui/react-use-size@1.1.0":
+  "@radix-ui/react-use-size@1.1.1":
     resolution:
       {
-        integrity: sha512-XW3/vWuIXHa+2Uwcc2ABSfcCledmXhhQPlGbfcRXbiUQI5Icjcg19BGCZVKKInYbvUCut/ufbbLLPFC5cbb1hw==,
+        integrity: sha512-ewrXRDTAqAXlkl6t/fkXWNAhFX9I+CkKlw6zjEwk86RSPKwZr3xpBRso655aqYafwtnbpHLj6toFzmd6xdVptQ==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -881,10 +905,10 @@ packages:
       "@types/react":
         optional: true
 
-  "@radix-ui/react-visually-hidden@1.1.2":
+  "@radix-ui/react-visually-hidden@1.1.3":
     resolution:
       {
-        integrity: sha512-1SzA4ns2M1aRlvxErqhLHsBHoS5eI5UUcI2awAMgGUp4LoaoWOKYmvqDY2s/tltuPkh3Yk77YF/r3IRj+Amx4Q==,
+        integrity: sha512-oXSF3ZQRd5fvomd9hmUCb2EHSZbPp3ZSHAHJJU/DlF9XoFkJBBW8RHU/E8WEH+RbSfJd/QFA0sl8ClJXknBwHQ==,
       }
     peerDependencies:
       "@types/react": "*"
@@ -897,10 +921,10 @@ packages:
       "@types/react-dom":
         optional: true
 
-  "@radix-ui/rect@1.1.0":
+  "@radix-ui/rect@1.1.1":
     resolution:
       {
-        integrity: sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==,
+        integrity: sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==,
       }
 
   "@rtsao/scc@1.1.0":
@@ -909,10 +933,10 @@ packages:
         integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==,
       }
 
-  "@rushstack/eslint-patch@1.10.5":
+  "@rushstack/eslint-patch@1.11.0":
     resolution:
       {
-        integrity: sha512-kkKUDVlII2DQiKy7UstOR1ErJP8kUKAQ4oa+SQtM0K+lPdmmjj0YnnxBgtTVYH7mUKtbsxeFC9y0AmK7Yb78/A==,
+        integrity: sha512-zxnHvoMQVqewTJr/W4pKjF0bMGiKJv1WX7bSrkl46Hg0QjESbzBROWK0Wg4RphzSOS5Jiy7eFimmM3UgMrMZbQ==,
       }
 
   "@swc/counter@0.1.3":
@@ -951,30 +975,44 @@ packages:
       typescript:
         optional: true
 
-  "@tanstack/query-core@5.66.4":
+  "@tailwindcss/forms@0.5.10":
     resolution:
       {
-        integrity: sha512-skM/gzNX4shPkqmdTCSoHtJAPMTtmIJNS0hE+xwTTUVYwezArCT34NMermABmBVUg5Ls5aiUXEDXfqwR1oVkcA==,
+        integrity: sha512-utI1ONF6uf/pPNO68kmN1b8rEwNXv3czukalo8VtJH8ksIkZXr3Q3VYudZLkCsDd4Wku120uF02hYK25XGPorw==,
+      }
+    peerDependencies:
+      tailwindcss: ">=3.0.0 || >= 3.0.0-alpha.1 || >= 4.0.0-alpha.20 || >= 4.0.0-beta.1"
+
+  "@tanstack/query-core@5.72.2":
+    resolution:
+      {
+        integrity: sha512-fxl9/0yk3mD/FwTmVEf1/H6N5B975H0luT+icKyX566w6uJG0x6o+Yl+I38wJRCaogiMkstByt+seXfDbWDAcA==,
       }
 
-  "@tanstack/react-query@5.66.5":
+  "@tanstack/react-query@5.72.2":
     resolution:
       {
-        integrity: sha512-D9aABj3/aFeNmifsdllh5O3hPyA8gUnZ1jAV8MjODQ7blirfAyGed9NjAnm8rgEdr1wChyjTT738ij3vY0EREQ==,
+        integrity: sha512-SVNHzyBUYiis+XiCl+8yiPZmMYei2AKYY94wM/zpvB5l1jxqOo82FQTziSJ4pBi96jtYqvYrTMxWynmbQh3XKw==,
       }
     peerDependencies:
       react: ^18 || ^19
 
+  "@tybys/wasm-util@0.9.0":
+    resolution:
+      {
+        integrity: sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==,
+      }
+
   "@types/eslint@8.56.12":
     resolution:
       {
         integrity: sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==,
       }
 
-  "@types/estree@1.0.6":
+  "@types/estree@1.0.7":
     resolution:
       {
-        integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==,
+        integrity: sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==,
       }
 
   "@types/json-schema@7.0.15":
@@ -989,10 +1027,10 @@ packages:
         integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==,
       }
 
-  "@types/node@22.13.4":
+  "@types/node@22.14.0":
     resolution:
       {
-        integrity: sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==,
+        integrity: sha512-Kmpl+z84ILoG+3T/zQFyAJsU6EPTmOCj8/2+83fSN6djd6I4o7uOuGIH6vq3PrjY5BGitSbFuMN18j3iknubbA==,
       }
 
   "@types/prop-types@15.7.14":
@@ -1001,88 +1039,88 @@ packages:
         integrity: sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==,
       }
 
-  "@types/react-dom@18.3.5":
+  "@types/react-dom@18.3.6":
     resolution:
       {
-        integrity: sha512-P4t6saawp+b/dFrUr2cvkVsfvPguwsxtH6dNIYRllMsefqFzkZk5UIjzyDOv5g1dXIPdG4Sp1yCR4Z6RCUsG/Q==,
+        integrity: sha512-nf22//wEbKXusP6E9pfOCDwFdHAX4u172eaJI4YkDRQEZiorm6KfYnSC2SWLDMVWUOWPERmJnN0ujeAfTBLvrw==,
       }
     peerDependencies:
       "@types/react": ^18.0.0
 
-  "@types/react@18.3.18":
+  "@types/react@18.3.20":
     resolution:
       {
-        integrity: sha512-t4yC+vtgnkYjNSKlFx1jkAhH8LgTo2N/7Qvi83kdEaUtMDiwpbLAktKDaAMlRcJ5eSxZkH74eEGt1ky31d7kfQ==,
+        integrity: sha512-IPaCZN7PShZK/3t6Q87pfTkRm6oLTd4vztyoj+cbHUF1g3FfVb2tFIL79uCRKEfv16AhqDMBywP2VW3KIZUvcg==,
       }
 
-  "@typescript-eslint/eslint-plugin@8.24.1":
+  "@typescript-eslint/eslint-plugin@8.29.1":
     resolution:
       {
-        integrity: sha512-ll1StnKtBigWIGqvYDVuDmXJHVH4zLVot1yQ4fJtLpL7qacwkxJc1T0bptqw+miBQ/QfUbhl1TcQ4accW5KUyA==,
+        integrity: sha512-ba0rr4Wfvg23vERs3eB+P3lfj2E+2g3lhWcCVukUuhtcdUx5lSIFZlGFEBHKr+3zizDa/TvZTptdNHVZWAkSBg==,
       }
     engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
     peerDependencies:
       "@typescript-eslint/parser": ^8.0.0 || ^8.0.0-alpha.0
       eslint: ^8.57.0 || ^9.0.0
-      typescript: ">=4.8.4 <5.8.0"
+      typescript: ">=4.8.4 <5.9.0"
 
-  "@typescript-eslint/parser@8.24.1":
+  "@typescript-eslint/parser@8.29.1":
     resolution:
       {
-        integrity: sha512-Tqoa05bu+t5s8CTZFaGpCH2ub3QeT9YDkXbPd3uQ4SfsLoh1/vv2GEYAioPoxCWJJNsenXlC88tRjwoHNts1oQ==,
+        integrity: sha512-zczrHVEqEaTwh12gWBIJWj8nx+ayDcCJs06yoNMY0kwjMWDM6+kppljY+BxWI06d2Ja+h4+WdufDcwMnnMEWmg==,
       }
     engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
-      typescript: ">=4.8.4 <5.8.0"
+      typescript: ">=4.8.4 <5.9.0"
 
-  "@typescript-eslint/scope-manager@8.24.1":
+  "@typescript-eslint/scope-manager@8.29.1":
     resolution:
       {
-        integrity: sha512-OdQr6BNBzwRjNEXMQyaGyZzgg7wzjYKfX2ZBV3E04hUCBDv3GQCHiz9RpqdUIiVrMgJGkXm3tcEh4vFSHreS2Q==,
+        integrity: sha512-2nggXGX5F3YrsGN08pw4XpMLO1Rgtnn4AzTegC2MDesv6q3QaTU5yU7IbS1tf1IwCR0Hv/1EFygLn9ms6LIpDA==,
       }
     engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
 
-  "@typescript-eslint/type-utils@8.24.1":
+  "@typescript-eslint/type-utils@8.29.1":
     resolution:
       {
-        integrity: sha512-/Do9fmNgCsQ+K4rCz0STI7lYB4phTtEXqqCAs3gZW0pnK7lWNkvWd5iW545GSmApm4AzmQXmSqXPO565B4WVrw==,
+        integrity: sha512-DkDUSDwZVCYN71xA4wzySqqcZsHKic53A4BLqmrWFFpOpNSoxX233lwGu/2135ymTCR04PoKiEEEvN1gFYg4Tw==,
       }
     engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
-      typescript: ">=4.8.4 <5.8.0"
+      typescript: ">=4.8.4 <5.9.0"
 
-  "@typescript-eslint/types@8.24.1":
+  "@typescript-eslint/types@8.29.1":
     resolution:
       {
-        integrity: sha512-9kqJ+2DkUXiuhoiYIUvIYjGcwle8pcPpdlfkemGvTObzgmYfJ5d0Qm6jwb4NBXP9W1I5tss0VIAnWFumz3mC5A==,
+        integrity: sha512-VT7T1PuJF1hpYC3AGm2rCgJBjHL3nc+A/bhOp9sGMKfi5v0WufsX/sHCFBfNTx2F+zA6qBc/PD0/kLRLjdt8mQ==,
       }
     engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
 
-  "@typescript-eslint/typescript-estree@8.24.1":
+  "@typescript-eslint/typescript-estree@8.29.1":
     resolution:
       {
-        integrity: sha512-UPyy4MJ/0RE648DSKQe9g0VDSehPINiejjA6ElqnFaFIhI6ZEiZAkUI0D5MCk0bQcTf/LVqZStvQ6K4lPn/BRg==,
+        integrity: sha512-l1enRoSaUkQxOQnbi0KPUtqeZkSiFlqrx9/3ns2rEDhGKfTa+88RmXqedC1zmVTOWrLc2e6DEJrTA51C9iLH5g==,
       }
     engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
     peerDependencies:
-      typescript: ">=4.8.4 <5.8.0"
+      typescript: ">=4.8.4 <5.9.0"
 
-  "@typescript-eslint/utils@8.24.1":
+  "@typescript-eslint/utils@8.29.1":
     resolution:
       {
-        integrity: sha512-OOcg3PMMQx9EXspId5iktsI3eMaXVwlhC8BvNnX6B5w9a4dVgpkQZuU8Hy67TolKcl+iFWq0XX+jbDGN4xWxjQ==,
+        integrity: sha512-QAkFEbytSaB8wnmB+DflhUPz6CLbFWE2SnSCrRMEa+KnXIzDYbpsn++1HGvnfAsUY44doDXmvRkO5shlM/3UfA==,
       }
     engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
-      typescript: ">=4.8.4 <5.8.0"
+      typescript: ">=4.8.4 <5.9.0"
 
-  "@typescript-eslint/visitor-keys@8.24.1":
+  "@typescript-eslint/visitor-keys@8.29.1":
     resolution:
       {
-        integrity: sha512-EwVHlp5l+2vp8CoqJm9KikPZgi3gbdZAtabKT9KPShGeOcJhsv4Zdo3oc8T8I0uKEmYoU4ItyxbptjF08enaxg==,
+        integrity: sha512-RGLh5CRaUEf02viP5c1Vh1cMGffQscyHe7HPAzGpfmfflFg1wUz2rYxd+OZqwpeypYvZ8UxSxuIpF++fmOzEcg==,
       }
     engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
 
@@ -1092,6 +1130,126 @@ packages:
         integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==,
       }
 
+  "@unrs/resolver-binding-darwin-arm64@1.4.1":
+    resolution:
+      {
+        integrity: sha512-8Tv+Bsd0BjGwfEedIyor4inw8atppRxM5BdUnIt+3mAm/QXUm7Dw74CHnXpfZKXkp07EXJGiA8hStqCINAWhdw==,
+      }
+    cpu: [arm64]
+    os: [darwin]
+
+  "@unrs/resolver-binding-darwin-x64@1.4.1":
+    resolution:
+      {
+        integrity: sha512-X8c3PhWziEMKAzZz+YAYWfwawi5AEgzy/hmfizAB4C70gMHLKmInJcp1270yYAOs7z07YVFI220pp50z24Jk3A==,
+      }
+    cpu: [x64]
+    os: [darwin]
+
+  "@unrs/resolver-binding-freebsd-x64@1.4.1":
+    resolution:
+      {
+        integrity: sha512-UUr/nREy1UdtxXQnmLaaTXFGOcGxPwNIzeJdb3KXai3TKtC1UgNOB9s8KOA4TaxOUBR/qVgL5BvBwmUjD5yuVA==,
+      }
+    cpu: [x64]
+    os: [freebsd]
+
+  "@unrs/resolver-binding-linux-arm-gnueabihf@1.4.1":
+    resolution:
+      {
+        integrity: sha512-e3pII53dEeS8inkX6A1ad2UXE0nuoWCqik4kOxaDnls0uJUq0ntdj5d9IYd+bv5TDwf9DSge/xPOvCmRYH+Tsw==,
+      }
+    cpu: [arm]
+    os: [linux]
+
+  "@unrs/resolver-binding-linux-arm-musleabihf@1.4.1":
+    resolution:
+      {
+        integrity: sha512-e/AKKd9gR+HNmVyDEPI/PIz2t0DrA3cyonHNhHVjrkxe8pMCiYiqhtn1+h+yIpHUtUlM6Y1FNIdivFa+r7wrEQ==,
+      }
+    cpu: [arm]
+    os: [linux]
+
+  "@unrs/resolver-binding-linux-arm64-gnu@1.4.1":
+    resolution:
+      {
+        integrity: sha512-vtIu34luF1jRktlHtiwm2mjuE8oJCsFiFr8hT5+tFQdqFKjPhbJXn83LswKsOhy0GxAEevpXDI4xxEwkjuXIPA==,
+      }
+    cpu: [arm64]
+    os: [linux]
+
+  "@unrs/resolver-binding-linux-arm64-musl@1.4.1":
+    resolution:
+      {
+        integrity: sha512-H3PaOuGyhFXiyJd+09uPhGl4gocmhyi1BRzvsP8Lv5AQO3p3/ZY7WjV4t2NkBksm9tMjf3YbOVHyPWi2eWsNYw==,
+      }
+    cpu: [arm64]
+    os: [linux]
+
+  "@unrs/resolver-binding-linux-ppc64-gnu@1.4.1":
+    resolution:
+      {
+        integrity: sha512-4+GmJcaaFntCi1S01YByqp8wLMjV/FyQyHVGm0vedIhL1Vfx7uHkz/sZmKsidRwokBGuxi92GFmSzqT2O8KcNA==,
+      }
+    cpu: [ppc64]
+    os: [linux]
+
+  "@unrs/resolver-binding-linux-s390x-gnu@1.4.1":
+    resolution:
+      {
+        integrity: sha512-6RDQVCmtFYTlhy89D5ixTqo9bTQqFhvNN0Ey1wJs5r+01Dq15gPHRXv2jF2bQATtMrOfYwv+R2ZR9ew1N1N3YQ==,
+      }
+    cpu: [s390x]
+    os: [linux]
+
+  "@unrs/resolver-binding-linux-x64-gnu@1.4.1":
+    resolution:
+      {
+        integrity: sha512-XpU9uzIkD86+19NjCXxlVPISMUrVXsXo5htxtuG+uJ59p5JauSRZsIxQxzzfKzkxEjdvANPM/lS1HFoX6A6QeA==,
+      }
+    cpu: [x64]
+    os: [linux]
+
+  "@unrs/resolver-binding-linux-x64-musl@1.4.1":
+    resolution:
+      {
+        integrity: sha512-3CDjG/spbTKCSHl66QP2ekHSD+H34i7utuDIM5gzoNBcZ1gTO0Op09Wx5cikXnhORRf9+HyDWzm37vU1PLSM1A==,
+      }
+    cpu: [x64]
+    os: [linux]
+
+  "@unrs/resolver-binding-wasm32-wasi@1.4.1":
+    resolution:
+      {
+        integrity: sha512-50tYhvbCTnuzMn7vmP8IV2UKF7ITo1oihygEYq9wW2DUb/Y+QMqBHJUSCABRngATjZ4shOK6f2+s0gQX6ElENQ==,
+      }
+    engines: { node: ">=14.0.0" }
+    cpu: [wasm32]
+
+  "@unrs/resolver-binding-win32-arm64-msvc@1.4.1":
+    resolution:
+      {
+        integrity: sha512-KyJiIne/AqV4IW0wyQO34wSMuJwy3VxVQOfIXIPyQ/Up6y/zi2P/WwXb78gHsLiGRUqCA9LOoCX+6dQZde0g1g==,
+      }
+    cpu: [arm64]
+    os: [win32]
+
+  "@unrs/resolver-binding-win32-ia32-msvc@1.4.1":
+    resolution:
+      {
+        integrity: sha512-y2NUD7pygrBolN2NoXUrwVqBpKPhF8DiSNE5oB5/iFO49r2DpoYqdj5HPb3F42fPBH5qNqj6Zg63+xCEzAD2hw==,
+      }
+    cpu: [ia32]
+    os: [win32]
+
+  "@unrs/resolver-binding-win32-x64-msvc@1.4.1":
+    resolution:
+      {
+        integrity: sha512-hVXaObGI2lGFmrtT77KSbPQ3I+zk9IU500wobjk0+oX59vg/0VqAzABNtt3YSQYgXTC2a/LYxekLfND/wlt0yQ==,
+      }
+    cpu: [x64]
+    os: [win32]
+
   acorn-jsx@5.3.2:
     resolution:
       {
@@ -1100,10 +1258,10 @@ packages:
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
 
-  acorn@8.14.0:
+  acorn@8.14.1:
     resolution:
       {
-        integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==,
+        integrity: sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==,
       }
     engines: { node: ">=0.4.0" }
     hasBin: true
@@ -1202,10 +1360,10 @@ packages:
       }
     engines: { node: ">= 0.4" }
 
-  array.prototype.findlastindex@1.2.5:
+  array.prototype.findlastindex@1.2.6:
     resolution:
       {
-        integrity: sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==,
+        integrity: sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==,
       }
     engines: { node: ">= 0.4" }
 
@@ -1257,10 +1415,10 @@ packages:
       }
     engines: { node: ">= 0.4" }
 
-  axe-core@4.10.2:
+  axe-core@4.10.3:
     resolution:
       {
-        integrity: sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==,
+        integrity: sha512-Xm7bpRXnDSX2YE2YFfBk2FnF0ep6tmG7xPh8iHee8MIcrgq762Nkce856dYtJYLkuIoYZvGfTs/PbZhideTcEg==,
       }
     engines: { node: ">=4" }
 
@@ -1324,10 +1482,10 @@ packages:
       }
     engines: { node: ">= 0.4" }
 
-  call-bound@1.0.3:
+  call-bound@1.0.4:
     resolution:
       {
-        integrity: sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==,
+        integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==,
       }
     engines: { node: ">= 0.4" }
 
@@ -1345,10 +1503,10 @@ packages:
       }
     engines: { node: ">= 6" }
 
-  caniuse-lite@1.0.30001700:
+  caniuse-lite@1.0.30001712:
     resolution:
       {
-        integrity: sha512-2S6XIXwaE7K7erT8dY+kLQcpa5ms63XlRkMkReXjle+kf6c5g38vyMl+Z5y8dSxOFDhcFe+nxnn261PLxBSQsQ==,
+        integrity: sha512-MBqPpGYYdQ7/hfKiet9SCI+nmN5/hp4ZzveOJubl5DTAMa5oggjAuoi0Z4onBpKPFI2ePGnQuQIzF3VxDjDJig==,
       }
 
   chalk@4.1.2:
@@ -1571,13 +1729,6 @@ packages:
         integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==,
       }
 
-  enhanced-resolve@5.18.1:
-    resolution:
-      {
-        integrity: sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==,
-      }
-    engines: { node: ">=10.13.0" }
-
   es-abstract@1.23.9:
     resolution:
       {
@@ -1659,10 +1810,10 @@ packages:
         integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==,
       }
 
-  eslint-import-resolver-typescript@3.8.1:
+  eslint-import-resolver-typescript@3.10.0:
     resolution:
       {
-        integrity: sha512-qw5TPA12HTmb9CkcuiNrFtwhM1ae2FWysLeRrTbQ+/JKS///gbL3fQ5LRhAZnzkcqkScOvkB5Y5o+xgyQz1VVg==,
+        integrity: sha512-aV3/dVsT0/H9BtpNwbaqvl+0xGMRGzncLyhm793NFGvbwGGvzyAykqWZ8oZlZuGwuHkwJjhWJkG1cM3ynvd2pQ==,
       }
     engines: { node: ^14.18.0 || >=16.0.0 }
     peerDependencies:
@@ -1730,10 +1881,10 @@ packages:
     peerDependencies:
       eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
 
-  eslint-plugin-react@7.37.4:
+  eslint-plugin-react@7.37.5:
     resolution:
       {
-        integrity: sha512-BGP0jRmfYyvOyvMoRX/uoUeW+GqNj9y16bPQzqAHf3AYII/tDs+jMN0dBVkl88/OZwNGwrVFxE7riHsXVfy/LQ==,
+        integrity: sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==,
       }
     engines: { node: ">=4" }
     peerDependencies:
@@ -1829,10 +1980,10 @@ packages:
         integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==,
       }
 
-  fastq@1.19.0:
+  fastq@1.19.1:
     resolution:
       {
-        integrity: sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA==,
+        integrity: sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==,
       }
 
   fdir@6.4.3:
@@ -1874,10 +2025,10 @@ packages:
       }
     engines: { node: ^10.12.0 || >=12.0.0 }
 
-  flatted@3.3.2:
+  flatted@3.3.3:
     resolution:
       {
-        integrity: sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==,
+        integrity: sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==,
       }
 
   for-each@0.3.5:
@@ -1887,17 +2038,17 @@ packages:
       }
     engines: { node: ">= 0.4" }
 
-  foreground-child@3.3.0:
+  foreground-child@3.3.1:
     resolution:
       {
-        integrity: sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==,
+        integrity: sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==,
       }
     engines: { node: ">=14" }
 
-  framer-motion@12.4.3:
+  framer-motion@12.6.3:
     resolution:
       {
-        integrity: sha512-rsMeO7w3dKyNG09o3cGwSH49iHU+VgDmfSSfsX+wfkO3zDA6WWkh4sUsMXd155YROjZP+7FTIhDrBYfgZeHjKQ==,
+        integrity: sha512-2hsqknz23aloK85bzMc9nSR2/JP+fValQ459ZTVElFQ0xgwR2YqNjYSuDZdFBPOwVCt4Q9jgyTt6hg6sVOALzw==,
       }
     peerDependencies:
       "@emotion/is-prop-valid": "*"
@@ -1944,10 +2095,10 @@ packages:
         integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==,
       }
 
-  get-intrinsic@1.2.7:
+  get-intrinsic@1.3.0:
     resolution:
       {
-        integrity: sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==,
+        integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==,
       }
     engines: { node: ">= 0.4" }
 
@@ -2177,10 +2328,10 @@ packages:
       }
     engines: { node: ">= 0.4" }
 
-  is-bun-module@1.3.0:
+  is-bun-module@2.0.0:
     resolution:
       {
-        integrity: sha512-DgXeu5UWI0IsMQundYb5UAOzm6G2eVnarJ0byP6Tm55iZNKceD59LNPA2L4VvsScTtHcw0yEkVwSf7PC+QoLSA==,
+        integrity: sha512-gNCGbnnnnFAUGKeZ9PdbyeGYJqewpmc2aKHUEMO5nQPWU9lOmv7jcmQIv+qHD8fXW6W7qfuCwX4rY9LNRjXrkQ==,
       }
 
   is-callable@1.2.7:
@@ -2513,6 +2664,13 @@ packages:
       }
     engines: { node: ">=8.6" }
 
+  mini-svg-data-uri@1.4.4:
+    resolution:
+      {
+        integrity: sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==,
+      }
+    hasBin: true
+
   minimatch@3.1.2:
     resolution:
       {
@@ -2539,22 +2697,22 @@ packages:
       }
     engines: { node: ">=16 || 14 >=14.17" }
 
-  motion-dom@12.0.0:
+  motion-dom@12.6.3:
     resolution:
       {
-        integrity: sha512-CvYd15OeIR6kHgMdonCc1ihsaUG4MYh/wrkz8gZ3hBX/uamyZCXN9S9qJoYF03GqfTt7thTV/dxnHYX4+55vDg==,
+        integrity: sha512-gRY08RjcnzgFYLemUZ1lo/e9RkBxR+6d4BRvoeZDSeArG4XQXERSPapKl3LNQRu22Sndjf1h+iavgY0O4NrYqA==,
       }
 
-  motion-utils@12.0.0:
+  motion-utils@12.6.3:
     resolution:
       {
-        integrity: sha512-MNFiBKbbqnmvOjkPyOKgHUp3Q6oiokLkI1bEwm5QA28cxMZrv0CbbBGDNmhF6DIXsi1pCQBSs0dX8xjeER1tmA==,
+        integrity: sha512-R/b3Ia2VxtTNZ4LTEO5pKYau1OUNHOuUfxuP0WFCTDYdHkeTBR9UtxR1cc8mDmKr8PEhmmfnTKGz3rSMjNRoRg==,
       }
 
-  motion@12.4.3:
+  motion@12.6.3:
     resolution:
       {
-        integrity: sha512-KeoMpKFEVdofN0v/z1g3tm4cMtk1WAHQ5Pg7M1ElxeRLA8cBSrkmSCJ9q6hLo7spp/n906h2kmeDNvBkysaxcQ==,
+        integrity: sha512-zw/vqUgv5F5m9fkvOl/eCv2AF1+tkeZl3fu2uIlisIaip8sm5e0CouAl6GkdiRoF+G7s29CjqMdIyPMirwUGHA==,
       }
     peerDependencies:
       "@emotion/is-prop-valid": "*"
@@ -2580,10 +2738,10 @@ packages:
         integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==,
       }
 
-  nanoid@3.3.8:
+  nanoid@3.3.11:
     resolution:
       {
-        integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==,
+        integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==,
       }
     engines: { node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1 }
     hasBin: true
@@ -2657,10 +2815,10 @@ packages:
       }
     engines: { node: ">= 0.4" }
 
-  object.entries@1.1.8:
+  object.entries@1.1.9:
     resolution:
       {
-        integrity: sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==,
+        integrity: sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==,
       }
     engines: { node: ">= 0.4" }
 
@@ -2793,13 +2951,21 @@ packages:
       }
     engines: { node: ">=0.10.0" }
 
-  pirates@4.0.6:
+  pirates@4.0.7:
     resolution:
       {
-        integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==,
+        integrity: sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==,
       }
     engines: { node: ">= 6" }
 
+  pnpm@10.8.0:
+    resolution:
+      {
+        integrity: sha512-DoJxTRtbQ8dGEBk8sgc0iXwdAN6J0OGEIK68WXf6E9eAqcsFc0Yk6B69gcyHbNRkeUhQZBxIuVRDJrViLKKZcQ==,
+      }
+    engines: { node: ">=18.12" }
+    hasBin: true
+
   possible-typed-array-names@1.1.0:
     resolution:
       {
@@ -2869,10 +3035,10 @@ packages:
       }
     engines: { node: ^10 || ^12 || >=14 }
 
-  postcss@8.5.2:
+  postcss@8.5.3:
     resolution:
       {
-        integrity: sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==,
+        integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==,
       }
     engines: { node: ^10 || ^12 || >=14 }
 
@@ -2941,10 +3107,10 @@ packages:
       prettier-plugin-svelte:
         optional: true
 
-  prettier@3.5.1:
+  prettier@3.5.3:
     resolution:
       {
-        integrity: sha512-hPpFQvHwL3Qv5AdRvBFMhnKo4tYxp0ReXiPn2bxkiohEX6mBeBwEpBSQTkD458RaaDKQMYSp4hX4UtfUTA5wDw==,
+        integrity: sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==,
       }
     engines: { node: ">=14" }
     hasBin: true
@@ -2976,10 +3142,10 @@ packages:
     peerDependencies:
       react: ^18.3.1
 
-  react-icons@5.4.0:
+  react-icons@5.5.0:
     resolution:
       {
-        integrity: sha512-7eltJxgVt7X64oHh6wSWNwwbKTCtMfK35hcjvJS0yxEAhPM8oUKdS3+kqaW1vicIltw+kR2unHaa12S9pPALoQ==,
+        integrity: sha512-MEFcXdkP3dLo8uumGI5xN3lDFNsRtrjbOEKDLD7yv76v4wpnEq2Lt2qeHaQOr34I/wPN3s3+N08WkQ+CW37Xiw==,
       }
     peerDependencies:
       react: "*"
@@ -3103,10 +3269,10 @@ packages:
       }
     hasBin: true
 
-  reusify@1.0.4:
+  reusify@1.1.0:
     resolution:
       {
-        integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==,
+        integrity: sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==,
       }
     engines: { iojs: ">=1.0.0", node: ">=0.10.0" }
 
@@ -3256,10 +3422,10 @@ packages:
       }
     engines: { node: ">=0.10.0" }
 
-  stable-hash@0.0.4:
+  stable-hash@0.0.5:
     resolution:
       {
-        integrity: sha512-LjdcbuBeLcdETCrPn9i8AYAZ1eCtu4ECAWtP7UleOiZ9LzVxRzzUZEoZ8zB24nhkQnDWyET0I+3sWokSDS3E7g==,
+        integrity: sha512-+L3ccpzibovGXFK+Ap/f8LOS0ahMrHTf3xu7mMLSpEGU0EO9ucaysSylKo9eRDFNhWve/y275iPmIZ4z39a9iA==,
       }
 
   streamsearch@1.1.0:
@@ -3398,13 +3564,6 @@ packages:
     engines: { node: ">=14.0.0" }
     hasBin: true
 
-  tapable@2.2.1:
-    resolution:
-      {
-        integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==,
-      }
-    engines: { node: ">=6" }
-
   text-table@0.2.0:
     resolution:
       {
@@ -3424,10 +3583,10 @@ packages:
         integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==,
       }
 
-  tinyglobby@0.2.11:
+  tinyglobby@0.2.12:
     resolution:
       {
-        integrity: sha512-32TmKeeKUahv0Go8WmQgiEp9Y21NuxjwjqiRC1nrUB51YacfSwuB44xgXD+HdIppmMRgjQNPdrHyA6vIybYZ+g==,
+        integrity: sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==,
       }
     engines: { node: ">=12.0.0" }
 
@@ -3438,10 +3597,10 @@ packages:
       }
     engines: { node: ">=8.0" }
 
-  ts-api-utils@2.0.1:
+  ts-api-utils@2.1.0:
     resolution:
       {
-        integrity: sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==,
+        integrity: sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==,
       }
     engines: { node: ">=18.12" }
     peerDependencies:
@@ -3507,10 +3666,10 @@ packages:
       }
     engines: { node: ">= 0.4" }
 
-  typescript@5.7.3:
+  typescript@5.8.3:
     resolution:
       {
-        integrity: sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==,
+        integrity: sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==,
       }
     engines: { node: ">=14.17" }
     hasBin: true
@@ -3522,10 +3681,16 @@ packages:
       }
     engines: { node: ">= 0.4" }
 
-  undici-types@6.20.0:
+  undici-types@6.21.0:
+    resolution:
+      {
+        integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==,
+      }
+
+  unrs-resolver@1.4.1:
     resolution:
       {
-        integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==,
+        integrity: sha512-MhPB3wBI5BR8TGieTb08XuYlE8oFVEXdSAgat3psdlRyejl8ojQ8iqPcjh094qCZ1r+TnkxzP6BeCd/umfHckQ==,
       }
 
   uri-js@4.4.1:
@@ -3587,10 +3752,10 @@ packages:
       }
     engines: { node: ">= 0.4" }
 
-  which-typed-array@1.1.18:
+  which-typed-array@1.1.19:
     resolution:
       {
-        integrity: sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==,
+        integrity: sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==,
       }
     engines: { node: ">= 0.4" }
 
@@ -3629,10 +3794,10 @@ packages:
         integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==,
       }
 
-  yaml@2.7.0:
+  yaml@2.7.1:
     resolution:
       {
-        integrity: sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==,
+        integrity: sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==,
       }
     engines: { node: ">= 14" }
     hasBin: true
@@ -3653,16 +3818,27 @@ packages:
 snapshots:
   "@alloc/quick-lru@5.2.0": {}
 
-  "@babel/runtime@7.26.9":
+  "@babel/runtime@7.27.0":
     dependencies:
       regenerator-runtime: 0.14.1
 
-  "@emnapi/runtime@1.3.1":
+  "@emnapi/core@1.4.0":
+    dependencies:
+      "@emnapi/wasi-threads": 1.0.1
+      tslib: 2.8.1
+    optional: true
+
+  "@emnapi/runtime@1.4.0":
     dependencies:
       tslib: 2.8.1
     optional: true
 
-  "@eslint-community/eslint-utils@4.4.1(eslint@8.57.1)":
+  "@emnapi/wasi-threads@1.0.1":
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
+  "@eslint-community/eslint-utils@4.5.1(eslint@8.57.1)":
     dependencies:
       eslint: 8.57.1
       eslint-visitor-keys: 3.4.3
@@ -3780,7 +3956,7 @@ snapshots:
 
   "@img/sharp-wasm32@0.33.5":
     dependencies:
-      "@emnapi/runtime": 1.3.1
+      "@emnapi/runtime": 1.4.0
     optional: true
 
   "@img/sharp-win32-ia32@0.33.5":
@@ -3815,6 +3991,13 @@ snapshots:
       "@jridgewell/resolve-uri": 3.1.2
       "@jridgewell/sourcemap-codec": 1.5.0
 
+  "@napi-rs/wasm-runtime@0.2.8":
+    dependencies:
+      "@emnapi/core": 1.4.0
+      "@emnapi/runtime": 1.4.0
+      "@tybys/wasm-util": 0.9.0
+    optional: true
+
   "@next/env@14.2.23": {}
 
   "@next/eslint-plugin-next@14.2.13":
@@ -3858,297 +4041,297 @@ snapshots:
   "@nodelib/fs.walk@1.2.8":
     dependencies:
       "@nodelib/fs.scandir": 2.1.5
-      fastq: 1.19.0
+      fastq: 1.19.1
 
   "@nolyfill/is-core-module@1.0.39": {}
 
   "@pkgjs/parseargs@0.11.0":
     optional: true
 
-  "@radix-ui/primitive@1.1.1": {}
+  "@radix-ui/primitive@1.1.2": {}
 
-  "@radix-ui/react-accordion@1.2.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
+  "@radix-ui/react-accordion@1.2.4(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
     dependencies:
-      "@radix-ui/primitive": 1.1.1
-      "@radix-ui/react-collapsible": 1.1.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-collection": 1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-compose-refs": 1.1.1(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-context": 1.1.1(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-direction": 1.1.0(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-id": 1.1.0(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-primitive": 2.0.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-use-controllable-state": 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      "@radix-ui/primitive": 1.1.2
+      "@radix-ui/react-collapsible": 1.1.4(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-collection": 1.1.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-compose-refs": 1.1.2(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-context": 1.1.2(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-direction": 1.1.1(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-id": 1.1.1(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-primitive": 2.0.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-use-controllable-state": 1.1.1(@types/react@18.3.20)(react@18.3.1)
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      "@types/react": 18.3.18
-      "@types/react-dom": 18.3.5(@types/react@18.3.18)
+      "@types/react": 18.3.20
+      "@types/react-dom": 18.3.6(@types/react@18.3.20)
 
-  "@radix-ui/react-arrow@1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
+  "@radix-ui/react-arrow@1.1.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
     dependencies:
-      "@radix-ui/react-primitive": 2.0.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-primitive": 2.0.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      "@types/react": 18.3.18
-      "@types/react-dom": 18.3.5(@types/react@18.3.18)
-
-  "@radix-ui/react-collapsible@1.1.3(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
-    dependencies:
-      "@radix-ui/primitive": 1.1.1
-      "@radix-ui/react-compose-refs": 1.1.1(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-context": 1.1.1(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-id": 1.1.0(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-presence": 1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-primitive": 2.0.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-use-controllable-state": 1.1.0(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-use-layout-effect": 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      "@types/react": 18.3.20
+      "@types/react-dom": 18.3.6(@types/react@18.3.20)
+
+  "@radix-ui/react-collapsible@1.1.4(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
+    dependencies:
+      "@radix-ui/primitive": 1.1.2
+      "@radix-ui/react-compose-refs": 1.1.2(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-context": 1.1.2(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-id": 1.1.1(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-presence": 1.1.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-primitive": 2.0.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-use-controllable-state": 1.1.1(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-use-layout-effect": 1.1.1(@types/react@18.3.20)(react@18.3.1)
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      "@types/react": 18.3.18
-      "@types/react-dom": 18.3.5(@types/react@18.3.18)
+      "@types/react": 18.3.20
+      "@types/react-dom": 18.3.6(@types/react@18.3.20)
 
-  "@radix-ui/react-collection@1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
+  "@radix-ui/react-collection@1.1.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
     dependencies:
-      "@radix-ui/react-compose-refs": 1.1.1(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-context": 1.1.1(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-primitive": 2.0.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-slot": 1.1.2(@types/react@18.3.18)(react@18.3.1)
+      "@radix-ui/react-compose-refs": 1.1.2(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-context": 1.1.2(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-primitive": 2.0.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-slot": 1.2.0(@types/react@18.3.20)(react@18.3.1)
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      "@types/react": 18.3.18
-      "@types/react-dom": 18.3.5(@types/react@18.3.18)
+      "@types/react": 18.3.20
+      "@types/react-dom": 18.3.6(@types/react@18.3.20)
 
-  "@radix-ui/react-compose-refs@1.1.1(@types/react@18.3.18)(react@18.3.1)":
+  "@radix-ui/react-compose-refs@1.1.2(@types/react@18.3.20)(react@18.3.1)":
     dependencies:
       react: 18.3.1
     optionalDependencies:
-      "@types/react": 18.3.18
+      "@types/react": 18.3.20
 
-  "@radix-ui/react-context@1.1.1(@types/react@18.3.18)(react@18.3.1)":
+  "@radix-ui/react-context@1.1.2(@types/react@18.3.20)(react@18.3.1)":
     dependencies:
       react: 18.3.1
     optionalDependencies:
-      "@types/react": 18.3.18
-
-  "@radix-ui/react-dialog@1.1.6(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
-    dependencies:
-      "@radix-ui/primitive": 1.1.1
-      "@radix-ui/react-compose-refs": 1.1.1(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-context": 1.1.1(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-dismissable-layer": 1.1.5(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-focus-guards": 1.1.1(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-focus-scope": 1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-id": 1.1.0(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-portal": 1.1.4(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-presence": 1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-primitive": 2.0.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-slot": 1.1.2(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-use-controllable-state": 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      "@types/react": 18.3.20
+
+  "@radix-ui/react-dialog@1.1.7(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
+    dependencies:
+      "@radix-ui/primitive": 1.1.2
+      "@radix-ui/react-compose-refs": 1.1.2(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-context": 1.1.2(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-dismissable-layer": 1.1.6(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-focus-guards": 1.1.2(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-focus-scope": 1.1.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-id": 1.1.1(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-portal": 1.1.5(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-presence": 1.1.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-primitive": 2.0.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-slot": 1.2.0(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-use-controllable-state": 1.1.1(@types/react@18.3.20)(react@18.3.1)
       aria-hidden: 1.2.4
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
-      react-remove-scroll: 2.6.3(@types/react@18.3.18)(react@18.3.1)
+      react-remove-scroll: 2.6.3(@types/react@18.3.20)(react@18.3.1)
     optionalDependencies:
-      "@types/react": 18.3.18
-      "@types/react-dom": 18.3.5(@types/react@18.3.18)
+      "@types/react": 18.3.20
+      "@types/react-dom": 18.3.6(@types/react@18.3.20)
 
-  "@radix-ui/react-direction@1.1.0(@types/react@18.3.18)(react@18.3.1)":
+  "@radix-ui/react-direction@1.1.1(@types/react@18.3.20)(react@18.3.1)":
     dependencies:
       react: 18.3.1
     optionalDependencies:
-      "@types/react": 18.3.18
+      "@types/react": 18.3.20
 
-  "@radix-ui/react-dismissable-layer@1.1.5(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
+  "@radix-ui/react-dismissable-layer@1.1.6(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
     dependencies:
-      "@radix-ui/primitive": 1.1.1
-      "@radix-ui/react-compose-refs": 1.1.1(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-primitive": 2.0.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-use-callback-ref": 1.1.0(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-use-escape-keydown": 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      "@radix-ui/primitive": 1.1.2
+      "@radix-ui/react-compose-refs": 1.1.2(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-primitive": 2.0.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-use-callback-ref": 1.1.1(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-use-escape-keydown": 1.1.1(@types/react@18.3.20)(react@18.3.1)
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      "@types/react": 18.3.18
-      "@types/react-dom": 18.3.5(@types/react@18.3.18)
+      "@types/react": 18.3.20
+      "@types/react-dom": 18.3.6(@types/react@18.3.20)
 
-  "@radix-ui/react-focus-guards@1.1.1(@types/react@18.3.18)(react@18.3.1)":
+  "@radix-ui/react-focus-guards@1.1.2(@types/react@18.3.20)(react@18.3.1)":
     dependencies:
       react: 18.3.1
     optionalDependencies:
-      "@types/react": 18.3.18
+      "@types/react": 18.3.20
 
-  "@radix-ui/react-focus-scope@1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
+  "@radix-ui/react-focus-scope@1.1.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
     dependencies:
-      "@radix-ui/react-compose-refs": 1.1.1(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-primitive": 2.0.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-use-callback-ref": 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      "@radix-ui/react-compose-refs": 1.1.2(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-primitive": 2.0.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-use-callback-ref": 1.1.1(@types/react@18.3.20)(react@18.3.1)
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      "@types/react": 18.3.18
-      "@types/react-dom": 18.3.5(@types/react@18.3.18)
+      "@types/react": 18.3.20
+      "@types/react-dom": 18.3.6(@types/react@18.3.20)
 
-  "@radix-ui/react-id@1.1.0(@types/react@18.3.18)(react@18.3.1)":
+  "@radix-ui/react-id@1.1.1(@types/react@18.3.20)(react@18.3.1)":
     dependencies:
-      "@radix-ui/react-use-layout-effect": 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      "@radix-ui/react-use-layout-effect": 1.1.1(@types/react@18.3.20)(react@18.3.1)
       react: 18.3.1
     optionalDependencies:
-      "@types/react": 18.3.18
-
-  "@radix-ui/react-popover@1.1.6(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
-    dependencies:
-      "@radix-ui/primitive": 1.1.1
-      "@radix-ui/react-compose-refs": 1.1.1(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-context": 1.1.1(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-dismissable-layer": 1.1.5(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-focus-guards": 1.1.1(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-focus-scope": 1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-id": 1.1.0(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-popper": 1.2.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-portal": 1.1.4(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-presence": 1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-primitive": 2.0.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-slot": 1.1.2(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-use-controllable-state": 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      "@types/react": 18.3.20
+
+  "@radix-ui/react-popover@1.1.7(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
+    dependencies:
+      "@radix-ui/primitive": 1.1.2
+      "@radix-ui/react-compose-refs": 1.1.2(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-context": 1.1.2(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-dismissable-layer": 1.1.6(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-focus-guards": 1.1.2(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-focus-scope": 1.1.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-id": 1.1.1(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-popper": 1.2.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-portal": 1.1.5(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-presence": 1.1.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-primitive": 2.0.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-slot": 1.2.0(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-use-controllable-state": 1.1.1(@types/react@18.3.20)(react@18.3.1)
       aria-hidden: 1.2.4
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
-      react-remove-scroll: 2.6.3(@types/react@18.3.18)(react@18.3.1)
+      react-remove-scroll: 2.6.3(@types/react@18.3.20)(react@18.3.1)
     optionalDependencies:
-      "@types/react": 18.3.18
-      "@types/react-dom": 18.3.5(@types/react@18.3.18)
+      "@types/react": 18.3.20
+      "@types/react-dom": 18.3.6(@types/react@18.3.20)
 
-  "@radix-ui/react-popper@1.2.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
+  "@radix-ui/react-popper@1.2.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
     dependencies:
       "@floating-ui/react-dom": 2.1.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-arrow": 1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-compose-refs": 1.1.1(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-context": 1.1.1(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-primitive": 2.0.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-use-callback-ref": 1.1.0(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-use-layout-effect": 1.1.0(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-use-rect": 1.1.0(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-use-size": 1.1.0(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/rect": 1.1.0
+      "@radix-ui/react-arrow": 1.1.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-compose-refs": 1.1.2(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-context": 1.1.2(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-primitive": 2.0.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-use-callback-ref": 1.1.1(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-use-layout-effect": 1.1.1(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-use-rect": 1.1.1(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-use-size": 1.1.1(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/rect": 1.1.1
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      "@types/react": 18.3.18
-      "@types/react-dom": 18.3.5(@types/react@18.3.18)
+      "@types/react": 18.3.20
+      "@types/react-dom": 18.3.6(@types/react@18.3.20)
 
-  "@radix-ui/react-portal@1.1.4(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
+  "@radix-ui/react-portal@1.1.5(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
     dependencies:
-      "@radix-ui/react-primitive": 2.0.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-use-layout-effect": 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      "@radix-ui/react-primitive": 2.0.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-use-layout-effect": 1.1.1(@types/react@18.3.20)(react@18.3.1)
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      "@types/react": 18.3.18
-      "@types/react-dom": 18.3.5(@types/react@18.3.18)
+      "@types/react": 18.3.20
+      "@types/react-dom": 18.3.6(@types/react@18.3.20)
 
-  "@radix-ui/react-presence@1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
+  "@radix-ui/react-presence@1.1.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
     dependencies:
-      "@radix-ui/react-compose-refs": 1.1.1(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-use-layout-effect": 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      "@radix-ui/react-compose-refs": 1.1.2(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-use-layout-effect": 1.1.1(@types/react@18.3.20)(react@18.3.1)
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      "@types/react": 18.3.18
-      "@types/react-dom": 18.3.5(@types/react@18.3.18)
+      "@types/react": 18.3.20
+      "@types/react-dom": 18.3.6(@types/react@18.3.20)
 
-  "@radix-ui/react-primitive@2.0.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
+  "@radix-ui/react-primitive@2.0.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
     dependencies:
-      "@radix-ui/react-slot": 1.1.2(@types/react@18.3.18)(react@18.3.1)
+      "@radix-ui/react-slot": 1.2.0(@types/react@18.3.20)(react@18.3.1)
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      "@types/react": 18.3.18
-      "@types/react-dom": 18.3.5(@types/react@18.3.18)
+      "@types/react": 18.3.20
+      "@types/react-dom": 18.3.6(@types/react@18.3.20)
 
-  "@radix-ui/react-slot@1.1.2(@types/react@18.3.18)(react@18.3.1)":
+  "@radix-ui/react-slot@1.2.0(@types/react@18.3.20)(react@18.3.1)":
     dependencies:
-      "@radix-ui/react-compose-refs": 1.1.1(@types/react@18.3.18)(react@18.3.1)
+      "@radix-ui/react-compose-refs": 1.1.2(@types/react@18.3.20)(react@18.3.1)
       react: 18.3.1
     optionalDependencies:
-      "@types/react": 18.3.18
-
-  "@radix-ui/react-toast@1.2.6(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
-    dependencies:
-      "@radix-ui/primitive": 1.1.1
-      "@radix-ui/react-collection": 1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-compose-refs": 1.1.1(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-context": 1.1.1(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-dismissable-layer": 1.1.5(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-portal": 1.1.4(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-presence": 1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-primitive": 2.0.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      "@radix-ui/react-use-callback-ref": 1.1.0(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-use-controllable-state": 1.1.0(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-use-layout-effect": 1.1.0(@types/react@18.3.18)(react@18.3.1)
-      "@radix-ui/react-visually-hidden": 1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@types/react": 18.3.20
+
+  "@radix-ui/react-toast@1.2.7(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
+    dependencies:
+      "@radix-ui/primitive": 1.1.2
+      "@radix-ui/react-collection": 1.1.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-compose-refs": 1.1.2(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-context": 1.1.2(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-dismissable-layer": 1.1.6(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-portal": 1.1.5(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-presence": 1.1.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-primitive": 2.0.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-use-callback-ref": 1.1.1(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-use-controllable-state": 1.1.1(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-use-layout-effect": 1.1.1(@types/react@18.3.20)(react@18.3.1)
+      "@radix-ui/react-visually-hidden": 1.1.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      "@types/react": 18.3.18
-      "@types/react-dom": 18.3.5(@types/react@18.3.18)
+      "@types/react": 18.3.20
+      "@types/react-dom": 18.3.6(@types/react@18.3.20)
 
-  "@radix-ui/react-use-callback-ref@1.1.0(@types/react@18.3.18)(react@18.3.1)":
+  "@radix-ui/react-use-callback-ref@1.1.1(@types/react@18.3.20)(react@18.3.1)":
     dependencies:
       react: 18.3.1
     optionalDependencies:
-      "@types/react": 18.3.18
+      "@types/react": 18.3.20
 
-  "@radix-ui/react-use-controllable-state@1.1.0(@types/react@18.3.18)(react@18.3.1)":
+  "@radix-ui/react-use-controllable-state@1.1.1(@types/react@18.3.20)(react@18.3.1)":
     dependencies:
-      "@radix-ui/react-use-callback-ref": 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      "@radix-ui/react-use-callback-ref": 1.1.1(@types/react@18.3.20)(react@18.3.1)
       react: 18.3.1
     optionalDependencies:
-      "@types/react": 18.3.18
+      "@types/react": 18.3.20
 
-  "@radix-ui/react-use-escape-keydown@1.1.0(@types/react@18.3.18)(react@18.3.1)":
+  "@radix-ui/react-use-escape-keydown@1.1.1(@types/react@18.3.20)(react@18.3.1)":
     dependencies:
-      "@radix-ui/react-use-callback-ref": 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      "@radix-ui/react-use-callback-ref": 1.1.1(@types/react@18.3.20)(react@18.3.1)
       react: 18.3.1
     optionalDependencies:
-      "@types/react": 18.3.18
+      "@types/react": 18.3.20
 
-  "@radix-ui/react-use-layout-effect@1.1.0(@types/react@18.3.18)(react@18.3.1)":
+  "@radix-ui/react-use-layout-effect@1.1.1(@types/react@18.3.20)(react@18.3.1)":
     dependencies:
       react: 18.3.1
     optionalDependencies:
-      "@types/react": 18.3.18
+      "@types/react": 18.3.20
 
-  "@radix-ui/react-use-rect@1.1.0(@types/react@18.3.18)(react@18.3.1)":
+  "@radix-ui/react-use-rect@1.1.1(@types/react@18.3.20)(react@18.3.1)":
     dependencies:
-      "@radix-ui/rect": 1.1.0
+      "@radix-ui/rect": 1.1.1
       react: 18.3.1
     optionalDependencies:
-      "@types/react": 18.3.18
+      "@types/react": 18.3.20
 
-  "@radix-ui/react-use-size@1.1.0(@types/react@18.3.18)(react@18.3.1)":
+  "@radix-ui/react-use-size@1.1.1(@types/react@18.3.20)(react@18.3.1)":
     dependencies:
-      "@radix-ui/react-use-layout-effect": 1.1.0(@types/react@18.3.18)(react@18.3.1)
+      "@radix-ui/react-use-layout-effect": 1.1.1(@types/react@18.3.20)(react@18.3.1)
       react: 18.3.1
     optionalDependencies:
-      "@types/react": 18.3.18
+      "@types/react": 18.3.20
 
-  "@radix-ui/react-visually-hidden@1.1.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
+  "@radix-ui/react-visually-hidden@1.1.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
     dependencies:
-      "@radix-ui/react-primitive": 2.0.2(@types/react-dom@18.3.5(@types/react@18.3.18))(@types/react@18.3.18)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      "@radix-ui/react-primitive": 2.0.3(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
     optionalDependencies:
-      "@types/react": 18.3.18
-      "@types/react-dom": 18.3.5(@types/react@18.3.18)
+      "@types/react": 18.3.20
+      "@types/react-dom": 18.3.6(@types/react@18.3.20)
 
-  "@radix-ui/rect@1.1.0": {}
+  "@radix-ui/rect@1.1.1": {}
 
   "@rtsao/scc@1.1.0": {}
 
-  "@rushstack/eslint-patch@1.10.5": {}
+  "@rushstack/eslint-patch@1.11.0": {}
 
   "@swc/counter@0.1.3": {}
 
@@ -4157,136 +4340,193 @@ snapshots:
       "@swc/counter": 0.1.3
       tslib: 2.8.1
 
-  "@t3-oss/env-core@0.11.1(typescript@5.7.3)(zod@3.24.2)":
+  "@t3-oss/env-core@0.11.1(typescript@5.8.3)(zod@3.24.2)":
     dependencies:
       zod: 3.24.2
     optionalDependencies:
-      typescript: 5.7.3
+      typescript: 5.8.3
 
-  "@t3-oss/env-nextjs@0.11.1(typescript@5.7.3)(zod@3.24.2)":
+  "@t3-oss/env-nextjs@0.11.1(typescript@5.8.3)(zod@3.24.2)":
     dependencies:
-      "@t3-oss/env-core": 0.11.1(typescript@5.7.3)(zod@3.24.2)
+      "@t3-oss/env-core": 0.11.1(typescript@5.8.3)(zod@3.24.2)
       zod: 3.24.2
     optionalDependencies:
-      typescript: 5.7.3
+      typescript: 5.8.3
+
+  "@tailwindcss/forms@0.5.10(tailwindcss@3.4.17)":
+    dependencies:
+      mini-svg-data-uri: 1.4.4
+      tailwindcss: 3.4.17
 
-  "@tanstack/query-core@5.66.4": {}
+  "@tanstack/query-core@5.72.2": {}
 
-  "@tanstack/react-query@5.66.5(react@18.3.1)":
+  "@tanstack/react-query@5.72.2(react@18.3.1)":
     dependencies:
-      "@tanstack/query-core": 5.66.4
+      "@tanstack/query-core": 5.72.2
       react: 18.3.1
 
+  "@tybys/wasm-util@0.9.0":
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
   "@types/eslint@8.56.12":
     dependencies:
-      "@types/estree": 1.0.6
+      "@types/estree": 1.0.7
       "@types/json-schema": 7.0.15
 
-  "@types/estree@1.0.6": {}
+  "@types/estree@1.0.7": {}
 
   "@types/json-schema@7.0.15": {}
 
   "@types/json5@0.0.29": {}
 
-  "@types/node@22.13.4":
+  "@types/node@22.14.0":
     dependencies:
-      undici-types: 6.20.0
+      undici-types: 6.21.0
 
   "@types/prop-types@15.7.14": {}
 
-  "@types/react-dom@18.3.5(@types/react@18.3.18)":
+  "@types/react-dom@18.3.6(@types/react@18.3.20)":
     dependencies:
-      "@types/react": 18.3.18
+      "@types/react": 18.3.20
 
-  "@types/react@18.3.18":
+  "@types/react@18.3.20":
     dependencies:
       "@types/prop-types": 15.7.14
       csstype: 3.1.3
 
-  "@typescript-eslint/eslint-plugin@8.24.1(@typescript-eslint/parser@8.24.1(eslint@8.57.1)(typescript@5.7.3))(eslint@8.57.1)(typescript@5.7.3)":
+  "@typescript-eslint/eslint-plugin@8.29.1(@typescript-eslint/parser@8.29.1(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(typescript@5.8.3)":
     dependencies:
       "@eslint-community/regexpp": 4.12.1
-      "@typescript-eslint/parser": 8.24.1(eslint@8.57.1)(typescript@5.7.3)
-      "@typescript-eslint/scope-manager": 8.24.1
-      "@typescript-eslint/type-utils": 8.24.1(eslint@8.57.1)(typescript@5.7.3)
-      "@typescript-eslint/utils": 8.24.1(eslint@8.57.1)(typescript@5.7.3)
-      "@typescript-eslint/visitor-keys": 8.24.1
+      "@typescript-eslint/parser": 8.29.1(eslint@8.57.1)(typescript@5.8.3)
+      "@typescript-eslint/scope-manager": 8.29.1
+      "@typescript-eslint/type-utils": 8.29.1(eslint@8.57.1)(typescript@5.8.3)
+      "@typescript-eslint/utils": 8.29.1(eslint@8.57.1)(typescript@5.8.3)
+      "@typescript-eslint/visitor-keys": 8.29.1
       eslint: 8.57.1
       graphemer: 1.4.0
       ignore: 5.3.2
       natural-compare: 1.4.0
-      ts-api-utils: 2.0.1(typescript@5.7.3)
-      typescript: 5.7.3
+      ts-api-utils: 2.1.0(typescript@5.8.3)
+      typescript: 5.8.3
     transitivePeerDependencies:
       - supports-color
 
-  "@typescript-eslint/parser@8.24.1(eslint@8.57.1)(typescript@5.7.3)":
+  "@typescript-eslint/parser@8.29.1(eslint@8.57.1)(typescript@5.8.3)":
     dependencies:
-      "@typescript-eslint/scope-manager": 8.24.1
-      "@typescript-eslint/types": 8.24.1
-      "@typescript-eslint/typescript-estree": 8.24.1(typescript@5.7.3)
-      "@typescript-eslint/visitor-keys": 8.24.1
+      "@typescript-eslint/scope-manager": 8.29.1
+      "@typescript-eslint/types": 8.29.1
+      "@typescript-eslint/typescript-estree": 8.29.1(typescript@5.8.3)
+      "@typescript-eslint/visitor-keys": 8.29.1
       debug: 4.4.0
       eslint: 8.57.1
-      typescript: 5.7.3
+      typescript: 5.8.3
     transitivePeerDependencies:
       - supports-color
 
-  "@typescript-eslint/scope-manager@8.24.1":
+  "@typescript-eslint/scope-manager@8.29.1":
     dependencies:
-      "@typescript-eslint/types": 8.24.1
-      "@typescript-eslint/visitor-keys": 8.24.1
+      "@typescript-eslint/types": 8.29.1
+      "@typescript-eslint/visitor-keys": 8.29.1
 
-  "@typescript-eslint/type-utils@8.24.1(eslint@8.57.1)(typescript@5.7.3)":
+  "@typescript-eslint/type-utils@8.29.1(eslint@8.57.1)(typescript@5.8.3)":
     dependencies:
-      "@typescript-eslint/typescript-estree": 8.24.1(typescript@5.7.3)
-      "@typescript-eslint/utils": 8.24.1(eslint@8.57.1)(typescript@5.7.3)
+      "@typescript-eslint/typescript-estree": 8.29.1(typescript@5.8.3)
+      "@typescript-eslint/utils": 8.29.1(eslint@8.57.1)(typescript@5.8.3)
       debug: 4.4.0
       eslint: 8.57.1
-      ts-api-utils: 2.0.1(typescript@5.7.3)
-      typescript: 5.7.3
+      ts-api-utils: 2.1.0(typescript@5.8.3)
+      typescript: 5.8.3
     transitivePeerDependencies:
       - supports-color
 
-  "@typescript-eslint/types@8.24.1": {}
+  "@typescript-eslint/types@8.29.1": {}
 
-  "@typescript-eslint/typescript-estree@8.24.1(typescript@5.7.3)":
+  "@typescript-eslint/typescript-estree@8.29.1(typescript@5.8.3)":
     dependencies:
-      "@typescript-eslint/types": 8.24.1
-      "@typescript-eslint/visitor-keys": 8.24.1
+      "@typescript-eslint/types": 8.29.1
+      "@typescript-eslint/visitor-keys": 8.29.1
       debug: 4.4.0
       fast-glob: 3.3.3
       is-glob: 4.0.3
       minimatch: 9.0.5
       semver: 7.7.1
-      ts-api-utils: 2.0.1(typescript@5.7.3)
-      typescript: 5.7.3
+      ts-api-utils: 2.1.0(typescript@5.8.3)
+      typescript: 5.8.3
     transitivePeerDependencies:
       - supports-color
 
-  "@typescript-eslint/utils@8.24.1(eslint@8.57.1)(typescript@5.7.3)":
+  "@typescript-eslint/utils@8.29.1(eslint@8.57.1)(typescript@5.8.3)":
     dependencies:
-      "@eslint-community/eslint-utils": 4.4.1(eslint@8.57.1)
-      "@typescript-eslint/scope-manager": 8.24.1
-      "@typescript-eslint/types": 8.24.1
-      "@typescript-eslint/typescript-estree": 8.24.1(typescript@5.7.3)
+      "@eslint-community/eslint-utils": 4.5.1(eslint@8.57.1)
+      "@typescript-eslint/scope-manager": 8.29.1
+      "@typescript-eslint/types": 8.29.1
+      "@typescript-eslint/typescript-estree": 8.29.1(typescript@5.8.3)
       eslint: 8.57.1
-      typescript: 5.7.3
+      typescript: 5.8.3
     transitivePeerDependencies:
       - supports-color
 
-  "@typescript-eslint/visitor-keys@8.24.1":
+  "@typescript-eslint/visitor-keys@8.29.1":
     dependencies:
-      "@typescript-eslint/types": 8.24.1
+      "@typescript-eslint/types": 8.29.1
       eslint-visitor-keys: 4.2.0
 
   "@ungap/structured-clone@1.3.0": {}
 
-  acorn-jsx@5.3.2(acorn@8.14.0):
+  "@unrs/resolver-binding-darwin-arm64@1.4.1":
+    optional: true
+
+  "@unrs/resolver-binding-darwin-x64@1.4.1":
+    optional: true
+
+  "@unrs/resolver-binding-freebsd-x64@1.4.1":
+    optional: true
+
+  "@unrs/resolver-binding-linux-arm-gnueabihf@1.4.1":
+    optional: true
+
+  "@unrs/resolver-binding-linux-arm-musleabihf@1.4.1":
+    optional: true
+
+  "@unrs/resolver-binding-linux-arm64-gnu@1.4.1":
+    optional: true
+
+  "@unrs/resolver-binding-linux-arm64-musl@1.4.1":
+    optional: true
+
+  "@unrs/resolver-binding-linux-ppc64-gnu@1.4.1":
+    optional: true
+
+  "@unrs/resolver-binding-linux-s390x-gnu@1.4.1":
+    optional: true
+
+  "@unrs/resolver-binding-linux-x64-gnu@1.4.1":
+    optional: true
+
+  "@unrs/resolver-binding-linux-x64-musl@1.4.1":
+    optional: true
+
+  "@unrs/resolver-binding-wasm32-wasi@1.4.1":
     dependencies:
-      acorn: 8.14.0
+      "@napi-rs/wasm-runtime": 0.2.8
+    optional: true
 
-  acorn@8.14.0: {}
+  "@unrs/resolver-binding-win32-arm64-msvc@1.4.1":
+    optional: true
+
+  "@unrs/resolver-binding-win32-ia32-msvc@1.4.1":
+    optional: true
+
+  "@unrs/resolver-binding-win32-x64-msvc@1.4.1":
+    optional: true
+
+  acorn-jsx@5.3.2(acorn@8.14.1):
+    dependencies:
+      acorn: 8.14.1
+
+  acorn@8.14.1: {}
 
   ajv@6.12.6:
     dependencies:
@@ -4324,7 +4564,7 @@ snapshots:
 
   array-buffer-byte-length@1.0.2:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       is-array-buffer: 3.0.5
 
   array-includes@3.1.8:
@@ -4333,7 +4573,7 @@ snapshots:
       define-properties: 1.2.1
       es-abstract: 1.23.9
       es-object-atoms: 1.1.1
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       is-string: 1.1.1
 
   array.prototype.findlast@1.2.5:
@@ -4345,9 +4585,10 @@ snapshots:
       es-object-atoms: 1.1.1
       es-shim-unscopables: 1.1.0
 
-  array.prototype.findlastindex@1.2.5:
+  array.prototype.findlastindex@1.2.6:
     dependencies:
       call-bind: 1.0.8
+      call-bound: 1.0.4
       define-properties: 1.2.1
       es-abstract: 1.23.9
       es-errors: 1.3.0
@@ -4383,7 +4624,7 @@ snapshots:
       define-properties: 1.2.1
       es-abstract: 1.23.9
       es-errors: 1.3.0
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       is-array-buffer: 3.0.5
 
   ast-types-flow@0.0.8: {}
@@ -4394,7 +4635,7 @@ snapshots:
     dependencies:
       possible-typed-array-names: 1.1.0
 
-  axe-core@4.10.2: {}
+  axe-core@4.10.3: {}
 
   axobject-query@4.1.0: {}
 
@@ -4428,19 +4669,19 @@ snapshots:
     dependencies:
       call-bind-apply-helpers: 1.0.2
       es-define-property: 1.0.1
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       set-function-length: 1.2.2
 
-  call-bound@1.0.3:
+  call-bound@1.0.4:
     dependencies:
       call-bind-apply-helpers: 1.0.2
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
 
   callsites@3.1.0: {}
 
   camelcase-css@2.0.1: {}
 
-  caniuse-lite@1.0.30001700: {}
+  caniuse-lite@1.0.30001712: {}
 
   chalk@4.1.2:
     dependencies:
@@ -4495,19 +4736,19 @@ snapshots:
 
   data-view-buffer@1.0.2:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       es-errors: 1.3.0
       is-data-view: 1.0.2
 
   data-view-byte-length@1.0.2:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       es-errors: 1.3.0
       is-data-view: 1.0.2
 
   data-view-byte-offset@1.0.1:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       es-errors: 1.3.0
       is-data-view: 1.0.2
 
@@ -4563,18 +4804,13 @@ snapshots:
 
   emoji-regex@9.2.2: {}
 
-  enhanced-resolve@5.18.1:
-    dependencies:
-      graceful-fs: 4.2.11
-      tapable: 2.2.1
-
   es-abstract@1.23.9:
     dependencies:
       array-buffer-byte-length: 1.0.2
       arraybuffer.prototype.slice: 1.0.4
       available-typed-arrays: 1.0.7
       call-bind: 1.0.8
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       data-view-buffer: 1.0.2
       data-view-byte-length: 1.0.2
       data-view-byte-offset: 1.0.1
@@ -4584,7 +4820,7 @@ snapshots:
       es-set-tostringtag: 2.1.0
       es-to-primitive: 1.3.0
       function.prototype.name: 1.1.8
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       get-proto: 1.0.1
       get-symbol-description: 1.1.0
       globalthis: 1.0.4
@@ -4620,7 +4856,7 @@ snapshots:
       typed-array-byte-offset: 1.0.4
       typed-array-length: 1.0.7
       unbox-primitive: 1.1.0
-      which-typed-array: 1.1.18
+      which-typed-array: 1.1.19
 
   es-define-property@1.0.1: {}
 
@@ -4629,13 +4865,13 @@ snapshots:
   es-iterator-helpers@1.2.1:
     dependencies:
       call-bind: 1.0.8
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       define-properties: 1.2.1
       es-abstract: 1.23.9
       es-errors: 1.3.0
       es-set-tostringtag: 2.1.0
       function-bind: 1.1.2
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       globalthis: 1.0.4
       gopd: 1.2.0
       has-property-descriptors: 1.0.2
@@ -4652,7 +4888,7 @@ snapshots:
   es-set-tostringtag@2.1.0:
     dependencies:
       es-errors: 1.3.0
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       has-tostringtag: 1.0.2
       hasown: 2.0.2
 
@@ -4668,21 +4904,21 @@ snapshots:
 
   escape-string-regexp@4.0.0: {}
 
-  eslint-config-next@14.2.13(eslint@8.57.1)(typescript@5.7.3):
+  eslint-config-next@14.2.13(eslint@8.57.1)(typescript@5.8.3):
     dependencies:
       "@next/eslint-plugin-next": 14.2.13
-      "@rushstack/eslint-patch": 1.10.5
-      "@typescript-eslint/eslint-plugin": 8.24.1(@typescript-eslint/parser@8.24.1(eslint@8.57.1)(typescript@5.7.3))(eslint@8.57.1)(typescript@5.7.3)
-      "@typescript-eslint/parser": 8.24.1(eslint@8.57.1)(typescript@5.7.3)
+      "@rushstack/eslint-patch": 1.11.0
+      "@typescript-eslint/eslint-plugin": 8.29.1(@typescript-eslint/parser@8.29.1(eslint@8.57.1)(typescript@5.8.3))(eslint@8.57.1)(typescript@5.8.3)
+      "@typescript-eslint/parser": 8.29.1(eslint@8.57.1)(typescript@5.8.3)
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.8.1(eslint-plugin-import@2.31.0)(eslint@8.57.1)
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.24.1(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-typescript@3.8.1)(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.10.0(eslint-plugin-import@2.31.0)(eslint@8.57.1)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.29.1(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.0)(eslint@8.57.1)
       eslint-plugin-jsx-a11y: 6.10.2(eslint@8.57.1)
-      eslint-plugin-react: 7.37.4(eslint@8.57.1)
+      eslint-plugin-react: 7.37.5(eslint@8.57.1)
       eslint-plugin-react-hooks: 5.0.0-canary-7118f5dd7-20230705(eslint@8.57.1)
     optionalDependencies:
-      typescript: 5.7.3
+      typescript: 5.8.3
     transitivePeerDependencies:
       - eslint-import-resolver-webpack
       - eslint-plugin-import-x
@@ -4696,44 +4932,44 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-import-resolver-typescript@3.8.1(eslint-plugin-import@2.31.0)(eslint@8.57.1):
+  eslint-import-resolver-typescript@3.10.0(eslint-plugin-import@2.31.0)(eslint@8.57.1):
     dependencies:
       "@nolyfill/is-core-module": 1.0.39
       debug: 4.4.0
-      enhanced-resolve: 5.18.1
       eslint: 8.57.1
       get-tsconfig: 4.10.0
-      is-bun-module: 1.3.0
-      stable-hash: 0.0.4
-      tinyglobby: 0.2.11
+      is-bun-module: 2.0.0
+      stable-hash: 0.0.5
+      tinyglobby: 0.2.12
+      unrs-resolver: 1.4.1
     optionalDependencies:
-      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.24.1(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-typescript@3.8.1)(eslint@8.57.1)
+      eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.29.1(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.0)(eslint@8.57.1)
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.12.0(@typescript-eslint/parser@8.24.1(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.8.1(eslint-plugin-import@2.31.0)(eslint@8.57.1))(eslint@8.57.1):
+  eslint-module-utils@2.12.0(@typescript-eslint/parser@8.29.1(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.0(eslint-plugin-import@2.31.0)(eslint@8.57.1))(eslint@8.57.1):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
-      "@typescript-eslint/parser": 8.24.1(eslint@8.57.1)(typescript@5.7.3)
+      "@typescript-eslint/parser": 8.29.1(eslint@8.57.1)(typescript@5.8.3)
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.8.1(eslint-plugin-import@2.31.0)(eslint@8.57.1)
+      eslint-import-resolver-typescript: 3.10.0(eslint-plugin-import@2.31.0)(eslint@8.57.1)
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.24.1(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-typescript@3.8.1)(eslint@8.57.1):
+  eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.29.1(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-typescript@3.10.0)(eslint@8.57.1):
     dependencies:
       "@rtsao/scc": 1.1.0
       array-includes: 3.1.8
-      array.prototype.findlastindex: 1.2.5
+      array.prototype.findlastindex: 1.2.6
       array.prototype.flat: 1.3.3
       array.prototype.flatmap: 1.3.3
       debug: 3.2.7
       doctrine: 2.1.0
       eslint: 8.57.1
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.24.1(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.8.1(eslint-plugin-import@2.31.0)(eslint@8.57.1))(eslint@8.57.1)
+      eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.29.1(eslint@8.57.1)(typescript@5.8.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.10.0(eslint-plugin-import@2.31.0)(eslint@8.57.1))(eslint@8.57.1)
       hasown: 2.0.2
       is-core-module: 2.16.1
       is-glob: 4.0.3
@@ -4745,7 +4981,7 @@ snapshots:
       string.prototype.trimend: 1.0.9
       tsconfig-paths: 3.15.0
     optionalDependencies:
-      "@typescript-eslint/parser": 8.24.1(eslint@8.57.1)(typescript@5.7.3)
+      "@typescript-eslint/parser": 8.29.1(eslint@8.57.1)(typescript@5.8.3)
     transitivePeerDependencies:
       - eslint-import-resolver-typescript
       - eslint-import-resolver-webpack
@@ -4757,7 +4993,7 @@ snapshots:
       array-includes: 3.1.8
       array.prototype.flatmap: 1.3.3
       ast-types-flow: 0.0.8
-      axe-core: 4.10.2
+      axe-core: 4.10.3
       axobject-query: 4.1.0
       damerau-levenshtein: 1.0.8
       emoji-regex: 9.2.2
@@ -4774,7 +5010,7 @@ snapshots:
     dependencies:
       eslint: 8.57.1
 
-  eslint-plugin-react@7.37.4(eslint@8.57.1):
+  eslint-plugin-react@7.37.5(eslint@8.57.1):
     dependencies:
       array-includes: 3.1.8
       array.prototype.findlast: 1.2.5
@@ -4787,7 +5023,7 @@ snapshots:
       hasown: 2.0.2
       jsx-ast-utils: 3.3.5
       minimatch: 3.1.2
-      object.entries: 1.1.8
+      object.entries: 1.1.9
       object.fromentries: 2.0.8
       object.values: 1.2.1
       prop-types: 15.8.1
@@ -4807,7 +5043,7 @@ snapshots:
 
   eslint@8.57.1:
     dependencies:
-      "@eslint-community/eslint-utils": 4.4.1(eslint@8.57.1)
+      "@eslint-community/eslint-utils": 4.5.1(eslint@8.57.1)
       "@eslint-community/regexpp": 4.12.1
       "@eslint/eslintrc": 2.1.4
       "@eslint/js": 8.57.1
@@ -4850,8 +5086,8 @@ snapshots:
 
   espree@9.6.1:
     dependencies:
-      acorn: 8.14.0
-      acorn-jsx: 5.3.2(acorn@8.14.0)
+      acorn: 8.14.1
+      acorn-jsx: 5.3.2(acorn@8.14.1)
       eslint-visitor-keys: 3.4.3
 
   esquery@1.6.0:
@@ -4880,9 +5116,9 @@ snapshots:
 
   fast-levenshtein@2.0.6: {}
 
-  fastq@1.19.0:
+  fastq@1.19.1:
     dependencies:
-      reusify: 1.0.4
+      reusify: 1.1.0
 
   fdir@6.4.3(picomatch@4.0.2):
     optionalDependencies:
@@ -4903,25 +5139,25 @@ snapshots:
 
   flat-cache@3.2.0:
     dependencies:
-      flatted: 3.3.2
+      flatted: 3.3.3
       keyv: 4.5.4
       rimraf: 3.0.2
 
-  flatted@3.3.2: {}
+  flatted@3.3.3: {}
 
   for-each@0.3.5:
     dependencies:
       is-callable: 1.2.7
 
-  foreground-child@3.3.0:
+  foreground-child@3.3.1:
     dependencies:
       cross-spawn: 7.0.6
       signal-exit: 4.1.0
 
-  framer-motion@12.4.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+  framer-motion@12.6.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
-      motion-dom: 12.0.0
-      motion-utils: 12.0.0
+      motion-dom: 12.6.3
+      motion-utils: 12.6.3
       tslib: 2.8.1
     optionalDependencies:
       react: 18.3.1
@@ -4937,7 +5173,7 @@ snapshots:
   function.prototype.name@1.1.8:
     dependencies:
       call-bind: 1.0.8
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       define-properties: 1.2.1
       functions-have-names: 1.2.3
       hasown: 2.0.2
@@ -4945,7 +5181,7 @@ snapshots:
 
   functions-have-names@1.2.3: {}
 
-  get-intrinsic@1.2.7:
+  get-intrinsic@1.3.0:
     dependencies:
       call-bind-apply-helpers: 1.0.2
       es-define-property: 1.0.1
@@ -4967,9 +5203,9 @@ snapshots:
 
   get-symbol-description@1.1.0:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       es-errors: 1.3.0
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
 
   get-tsconfig@4.10.0:
     dependencies:
@@ -4985,7 +5221,7 @@ snapshots:
 
   glob@10.3.10:
     dependencies:
-      foreground-child: 3.3.0
+      foreground-child: 3.3.1
       jackspeak: 2.3.6
       minimatch: 9.0.5
       minipass: 7.1.2
@@ -4993,7 +5229,7 @@ snapshots:
 
   glob@10.4.5:
     dependencies:
-      foreground-child: 3.3.0
+      foreground-child: 3.3.1
       jackspeak: 3.4.3
       minimatch: 9.0.5
       minipass: 7.1.2
@@ -5071,15 +5307,15 @@ snapshots:
   is-array-buffer@3.0.5:
     dependencies:
       call-bind: 1.0.8
-      call-bound: 1.0.3
-      get-intrinsic: 1.2.7
+      call-bound: 1.0.4
+      get-intrinsic: 1.3.0
 
   is-arrayish@0.3.2: {}
 
   is-async-function@2.1.1:
     dependencies:
       async-function: 1.0.0
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       get-proto: 1.0.1
       has-tostringtag: 1.0.2
       safe-regex-test: 1.1.0
@@ -5094,10 +5330,10 @@ snapshots:
 
   is-boolean-object@1.2.2:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       has-tostringtag: 1.0.2
 
-  is-bun-module@1.3.0:
+  is-bun-module@2.0.0:
     dependencies:
       semver: 7.7.1
 
@@ -5109,26 +5345,26 @@ snapshots:
 
   is-data-view@1.0.2:
     dependencies:
-      call-bound: 1.0.3
-      get-intrinsic: 1.2.7
+      call-bound: 1.0.4
+      get-intrinsic: 1.3.0
       is-typed-array: 1.1.15
 
   is-date-object@1.1.0:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       has-tostringtag: 1.0.2
 
   is-extglob@2.1.1: {}
 
   is-finalizationregistry@1.1.1:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
 
   is-fullwidth-code-point@3.0.0: {}
 
   is-generator-function@1.1.0:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       get-proto: 1.0.1
       has-tostringtag: 1.0.2
       safe-regex-test: 1.1.0
@@ -5141,7 +5377,7 @@ snapshots:
 
   is-number-object@1.1.1:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       has-tostringtag: 1.0.2
 
   is-number@7.0.0: {}
@@ -5150,7 +5386,7 @@ snapshots:
 
   is-regex@1.2.1:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       gopd: 1.2.0
       has-tostringtag: 1.0.2
       hasown: 2.0.2
@@ -5159,33 +5395,33 @@ snapshots:
 
   is-shared-array-buffer@1.0.4:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
 
   is-string@1.1.1:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       has-tostringtag: 1.0.2
 
   is-symbol@1.1.1:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       has-symbols: 1.1.0
       safe-regex-test: 1.1.0
 
   is-typed-array@1.1.15:
     dependencies:
-      which-typed-array: 1.1.18
+      which-typed-array: 1.1.19
 
   is-weakmap@2.0.2: {}
 
   is-weakref@1.1.1:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
 
   is-weakset@2.0.4:
     dependencies:
-      call-bound: 1.0.3
-      get-intrinsic: 1.2.7
+      call-bound: 1.0.4
+      get-intrinsic: 1.3.0
 
   isarray@2.0.5: {}
 
@@ -5195,7 +5431,7 @@ snapshots:
     dependencies:
       define-data-property: 1.1.4
       es-object-atoms: 1.1.1
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       get-proto: 1.0.1
       has-symbols: 1.1.0
       set-function-name: 2.0.2
@@ -5270,7 +5506,7 @@ snapshots:
 
   match-sorter@8.0.0:
     dependencies:
-      "@babel/runtime": 7.26.9
+      "@babel/runtime": 7.27.0
       remove-accents: 0.5.0
 
   math-intrinsics@1.1.0: {}
@@ -5282,6 +5518,8 @@ snapshots:
       braces: 3.0.3
       picomatch: 2.3.1
 
+  mini-svg-data-uri@1.4.4: {}
+
   minimatch@3.1.2:
     dependencies:
       brace-expansion: 1.1.11
@@ -5294,15 +5532,15 @@ snapshots:
 
   minipass@7.1.2: {}
 
-  motion-dom@12.0.0:
+  motion-dom@12.6.3:
     dependencies:
-      motion-utils: 12.0.0
+      motion-utils: 12.6.3
 
-  motion-utils@12.0.0: {}
+  motion-utils@12.6.3: {}
 
-  motion@12.4.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+  motion@12.6.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
-      framer-motion: 12.4.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      framer-motion: 12.6.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       tslib: 2.8.1
     optionalDependencies:
       react: 18.3.1
@@ -5316,7 +5554,7 @@ snapshots:
       object-assign: 4.1.1
       thenify-all: 1.6.0
 
-  nanoid@3.3.8: {}
+  nanoid@3.3.11: {}
 
   natural-compare@1.4.0: {}
 
@@ -5325,7 +5563,7 @@ snapshots:
       "@next/env": 14.2.23
       "@swc/helpers": 0.5.5
       busboy: 1.6.0
-      caniuse-lite: 1.0.30001700
+      caniuse-lite: 1.0.30001712
       graceful-fs: 4.2.11
       postcss: 8.4.31
       react: 18.3.1
@@ -5358,15 +5596,16 @@ snapshots:
   object.assign@4.1.7:
     dependencies:
       call-bind: 1.0.8
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       define-properties: 1.2.1
       es-object-atoms: 1.1.1
       has-symbols: 1.1.0
       object-keys: 1.1.1
 
-  object.entries@1.1.8:
+  object.entries@1.1.9:
     dependencies:
       call-bind: 1.0.8
+      call-bound: 1.0.4
       define-properties: 1.2.1
       es-object-atoms: 1.1.1
 
@@ -5386,7 +5625,7 @@ snapshots:
   object.values@1.2.1:
     dependencies:
       call-bind: 1.0.8
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       define-properties: 1.2.1
       es-object-atoms: 1.1.1
 
@@ -5405,7 +5644,7 @@ snapshots:
 
   own-keys@1.0.1:
     dependencies:
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       object-keys: 1.1.1
       safe-push-apply: 1.0.0
 
@@ -5444,32 +5683,34 @@ snapshots:
 
   pify@2.3.0: {}
 
-  pirates@4.0.6: {}
+  pirates@4.0.7: {}
+
+  pnpm@10.8.0: {}
 
   possible-typed-array-names@1.1.0: {}
 
-  postcss-import@15.1.0(postcss@8.5.2):
+  postcss-import@15.1.0(postcss@8.5.3):
     dependencies:
-      postcss: 8.5.2
+      postcss: 8.5.3
       postcss-value-parser: 4.2.0
       read-cache: 1.0.0
       resolve: 1.22.10
 
-  postcss-js@4.0.1(postcss@8.5.2):
+  postcss-js@4.0.1(postcss@8.5.3):
     dependencies:
       camelcase-css: 2.0.1
-      postcss: 8.5.2
+      postcss: 8.5.3
 
-  postcss-load-config@4.0.2(postcss@8.5.2):
+  postcss-load-config@4.0.2(postcss@8.5.3):
     dependencies:
       lilconfig: 3.1.3
-      yaml: 2.7.0
+      yaml: 2.7.1
     optionalDependencies:
-      postcss: 8.5.2
+      postcss: 8.5.3
 
-  postcss-nested@6.2.0(postcss@8.5.2):
+  postcss-nested@6.2.0(postcss@8.5.3):
     dependencies:
-      postcss: 8.5.2
+      postcss: 8.5.3
       postcss-selector-parser: 6.1.2
 
   postcss-selector-parser@6.1.2:
@@ -5481,23 +5722,23 @@ snapshots:
 
   postcss@8.4.31:
     dependencies:
-      nanoid: 3.3.8
+      nanoid: 3.3.11
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
-  postcss@8.5.2:
+  postcss@8.5.3:
     dependencies:
-      nanoid: 3.3.8
+      nanoid: 3.3.11
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
   prelude-ls@1.2.1: {}
 
-  prettier-plugin-tailwindcss@0.6.11(prettier@3.5.1):
+  prettier-plugin-tailwindcss@0.6.11(prettier@3.5.3):
     dependencies:
-      prettier: 3.5.1
+      prettier: 3.5.3
 
-  prettier@3.5.1: {}
+  prettier@3.5.3: {}
 
   prop-types@15.8.1:
     dependencies:
@@ -5515,38 +5756,38 @@ snapshots:
       react: 18.3.1
       scheduler: 0.23.2
 
-  react-icons@5.4.0(react@18.3.1):
+  react-icons@5.5.0(react@18.3.1):
     dependencies:
       react: 18.3.1
 
   react-is@16.13.1: {}
 
-  react-remove-scroll-bar@2.3.8(@types/react@18.3.18)(react@18.3.1):
+  react-remove-scroll-bar@2.3.8(@types/react@18.3.20)(react@18.3.1):
     dependencies:
       react: 18.3.1
-      react-style-singleton: 2.2.3(@types/react@18.3.18)(react@18.3.1)
+      react-style-singleton: 2.2.3(@types/react@18.3.20)(react@18.3.1)
       tslib: 2.8.1
     optionalDependencies:
-      "@types/react": 18.3.18
+      "@types/react": 18.3.20
 
-  react-remove-scroll@2.6.3(@types/react@18.3.18)(react@18.3.1):
+  react-remove-scroll@2.6.3(@types/react@18.3.20)(react@18.3.1):
     dependencies:
       react: 18.3.1
-      react-remove-scroll-bar: 2.3.8(@types/react@18.3.18)(react@18.3.1)
-      react-style-singleton: 2.2.3(@types/react@18.3.18)(react@18.3.1)
+      react-remove-scroll-bar: 2.3.8(@types/react@18.3.20)(react@18.3.1)
+      react-style-singleton: 2.2.3(@types/react@18.3.20)(react@18.3.1)
       tslib: 2.8.1
-      use-callback-ref: 1.3.3(@types/react@18.3.18)(react@18.3.1)
-      use-sidecar: 1.1.3(@types/react@18.3.18)(react@18.3.1)
+      use-callback-ref: 1.3.3(@types/react@18.3.20)(react@18.3.1)
+      use-sidecar: 1.1.3(@types/react@18.3.20)(react@18.3.1)
     optionalDependencies:
-      "@types/react": 18.3.18
+      "@types/react": 18.3.20
 
-  react-style-singleton@2.2.3(@types/react@18.3.18)(react@18.3.1):
+  react-style-singleton@2.2.3(@types/react@18.3.20)(react@18.3.1):
     dependencies:
       get-nonce: 1.0.1
       react: 18.3.1
       tslib: 2.8.1
     optionalDependencies:
-      "@types/react": 18.3.18
+      "@types/react": 18.3.20
 
   react@18.3.1:
     dependencies:
@@ -5567,7 +5808,7 @@ snapshots:
       es-abstract: 1.23.9
       es-errors: 1.3.0
       es-object-atoms: 1.1.1
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       get-proto: 1.0.1
       which-builtin-type: 1.2.1
 
@@ -5600,7 +5841,7 @@ snapshots:
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
-  reusify@1.0.4: {}
+  reusify@1.1.0: {}
 
   rimraf@3.0.2:
     dependencies:
@@ -5613,8 +5854,8 @@ snapshots:
   safe-array-concat@1.1.3:
     dependencies:
       call-bind: 1.0.8
-      call-bound: 1.0.3
-      get-intrinsic: 1.2.7
+      call-bound: 1.0.4
+      get-intrinsic: 1.3.0
       has-symbols: 1.1.0
       isarray: 2.0.5
 
@@ -5625,7 +5866,7 @@ snapshots:
 
   safe-regex-test@1.1.0:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       es-errors: 1.3.0
       is-regex: 1.2.1
 
@@ -5642,7 +5883,7 @@ snapshots:
       define-data-property: 1.1.4
       es-errors: 1.3.0
       function-bind: 1.1.2
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       gopd: 1.2.0
       has-property-descriptors: 1.0.2
 
@@ -5698,16 +5939,16 @@ snapshots:
 
   side-channel-map@1.0.1:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       es-errors: 1.3.0
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       object-inspect: 1.13.4
 
   side-channel-weakmap@1.0.2:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       es-errors: 1.3.0
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       object-inspect: 1.13.4
       side-channel-map: 1.0.1
 
@@ -5727,7 +5968,7 @@ snapshots:
 
   source-map-js@1.2.1: {}
 
-  stable-hash@0.0.4: {}
+  stable-hash@0.0.5: {}
 
   streamsearch@1.1.0: {}
 
@@ -5752,12 +5993,12 @@ snapshots:
   string.prototype.matchall@4.0.12:
     dependencies:
       call-bind: 1.0.8
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       define-properties: 1.2.1
       es-abstract: 1.23.9
       es-errors: 1.3.0
       es-object-atoms: 1.1.1
-      get-intrinsic: 1.2.7
+      get-intrinsic: 1.3.0
       gopd: 1.2.0
       has-symbols: 1.1.0
       internal-slot: 1.1.0
@@ -5773,7 +6014,7 @@ snapshots:
   string.prototype.trim@1.2.10:
     dependencies:
       call-bind: 1.0.8
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       define-data-property: 1.1.4
       define-properties: 1.2.1
       es-abstract: 1.23.9
@@ -5783,7 +6024,7 @@ snapshots:
   string.prototype.trimend@1.0.9:
     dependencies:
       call-bind: 1.0.8
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       define-properties: 1.2.1
       es-object-atoms: 1.1.1
 
@@ -5817,7 +6058,7 @@ snapshots:
       glob: 10.4.5
       lines-and-columns: 1.2.4
       mz: 2.7.0
-      pirates: 4.0.6
+      pirates: 4.0.7
       ts-interface-checker: 0.1.13
 
   supports-color@7.2.0:
@@ -5842,19 +6083,17 @@ snapshots:
       normalize-path: 3.0.0
       object-hash: 3.0.0
       picocolors: 1.1.1
-      postcss: 8.5.2
-      postcss-import: 15.1.0(postcss@8.5.2)
-      postcss-js: 4.0.1(postcss@8.5.2)
-      postcss-load-config: 4.0.2(postcss@8.5.2)
-      postcss-nested: 6.2.0(postcss@8.5.2)
+      postcss: 8.5.3
+      postcss-import: 15.1.0(postcss@8.5.3)
+      postcss-js: 4.0.1(postcss@8.5.3)
+      postcss-load-config: 4.0.2(postcss@8.5.3)
+      postcss-nested: 6.2.0(postcss@8.5.3)
       postcss-selector-parser: 6.1.2
       resolve: 1.22.10
       sucrase: 3.35.0
     transitivePeerDependencies:
       - ts-node
 
-  tapable@2.2.1: {}
-
   text-table@0.2.0: {}
 
   thenify-all@1.6.0:
@@ -5865,7 +6104,7 @@ snapshots:
     dependencies:
       any-promise: 1.3.0
 
-  tinyglobby@0.2.11:
+  tinyglobby@0.2.12:
     dependencies:
       fdir: 6.4.3(picomatch@4.0.2)
       picomatch: 4.0.2
@@ -5874,9 +6113,9 @@ snapshots:
     dependencies:
       is-number: 7.0.0
 
-  ts-api-utils@2.0.1(typescript@5.7.3):
+  ts-api-utils@2.1.0(typescript@5.8.3):
     dependencies:
-      typescript: 5.7.3
+      typescript: 5.8.3
 
   ts-interface-checker@0.1.13: {}
 
@@ -5897,7 +6136,7 @@ snapshots:
 
   typed-array-buffer@1.0.3:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       es-errors: 1.3.0
       is-typed-array: 1.1.15
 
@@ -5928,35 +6167,53 @@ snapshots:
       possible-typed-array-names: 1.1.0
       reflect.getprototypeof: 1.0.10
 
-  typescript@5.7.3: {}
+  typescript@5.8.3: {}
 
   unbox-primitive@1.1.0:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       has-bigints: 1.1.0
       has-symbols: 1.1.0
       which-boxed-primitive: 1.1.1
 
-  undici-types@6.20.0: {}
+  undici-types@6.21.0: {}
+
+  unrs-resolver@1.4.1:
+    optionalDependencies:
+      "@unrs/resolver-binding-darwin-arm64": 1.4.1
+      "@unrs/resolver-binding-darwin-x64": 1.4.1
+      "@unrs/resolver-binding-freebsd-x64": 1.4.1
+      "@unrs/resolver-binding-linux-arm-gnueabihf": 1.4.1
+      "@unrs/resolver-binding-linux-arm-musleabihf": 1.4.1
+      "@unrs/resolver-binding-linux-arm64-gnu": 1.4.1
+      "@unrs/resolver-binding-linux-arm64-musl": 1.4.1
+      "@unrs/resolver-binding-linux-ppc64-gnu": 1.4.1
+      "@unrs/resolver-binding-linux-s390x-gnu": 1.4.1
+      "@unrs/resolver-binding-linux-x64-gnu": 1.4.1
+      "@unrs/resolver-binding-linux-x64-musl": 1.4.1
+      "@unrs/resolver-binding-wasm32-wasi": 1.4.1
+      "@unrs/resolver-binding-win32-arm64-msvc": 1.4.1
+      "@unrs/resolver-binding-win32-ia32-msvc": 1.4.1
+      "@unrs/resolver-binding-win32-x64-msvc": 1.4.1
 
   uri-js@4.4.1:
     dependencies:
       punycode: 2.3.1
 
-  use-callback-ref@1.3.3(@types/react@18.3.18)(react@18.3.1):
+  use-callback-ref@1.3.3(@types/react@18.3.20)(react@18.3.1):
     dependencies:
       react: 18.3.1
       tslib: 2.8.1
     optionalDependencies:
-      "@types/react": 18.3.18
+      "@types/react": 18.3.20
 
-  use-sidecar@1.1.3(@types/react@18.3.18)(react@18.3.1):
+  use-sidecar@1.1.3(@types/react@18.3.20)(react@18.3.1):
     dependencies:
       detect-node-es: 1.1.0
       react: 18.3.1
       tslib: 2.8.1
     optionalDependencies:
-      "@types/react": 18.3.18
+      "@types/react": 18.3.20
 
   util-deprecate@1.0.2: {}
 
@@ -5970,7 +6227,7 @@ snapshots:
 
   which-builtin-type@1.2.1:
     dependencies:
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       function.prototype.name: 1.1.8
       has-tostringtag: 1.0.2
       is-async-function: 2.1.1
@@ -5982,7 +6239,7 @@ snapshots:
       isarray: 2.0.5
       which-boxed-primitive: 1.1.1
       which-collection: 1.0.2
-      which-typed-array: 1.1.18
+      which-typed-array: 1.1.19
 
   which-collection@1.0.2:
     dependencies:
@@ -5991,12 +6248,13 @@ snapshots:
       is-weakmap: 2.0.2
       is-weakset: 2.0.4
 
-  which-typed-array@1.1.18:
+  which-typed-array@1.1.19:
     dependencies:
       available-typed-arrays: 1.0.7
       call-bind: 1.0.8
-      call-bound: 1.0.3
+      call-bound: 1.0.4
       for-each: 0.3.5
+      get-proto: 1.0.1
       gopd: 1.2.0
       has-tostringtag: 1.0.2
 
@@ -6020,7 +6278,7 @@ snapshots:
 
   wrappy@1.0.2: {}
 
-  yaml@2.7.0: {}
+  yaml@2.7.1: {}
 
   yocto-queue@0.1.0: {}
 
diff --git a/frontend/public/images/DevDogsLogo.png b/frontend/public/images/DevDogsLogo.png
new file mode 100644
index 00000000..445dfd8a
Binary files /dev/null and b/frontend/public/images/DevDogsLogo.png differ
diff --git a/frontend/public/images/GoogleDevLogo.png b/frontend/public/images/GoogleDevLogo.png
new file mode 100644
index 00000000..9083dfba
Binary files /dev/null and b/frontend/public/images/GoogleDevLogo.png differ
diff --git a/frontend/public/images/WordmarkMascot.png b/frontend/public/images/WordmarkMascot.png
new file mode 100644
index 00000000..bd92a051
Binary files /dev/null and b/frontend/public/images/WordmarkMascot.png differ
diff --git a/frontend/public/images/devdogCobranded.png b/frontend/public/images/devdogCobranded.png
new file mode 100644
index 00000000..62f6976a
Binary files /dev/null and b/frontend/public/images/devdogCobranded.png differ
diff --git a/frontend/src/app/course-adding/page.tsx b/frontend/src/app/course-adding/page.tsx
deleted file mode 100644
index 8fe6f3b4..00000000
--- a/frontend/src/app/course-adding/page.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { SearchFilter } from "@/components/Filters";
-import { Navbar } from "@/components/Navbar";
-import CourseDisplay from "@/components/courses/CourseDisplay";
-import Link from "next/link";
-
-interface Props {
-  /**
-   *  The current URL search params.
-   */
-  searchParams: Record<string, string | string[] | undefined>;
-}
-
-export default function Page({ searchParams }: Props) {
-  return (
-    <div className="min-h-screen">
-      <Navbar />
-      <main className="flex flex-col gap-8 px-4 pb-4 pt-8 md:px-12 lg:px-24">
-        <CourseDisplay searchParams={searchParams} />
-        <SearchFilter />
-        <section className="flex flex-col gap-3 sm:flex-row sm:justify-center">
-          <button className="rounded-lg bg-bulldog-red px-4 py-2 font-semibold text-white">
-            <Link href={"/generate-schedule"}>Generate Schedule</Link>
-          </button>
-        </section>
-      </main>
-    </div>
-  );
-}
diff --git a/frontend/src/app/create/page.tsx b/frontend/src/app/create/page.tsx
new file mode 100644
index 00000000..5927248a
--- /dev/null
+++ b/frontend/src/app/create/page.tsx
@@ -0,0 +1,35 @@
+import Filters from "@/components/Filters";
+import { Navbar } from "@/components/Navbar";
+import CourseDisplay from "@/components/courses/CourseDisplay";
+import { PiSparkleBold } from "react-icons/pi";
+import background from "../../../public/images/background.png";
+
+interface Props {
+  /**
+   *  The current URL search params.
+   */
+  searchParams: Record<string, string | string[] | undefined>;
+}
+
+export default function Page({ searchParams }: Props) {
+  return (
+    <div
+      className="min-h-screen bg-cover bg-fixed bg-bottom bg-no-repeat"
+      style={{
+        backgroundImage: `url(${background.src})`,
+      }}
+    >
+      <Navbar />
+      <main className="flex flex-col gap-8 px-4 pb-4 pt-8 xl:px-24">
+        <CourseDisplay searchParams={searchParams} />
+        <Filters />
+        <section className="flex justify-center">
+          <button className="flex items-center gap-2 self-end rounded-md border-2 border-red-800 bg-bulldog-red px-6 py-2 font-medium text-white transition-[background-color,border-color,box-shadow] disabled:cursor-not-allowed disabled:opacity-60 sm:gap-3 sm:px-8 sm:py-2.5 sm:text-lg [&:not(:disabled)]:hover:border-red-950 [&:not(:disabled)]:hover:bg-red-800 [&:not(:disabled)]:hover:shadow-md">
+            <PiSparkleBold />
+            Generate Schedule
+          </button>
+        </section>
+      </main>
+    </div>
+  );
+}
diff --git a/frontend/src/app/credit-data/page.tsx b/frontend/src/app/credit-data/page.tsx
index 41eff3f9..804c2ab8 100644
--- a/frontend/src/app/credit-data/page.tsx
+++ b/frontend/src/app/credit-data/page.tsx
@@ -1,7 +1,6 @@
 // Returning User: -> Past Credit Data
 // New User: -> Past Credit Data page -> option(Home or Schedule Generaton(\schedules))
 import { Navbar } from "@/components/Navbar";
-import { Button } from "@/components/ui/Button";
 import Link from "next/link";
 
 export default function CreditData() {
diff --git a/frontend/src/app/generate-schedule/page.tsx b/frontend/src/app/generate-schedule/page.tsx
index da616660..a7a04e88 100644
--- a/frontend/src/app/generate-schedule/page.tsx
+++ b/frontend/src/app/generate-schedule/page.tsx
@@ -1,5 +1,4 @@
 import { Navbar } from "@/components/Navbar";
-import { Button } from "@/components/ui/Button";
 import Link from "next/link";
 
 export default function GenerateSchedules() {
@@ -19,7 +18,7 @@ export default function GenerateSchedules() {
             </div>
             <div>
               <button className="rounded-lg bg-bulldog-red px-4 py-2 font-semibold text-white">
-                <Link href={"/saved-plans"}>Saved Plans</Link>
+                <Link href={"/plans"}>My Plans</Link>
               </button>
             </div>
           </div>
diff --git a/frontend/src/app/login/page.tsx b/frontend/src/app/login/page.tsx
index 1ba2d18b..ded0d33a 100644
--- a/frontend/src/app/login/page.tsx
+++ b/frontend/src/app/login/page.tsx
@@ -2,7 +2,6 @@
 // If new user -> Signup
 
 import { Navbar } from "@/components/Navbar";
-import { Button } from "@/components/ui/Button";
 import Link from "next/link";
 
 export default function Login() {
diff --git a/frontend/src/app/not-found.tsx b/frontend/src/app/not-found.tsx
index 05d2a619..264763e9 100644
--- a/frontend/src/app/not-found.tsx
+++ b/frontend/src/app/not-found.tsx
@@ -11,7 +11,7 @@ export default function NotFound() {
 
       <Link href="/">
         <Button
-          className="h-[4rem] w-[10rem] transition duration-300 ease-in-out hover:bg-black"
+          className="h-[4rem] w-[10rem] transition duration-300 ease-in-out hover:bg-black hover:text-white"
           text="Home"
         />
       </Link>
diff --git a/frontend/src/app/page.tsx b/frontend/src/app/page.tsx
index 3149bbb6..b7da7950 100644
--- a/frontend/src/app/page.tsx
+++ b/frontend/src/app/page.tsx
@@ -6,63 +6,65 @@
 import { Navbar } from "@/components/Navbar";
 import Image from "next/image";
 import Link from "next/link";
+import devdogCobranded from "../../public/images/devdogCobranded.png";
 import background from "../../public/images/background.png";
-import devdog from "../../public/images/devdog.png";
 
 export default function Home() {
   return (
     <>
       <Navbar />
-      <div className="relative -mt-[3.625rem] flex flex-1 flex-col items-center justify-center gap-16 px-4 pt-24 text-center">
-        <Image
-          alt=""
-          className="absolute top-14 -z-10 max-h-full w-screen object-cover sm:top-0"
-          sizes="100vw"
-          src={background}
-        />
-        <Image
-          alt=""
-          className="absolute -bottom-36 -z-10 w-screen rotate-180 sm:hidden"
-          sizes="100vw"
-          src={background}
-        />
-
-        <div className="flex flex-col items-center gap-20 rounded-md bg-gradient-to-bl from-white/50 to-pink-100/50 px-6 py-16 backdrop-blur-sm min-[480px]:px-12 sm:px-16 md:contents">
-          <div className="flex gap-6 text-6xl md:text-7xl xl:text-8xl">
-            <h2 className="font-extrabold text-slate-800">DogDays</h2>
-            <figure className="size-[1em]">
-              <Image
-                alt="UGA Dev Dogs logo"
-                className=""
-                height={128}
-                src={devdog}
-              />
-            </figure>
-          </div>
-
-          <div className="flex flex-col gap-8 rounded-md from-white/50 to-pink-100/50 md:bg-gradient-to-bl md:px-16 md:py-8 md:backdrop-blur-sm">
-            <p className="flex flex-col font-bold text-bulldog-red">
-              <span className="text-xl sm:text-2xl xl:text-3xl">
-                An Optimized Schedule Builder
-              </span>
-              <span className="sm:text-lg xl:text-2xl">
-                For Students, By Students
-              </span>
-            </p>
-
-            <div className="flex items-center text-lg font-bold xl:text-xl">
-              <p className="-mr-6 flex-1 cursor-default rounded-l-full bg-[#F8E6EA] bg-dusty-pink px-4 py-3 text-left text-neutral-600/40 shadow-inner">
-                Ready?
-              </p>
-              <Link
-                className="flex items-center gap-10 rounded-full border-2 border-red-900 bg-bulldog-red py-2.5 pl-4 pr-1.5 text-white shadow-md"
-                href="/"
-              >
-                Join Now!{" "}
-                <span className="-my-2 flex size-10 items-center justify-center rounded-full border-2 border-red-900 bg-white pt-0.5 text-[1.5rem] leading-none shadow-sm">
-                  🚀
-                </span>
-              </Link>
+      <div
+        className="relative -mt-[3.625rem] flex h-[calc(100vh-100px)] flex-1 flex-col items-center justify-center gap-16 overflow-hidden bg-cover bg-fixed bg-bottom bg-no-repeat px-4 pt-24 text-center"
+        style={{
+          backgroundImage: `url(${background.src})`,
+        }}
+      >
+        <div className="flex flex-col items-center px-6 py-8 min-[480px]:px-12 sm:px-16 md:max-w-[80%]">
+          <div className="flex w-full flex-col items-center rounded-3xl bg-gradient-to-b from-white/50 to-transparent p-8 backdrop-blur-sm">
+            <div className="flex translate-y-2 justify-center text-nowrap text-5xl md:translate-y-5 md:text-6xl lg:text-7xl">
+              <h2 className="font-extrabold text-slate-800">Bulldog Planner</h2>
+            </div>
+            {/* Hero Section */}
+            <div className="flex w-full flex-col items-center pl-10 pr-10">
+              <div className="flex w-full items-center justify-center gap-8">
+                <div className="flex translate-x-5 flex-col items-start">
+                  <div className="flex items-center">
+                    <div className="mr-4 h-20 border-l-4 border-bulldog-red"></div>
+                    <div className="flex h-20 flex-col justify-center text-nowrap">
+                      <span className="text-nowrap text-left text-2xl font-bold leading-tight text-bulldog-red sm:text-3xl xl:text-4xl">
+                        An Optimized
+                        <br />
+                        Schedule Builder
+                      </span>
+                    </div>
+                  </div>
+                  <span className="mt-5 text-left font-medium text-bulldog-red sm:text-lg xl:text-2xl">
+                    For Students, By Students
+                  </span>
+                </div>
+                <Image
+                  alt="UGA Dev Dogs logo"
+                  height={220}
+                  width={220}
+                  className="h-[180px] w-[180px] translate-x-0 sm:h-[200px] sm:w-[200px] md:h-[220px] md:w-[220px] lg:-translate-x-1"
+                  src={devdogCobranded}
+                />
+              </div>
+              {/* Ready and Start Now Button */}
+              <div className="flex w-full min-w-[350px] max-w-lg -translate-y-0 items-center justify-center text-xl font-bold md:-translate-y-5 xl:-translate-y-3 xl:text-2xl">
+                <p className="-mr-8 w-1/2 cursor-default rounded-l-full bg-[#F8E6EA] bg-dusty-pink px-6 py-4 text-left text-neutral-600/40 sm:py-5">
+                  Ready?
+                </p>
+                <Link
+                  className="flex w-3/5 items-center text-nowrap rounded-full bg-bulldog-red px-6 py-4 pl-8 pr-1.5 text-white shadow-md sm:py-5"
+                  href="/create"
+                >
+                  Start Now!{" "}
+                  <span className="-my-2 ml-auto mr-3 flex size-12 items-center justify-center rounded-full border-2 border-red-900 bg-white pt-0.5 text-[1.5rem] leading-none">
+                    🚀
+                  </span>
+                </Link>
+              </div>
             </div>
           </div>
         </div>
diff --git a/frontend/src/app/past-credits/page.tsx b/frontend/src/app/past-credits/page.tsx
index d352f7e8..6c9621a5 100644
--- a/frontend/src/app/past-credits/page.tsx
+++ b/frontend/src/app/past-credits/page.tsx
@@ -3,7 +3,6 @@
 
 // make class blocks clickable to access more
 import { Navbar } from "@/components/Navbar";
-import { Button } from "@/components/ui/Button";
 import Link from "next/link";
 
 export default function PastCredits() {
diff --git a/frontend/src/app/schedules/layout.tsx b/frontend/src/app/plans/[id]/layout.tsx
similarity index 92%
rename from frontend/src/app/schedules/layout.tsx
rename to frontend/src/app/plans/[id]/layout.tsx
index d2f606fd..1d7a6a53 100644
--- a/frontend/src/app/schedules/layout.tsx
+++ b/frontend/src/app/plans/[id]/layout.tsx
@@ -14,7 +14,7 @@ export default function RootLayout({
 }: Readonly<{ children: React.ReactNode }>) {
   return (
     <>
-      <Navbar keyword={"schedules"} />
+      <Navbar />
       {children}
     </>
   );
diff --git a/frontend/src/app/plans/[id]/page.tsx b/frontend/src/app/plans/[id]/page.tsx
new file mode 100644
index 00000000..9c7f41aa
--- /dev/null
+++ b/frontend/src/app/plans/[id]/page.tsx
@@ -0,0 +1,31 @@
+"use client";
+
+import { Suspense } from "react";
+import ScheduleDisplay from "@/components/schedules/ScheduleDisplay";
+import background from "../../../../public/images/background.png";
+
+interface Props {
+  params: {
+    id: string;
+  };
+}
+
+// Page for viewing a generated schedule / saved plan
+export default function SchedulePage({ params }: Props) {
+  // Render the schedule
+  return (
+    <div
+      className="relative -mb-[3.625rem] -mt-[3.625rem] min-h-screen bg-cover bg-fixed bg-bottom bg-no-repeat pt-2"
+      style={{
+        backgroundImage: `url(${background.src})`,
+      }}
+    >
+      {/* Schedule display container */}
+      <div className="flex flex-grow flex-row overflow-y-auto pt-32">
+        <Suspense fallback={<div>Loading...</div>}>
+          <ScheduleDisplay id={params.id} />
+        </Suspense>
+      </div>
+    </div>
+  );
+}
diff --git a/frontend/src/app/plans/page.tsx b/frontend/src/app/plans/page.tsx
new file mode 100644
index 00000000..b242cd87
--- /dev/null
+++ b/frontend/src/app/plans/page.tsx
@@ -0,0 +1,96 @@
+"use client";
+import { Navbar } from "@/components/Navbar";
+import SavedPlan from "@/components/saved-plans/SavedPlan";
+import DeletePlan from "@/components/ui/DeletePlan";
+import useLocalStorage from "@/hooks/useLocalStorage";
+import { motion } from "motion/react";
+import Link from "next/link";
+import { useState } from "react";
+
+// Handles retrieval of saved plans from local storage and displays a list of them for the user to select
+export default function MyPlans() {
+  // useState variables for updating the saved plans list + specifying a plan to pin or delete
+  const [savedPlans, setSavedPlans] = useLocalStorage("schedules");
+  const [planToDelete, setPlanToDelete] = useState<string | null>(null);
+
+  // When the heart is clicked, the plan is pinned and takes priority in the list
+  const pinPlan = (id: string) => {
+    setSavedPlans((prevPlans) =>
+      prevPlans.map((plan) =>
+        id === plan.id ? { ...plan, pinned: !plan.pinned } : plan,
+      ),
+    );
+  };
+
+  const confirmDeletePlan = (title: string) => {
+    setPlanToDelete(title);
+  };
+
+  const cancelDelete = () => {
+    setPlanToDelete(null);
+  };
+
+  const deletePlan = () => {
+    if (planToDelete) {
+      localStorage.removeItem(planToDelete);
+      setSavedPlans((prevPlans) =>
+        prevPlans.filter((plan) => plan.title !== planToDelete),
+      );
+      setPlanToDelete(null);
+    }
+  };
+
+  return (
+    <div className="min-h-screen">
+      <Navbar />
+
+      {savedPlans.length === 0 && (
+        // if savedPlans array is empty: direct user to the schedule builder
+        <div className="z-1 mb-10 ml-auto mr-auto mt-20 flex h-[85vh] w-4/5 flex-col flex-nowrap items-center overflow-y-auto rounded-xl border-2 border-black bg-barely-pink">
+          <div className="m-auto flex flex-col items-center justify-center">
+            <h1 className="text-3xl font-bold">
+              You don&apos;t have any saved plans yet.{" "}
+            </h1>
+            <Link href="/create">
+              <button className="mt-5 rounded-lg bg-bulldog-red px-8 py-4 text-xl font-bold text-white hover:bg-black">
+                Create
+              </button>
+            </Link>
+          </div>
+        </div>
+      )}
+
+      <div className="z-1 mb-10 ml-auto mr-auto mt-20 flex h-[85vh] w-4/5 flex-col flex-nowrap items-center gap-6 overflow-y-auto rounded-xl border-2 border-black bg-barely-pink py-10">
+        {savedPlans
+          .toSorted((a, b) => (a.pinned !== b.pinned ? (a.pinned ? -1 : 1) : 0))
+          .map((plan) => (
+            <motion.div
+              layout
+              key={plan.id}
+              transition={{
+                type: "spring",
+                damping: 20,
+                stiffness: 120,
+                duration: 100,
+              }}
+              className="relative"
+            >
+              <SavedPlan
+                plan={plan}
+                onPin={() => pinPlan(plan.id)}
+                onDelete={() => confirmDeletePlan(plan.id)}
+              />
+            </motion.div>
+          ))}
+      </div>
+
+      {planToDelete && (
+        <DeletePlan
+          onConfirm={deletePlan}
+          onCancel={cancelDelete}
+          planTitle={planToDelete}
+        />
+      )}
+    </div>
+  );
+}
diff --git a/frontend/src/app/questionnaire/page.tsx b/frontend/src/app/questionnaire/page.tsx
index c701a370..850ad9d0 100644
--- a/frontend/src/app/questionnaire/page.tsx
+++ b/frontend/src/app/questionnaire/page.tsx
@@ -1,7 +1,6 @@
 // Returning User: -> Past Credit Data
 // New User: -> Past Credit Data page -> option(Home or Schedule Generaton(\schedules))
 import { Navbar } from "@/components/Navbar";
-import { Button } from "@/components/ui/Button";
 import Link from "next/link";
 
 export default function Questionnaire() {
diff --git a/frontend/src/app/route-map/page.tsx b/frontend/src/app/route-map/page.tsx
index a25227ab..91fb7abb 100644
--- a/frontend/src/app/route-map/page.tsx
+++ b/frontend/src/app/route-map/page.tsx
@@ -1,7 +1,6 @@
 // Returning User: option to return Home or return Schedule View
 // New User: option to return Home or returen Schdeule View
 import { Navbar } from "@/components/Navbar";
-import { Button } from "@/components/ui/Button";
 import Link from "next/link";
 
 export default function RouteMap() {
diff --git a/frontend/src/app/saved-plans/choose-plan/page.tsx b/frontend/src/app/saved-plans/choose-plan/page.tsx
deleted file mode 100644
index ff446e1b..00000000
--- a/frontend/src/app/saved-plans/choose-plan/page.tsx
+++ /dev/null
@@ -1,375 +0,0 @@
-"use client";
-// Returning User: -> Schedule View (\schedules)
-// New User: -> Schedule View (\schedules)
-
-// make class blocks clickable to access more
-import { Navbar } from "@/components/Navbar";
-import { Button } from "@/components/ui/Button";
-import Link from "next/link";
-import { type WeekSchedule as WeekScheduleType } from "@/types/scheduleTypes";
-import WeekSchedule from "@/components/schedules/WeekSchedule";
-import { useState, useEffect } from "react";
-import SavedPlan from "@/components/saved-plans/SavedPlan";
-
-export default function ChoosePlan() {
-  const savedPlansList = [
-    {
-      href: "/schedules",
-      text: "Plan 1",
-    },
-    {
-      href: "/saved-plans",
-      text: "Plan 2",
-    },
-  ];
-
-  const weekScheduleData: WeekScheduleType = {
-    Monday: [
-      {
-        classTitle: "CSCI 3030",
-        className: "Computing, Ethics, and Society",
-        description:
-          "Introduction to social and ethical issues relating to computer science and information technology. Topics include privacy, intellectual property, open-source software, the digital divide, globalization, professional ethics, social justice issues, and current events. Students should have a working knowledge of personal computing.",
-        locationLong: "Boyd Research and Education Center 100",
-        locationShort: "Boyd 100",
-        prereq: "ENGL 1102",
-        coreq: "",
-        professor: "John Doe",
-        semester: "Spring",
-        timeStart: "8:00 am",
-        timeEnd: "8:50 am",
-        timeDifference: null,
-        credits: 3,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-bulldog-red",
-        borderColor: "border-bulldog-red",
-        currentDay: "MW",
-        otherTimes: ["F", "8:00 am - 8:50 am", "Chemistry 100"],
-      },
-
-      {
-        classTitle: "CSCI 1302",
-        className: "Software Development",
-        description: "The course description will be displayed here.",
-        locationLong: "Conner Hall 100",
-        locationShort: "Conner 100",
-        prereq: "ENGL 1102",
-        coreq: "",
-        professor: "John Doe",
-        semester: "All",
-        timeStart: "10:20 am",
-        timeEnd: "11:10 am",
-        timeDifference: null,
-        credits: 4,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-bulldog-red",
-        borderColor: "border-bulldog-red",
-        currentDay: "M",
-        otherTimes: ["TR", "9:35 am - 10:50 am", "Food Sci 100"],
-      },
-
-      {
-        classTitle: "BIOL 1103",
-        className: "Topics in Biology",
-        description: "The course description will be displayed here.",
-        locationLong: "Science Learning Center 100",
-        locationShort: "SLC 100",
-        prereq: "",
-        coreq: "BIOL 1103L",
-        professor: "Jane Doe",
-        semester: "Spring/Fall",
-        timeStart: "1:30 pm",
-        timeEnd: "2:20 pm",
-        timeDifference: null,
-        credits: 3,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-dev-dog-blue",
-        borderColor: "border-dev-dog-blue",
-
-        currentDay: "MWF",
-        otherTimes: ["", "", ""],
-      },
-    ],
-
-    Tuesday: [
-      {
-        classTitle: "CSCI 1302",
-        className: "Software Development",
-        description: "The course description will be displayed here.",
-        locationLong: "Food Science 100",
-        locationShort: "Food Sci 100",
-        prereq: "ENGL 1102",
-        coreq: "",
-        professor: "John Doe",
-        semester: "All",
-        timeStart: "9:35 am",
-        timeEnd: "10:50 am",
-        timeDifference: null,
-        credits: 4,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-bulldog-red",
-        borderColor: "border-bulldog-red",
-        currentDay: "TR",
-        otherTimes: ["M", "10:20 am - 11:10 am", "Conner 100"],
-      },
-
-      {
-        classTitle: "MUSI 2300",
-        className: "Music in Athens",
-        description:
-          "Explores national and international musical and cultural trends. The course draws from Athens, Georgia’s diverse musical communities and their histories, exploring the rock, hip hop, and indie popular music scenes along with African-American traditions, folk and traditional musics, and the emergent Latin music scene.",
-        locationLong: "Hugh Hudgson School of Music 100",
-        locationShort: "Hugh Hudgson 100",
-        prereq: "",
-        coreq: "",
-        professor: "Jane Doe",
-        semester: "Spring",
-        timeStart: "12:45 pm",
-        timeEnd: "2:00 pm",
-        timeDifference: null,
-        credits: 3,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-lake-herrick",
-        borderColor: "border-lake-herrick",
-        currentDay: "TR",
-        otherTimes: ["", "", ""],
-      },
-    ],
-
-    Wednesday: [
-      {
-        classTitle: "CSCI 3030",
-        className: "Computing, Ethics, and Society",
-        description: "The course description will be displayed here.",
-        locationLong: "Boyd Research and Education Center 100",
-        locationShort: "Boyd 100",
-        prereq: "ENGL 1102",
-        coreq: "",
-        professor: "John Doe",
-        semester: "Spring",
-        timeStart: "8:00 am",
-        timeEnd: "8:50 am",
-        timeDifference: null,
-        credits: 3,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-bulldog-red",
-        borderColor: "border-bulldog-red",
-        currentDay: "MW",
-        otherTimes: ["F", "8:00 am - 8:50 am", "Chemistry 100"],
-      },
-
-      {
-        classTitle: "BIOL 1103",
-        className: "Topics in Biology",
-        description: "The course description will be displayed here.",
-        locationLong: "Science Learning Center 100",
-        locationShort: "SLC 100",
-        prereq: "",
-        coreq: "BIOL 1103L",
-        professor: "Jane Doe",
-        semester: "Spring/Fall",
-        timeStart: "1:30 pm",
-        timeEnd: "2:20 pm",
-        timeDifference: null,
-        credits: 3,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-dev-dog-blue",
-        borderColor: "border-dev-dog-blue",
-        currentDay: "MWF",
-        otherTimes: ["", "", ""],
-      },
-    ],
-
-    Thursday: [
-      {
-        classTitle: "CSCI 1302",
-        className: "Software Development",
-        description: "The course description will be displayed here.",
-        locationLong: "Food Science 100",
-        locationShort: "Food Sci 100",
-        prereq: "ENGL 1102",
-        coreq: "",
-        professor: "John Doe",
-        semester: "Spring",
-        timeStart: "9:35 am",
-        timeEnd: "10:50 am",
-        timeDifference: null,
-        credits: 4,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-bulldog-red",
-        borderColor: "border-bulldog-red",
-        currentDay: "TR",
-        otherTimes: ["M", "10:20 am - 11:10 am", "Conner 100"],
-      },
-
-      {
-        classTitle: "MUSI 2300",
-        className: "Music in Athens",
-        description: "The course description will be displayed here.",
-        locationLong: "Hugh Hudgson School of Music 100",
-        locationShort: "Hugh Hudgson 100",
-        prereq: "ENGL 1102",
-        coreq: "",
-        professor: "Jane Doe",
-        semester: "Spring",
-        timeStart: "12:45 pm",
-        timeEnd: "2:00 pm",
-        timeDifference: null,
-        credits: 3,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-lake-herrick",
-        borderColor: "border-lake-herrick",
-        currentDay: "TR",
-        otherTimes: ["", "", ""],
-      },
-
-      {
-        classTitle: "BIOL 1103L",
-        className: "Concepts in Biology Laboratory",
-        description: "The course description will be displayed here.",
-        locationLong: "Science Learning Center 100",
-        locationShort: "SLC 100",
-        prereq: "",
-        coreq: "BIOL 1103",
-        professor: "Jane Doe",
-        semester: "Spring/Fall",
-        timeStart: "2:20 pm",
-        timeEnd: "4:15 pm",
-        timeDifference: null,
-        credits: 1,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-dev-dog-blue",
-        borderColor: "border-dev-dog-blue",
-        currentDay: "R",
-        otherTimes: ["", "", ""],
-      },
-    ],
-
-    Friday: [
-      {
-        classTitle: "CSCI 3030",
-        className: "Computing, Ethics, and Society",
-        description: "The course description will be displayed here.",
-        locationLong: "Boyd Research and Education Center 100",
-        locationShort: "Chemistry 100",
-        prereq: "ENGL 1102",
-        coreq: "",
-        professor: "John Doe",
-        semester: "Spring",
-        timeStart: "8:00 am",
-        timeEnd: "8:50 am",
-        timeDifference: null,
-        credits: 3,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-bulldog-red",
-        borderColor: "border-bulldog-red",
-        currentDay: "F",
-        otherTimes: ["MW", "8:00 - 8:50 am", "Boyd 100"],
-      },
-
-      {
-        classTitle: "BIOL 1103",
-        className: "Topics in Biology",
-        description: "The course description will be displayed here.",
-        locationLong: "Science Learning Center 100",
-        locationShort: "SLC 100",
-        prereq: "",
-        coreq: "BIOL 1103L",
-        professor: "Jane Doe",
-        semester: "Spring/Fall",
-        timeStart: "1:30 pm",
-        timeEnd: "2:20 pm",
-        timeDifference: null,
-        credits: 3,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-dev-dog-blue",
-        borderColor: "border-dev-dog-blue",
-        currentDay: "MWF",
-        otherTimes: ["", "", ""],
-      },
-    ],
-
-    // Add more days as needed
-  };
-
-  return (
-    <div className="min-h-screen">
-      <Navbar />
-      {/* Options for creating and modifying saved plans */}
-      <div className="mt-12 flex flex-row flex-nowrap justify-between gap-1 text-center">
-        <h1 className="ml-8 text-2xl font-bold">
-          Select a plan or create a new one.
-        </h1>
-        <div className="mr-8 flex flex-row gap-1">
-          <Button
-            className="m-2 rounded-lg border-2 border-nearly-black bg-bulldog-red px-4 py-2 font-semibold text-black hover:bg-glory-glory-red"
-            text="Delete"
-          ></Button>
-          <Button
-            className="m-2 rounded-lg border-2 border-pebble-gray bg-dusty-pink px-4 py-2 font-semibold text-black hover:bg-barely-pink"
-            text="Edit"
-          ></Button>
-          <Button
-            className="m-2 rounded-lg border-2 border-pebble-gray bg-dusty-pink px-4 py-2 font-semibold text-black hover:bg-barely-pink"
-            text="Save"
-          ></Button>
-          <Button
-            className="m-2 rounded-lg border-2 border-pebble-gray bg-dusty-pink px-4 py-2 font-semibold text-black hover:bg-barely-pink"
-            text="Create"
-          ></Button>
-        </div>
-      </div>
-
-      {/* List of saved plans (placeholder list of 2): We can add more when the saving functionality is actually implemented.
-      Should this be an array? */}
-      <div className="mt-10 flex flex-col flex-nowrap items-center justify-center gap-1">
-        <SavedPlan
-          className="onClick={selectSavedPlan} m-10 h-[20vh] w-[80vw] !rounded-3xl border-2 border-pebble-gray bg-dusty-pink text-3xl font-semibold text-black hover:bg-barely-pink"
-          planTitle="Plan 1"
-          plan={weekScheduleData}
-        ></SavedPlan>
-        <SavedPlan
-          className="m-10 h-[20vh] w-[80vw] !rounded-3xl border-2 border-pebble-gray bg-dusty-pink text-3xl font-semibold text-black hover:bg-barely-pink"
-          planTitle="Plan 2"
-          plan={weekScheduleData}
-        ></SavedPlan>
-      </div>
-    </div>
-  );
-}
diff --git a/frontend/src/app/saved-plans/page.tsx b/frontend/src/app/saved-plans/page.tsx
deleted file mode 100644
index e001393c..00000000
--- a/frontend/src/app/saved-plans/page.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-// Returning User: -> Schedule View (\schedules)
-// New User: -> Schedule View (\schedules)
-
-"use client";
-// make class blocks clickable to access more
-import { Navbar } from "@/components/Navbar";
-import { Button } from "@/components/ui/Button";
-import Link from "next/link";
-
-export default function SavedPlans() {
-  return (
-    <div className="min-h-screen">
-      <Navbar />
-      <div className="flex h-[calc(100vh-5rem)] flex-grow flex-col items-center justify-center text-center">
-        <div className="mt-10 flex flex-col flex-nowrap items-center justify-center gap-1">
-          <h1 className="mb-5 text-4xl font-bold">
-            There are currently no saved plans.
-          </h1>
-          <Link href="/saved-plans/choose-plan">
-            <Button
-              className="rounded-lg border-2 border-pebble-gray bg-dusty-pink px-8 py-4 text-lg font-semibold text-black"
-              text="Create"
-            ></Button>
-          </Link>
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/frontend/src/app/schedules/page.tsx b/frontend/src/app/schedules/page.tsx
deleted file mode 100644
index 1e233c6b..00000000
--- a/frontend/src/app/schedules/page.tsx
+++ /dev/null
@@ -1,333 +0,0 @@
-// Returning User: -> Saved Plans
-// New User: -> Saved Plans
-
-import { type WeekSchedule as WeekScheduleType } from "@/types/scheduleTypes";
-import WeekSchedule from "@/components/schedules/WeekSchedule";
-import Link from "next/link";
-
-export default function SchedulePage() {
-  const weekScheduleData: WeekScheduleType = {
-    Monday: [
-      {
-        classTitle: "CSCI 3030",
-        className: "Computing, Ethics, and Society",
-        description:
-          "Introduction to social and ethical issues relating to computer science and information technology. Topics include privacy, intellectual property, open-source software, the digital divide, globalization, professional ethics, social justice issues, and current events. Students should have a working knowledge of personal computing.",
-        locationLong: "Boyd Research and Education Center 100",
-        locationShort: "Boyd 100",
-        prereq: "ENGL 1102",
-        coreq: "",
-        professor: "John Doe",
-        semester: "Spring",
-        timeStart: "8:00 am",
-        timeEnd: "8:50 am",
-        timeDifference: null,
-        credits: 3,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-bulldog-red",
-        borderColor: "border-bulldog-red",
-        currentDay: "MW",
-        otherTimes: ["F", "8:00 am - 8:50 am", "Chemistry 100"],
-      },
-
-      {
-        classTitle: "CSCI 1302",
-        className: "Software Development",
-        description: "The course description will be displayed here.",
-        locationLong: "Conner Hall 100",
-        locationShort: "Conner 100",
-        prereq: "ENGL 1102",
-        coreq: "",
-        professor: "John Doe",
-        semester: "All",
-        timeStart: "10:20 am",
-        timeEnd: "11:10 am",
-        timeDifference: null,
-        credits: 4,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-bulldog-red",
-        borderColor: "border-bulldog-red",
-        currentDay: "M",
-        otherTimes: ["TR", "9:35 am - 10:50 am", "Food Sci 100"],
-      },
-
-      {
-        classTitle: "BIOL 1103",
-        className: "Topics in Biology",
-        description: "The course description will be displayed here.",
-        locationLong: "Science Learning Center 100",
-        locationShort: "SLC 100",
-        prereq: "",
-        coreq: "BIOL 1103L",
-        professor: "Jane Doe",
-        semester: "Spring/Fall",
-        timeStart: "1:30 pm",
-        timeEnd: "2:20 pm",
-        timeDifference: null,
-        credits: 3,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-dev-dog-blue",
-        borderColor: "border-dev-dog-blue",
-
-        currentDay: "MWF",
-        otherTimes: ["", "", ""],
-      },
-    ],
-
-    Tuesday: [
-      {
-        classTitle: "CSCI 1302",
-        className: "Software Development",
-        description: "The course description will be displayed here.",
-        locationLong: "Food Science 100",
-        locationShort: "Food Sci 100",
-        prereq: "ENGL 1102",
-        coreq: "",
-        professor: "John Doe",
-        semester: "All",
-        timeStart: "9:35 am",
-        timeEnd: "10:50 am",
-        timeDifference: null,
-        credits: 4,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-bulldog-red",
-        borderColor: "border-bulldog-red",
-        currentDay: "TR",
-        otherTimes: ["M", "10:20 am - 11:10 am", "Conner 100"],
-      },
-
-      {
-        classTitle: "MUSI 2300",
-        className: "Music in Athens",
-        description:
-          "Explores national and international musical and cultural trends. The course draws from Athens, Georgia’s diverse musical communities and their histories, exploring the rock, hip hop, and indie popular music scenes along with African-American traditions, folk and traditional musics, and the emergent Latin music scene.",
-        locationLong: "Hugh Hudgson School of Music 100",
-        locationShort: "Hugh Hudgson 100",
-        prereq: "",
-        coreq: "",
-        professor: "Jane Doe",
-        semester: "Spring",
-        timeStart: "12:45 pm",
-        timeEnd: "2:00 pm",
-        timeDifference: null,
-        credits: 3,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-lake-herrick",
-        borderColor: "border-lake-herrick",
-        currentDay: "TR",
-        otherTimes: ["", "", ""],
-      },
-    ],
-
-    Wednesday: [
-      {
-        classTitle: "CSCI 3030",
-        className: "Computing, Ethics, and Society",
-        description: "The course description will be displayed here.",
-        locationLong: "Boyd Research and Education Center 100",
-        locationShort: "Boyd 100",
-        prereq: "ENGL 1102",
-        coreq: "",
-        professor: "John Doe",
-        semester: "Spring",
-        timeStart: "8:00 am",
-        timeEnd: "8:50 am",
-        timeDifference: null,
-        credits: 3,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-bulldog-red",
-        borderColor: "border-bulldog-red",
-        currentDay: "MW",
-        otherTimes: ["F", "8:00 am - 8:50 am", "Chemistry 100"],
-      },
-
-      {
-        classTitle: "BIOL 1103",
-        className: "Topics in Biology",
-        description: "The course description will be displayed here.",
-        locationLong: "Science Learning Center 100",
-        locationShort: "SLC 100",
-        prereq: "",
-        coreq: "BIOL 1103L",
-        professor: "Jane Doe",
-        semester: "Spring/Fall",
-        timeStart: "1:30 pm",
-        timeEnd: "2:20 pm",
-        timeDifference: null,
-        credits: 3,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-dev-dog-blue",
-        borderColor: "border-dev-dog-blue",
-        currentDay: "MWF",
-        otherTimes: ["", "", ""],
-      },
-    ],
-
-    Thursday: [
-      {
-        classTitle: "CSCI 1302",
-        className: "Software Development",
-        description: "The course description will be displayed here.",
-        locationLong: "Food Science 100",
-        locationShort: "Food Sci 100",
-        prereq: "ENGL 1102",
-        coreq: "",
-        professor: "John Doe",
-        semester: "Spring",
-        timeStart: "9:35 am",
-        timeEnd: "10:50 am",
-        timeDifference: null,
-        credits: 4,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-bulldog-red",
-        borderColor: "border-bulldog-red",
-        currentDay: "TR",
-        otherTimes: ["M", "10:20 am - 11:10 am", "Conner 100"],
-      },
-
-      {
-        classTitle: "MUSI 2300",
-        className: "Music in Athens",
-        description: "The course description will be displayed here.",
-        locationLong: "Hugh Hudgson School of Music 100",
-        locationShort: "Hugh Hudgson 100",
-        prereq: "ENGL 1102",
-        coreq: "",
-        professor: "Jane Doe",
-        semester: "Spring",
-        timeStart: "12:45 pm",
-        timeEnd: "2:00 pm",
-        timeDifference: null,
-        credits: 3,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-lake-herrick",
-        borderColor: "border-lake-herrick",
-        currentDay: "TR",
-        otherTimes: ["", "", ""],
-      },
-
-      {
-        classTitle: "BIOL 1103L",
-        className: "Concepts in Biology Laboratory",
-        description: "The course description will be displayed here.",
-        locationLong: "Science Learning Center 100",
-        locationShort: "SLC 100",
-        prereq: "",
-        coreq: "BIOL 1103",
-        professor: "Jane Doe",
-        semester: "Spring/Fall",
-        timeStart: "2:20 pm",
-        timeEnd: "4:15 pm",
-        timeDifference: null,
-        credits: 1,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-dev-dog-blue",
-        borderColor: "border-dev-dog-blue",
-        currentDay: "R",
-        otherTimes: ["", "", ""],
-      },
-    ],
-
-    Friday: [
-      {
-        classTitle: "CSCI 3030",
-        className: "Computing, Ethics, and Society",
-        description: "The course description will be displayed here.",
-        locationLong: "Boyd Research and Education Center 100",
-        locationShort: "Chemistry 100",
-        prereq: "ENGL 1102",
-        coreq: "",
-        professor: "John Doe",
-        semester: "Spring",
-        timeStart: "8:00 am",
-        timeEnd: "8:50 am",
-        timeDifference: null,
-        credits: 3,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-bulldog-red",
-        borderColor: "border-bulldog-red",
-        currentDay: "F",
-        otherTimes: ["MW", "8:00 - 8:50 am", "Boyd 100"],
-      },
-
-      {
-        classTitle: "BIOL 1103",
-        className: "Topics in Biology",
-        description: "The course description will be displayed here.",
-        locationLong: "Science Learning Center 100",
-        locationShort: "SLC 100",
-        prereq: "",
-        coreq: "BIOL 1103L",
-        professor: "Jane Doe",
-        semester: "Spring/Fall",
-        timeStart: "1:30 pm",
-        timeEnd: "2:20 pm",
-        timeDifference: null,
-        credits: 3,
-        crn: 26510,
-        openSeats: 100,
-        maxSeats: 100,
-        waitlist: 0,
-        bgColor: "bg-dev-dog-blue",
-        borderColor: "border-dev-dog-blue",
-        currentDay: "MWF",
-        otherTimes: ["", "", ""],
-      },
-    ],
-
-    // Add more days as needed
-  };
-
-  // Sorts the classes by start time
-  Object.keys(weekScheduleData).forEach((day) => {
-    weekScheduleData[day]?.sort((a, b) => {
-      const timeA = new Date(`1970/01/01 ${a.timeStart}`); // Any date can be used since we're only comparing times
-      const timeB = new Date(`1970/01/01 ${b.timeStart}`);
-      return timeA.getTime() - timeB.getTime();
-    });
-  });
-
-  return (
-    <div className="mx-auto min-h-screen w-[100%]">
-      <div className="p-7 text-center text-blue-600">
-        <button className="rounded-lg bg-bulldog-red px-4 py-2 font-semibold text-white">
-          <Link href={"/route-map"}>Route Map</Link>
-        </button>
-      </div>
-      <WeekSchedule weekData={weekScheduleData} />
-    </div>
-  );
-}
diff --git a/frontend/src/app/settings/page.tsx b/frontend/src/app/settings/page.tsx
index e72945e8..e0f0e9b5 100644
--- a/frontend/src/app/settings/page.tsx
+++ b/frontend/src/app/settings/page.tsx
@@ -1,6 +1,4 @@
 import { Navbar } from "@/components/Navbar";
-import { Button } from "@/components/ui/Button";
-import Link from "next/link";
 
 export default function PastCredits() {
   return (
diff --git a/frontend/src/app/signup/page.tsx b/frontend/src/app/signup/page.tsx
index 8b9ea290..548e2190 100644
--- a/frontend/src/app/signup/page.tsx
+++ b/frontend/src/app/signup/page.tsx
@@ -1,7 +1,6 @@
 // Fill out signup data
 // get started -> Home
 
-import { Button } from "@/components/ui/Button";
 import { Navbar } from "@/components/Navbar";
 import Link from "next/link";
 
diff --git a/frontend/src/components/Filters.tsx b/frontend/src/components/Filters.tsx
index 61dea74f..b880a3ea 100644
--- a/frontend/src/components/Filters.tsx
+++ b/frontend/src/components/Filters.tsx
@@ -1,222 +1,185 @@
 "use client";
 
-import { useEffect, useState } from "react";
-import { DropdownSearchInput } from "./ui/DropdownSearchInput";
-import { DropdownTagInput } from "./ui/DropdownTagInput";
+import { useMemo, useState } from "react";
+import Combobox from "./ui/Combobox";
 
-interface props {
-  text?: string;
+function options<T extends string>(items: T[]) {
+  return items.map((item) => ({ value: item, content: item }));
 }
 
-//TODO: replace dummy data placeholders with respective items for dropdowns
-const termList = [
+const timeOptions = options([
+  "8 AM",
+  "9 AM",
+  "10 AM",
+  "11 AM",
+  "12 PM",
+  "1 PM",
+  "2 PM",
+  "3 PM",
+  "4 PM",
+  "5 PM",
+  "6 PM",
+  "8 PM",
+  "9 PM",
+  "10 PM",
+]);
+
+const termOptions = options([
+  `Spring ${new Date().getFullYear()}`,
+  `Summer ${new Date().getFullYear()}`,
   `Fall ${new Date().getFullYear()}`,
-  `Spring ${new Date().getFullYear() + 1}`,
-  `Summer ${new Date().getFullYear() + 1}`,
-];
-const instructionlist = [
-  "Lecture",
-  "Seminar",
-  "Lab",
-  "Online",
-  "Hybrid",
-  "Workshops",
-  "Recitations",
-  "Studio",
-  "Independent Study",
-  "Fieldwork",
-];
-const campusList = [
+]);
+
+const campusOptions = options([
   "Athens",
   "Buckhead",
   "Griffin",
   "Gwinnett",
   "Online",
   "Tifton",
-];
-const educationLevelList = ["Undergraduate", "Graduate"];
-let minmHourList: string[];
-let maxmHourList: string[];
-const hours = [
-  "1 hour",
-  "2 hours",
-  "3 hours",
-  "4 hours",
-  "5 hours",
-  "6 hours",
-  "7 hours",
-  "8 hours",
-  "9 hours",
-  "10 hours",
-  "11 hours",
-  "12 hours",
-  "13 hours",
-  "14 hours",
-  "15 hours",
-  "16 hours",
-  "17 hours",
-  "18 hours",
-  "19 hours",
-  "20 hours",
-  "21 hours",
-  "22 hours",
-  "23 hours",
-  "24 hours",
-];
-
-export const SearchFilter = ({}: props) => {
-  const [minmHours, setSelectedMinmHours] = useState<string | null>();
-  const [maxmHours, setSelectedMaxmHours] = useState<string | null>();
-
-  // State for filtered dropdown lists
-  const [minmHourList, setMinmHourList] = useState<string[]>(hours);
-  const [maxmHourList, setMaxmHourList] = useState<string[]>(hours);
-
-  // Update dropdown lists when minmHours changes
-  useEffect(() => {
-    if (minmHours !== null) {
-      setMaxmHourList((prev) => [
-        ...hours.slice(Number(minmHours?.split(" ")[0])),
-      ]);
-    } else {
-      setMaxmHourList(hours);
-    }
-  }, [minmHours]);
-
-  // Update dropdown lists when maxmHours changes
-  useEffect(() => {
-    if (maxmHours !== null) {
-      setMinmHourList([...hours.slice(0, Number(maxmHours?.split(" ")[0]))]);
-    } else {
-      setMinmHourList(hours);
-    }
-  }, [maxmHours]);
+]);
+
+export default function Filters() {
+  const [startTime, setStartTime] = useState<string | undefined>(
+    timeOptions[0]?.value,
+  );
+
+  const [endTime, setEndTime] = useState<string | undefined>(
+    timeOptions[timeOptions.length - 1]?.value,
+  );
+
+  const startTimeOptions = useMemo(
+    () =>
+      timeOptions.slice(
+        0,
+        timeOptions.findIndex((time) => time?.value === endTime),
+      ),
+    [endTime],
+  );
+
+  const endTimeOptions = useMemo(
+    () =>
+      timeOptions.slice(
+        timeOptions.findIndex((time) => time?.value === startTime) + 1,
+      ),
+    [startTime],
+  );
+
+  const [minCreditHours, setMinCreditHours] = useState<number>(12);
+  const [maxCreditHours, setMaxCreditHours] = useState<number>(18);
 
   return (
-    <section>
-      <div className="flex flex-col border-4 border-dusty-pink bg-barely-pink p-2">
-        {" "}
-        {/* Div for Whole Filter Component*/}
-        <h1 className="m-4 text-center text-lg font-extrabold sm:m-2 sm:ml-8 sm:mt-8 sm:w-full sm:text-left sm:text-2xl sm:font-extrabold">
-          Filters
-        </h1>{" "}
-        {/* h1 For Filter Title */}
-        <div className="sm:flex sm:flex-row sm:justify-around sm:px-8 sm:py-4">
-          {" "}
-          {/* Div for filters*/}
-          <div className="m-4 grid grid-cols-2 justify-center gap-4 sm:flex sm:flex-col lg:grid lg:grid-cols-2">
-            {" "}
-            {/* Div For Column 1*/}
-            <div className="text-right md:text-left">
-              {" "}
-              {/* Course Status Label */}
-              <label htmlFor="open" className="text-right font-extrabold">
-                Course Status:
-              </label>
-            </div>
-            <div className="flex flex-col space-y-5">
-              {" "}
-              {/* Div For Checkboxes */}
-              <div className="font-bold sm:flex sm:items-center sm:space-x-3">
-                <input
-                  title="open"
-                  type="checkbox"
-                  id="open"
-                  name="open"
-                  className="h-5 w-5 cursor-pointer rounded-full accent-red-700 peer-checked:opacity-100"
-                ></input>
-                <label htmlFor="open" className="text-black-700 m-1">
-                  Open
-                </label>
-              </div>
-              <div className="font-bold sm:flex sm:items-center sm:space-x-3">
-                <input
-                  title="waitlist"
-                  type="checkbox"
-                  id="waitlist"
-                  name="waitlist"
-                  className="h-5 w-5 cursor-pointer rounded-full accent-red-700 peer-checked:opacity-100"
-                ></input>
-                <label htmlFor="sm:waitlist" className="sm:text-black-700 m-1">
-                  Waitlist
-                </label>
-              </div>
-              <div className="font-bold sm:flex sm:items-center sm:space-x-3">
-                <input
-                  title="closed"
-                  type="checkbox"
-                  id="closed"
-                  name="closed"
-                  className="h-5 w-5 cursor-pointer rounded-full accent-red-700 peer-checked:opacity-100"
-                ></input>
-                <label htmlFor="closed" className="sm:text-black-700 m-1">
-                  Closed
-                </label>
-              </div>
-            </div>
-          </div>
-          <div className="m-4 grid grid-cols-2 gap-4 sm:flex">
-            {" "}
-            {/* Div For Column 2 */}
-            <div className="grid grid-rows-3 gap-4">
-              {" "}
-              {/* Div For Labels */}
-              <label className="text-right font-extrabold">Term:</label>
-              <label className="text-right font-extrabold">Instruction:</label>
-              <label className="text-right font-extrabold">Campus:</label>
-            </div>
-            <div className="grid max-w-56 grid-rows-3 gap-4">
-              {" "}
-              {/* Div For Dropdowns */}
-              <DropdownSearchInput items={termList} placeholder="Enter Term" />
-              <DropdownTagInput
-                items={instructionlist}
-                placeholder="Enter Instruction"
-              />
-              <DropdownSearchInput
-                items={campusList}
-                placeholder="Enter Campus"
-              />
-            </div>
-          </div>
-          <div className="m-4 grid grid-cols-2 gap-4 sm:flex">
-            {" "}
-            {/* Div For Column 3 in Filters*/}
-            <div className="grid grid-rows-3 gap-4">
-              {" "}
-              {/* Div For Labels */}
-              <label className="text-right font-extrabold">Levels:</label>
-              <label className="text-right font-extrabold">
-                Min Credit Hours:
-              </label>
-              <label className="text-right font-extrabold">
-                Max Credit Hours:
-              </label>
-            </div>
-            <div className="grid max-w-56 grid-rows-3 gap-4">
-              {" "}
-              {/* Div For Dropdowns */}
-              <DropdownSearchInput
-                items={educationLevelList}
-                placeholder="Enter Level"
-              />
-              <DropdownSearchInput
-                items={minmHourList}
-                placeholder="Enter Min Credit Hours"
-                selectedItem={minmHours ?? undefined}
-                onSelect={(value) => setSelectedMinmHours(value)}
-              />
-              <DropdownSearchInput
-                key={maxmHourList.length}
-                items={maxmHourList}
-                placeholder="Enter Max Credit Hours"
-                selectedItem={maxmHours ?? undefined}
-                onSelect={(value) => setSelectedMaxmHours(value)}
-              />
-            </div>
-          </div>
+    <section className="flex flex-col gap-6 rounded-lg border-2 border-[#A79A9D] bg-barely-pink px-4 py-6 sm:gap-9 sm:px-8 sm:py-9">
+      <h1 className="w-full text-center text-xl font-bold sm:text-2xl lg:text-left">
+        Filters
+      </h1>
+
+      <fieldset className="grid grid-cols-[1fr_2fr] gap-x-3 gap-y-4 text-right text-sm sm:grid-cols-[repeat(2,1fr_2fr)] sm:gap-y-6 md:text-base lg:grid-flow-col lg:grid-cols-[repeat(3,1fr_2fr)] lg:grid-rows-3">
+        <label className="col-span-2 grid grid-cols-subgrid items-center">
+          <span className="pl-3 text-right font-bold">Start Time</span>
+          <Combobox
+            defaultValue={startTime}
+            name="prefStartTime"
+            onChange={setStartTime}
+            options={startTimeOptions}
+            preserveOrdering
+            required
+            searchPlaceholder="Search Start Times"
+            selectPlaceholder="Select a Start Time"
+          />
+        </label>
+
+        <label className="col-span-2 grid grid-cols-subgrid items-center">
+          <span className="pl-3 text-right font-bold">End Time</span>
+          <Combobox
+            defaultValue={endTime}
+            name="prefEndTime"
+            onChange={setEndTime}
+            options={endTimeOptions}
+            preserveOrdering
+            required
+            searchPlaceholder="Search End Times"
+            selectPlaceholder="Select an End Time"
+          />
+        </label>
+
+        <div className="contents grid-cols-subgrid items-center lg:col-span-2 lg:grid">
+          <label className="col-span-full flex items-center justify-center gap-4 border-b-2 border-pebble-gray/40 pb-4 text-neutral-700 hover:text-black sm:pb-6 lg:col-start-2 lg:justify-start lg:border-none lg:pb-0">
+            <input
+              className="form-checkbox size-6 rounded-md border-2 border-limestone text-bulldog-red hover:border-pebble-gray focus:ring-bulldog-red"
+              name="walking"
+              type="checkbox"
+            />
+            <span className="text-balance text-left leading-tight">
+              Walking Distance Between Classes
+            </span>
+          </label>
         </div>
-      </div>
+
+        <label className="col-span-2 grid grid-cols-subgrid items-center">
+          <span className="pl-3 text-right font-bold">Term</span>
+          <Combobox
+            name="term"
+            options={termOptions}
+            preserveOrdering
+            required
+            searchPlaceholder="Search Open Terms"
+            selectPlaceholder="Select a Term"
+          />
+        </label>
+
+        <label className="col-span-2 grid grid-cols-subgrid items-center">
+          <span className="pl-3 text-right font-bold">Campus</span>
+          <Combobox
+            name="inputCampus"
+            options={campusOptions}
+            required
+            searchPlaceholder="Search Campuses"
+            selectPlaceholder="Select a Campus"
+          />
+        </label>
+
+        <div className="contents grid-cols-subgrid items-center lg:col-span-2 lg:grid">
+          <label className="col-span-full flex items-center justify-center gap-4 border-b-2 border-pebble-gray/40 pb-4 text-neutral-700 hover:text-black sm:pb-6 lg:col-start-2 lg:justify-start lg:border-none lg:pb-0">
+            <input
+              className="form-checkbox size-6 rounded-md border-2 border-limestone text-bulldog-red hover:border-pebble-gray focus:ring-bulldog-red"
+              name="showFilledClasses"
+              type="checkbox"
+            />
+            <span className="text-balance text-left leading-tight">
+              Include Waitlisted Course Sections
+            </span>
+          </label>
+        </div>
+
+        <label className="col-span-2 grid grid-cols-subgrid items-center">
+          <span className="pl-3 text-right font-bold">Min Credit Hours</span>
+          <input
+            className="flex w-full items-center gap-6 rounded-md border-2 border-limestone bg-white px-3 py-1.5 transition-[box-shadow,border-color] disabled:cursor-not-allowed disabled:opacity-60 [&:not(:disabled):hover]:border-pebble-gray [&:not(:disabled):hover]:shadow-sm"
+            min={1}
+            max={maxCreditHours - 1}
+            name="minCreditHours"
+            onChange={(e) => setMinCreditHours(parseInt(e.currentTarget.value))}
+            required
+            type="number"
+            value={minCreditHours}
+          />
+        </label>
+
+        <label className="col-span-2 grid grid-cols-subgrid items-center">
+          <span className="pl-3 text-right font-bold">Max Credit Hours</span>
+          <input
+            className="flex w-full items-center gap-6 rounded-md border-2 border-limestone bg-white px-3 py-1.5 transition-[box-shadow,border-color] disabled:cursor-not-allowed disabled:opacity-60 [&:not(:disabled):hover]:border-pebble-gray [&:not(:disabled):hover]:shadow-sm"
+            min={minCreditHours + 1}
+            max={18}
+            name="maxCreditHours"
+            onChange={(e) => setMaxCreditHours(parseInt(e.currentTarget.value))}
+            required
+            type="number"
+            value={maxCreditHours}
+          />
+        </label>
+      </fieldset>
     </section>
   );
-};
+}
diff --git a/frontend/src/components/Footer.tsx b/frontend/src/components/Footer.tsx
index cd2a6bcf..2599f6cf 100644
--- a/frontend/src/components/Footer.tsx
+++ b/frontend/src/components/Footer.tsx
@@ -1,49 +1,77 @@
 import { PiInstagramLogoBold, PiLinkedinLogoBold } from "react-icons/pi";
+import Image from "next/image";
 
 export function Footer() {
   return (
-    <footer className="m-4 grid grid-cols-6 grid-rows-3 gap-y-1.5 rounded-md border-2 border-neutral-500 bg-neutral-200 px-4 py-3 text-neutral-600 min-[480px]:grid-cols-[1fr_repeat(3,1.5fr)_1fr] min-[480px]:grid-rows-2 min-[480px]:gap-y-2 min-[480px]:py-4 sm:gap-y-1.5 sm:py-3 md:grid-cols-[repeat(2,max-content)_1fr_repeat(3,max-content)] md:grid-rows-1 md:gap-x-4 lg:gap-x-6 lg:px-6">
-      <h2 className="col-span-full text-center text-slate-900 sm:row-start-2 md:col-span-1 md:col-start-3 md:row-start-1">
-        Developed by UGA DevDogs &copy;
-      </h2>
-
+    <footer className="m-4 flex flex-row items-center justify-center gap-y-0 rounded-md border-2 border-neutral-500 bg-neutral-200 px-4 py-0 py-3 text-neutral-600 sm:gap-y-1 sm:py-2 md:gap-x-4 lg:gap-x-6 lg:px-6">
       <nav className="contents">
-        <a
-          className="col-span-2 text-center hover:text-slate-900 min-[480px]:col-span-1 min-[480px]:col-start-2 md:col-start-1 md:row-start-1"
-          href="https://devdogs.uga.edu/"
-          target="_blank"
-        >
-          About Us
-        </a>
+        <div className="flex w-1/5 flex-col justify-start gap-x-4 gap-y-4 text-xl sm:flex-row sm:gap-y-0 sm:text-base">
+          <a
+            rel="noopener"
+            className="col-span-2 flex items-center justify-center text-nowrap text-center hover:text-slate-900"
+            href="https://devdogs.uga.edu/"
+            target="_blank"
+          >
+            About Us
+          </a>
+          <a
+            className="flex items-center justify-center text-center hover:text-slate-900"
+            href="https://linktr.ee/devdogs"
+            target="_blank"
+            rel="noopener"
+          >
+            Contact
+          </a>
+        </div>
 
-        <a
-          className="col-span-2 text-center hover:text-slate-900 min-[480px]:col-span-1"
-          href="#"
-        >
-          Terms of Use
-        </a>
+        {/* WordmarkMascot image */}
+        <div className="flex h-full grow flex-col items-center justify-center py-1 sm:flex-row">
+          <Image
+            src="/images/DevDogsLogo.png"
+            alt="UGA DevDogs Logo"
+            width={100}
+            height={100}
+            className="m-2"
+            priority
+          />
 
+          <Image
+            src="/images/GoogleDevLogo.png"
+            alt="UGA GDG Logo"
+            width={160}
+            height={160}
+            className="m-2"
+            priority
+          />
+        </div>
+
+        {/* Removed Terms of Use */}
         <a
-          className="col-span-2 text-center hover:text-slate-900 min-[480px]:col-span-1"
+          title="blank"
+          className="col-span-2 flex items-center justify-center text-center hover:text-slate-900 min-[480px]:col-span-1"
           href="#"
-        >
-          Contact
-        </a>
+        ></a>
 
-        <a
-          className="col-span-3 flex justify-end px-2 text-2xl text-neutral-500 hover:text-slate-900 min-[480px]:col-span-1 min-[480px]:col-start-1 min-[480px]:row-start-2 min-[480px]:justify-center sm:row-start-1 md:col-start-5 md:px-0"
-          href="https://www.instagram.com/devdogs_uga/"
-          target="_blank"
-        >
-          <PiInstagramLogoBold />
-        </a>
-        <a
-          className="col-span-3 flex justify-start px-2 text-2xl text-neutral-500 hover:text-slate-900 min-[480px]:col-span-1 min-[480px]:justify-center md:px-0"
-          href="https://www.linkedin.com/company/devdogs-uga/"
-          target="_blank"
-        >
-          <PiLinkedinLogoBold />
-        </a>
+        <div className="flex w-1/5 flex-row justify-end">
+          <a
+            title="Instagram"
+            rel="noopener"
+            className="flex items-center justify-end justify-center px-2 text-4xl text-neutral-500 hover:text-slate-900 sm:text-2xl"
+            href="https://www.instagram.com/devdogs_uga/"
+            target="_blank"
+          >
+            <PiInstagramLogoBold />
+          </a>
+          <a
+            title="LinkedIn"
+            rel="noopener"
+            className="flex items-center justify-start justify-center px-2 text-4xl text-neutral-500 hover:text-slate-900 sm:text-2xl"
+            href="https://www.linkedin.com/company/devdogs-uga/"
+            target="_blank"
+          >
+            <PiLinkedinLogoBold />
+          </a>
+        </div>
       </nav>
     </footer>
   );
diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx
index fbf2870f..4953edc8 100644
--- a/frontend/src/components/Navbar.tsx
+++ b/frontend/src/components/Navbar.tsx
@@ -3,8 +3,7 @@
 import React, { useState, useEffect } from "react";
 import Image from "next/image";
 import Link from "next/link";
-import Notifications from "./Notifications";
-import { PiGear, PiGearFill } from "react-icons/pi";
+import { PiGear } from "react-icons/pi";
 
 // Custom hook for scroll direction
 function useScrollDirection() {
@@ -49,7 +48,7 @@ export function Navbar({ keyword = "default" }) {
           {/* Logo and Title */}
           <Link
             href="/"
-            className="tems-center flex gap-2 bg-inherit py-4 sm:gap-4 sm:py-0"
+            className="flex items-center gap-2 bg-inherit py-4 sm:gap-4 sm:py-0"
           >
             <Image
               className="block fill-current invert"
@@ -58,7 +57,7 @@ export function Navbar({ keyword = "default" }) {
               height={40}
               alt="white paw"
             />
-            <h1 className="text-3xl font-bold text-white">DogDays</h1>
+            <h1 className="text-3xl font-bold text-white">Bulldog Planner</h1>
           </Link>
           {/* Space filler div */}
           <div className="flex-1"></div>
@@ -68,7 +67,7 @@ export function Navbar({ keyword = "default" }) {
             <li className="contents">
               <Link
                 className="px-6 py-3 text-center text-white transition hover:text-[#e4212b] sm:rounded-lg sm:py-1 md:px-4"
-                href="/saved-plans"
+                href="/plans"
               >
                 My Plans
               </Link>
@@ -97,7 +96,7 @@ export function Navbar({ keyword = "default" }) {
 
             <Link
               className="px-2 py-3 text-center text-white transition hover:text-[#e4212b] sm:hidden sm:rounded-lg sm:py-1 md:px-4"
-              href="/saved-plans"
+              href="/plans"
             >
               My Plans
             </Link>
@@ -113,7 +112,7 @@ export function Navbar({ keyword = "default" }) {
           {/* Logo and Title */}
           <Link
             href="/"
-            className="tems-center flex gap-2 bg-inherit py-4 sm:gap-4 sm:py-0"
+            className="flex items-center gap-2 bg-inherit py-4 sm:gap-4 sm:py-0"
           >
             <Image
               className="block fill-current invert"
diff --git a/frontend/src/components/courses/AddCourses.tsx b/frontend/src/components/courses/AddCourses.tsx
index 1a7399bf..b6b8d6b6 100644
--- a/frontend/src/components/courses/AddCourses.tsx
+++ b/frontend/src/components/courses/AddCourses.tsx
@@ -136,28 +136,28 @@ export function AddCourses({ onAddCourse, searchParams }: Props) {
         <Link
           href={subjectView.href}
           data-active={state.view === "subject"}
-          className="w-1/3 rounded-bl-none rounded-br-none rounded-tl-lg rounded-tr-lg bg-dusty-pink px-4 py-2 text-left font-bold capitalize text-[#CFBEBE] duration-150 data-[active=true]:bg-bulldog-red data-[active=true]:text-white"
+          className="w-1/3 rounded-bl-none rounded-br-none rounded-tl-lg rounded-tr-lg bg-dusty-pink px-4 py-2 text-left font-bold capitalize text-[#c9b1b9] duration-150 data-[active=true]:bg-bulldog-red data-[active=true]:text-white"
         >
           By Subject
         </Link>
         <Link
           href={instructorView.href}
           data-active={state.view === "instructor"}
-          className="w-1/3 rounded-bl-none rounded-br-none rounded-tl-lg rounded-tr-lg bg-dusty-pink px-4 py-2 text-left font-bold capitalize text-[#CFBEBE] duration-150 data-[active=true]:bg-bulldog-red data-[active=true]:text-white"
+          className="w-1/3 rounded-bl-none rounded-br-none rounded-tl-lg rounded-tr-lg bg-dusty-pink px-4 py-2 text-left font-bold capitalize text-[#c9b1b9] duration-150 data-[active=true]:bg-bulldog-red data-[active=true]:text-white"
         >
           By Instructor
         </Link>
         <Link
           href={crnView.href}
           data-active={state.view === "crn"}
-          className="w-1/3 rounded-bl-none rounded-br-none rounded-tl-lg rounded-tr-lg bg-dusty-pink px-4 py-2 text-left font-bold capitalize text-[#CFBEBE] duration-150 data-[active=true]:bg-bulldog-red data-[active=true]:text-white"
+          className="w-1/3 rounded-bl-none rounded-br-none rounded-tl-lg rounded-tr-lg bg-dusty-pink px-4 py-2 text-left font-bold capitalize text-[#c9b1b9] duration-150 data-[active=true]:bg-bulldog-red data-[active=true]:text-white"
         >
           By CRN
         </Link>
       </nav>
 
       <form
-        className="flex flex-col gap-16 border-4 border-dusty-pink bg-barely-pink px-8 py-10"
+        className="flex flex-col gap-16 rounded-bl-lg rounded-br-lg border-2 border-t-0 border-[#A79A9D] bg-barely-pink px-8 py-10"
         onSubmit={handleSubmit}
       >
         {state.view === "subject" && <SearchBySubject {...subjectView} />}
diff --git a/frontend/src/components/courses/CourseDisplay.tsx b/frontend/src/components/courses/CourseDisplay.tsx
index 7943c5a0..a6e236e2 100644
--- a/frontend/src/components/courses/CourseDisplay.tsx
+++ b/frontend/src/components/courses/CourseDisplay.tsx
@@ -44,7 +44,7 @@ export default function CourseDisplay({ searchParams }: Props) {
         </h1>
         <div className="relative">
           {/* Container for course list */}
-          <div className="no-scrollbar relative flex flex-1 flex-col overflow-x-hidden overflow-y-scroll scroll-smooth border-4 border-dusty-pink bg-white py-4">
+          <div className="no-scrollbar relative flex flex-1 flex-col overflow-x-hidden overflow-y-scroll scroll-smooth rounded-tl-lg rounded-tr-lg border-2 border-b-0 border-[#A79A9D] bg-white py-4">
             {/*Course item */}
             {courses.map((course) => (
               <RegisteredClass
@@ -57,7 +57,7 @@ export default function CourseDisplay({ searchParams }: Props) {
             ))}
           </div>
           {/* Styling div to add spacing and hold down arrow notification in case there is more items */}
-          <div className="absolute bottom-0 left-0 flex h-6 w-full justify-center border-4 border-t-0 border-dusty-pink bg-white">
+          <div className="absolute bottom-0 left-0 top-4 flex h-6 w-full justify-center rounded-bl-lg rounded-br-lg border-2 border-t-0 border-[#A79A9D] bg-white">
             {courses.length > 5 && (
               <PiCaretDownBold className="size-30 h-auto w-auto animate-bounce" />
             )}
diff --git a/frontend/src/components/courses/TimeDistanceFilter.tsx b/frontend/src/components/courses/TimeDistanceFilter.tsx
new file mode 100644
index 00000000..7950a5f6
--- /dev/null
+++ b/frontend/src/components/courses/TimeDistanceFilter.tsx
@@ -0,0 +1,71 @@
+"use client";
+
+import { useState } from "react";
+import { DropdownSearchInput } from "../ui/DropdownSearchInput";
+
+// Create time slots from 8:00 AM to 10:00 PM
+const createTimeSlots = () => {
+  const times = [];
+  for (let hr = 8; hr <= 22; hr++) {
+    const hour = hr <= 12 ? hr : hr - 12; // 24hr to 12hr format
+    const amPm = hr < 12 ? "AM" : "PM";
+    times.push(`${hour}:00 ${amPm}`);
+  }
+  return times;
+};
+
+export function TimeDistanceFilter() {
+  // Tracks selected start time
+  const [startTime, setStartTime] = useState<string>("");
+  // Tracks selected end time
+  const [endTime, setEndTime] = useState<string>("");
+  // Stores the valid end times based on selected start time
+  const [availableEndTimes, setAvailableEndTimes] = useState<string[]>([]);
+
+  const allTimeSlots = createTimeSlots();
+
+  /* Handler function for when a start time is selected.
+  / If start time sleceted, update available end times.
+  / Always clears end time when start time changed. */
+  const handleStartTimeSelect = (value: string) => {
+    setStartTime(value); // Update start time state
+
+    if (!value) {
+      // If no start time selected
+      setAvailableEndTimes([]);
+      setEndTime("");
+    } else {
+      // If start time is selected
+      const startIndex = allTimeSlots.indexOf(value);
+      // Get all times after the selected start time
+      const validEndTimes = allTimeSlots.slice(startIndex + 1);
+      setAvailableEndTimes(validEndTimes); // Update available end times
+      setEndTime("");
+    }
+  };
+
+  return (
+    <div className="contents">
+      {/* Start Time Dropdown */}
+      <DropdownSearchInput
+        labelText="Start Time"
+        items={allTimeSlots} // All possible time slots
+        placeholder="Start Time"
+        className="border-pebble-gray"
+        onSelect={handleStartTimeSelect}
+        selectedItem={startTime}
+      />
+
+      {/* End Time Dropdown */}
+      <DropdownSearchInput
+        labelText="End Time"
+        key={startTime} // Forces component refresh when start time changes
+        items={availableEndTimes} // Only shows valid end times
+        placeholder={startTime ? "End Time" : "Select Start Time"}
+        className="border-pebble-gray"
+        onSelect={(value) => setEndTime(value)}
+        selectedItem={endTime}
+      />
+    </div>
+  );
+}
diff --git a/frontend/src/components/saved-plans/SavedPlan.tsx b/frontend/src/components/saved-plans/SavedPlan.tsx
index ef7d4ab2..0dd560c1 100644
--- a/frontend/src/components/saved-plans/SavedPlan.tsx
+++ b/frontend/src/components/saved-plans/SavedPlan.tsx
@@ -1,50 +1,78 @@
 "use client";
-import { Button } from "@/components/ui/Button";
-import { type WeekSchedule as WeekScheduleType } from "@/types/scheduleTypes";
-import WeekSchedule from "@/components/schedules/WeekSchedule";
-import { useState, useEffect } from "react";
+
+import { type SavedPlan } from "@/schemas/localStorage";
+import Image from "next/image";
+import { useRouter } from "next/navigation";
+import { useCallback } from "react";
+import { PiHeartBold, PiHeartFill, PiTrashBold } from "react-icons/pi";
 
 interface PlanDisplayProps {
-  className?: string;
-  planTitle?: string;
-  plan?: WeekScheduleType;
+  plan: SavedPlan;
+  onPin: () => void;
+  onDelete: () => void;
 }
 
-function PlanDisplay({ plan, planTitle }: PlanDisplayProps) {
-  // create some className variables to be used with both return statements.
-  // we need a popup to hold the schedule component and its associated plan title
-  // <WeekSchedule weekData={plan} />
+// Saved Plan Component.
+// Contains each "banner" and action buttons for each of the user's saved plans.
+export default function SavedPlan({ plan, onPin, onDelete }: PlanDisplayProps) {
+  const router = useRouter();
 
-  const planContainer =
-    "fixed inset-0 z-40 flex items-center justify-center bg-white bg-opacity-50";
+  const goToPlan = useCallback(() => {
+    router.push(`/plans/${plan.id}`);
+  }, [router, plan]);
 
-  if (!plan) {
-    return <div></div>;
-  }
-  return (
-    <div>
-      <WeekSchedule weekData={plan} />
-    </div>
+  const handlePin = useCallback(
+    (e: React.MouseEvent) => {
+      e.stopPropagation();
+      onPin();
+    },
+    [onPin],
+  );
+
+  const handleDelete = useCallback(
+    (e: React.MouseEvent) => {
+      e.stopPropagation();
+      onDelete();
+    },
+    [onDelete],
   );
-}
 
-export default function SavedPlan({
-  className,
-  planTitle,
-  plan,
-}: PlanDisplayProps) {
-  const [planButtonClicked, setplanButtonClicked] = useState(false);
-  const savedPlanDisplay = () => {
-    setplanButtonClicked(!planButtonClicked);
-  };
   return (
-    <div>
-      <Button
-        className={className}
-        onClick={savedPlanDisplay}
-        text={planTitle}
-      ></Button>
-      {planButtonClicked && <PlanDisplay plan={plan} planTitle={planTitle} />}
+    <div
+      className="relative z-10 flex w-[70vw] cursor-pointer flex-row items-center gap-4 rounded-xl border-b-8 border-neutral-400 bg-white px-7 py-4 ring-2 ring-black hover:mt-1 hover:border-b-4 hover:border-neutral-500 hover:bg-neutral-100 [&:active:not(:has(input:hover,button:hover))]:border-b-0 [&:active:not(:has(input:hover,button:hover))]:border-t-4"
+      onClick={goToPlan}
+      role="link"
+    >
+      {/* Paw icon */}
+      <Image
+        src="/images/blackpaw.svg"
+        width={64}
+        height={64}
+        className="size-8"
+        alt="black paw"
+      />
+
+      {/* Plan title */}
+      <h2 className="flex-1 text-2xl font-bold text-black">{plan.title}</h2>
+
+      {/* Pin button (gives a saved plan priority over others*/}
+      <button type="button" className="cursor-default" onClick={handlePin}>
+        {plan.pinned ? (
+          <PiHeartFill className="size-8 text-glory-glory-red transition" />
+        ) : (
+          <PiHeartBold className="m-0.5 size-7 transition-[color,width,height,margin] hover:m-0 hover:size-8 hover:text-glory-glory-red" />
+        )}
+      </button>
+
+      <button
+        type="button"
+        className="cursor-default rounded-md p-0.5 transition-colors hover:bg-glory-glory-red/15"
+      >
+        <PiTrashBold
+          className="size-7 text-glory-glory-red"
+          onClick={handleDelete}
+        />
+      </button>
     </div>
   );
 }
diff --git a/frontend/src/components/schedules/DayClass.tsx b/frontend/src/components/schedules/DayClass.tsx
index e7b69b62..a100f385 100644
--- a/frontend/src/components/schedules/DayClass.tsx
+++ b/frontend/src/components/schedules/DayClass.tsx
@@ -1,9 +1,32 @@
 "use client";
 import { type ClassData } from "@/types/scheduleTypes";
 import { useState, useEffect } from "react";
+import useQuery from "@/hooks/useQuery";
+import { FaStar } from "react-icons/fa";
 
 type DayClassProps = ClassData;
 
+// Convert 12-hours to 24-hours
+function convertToMinutes(time: string): number {
+  const [hour, minute] = time.split(":").map((val) => parseInt(val, 10));
+  const suffix = time.slice(-2).toLowerCase();
+  let convertedTime = hour! * 60 + minute!; // The ! assers the tyoe of hour and minute as number since they could be undefined. If there's an error it means one of these is undefined.
+  if (suffix === "pm" && hour !== 12) {
+    convertedTime += 12 * 60;
+  }
+  if (suffix === "am" && hour === 12) {
+    convertedTime -= 12 * 60;
+  }
+  return convertedTime;
+}
+
+// Duration of course for the day
+function getDuration(timeStart: string, timeEnd: string): number {
+  const startMinutes = convertToMinutes(timeStart);
+  const endMinutes = convertToMinutes(timeEnd);
+  return endMinutes - startMinutes;
+}
+
 // Allows course block info window to resize itself relative to the screen size
 function useResize() {
   const [width, setWidth] = useState("80vw");
@@ -102,6 +125,18 @@ function getWeekLayout(
   return weekInfo;
 }
 
+interface ProfessorStarsProps {
+  rating: number;
+}
+const ProfessorStars = ({ rating }: ProfessorStarsProps) => {
+  const renderSVGs = () => {
+    return Array.from({ length: rating }, () => (
+      <FaStar key={rating} className="inline -translate-y-0.5" />
+    ));
+  };
+  return <div className="inline">{renderSVGs()}</div>;
+};
+
 function CourseInfo({
   classTitle,
   className,
@@ -114,9 +149,10 @@ function CourseInfo({
   semester,
   credits,
   crn,
-  openSeats,
-  maxSeats,
-  waitlist,
+  // Uncomment to use parameters, currently unused
+  // openSeats,
+  // maxSeats,
+  // waitlist,
   bgColor,
   borderColor,
   timeStart,
@@ -138,6 +174,26 @@ function CourseInfo({
     locationShort,
   );
 
+  const professorName: string[] = professor.split(" ");
+  const firstName: string = professorName[0] ?? "";
+  const lastName: string = professorName.slice(1).join(" ") ?? "";
+  const avgProfessorQuery = useQuery("getAvgProfessorRating", {
+    lname: lastName,
+    fname: firstName,
+  });
+  // To test with dummy data, replace "0" with a professor rating of choice in the following line
+  const avgProfessorData: number | undefined = avgProfessorQuery.data ?? 0;
+  const isAvgZero = avgProfessorData === 0;
+  const numProfessorQuery = useQuery("getNumProfessorRatings", {
+    lname: lastName,
+    fname: firstName,
+  });
+  // To test with dummy data, replace "0" with a number of reviewings in the following line
+  const numProfessorData: number | undefined = numProfessorQuery.data ?? 0;
+  const isNumZero = numProfessorData === 0;
+  const defaultPrereq = prereq && prereq.trim() !== "" ? prereq : "None";
+  const defaultCorereq = coreq && coreq.trim() !== "" ? coreq : "None";
+
   return (
     <div
       className={`fixed inset-0 z-40 flex items-center justify-center bg-white bg-opacity-50`}
@@ -172,7 +228,11 @@ function CourseInfo({
             </p>
             <p>
               {" "}
-              <b>Professor:</b> {professor}{" "}
+              <b>Professor:</b> {professor}
+              {!(isAvgZero && isNumZero) && " | "}
+              <ProfessorStars rating={avgProfessorData} />
+              {!isAvgZero && !isNumZero && " | "}
+              {!isNumZero && numProfessorData + " reviews"}{" "}
             </p>{" "}
             <br></br>
             <p>
@@ -186,11 +246,11 @@ function CourseInfo({
             <br></br>
             <p>
               {" "}
-              <b>Prerequisites:</b> {prereq}{" "}
+              <b>Prerequisites:</b> {defaultPrereq}{" "}
             </p>
             <p>
               {" "}
-              <b>Corequisites:</b> {coreq}{" "}
+              <b>Corequisites:</b> {defaultCorereq}{" "}
             </p>{" "}
             <br></br>
             <p> {description} </p>
@@ -308,28 +368,54 @@ export default function DayClass({
   currentDay,
   otherTimes,
 }: DayClassProps) {
+  // Find course duartion
+  const duration = getDuration(timeStart, timeEnd);
+
+  // Position of class block based on start time
+  const startPosition = `${timeDifference ? `${timeDifference * 0.8}px` : "0px"}`;
+
+  // Height of class block based on duration
+  const classHeight = `${duration * 0.9}px`;
+
   // Open course block info popup
   const [courseBlockClicked, setcourseBlockClicked] = useState(false);
   const courseBlockInfo = () => {
     setcourseBlockClicked(!courseBlockClicked);
   };
 
+  timeStart = timeStart.toUpperCase();
+  timeEnd = timeEnd.toUpperCase();
+
   return (
-    <div className={`relative ${className}`} onClick={courseBlockInfo}>
+    <div
+      className={`relative ${className} flex justify-end`}
+      onClick={courseBlockInfo}
+    >
+      <div
+        className="absolute inset-0 border-r-2 bg-gray-100"
+        style={{
+          height: "100%",
+          width: "100%",
+          backgroundSize: "100% 60px",
+        }}
+      ></div>
+
       <div
-        className={`w-full rounded-lg p-4 transition duration-150 ease-in-out hover:bg-black ${bgColor} flex justify-between`}
+        className={`w-4/6 rounded-lg p-4 transition duration-150 ease-in-out hover:bg-black ${bgColor} flex items-center justify-between`}
         style={{
           position: "absolute",
-          top: timeDifference ? `${timeDifference * 0.9}px` : "0px",
+          top: startPosition, //timeDifference ? `${timeDifference * 0.9}px` : "0px",
+          height: classHeight,
         }}
       >
-        <div className="">
+        <div>
           <h2 className="font-bold text-white">{classTitle}</h2>
-          {locationShort && (
+          {/* Uncomment following line to show location */}
+          {/* {locationShort && (
             <p className="text-sm text-white/90">{locationShort}</p>
-          )}
+          )} */}
         </div>
-        <div className="text-right text-sm text-white/90">
+        <div className="text-right text-xs text-white">
           <p>{timeStart}</p>
           <p>{timeEnd}</p>
         </div>
diff --git a/frontend/src/components/schedules/ScheduleDisplay.tsx b/frontend/src/components/schedules/ScheduleDisplay.tsx
new file mode 100644
index 00000000..4e514e95
--- /dev/null
+++ b/frontend/src/components/schedules/ScheduleDisplay.tsx
@@ -0,0 +1,137 @@
+"use client";
+
+import WeekSchedule from "@/components/schedules/WeekSchedule";
+import useLocalStorage from "@/hooks/useLocalStorage";
+import Link from "next/link";
+import { useCallback, useMemo } from "react";
+import {
+  PiArrowLeftBold,
+  PiArrowRightBold,
+  PiHeartBold,
+  PiHeartFill,
+  PiXBold,
+} from "react-icons/pi";
+
+interface Props {
+  id: string;
+}
+
+export default function ScheduleDisplay({ id }: Props) {
+  const [savedPlans, setSavedPlans] = useLocalStorage("schedules");
+
+  const pinPlan = useCallback(() => {
+    setSavedPlans((plans) =>
+      plans.map((plan) =>
+        plan.id === id ? { ...plan, pinned: !plan.pinned } : plan,
+      ),
+    );
+  }, [id, setSavedPlans]);
+
+  const currentPlanIndex = useMemo(
+    () => savedPlans.findIndex((plan) => plan.id === id),
+    [savedPlans, id],
+  );
+
+  const handleInputKeyUp = useCallback(
+    (e: React.KeyboardEvent<HTMLInputElement>) => {
+      if (e.key === "Enter") {
+        e.preventDefault();
+        e.currentTarget.blur();
+      }
+    },
+    [],
+  );
+
+  const handleChangeTitle = useCallback(
+    (e: React.FocusEvent<HTMLInputElement>) => {
+      const title = e.currentTarget.value.trim();
+
+      if (title.length < 1) {
+        if (savedPlans[currentPlanIndex]) {
+          e.currentTarget.value = savedPlans[currentPlanIndex].title;
+        }
+        return;
+      }
+
+      e.currentTarget.value = title;
+      setSavedPlans((plans) =>
+        plans.map((plan) => (plan.id === id ? { ...plan, title } : plan)),
+      );
+    },
+    [currentPlanIndex, id, savedPlans, setSavedPlans],
+  );
+
+  if (currentPlanIndex === -1) {
+    return null;
+  }
+
+  const { data, title, pinned } = savedPlans[currentPlanIndex]!;
+
+  // Render the schedule
+  return (
+    <div className="mx-auto min-h-screen w-[100%]">
+      {/* Container for schedule display, schedule cycling, and save/exit buttons */}
+      <div className="z-1 ml-auto mr-auto flex h-[85vh] w-[90vw] flex-col rounded-lg border-2 border-black bg-barely-pink pt-2">
+        {/* Properly positions the cycling bar and the save/exit buttons */}
+        <div className="flex flex-row items-center justify-between px-12 py-2">
+          <button type="button" className="cursor-default" onClick={pinPlan}>
+            {pinned ? (
+              <PiHeartFill className="size-8 text-glory-glory-red transition" />
+            ) : (
+              <PiHeartBold className="m-0.5 size-7 transition-[color,width,height,margin] hover:m-0 hover:size-8 hover:text-glory-glory-red" />
+            )}
+          </button>
+
+          {/* Cycling bar; changes the displayed schedule when arrows are clicked */}
+          <div className="flex flex-row items-center justify-center gap-0.5 rounded-lg bg-white">
+            {savedPlans.length > 1 && (
+              <Link
+                className="rounded-l-lg border-2 border-white bg-white px-2 py-1 text-2xl transition-colors hover:border-gray-400 hover:bg-gray-100"
+                href={`/plans/${savedPlans[(currentPlanIndex + savedPlans.length - 1) % savedPlans.length]!.id}`}
+                title={
+                  savedPlans[
+                    (currentPlanIndex + savedPlans.length - 1) %
+                      savedPlans.length
+                  ]!.title
+                }
+              >
+                <PiArrowLeftBold />
+              </Link>
+            )}
+
+            <input
+              className="rounded-sm border-2 border-white pb-px pt-0.5 text-center text-xl font-semibold hover:border-gray-500 focus:border-gray-300"
+              defaultValue={title}
+              maxLength={32}
+              onBlur={handleChangeTitle}
+              onKeyUp={handleInputKeyUp}
+            />
+
+            {savedPlans.length > 1 && (
+              <Link
+                className="rounded-r-lg border-2 border-white bg-white px-2 py-1 text-2xl transition-colors hover:border-gray-400 hover:bg-gray-100"
+                href={`/plans/${savedPlans[(currentPlanIndex + 1) % savedPlans.length]!.id}`}
+                title={
+                  savedPlans[(currentPlanIndex + 1) % savedPlans.length]!.title
+                }
+              >
+                <PiArrowRightBold />
+              </Link>
+            )}
+          </div>
+          {/* Save/exit buttons: exit returns to saved plan list */}
+          <Link
+            href="/plans"
+            className="transition-colors hover:text-bulldog-red"
+          >
+            <PiXBold className="size-7" />
+          </Link>
+        </div>
+        {/* Schedule display container */}
+        <div className="flex flex-grow flex-row overflow-y-auto">
+          <WeekSchedule weekData={data} />
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/frontend/src/components/schedules/WeekSchedule.tsx b/frontend/src/components/schedules/WeekSchedule.tsx
index c72efdc9..d33053e8 100644
--- a/frontend/src/components/schedules/WeekSchedule.tsx
+++ b/frontend/src/components/schedules/WeekSchedule.tsx
@@ -1,19 +1,84 @@
 "use client";
 
+import { type WeekSchedule as WeekScheduleType } from "@/types/scheduleTypes";
 import { differenceInMinutes } from "date-fns";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { PiCaretDoubleRightBold } from "react-icons/pi";
-import { type WeekSchedule as WeekScheduleType } from "@/types/scheduleTypes";
 import DayClass from "./DayClass";
 
 interface WeekScheduleProps {
   weekData: WeekScheduleType;
 }
 
+// Background colors for course blocks
+const bgColors = [
+  "bg-[#cc0128]",
+  "bg-[#bc8da7]",
+  "bg-[#0db1b1]",
+  "bg-[#53917e]",
+  "bg-[#202c59]",
+];
+
+const borderColors = [
+  "border-[#cc0128]",
+  "border-[#bc8da7]",
+  "border-[#0db1b1]",
+  "border-[#53917e]",
+  "border-[#202c59]",
+];
+
 export default function WeekSchedule({ weekData }: WeekScheduleProps) {
   const scrollportRef = useRef<HTMLElement>(null);
   const [next, setNext] = useState<string | undefined>(undefined);
   const [prev, setPrev] = useState<string | undefined>(undefined);
+  const colorMapping = useRef<
+    Record<string, { bgColor: string; borderColor: string }>
+  >({});
+  const usedColors = useRef<Set<string>>(new Set<string>());
+
+  const getBgColorForClass = useCallback((classTitle: string) => {
+    // Check if the course is a lab (has an L at the end)
+    // If so, drop the L when comparing so it has the same color as the corresponding class
+    classTitle.trimEnd();
+    if (classTitle.endsWith("L")) {
+      classTitle = classTitle.substring(0, classTitle.length - 1);
+    }
+
+    // Course block colors:
+    // Check if color has already been used
+    if (colorMapping.current[classTitle]) {
+      return colorMapping.current[classTitle]!;
+    }
+
+    // Find an unused color
+    let bgColorToAssign: string | undefined;
+    let borderColorToAssign: string | undefined;
+
+    // Assign unused color
+    if (usedColors.current.size < bgColors.length) {
+      for (const color of bgColors) {
+        if (!usedColors.current.has(color)) {
+          bgColorToAssign = color;
+          borderColorToAssign = borderColors[bgColors.indexOf(color)]; // Find the same color in the border colors list
+          usedColors.current.add(color); // Mark color as used
+          break;
+        }
+      }
+      // Reassign the color to the first class that needs a color
+      bgColorToAssign = bgColors[usedColors.current.size % bgColors.length];
+      borderColorToAssign =
+        borderColors[usedColors.current.size % borderColors.length];
+      usedColors.current.add(bgColorToAssign!); // ! asserts variable to not be read as undefined
+    }
+
+    // Store the assign color for classTitle
+    colorMapping.current[classTitle] = {
+      bgColor: bgColorToAssign ?? "bg-gray-500",
+      borderColor: borderColorToAssign ?? "border-gray-500",
+    };
+
+    return colorMapping.current[classTitle]!;
+  }, []);
 
   /**
    * Handler updating next/prev scroll buttons for scroll/resize events.
@@ -82,10 +147,48 @@ export default function WeekSchedule({ weekData }: WeekScheduleProps) {
     return () => controller.abort();
   }, [handleScroll]);
 
+  /*
+   * Create lines for each hour under each day. (8AM to 10PM)
+   */
+  const createHourlySections = useCallback(() => {
+    const sections = [];
+    const startHour = 8; // 8AM
+    const endHour = 22; // 10PM
+    const totalHours = endHour - startHour + 1;
+    const sectionHeight = 50 / totalHours;
+
+    for (let hour = startHour; hour <= endHour; hour++) {
+      // convert 24-hour to am/pm
+      const ampm = hour > 12 ? hour - 12 : hour;
+      const period = hour >= 12 ? "PM" : "AM";
+      const ampmString = `${ampm}`;
+      const periodString = `${period}`;
+      sections.push(
+        <div
+          key={hour}
+          className="h- relative w-full border-t border-gray-300"
+          style={{
+            height: `${sectionHeight}%`,
+            top: `${(hour - startHour) * sectionHeight}%`,
+            zIndex: 0, // lines stay behind course blocks
+          }}
+        >
+          <span className="absolute left-0 px-4 text-sm text-gray-500">
+            <div>
+              <span className="font-bold">{ampm}</span> {period}
+            </div>
+          </span>
+        </div>,
+      );
+    }
+
+    return sections;
+  }, []);
+
   return (
-    <div className="relative z-0 mx-auto w-screen max-w-[1800px] overflow-hidden px-8">
+    <div className="relative z-0 mx-auto w-screen max-w-[1800px] overflow-x-hidden px-4">
       <button
-        className="absolute left-0 top-0 z-10 flex h-full w-8 rotate-180 items-center justify-between border-l-2 border-pink-900 bg-pink-50 py-4 text-center font-bold text-pink-900 transition-[left] [writing-mode:vertical-lr] 2xl:hidden [&:not([data-scroll-target])]:-left-8"
+        className="absolute left-0 top-0 z-10 flex h-full w-8 rotate-180 items-center justify-between rounded-r-lg border-l-2 border-pink-900 bg-pink-50 py-4 text-center font-bold text-pink-900 transition-[left] [writing-mode:vertical-lr] 2xl:hidden [&:not([data-scroll-target])]:-left-8"
         data-scroll-target={prev}
         onClick={scrollLeft}
         type="button"
@@ -95,27 +198,41 @@ export default function WeekSchedule({ weekData }: WeekScheduleProps) {
         <PiCaretDoubleRightBold />
       </button>
 
+      {/* Viewport of schedule display */}
       <section
-        className="grid h-[540px] w-full snap-x snap-mandatory grid-cols-[1rem_repeat(5,calc((100%-1rem)/var(--cols)))] overflow-x-auto scroll-smooth [--cols:1] sm:[--cols:2] md:overflow-hidden lg:[--cols:3] xl:[--cols:4] 2xl:[--cols:5]"
+        className="grid h-[750px] w-full snap-x snap-mandatory grid-cols-[1rem_repeat(5,calc((100%-1rem)/var(--cols)))] overflow-x-auto scroll-smooth rounded-lg bg-pink-200/50 py-4 [--cols:1] sm:[--cols:2] md:overflow-hidden lg:[--cols:3] xl:[--cols:4] 2xl:[--cols:5]"
         ref={scrollportRef}
       >
         <div />
 
         {Object.entries(weekData).map(([day, classes]) => (
           <div className="snap-end snap-always pr-4" data-title={day} key={day}>
-            <article className="flex h-full w-full flex-col gap-4 rounded-xl bg-pink-200/50 px-4 py-6">
-              <h2 className="text text-xl font-bold">{day}</h2>
-              <div>
-                {classes.map((classData, index) => (
-                  <DayClass
-                    key={`${day}-${classData.classTitle}-${index}`}
-                    {...classData}
-                    timeDifference={differenceInMinutes(
-                      new Date(`1970/01/01 ${classData.timeStart}`),
-                      new Date("1970/01/01 8:00 am"),
-                    )}
-                  />
-                ))}
+            {/* One day's schedule */}
+            <article className="flex h-full w-full flex-col gap-4 rounded-xl bg-white px-0 py-0">
+              {/* Day label */}
+              <h2 className="text rounded-lg bg-[#222233] px-4 py-3 text-center text-xl font-bold text-white">
+                {day}
+              </h2>
+              {/* Class list */}
+              <div className="relative h-full">
+                {createHourlySections()}
+                {classes.map((classData, index) => {
+                  const colors = getBgColorForClass(classData.classTitle);
+                  const startDiff = differenceInMinutes(
+                    new Date(`1970/01/01 ${classData.timeStart}`),
+                    new Date("1970/01/01 3:06 pm"), // This time is not correct it should be 8:00 AM, but it positions the course blocks correctly
+                  );
+
+                  return (
+                    <DayClass
+                      key={`${day}-${classData.classTitle}-${index}`}
+                      {...classData}
+                      bgColor={colors.bgColor}
+                      borderColor={colors.borderColor}
+                      timeDifference={startDiff}
+                    />
+                  );
+                })}
               </div>
             </article>
           </div>
@@ -123,7 +240,7 @@ export default function WeekSchedule({ weekData }: WeekScheduleProps) {
       </section>
 
       <button
-        className="absolute right-0 top-0 z-10 flex h-full w-8 items-center justify-between border-l-2 border-pink-900 bg-pink-50 py-4 text-center font-bold text-pink-900 transition-[right] [writing-mode:vertical-rl] 2xl:hidden [&:not([data-scroll-target])]:-right-8"
+        className="absolute right-0 top-0 z-10 flex h-full w-8 items-center justify-between rounded-r-lg border-l-2 border-pink-900 bg-pink-50 py-4 text-center font-bold text-pink-900 transition-[right] [writing-mode:vertical-rl] 2xl:hidden [&:not([data-scroll-target])]:-right-8"
         data-scroll-target={next}
         onClick={scrollRight}
         type="button"
diff --git a/frontend/src/components/schedules/dummySchedules.ts b/frontend/src/components/schedules/dummySchedules.ts
new file mode 100644
index 00000000..fd13b4dc
--- /dev/null
+++ b/frontend/src/components/schedules/dummySchedules.ts
@@ -0,0 +1,609 @@
+import { type WeekSchedule as WeekScheduleType } from "@/types/scheduleTypes";
+
+export const dummyData1: WeekScheduleType = {
+  Monday: [
+    {
+      classTitle: "CSCI 3030",
+      className: "Computing, Ethics, and Society",
+      description:
+        "Introduction to social and ethical issues relating to computer science and information technology. Topics include privacy, intellectual property, open-source software, the digital divide, globalization, professional ethics, social justice issues, and current events. Students should have a working knowledge of personal computing.",
+      locationLong: "Boyd Research and Education Center 100",
+      locationShort: "Boyd 100",
+      prereq: "ENGL 1102",
+      coreq: "",
+      professor: "John Doe",
+      semester: "Spring",
+      timeStart: "8:00 am",
+      timeEnd: "8:50 am",
+      timeDifference: null,
+      credits: 3,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-bulldog-red",
+      borderColor: "border-bulldog-red",
+      currentDay: "MW",
+      otherTimes: ["F", "8:00 am - 8:50 am", "Chemistry 100"],
+    },
+
+    {
+      classTitle: "CSCI 1302",
+      className: "Software Development",
+      description: "The course description will be displayed here.",
+      locationLong: "Conner Hall 100",
+      locationShort: "Conner 100",
+      prereq: "ENGL 1102",
+      coreq: "",
+      professor: "John Doe",
+      semester: "All",
+      timeStart: "10:20 am",
+      timeEnd: "11:10 am",
+      timeDifference: null,
+      credits: 4,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-bulldog-red",
+      borderColor: "border-bulldog-red",
+      currentDay: "M",
+      otherTimes: ["TR", "9:35 am - 10:50 am", "Food Sci 100"],
+    },
+
+    {
+      classTitle: "BIOL 1103",
+      className: "Topics in Biology",
+      description: "The course description will be displayed here.",
+      locationLong: "Science Learning Center 100",
+      locationShort: "SLC 100",
+      prereq: "",
+      coreq: "BIOL 1103L",
+      professor: "Jane Doe",
+      semester: "Spring/Fall",
+      timeStart: "1:30 pm",
+      timeEnd: "2:20 pm",
+      timeDifference: null,
+      credits: 3,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-dev-dog-blue",
+      borderColor: "border-dev-dog-blue",
+
+      currentDay: "MWF",
+      otherTimes: ["", "", ""],
+    },
+  ],
+
+  Tuesday: [
+    {
+      classTitle: "CSCI 1302",
+      className: "Software Development",
+      description: "The course description will be displayed here.",
+      locationLong: "Food Science 100",
+      locationShort: "Food Sci 100",
+      prereq: "ENGL 1102",
+      coreq: "",
+      professor: "John Doe",
+      semester: "All",
+      timeStart: "9:35 am",
+      timeEnd: "10:50 am",
+      timeDifference: null,
+      credits: 4,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-bulldog-red",
+      borderColor: "border-bulldog-red",
+      currentDay: "TR",
+      otherTimes: ["M", "10:20 am - 11:10 am", "Conner 100"],
+    },
+
+    {
+      classTitle: "MUSI 2300",
+      className: "Music in Athens",
+      description:
+        "Explores national and international musical and cultural trends. The course draws from Athens, Georgia’s diverse musical communities and their histories, exploring the rock, hip hop, and indie popular music scenes along with African-American traditions, folk and traditional musics, and the emergent Latin music scene.",
+      locationLong: "Hugh Hudgson School of Music 100",
+      locationShort: "Hugh Hudgson 100",
+      prereq: "",
+      coreq: "",
+      professor: "Jane Doe",
+      semester: "Spring",
+      timeStart: "12:45 pm",
+      timeEnd: "2:00 pm",
+      timeDifference: null,
+      credits: 3,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-lake-herrick",
+      borderColor: "border-lake-herrick",
+      currentDay: "TR",
+      otherTimes: ["", "", ""],
+    },
+  ],
+
+  Wednesday: [
+    {
+      classTitle: "CSCI 3030",
+      className: "Computing, Ethics, and Society",
+      description: "The course description will be displayed here.",
+      locationLong: "Boyd Research and Education Center 100",
+      locationShort: "Boyd 100",
+      prereq: "ENGL 1102",
+      coreq: "",
+      professor: "John Doe",
+      semester: "Spring",
+      timeStart: "8:00 am",
+      timeEnd: "8:50 am",
+      timeDifference: null,
+      credits: 3,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-bulldog-red",
+      borderColor: "border-bulldog-red",
+      currentDay: "MW",
+      otherTimes: ["F", "8:00 am - 8:50 am", "Chemistry 100"],
+    },
+
+    {
+      classTitle: "BIOL 1103",
+      className: "Topics in Biology",
+      description: "The course description will be displayed here.",
+      locationLong: "Science Learning Center 100",
+      locationShort: "SLC 100",
+      prereq: "",
+      coreq: "BIOL 1103L",
+      professor: "Jane Doe",
+      semester: "Spring/Fall",
+      timeStart: "1:30 pm",
+      timeEnd: "2:20 pm",
+      timeDifference: null,
+      credits: 3,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-dev-dog-blue",
+      borderColor: "border-dev-dog-blue",
+      currentDay: "MWF",
+      otherTimes: ["", "", ""],
+    },
+  ],
+
+  Thursday: [
+    {
+      classTitle: "CSCI 1302",
+      className: "Software Development",
+      description: "The course description will be displayed here.",
+      locationLong: "Food Science 100",
+      locationShort: "Food Sci 100",
+      prereq: "ENGL 1102",
+      coreq: "",
+      professor: "John Doe",
+      semester: "Spring",
+      timeStart: "9:35 am",
+      timeEnd: "10:50 am",
+      timeDifference: null,
+      credits: 4,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-bulldog-red",
+      borderColor: "border-bulldog-red",
+      currentDay: "TR",
+      otherTimes: ["M", "10:20 am - 11:10 am", "Conner 100"],
+    },
+
+    {
+      classTitle: "MUSI 2300",
+      className: "Music in Athens",
+      description: "The course description will be displayed here.",
+      locationLong: "Hugh Hudgson School of Music 100",
+      locationShort: "Hugh Hudgson 100",
+      prereq: "ENGL 1102",
+      coreq: "",
+      professor: "Jane Doe",
+      semester: "Spring",
+      timeStart: "12:45 pm",
+      timeEnd: "2:00 pm",
+      timeDifference: null,
+      credits: 3,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-lake-herrick",
+      borderColor: "border-lake-herrick",
+      currentDay: "TR",
+      otherTimes: ["", "", ""],
+    },
+
+    {
+      classTitle: "BIOL 1103L",
+      className: "Concepts in Biology Laboratory",
+      description: "The course description will be displayed here.",
+      locationLong: "Science Learning Center 100",
+      locationShort: "SLC 100",
+      prereq: "",
+      coreq: "BIOL 1103",
+      professor: "Jane Doe",
+      semester: "Spring/Fall",
+      timeStart: "2:20 pm",
+      timeEnd: "4:15 pm",
+      timeDifference: null,
+      credits: 1,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-dev-dog-blue",
+      borderColor: "border-dev-dog-blue",
+      currentDay: "R",
+      otherTimes: ["", "", ""],
+    },
+  ],
+
+  Friday: [
+    {
+      classTitle: "CSCI 3030",
+      className: "Computing, Ethics, and Society",
+      description: "The course description will be displayed here.",
+      locationLong: "Boyd Research and Education Center 100",
+      locationShort: "Chemistry 100",
+      prereq: "ENGL 1102",
+      coreq: "",
+      professor: "John Doe",
+      semester: "Spring",
+      timeStart: "8:00 am",
+      timeEnd: "8:50 am",
+      timeDifference: null,
+      credits: 3,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-bulldog-red",
+      borderColor: "border-bulldog-red",
+      currentDay: "F",
+      otherTimes: ["MW", "8:00 - 8:50 am", "Boyd 100"],
+    },
+
+    {
+      classTitle: "BIOL 1103",
+      className: "Topics in Biology",
+      description: "The course description will be displayed here.",
+      locationLong: "Science Learning Center 100",
+      locationShort: "SLC 100",
+      prereq: "",
+      coreq: "BIOL 1103L",
+      professor: "Jane Doe",
+      semester: "Spring/Fall",
+      timeStart: "1:30 pm",
+      timeEnd: "2:20 pm",
+      timeDifference: null,
+      credits: 3,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-dev-dog-blue",
+      borderColor: "border-dev-dog-blue",
+      currentDay: "MWF",
+      otherTimes: ["", "", ""],
+    },
+  ],
+};
+
+// Dummy Schedule #2: Remove as necessary
+// Be sure to update when the WeekSchedule component changes!
+export const dummyData2: WeekScheduleType = {
+  Monday: [
+    {
+      classTitle: "CSCI 3030",
+      className: "Computing, Ethics, and Society",
+      description:
+        "Introduction to social and ethical issues relating to computer science and information technology. Topics include privacy, intellectual property, open-source software, the digital divide, globalization, professional ethics, social justice issues, and current events. Students should have a working knowledge of personal computing.",
+      locationLong: "Boyd Research and Education Center 100",
+      locationShort: "Boyd 100",
+      prereq: "ENGL 1102",
+      coreq: "",
+      professor: "John Doe",
+      semester: "Spring",
+      timeStart: "1:30 pm",
+      timeEnd: "2:20 pm",
+      timeDifference: null,
+      credits: 3,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-bulldog-red",
+      borderColor: "border-bulldog-red",
+      currentDay: "MW",
+      otherTimes: ["F", "8:00 am - 8:50 am", "Chemistry 100"],
+    },
+
+    {
+      classTitle: "CSCI 1302",
+      className: "Software Development",
+      description: "The course description will be displayed here.",
+      locationLong: "Conner Hall 100",
+      locationShort: "Conner 100",
+      prereq: "ENGL 1102",
+      coreq: "",
+      professor: "John Doe",
+      semester: "All",
+      timeStart: "10:20 am",
+      timeEnd: "11:10 am",
+      timeDifference: null,
+      credits: 4,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-bulldog-red",
+      borderColor: "border-bulldog-red",
+      currentDay: "M",
+      otherTimes: ["TR", "9:35 am - 10:50 am", "Food Sci 100"],
+    },
+
+    {
+      classTitle: "BIOL 1103",
+      className: "Topics in Biology",
+      description: "The course description will be displayed here.",
+      locationLong: "Science Learning Center 100",
+      locationShort: "SLC 100",
+      prereq: "",
+      coreq: "BIOL 1103L",
+      professor: "Jane Doe",
+      semester: "Spring/Fall",
+      timeStart: "9:10 am",
+      timeEnd: "10:00 am",
+      timeDifference: null,
+      credits: 3,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-dev-dog-blue",
+      borderColor: "border-dev-dog-blue",
+
+      currentDay: "MWF",
+      otherTimes: ["", "", ""],
+    },
+  ],
+
+  Tuesday: [
+    {
+      classTitle: "CSCI 1302",
+      className: "Software Development",
+      description: "The course description will be displayed here.",
+      locationLong: "Food Science 100",
+      locationShort: "Food Sci 100",
+      prereq: "ENGL 1102",
+      coreq: "",
+      professor: "John Doe",
+      semester: "All",
+      timeStart: "9:35 am",
+      timeEnd: "10:50 am",
+      timeDifference: null,
+      credits: 4,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-bulldog-red",
+      borderColor: "border-bulldog-red",
+      currentDay: "TR",
+      otherTimes: ["M", "10:20 am - 11:10 am", "Conner 100"],
+    },
+
+    {
+      classTitle: "MUSI 2300",
+      className: "Music in Athens",
+      description:
+        "Explores national and international musical and cultural trends. The course draws from Athens, Georgia’s diverse musical communities and their histories, exploring the rock, hip hop, and indie popular music scenes along with African-American traditions, folk and traditional musics, and the emergent Latin music scene.",
+      locationLong: "Hugh Hudgson School of Music 100",
+      locationShort: "Hugh Hudgson 100",
+      prereq: "",
+      coreq: "",
+      professor: "Jane Doe",
+      semester: "Spring",
+      timeStart: "12:45 pm",
+      timeEnd: "2:00 pm",
+      timeDifference: null,
+      credits: 3,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-lake-herrick",
+      borderColor: "border-lake-herrick",
+      currentDay: "TR",
+      otherTimes: ["", "", ""],
+    },
+  ],
+
+  Wednesday: [
+    {
+      classTitle: "CSCI 3030",
+      className: "Computing, Ethics, and Society",
+      description: "The course description will be displayed here.",
+      locationLong: "Boyd Research and Education Center 100",
+      locationShort: "Boyd 100",
+      prereq: "ENGL 1102",
+      coreq: "",
+      professor: "John Doe",
+      semester: "Spring",
+      timeStart: "1:30 pm",
+      timeEnd: "2:20 pm",
+      timeDifference: null,
+      credits: 3,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-bulldog-red",
+      borderColor: "border-bulldog-red",
+      currentDay: "MW",
+      otherTimes: ["F", "1:30 pm - 2:20 pm", "Chemistry 100"],
+    },
+
+    {
+      classTitle: "BIOL 1103",
+      className: "Topics in Biology",
+      description: "The course description will be displayed here.",
+      locationLong: "Science Learning Center 100",
+      locationShort: "SLC 100",
+      prereq: "",
+      coreq: "BIOL 1103L",
+      professor: "Jane Doe",
+      semester: "Spring/Fall",
+      timeStart: "9:10 am",
+      timeEnd: "10:00 am",
+      timeDifference: null,
+      credits: 3,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-dev-dog-blue",
+      borderColor: "border-dev-dog-blue",
+      currentDay: "MWF",
+      otherTimes: ["", "", ""],
+    },
+  ],
+
+  Thursday: [
+    {
+      classTitle: "CSCI 1302",
+      className: "Software Development",
+      description: "The course description will be displayed here.",
+      locationLong: "Food Science 100",
+      locationShort: "Food Sci 100",
+      prereq: "ENGL 1102",
+      coreq: "",
+      professor: "John Doe",
+      semester: "Spring",
+      timeStart: "9:35 am",
+      timeEnd: "10:50 am",
+      timeDifference: null,
+      credits: 4,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-bulldog-red",
+      borderColor: "border-bulldog-red",
+      currentDay: "TR",
+      otherTimes: ["M", "10:20 am - 11:10 am", "Conner 100"],
+    },
+
+    {
+      classTitle: "MUSI 2300",
+      className: "Music in Athens",
+      description: "The course description will be displayed here.",
+      locationLong: "Hugh Hudgson School of Music 100",
+      locationShort: "Hugh Hudgson 100",
+      prereq: "ENGL 1102",
+      coreq: "",
+      professor: "Jane Doe",
+      semester: "Spring",
+      timeStart: "12:45 pm",
+      timeEnd: "2:00 pm",
+      timeDifference: null,
+      credits: 3,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-lake-herrick",
+      borderColor: "border-lake-herrick",
+      currentDay: "TR",
+      otherTimes: ["", "", ""],
+    },
+
+    {
+      classTitle: "BIOL 1103L",
+      className: "Concepts in Biology Laboratory",
+      description: "The course description will be displayed here.",
+      locationLong: "Science Learning Center 100",
+      locationShort: "SLC 100",
+      prereq: "",
+      coreq: "BIOL 1103",
+      professor: "Jane Doe",
+      semester: "Spring/Fall",
+      timeStart: "2:20 pm",
+      timeEnd: "4:15 pm",
+      timeDifference: null,
+      credits: 1,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-dev-dog-blue",
+      borderColor: "border-dev-dog-blue",
+      currentDay: "R",
+      otherTimes: ["", "", ""],
+    },
+  ],
+
+  Friday: [
+    {
+      classTitle: "CSCI 3030",
+      className: "Computing, Ethics, and Society",
+      description: "The course description will be displayed here.",
+      locationLong: "Boyd Research and Education Center 100",
+      locationShort: "Chemistry 100",
+      prereq: "ENGL 1102",
+      coreq: "",
+      professor: "John Doe",
+      semester: "Spring",
+      timeStart: "1:30 pm",
+      timeEnd: "2:20 pm",
+      timeDifference: null,
+      credits: 3,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-bulldog-red",
+      borderColor: "border-bulldog-red",
+      currentDay: "F",
+      otherTimes: ["MW", "1:30 pm - 2:20 pm", "Boyd 100"],
+    },
+
+    {
+      classTitle: "BIOL 1103",
+      className: "Topics in Biology",
+      description: "The course description will be displayed here.",
+      locationLong: "Science Learning Center 100",
+      locationShort: "SLC 100",
+      prereq: "",
+      coreq: "BIOL 1103L",
+      professor: "Jane Doe",
+      semester: "Spring/Fall",
+      timeStart: "9:10 am",
+      timeEnd: "10:00 am",
+      timeDifference: null,
+      credits: 3,
+      crn: 26510,
+      openSeats: 100,
+      maxSeats: 100,
+      waitlist: 0,
+      bgColor: "bg-dev-dog-blue",
+      borderColor: "border-dev-dog-blue",
+      currentDay: "MWF",
+      otherTimes: ["", "", ""],
+    },
+  ],
+};
diff --git a/frontend/src/components/ui/Card.tsx b/frontend/src/components/ui/Card.tsx
index d46d040d..c51e7c86 100644
--- a/frontend/src/components/ui/Card.tsx
+++ b/frontend/src/components/ui/Card.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { Button } from "./Button";
+import Image from "next/image";
 
 interface props {
   image?: string;
@@ -17,7 +18,7 @@ export function Card({ image, heading, text, handleClick }: props) {
         {/* Image */}
         {image && (
           <div className="p-4 pt-0 sm:p-8">
-            <img className="min-h-24 sm:min-h-36" src={image} alt="Image" />
+            <Image src={image} alt="Image" height={100} width={100} />
           </div>
         )}
         {/* Heading */}
diff --git a/frontend/src/components/ui/Combobox.tsx b/frontend/src/components/ui/Combobox.tsx
index 184693ec..b0342918 100644
--- a/frontend/src/components/ui/Combobox.tsx
+++ b/frontend/src/components/ui/Combobox.tsx
@@ -52,6 +52,10 @@ interface Props {
    * Indicates whether the current
    */
   required?: boolean;
+  /**
+   * Disable automatic lexicographic sorting of options
+   */
+  preserveOrdering?: boolean;
   /**
    * The placeholder text displayed when no item is selected.
    */
@@ -79,6 +83,7 @@ export default function Combobox({
   name,
   onChange,
   options,
+  preserveOrdering,
   required,
   searchPlaceholder,
   selectPlaceholder,
@@ -109,8 +114,16 @@ export default function Combobox({
   );
 
   const filteredOptions = useMemo(
-    () => (options ? matchSorter(options, filter, { keys: ["content"] }) : []),
-    [options, filter],
+    () =>
+      options
+        ? matchSorter(options, filter, {
+            ...(preserveOrdering
+              ? { baseSort: (a, b) => (a.index < b.index ? -1 : 1) }
+              : {}),
+            keys: ["content"],
+          })
+        : [],
+    [options, filter, preserveOrdering],
   );
 
   const handleChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
@@ -286,7 +299,7 @@ export default function Combobox({
           </label>
 
           <fieldset
-            className="relative flex flex-1 snap-y snap-mandatory flex-col gap-1 overflow-y-auto"
+            className="relative flex max-h-[140px] snap-y snap-mandatory flex-col gap-1 overflow-y-auto"
             ref={fieldset}
           >
             {filteredOptions.map(({ value, content }) => (
diff --git a/frontend/src/components/ui/DeletePlan.tsx b/frontend/src/components/ui/DeletePlan.tsx
new file mode 100644
index 00000000..93624806
--- /dev/null
+++ b/frontend/src/components/ui/DeletePlan.tsx
@@ -0,0 +1,39 @@
+"use client";
+
+import { Button } from "./Button";
+
+interface DeletePlanProps {
+  onConfirm: () => void;
+  onCancel: () => void;
+  planTitle: string;
+}
+
+export default function DeletePlan({
+  onConfirm,
+  onCancel,
+  planTitle,
+}: DeletePlanProps) {
+  return (
+    <div className="fixed inset-0 z-50 flex items-center justify-center bg-black bg-opacity-50">
+      <div className="rounded-lg border-2 border-black bg-barely-pink p-5">
+        <div className="flex flex-col items-center">
+          <h2 className="mb-4 text-xl text-black">
+            Are you sure you want to delete the plan {planTitle}?
+          </h2>
+          <div className="flex flex-row space-x-4">
+            <Button
+              className="mr-5 px-8 py-2 text-white hover:bg-black"
+              text="Yes"
+              onClick={onConfirm}
+            ></Button>
+            <Button
+              className="ml-5 px-8 py-2 text-white hover:bg-black"
+              text="No"
+              onClick={onCancel}
+            ></Button>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/frontend/src/components/ui/DropdownSearchInput.tsx b/frontend/src/components/ui/DropdownSearchInput.tsx
index 4179f7bd..92fcd311 100644
--- a/frontend/src/components/ui/DropdownSearchInput.tsx
+++ b/frontend/src/components/ui/DropdownSearchInput.tsx
@@ -3,6 +3,7 @@
 import React, { useState, useEffect, useRef } from "react";
 
 interface searchFilterProps {
+  labelText?: string;
   name?: string;
   items?: string[];
   type?: string;
@@ -23,6 +24,7 @@ export const DropdownSearchInput = ({
   clearState,
   selectedItem,
   onSelect,
+  labelText,
 }: searchFilterProps) => {
   const dropdownRef = useRef<HTMLUListElement>(null);
   const [isOpen, setIsOpen] = useState(false);
@@ -44,7 +46,8 @@ export const DropdownSearchInput = ({
   };
 
   //Handles clicking on a dropdown item
-  const handleClick = (e: React.MouseEvent, index: number) => {
+  //"index: number" parameter never used
+  const handleClick = (e: React.MouseEvent) => {
     const selectedValue = e.currentTarget.textContent ?? "";
     setQuery(selectedValue);
     setIsOpen((prev) => !prev);
@@ -91,18 +94,21 @@ export const DropdownSearchInput = ({
 
   return (
     <div className={`relative w-full min-w-32`}>
-      <input
-        name={name}
-        value={query}
-        type={type}
-        min={0}
-        onChange={handleQuery}
-        onClick={() => setIsOpen((prev) => !prev)}
-        placeholder={placeholder}
-        className={`w-full rounded-md border-2 p-2 outline-none hover:border-pebble-gray ${className}`}
-        autoComplete="off"
-        onKeyDown={handleKeyPress}
-      />
+      <label className="flex flex-col gap-0.5">
+        {labelText && <span className="font-bold">{labelText}</span>}
+        <input
+          name={name}
+          value={query}
+          type={type}
+          min={0}
+          onChange={handleQuery}
+          onClick={() => setIsOpen((prev) => !prev)}
+          placeholder={placeholder}
+          className={`w-full rounded-md border-2 p-2 outline-none hover:border-pebble-gray ${className}`}
+          autoComplete="off"
+          onKeyDown={handleKeyPress}
+        />
+      </label>
       {/* DROPDOWN MENU */}
       {isOpen && filteredData.length !== 0 && (
         <ul
@@ -113,7 +119,7 @@ export const DropdownSearchInput = ({
           {filteredData.map((item, index) => (
             <li
               key={index}
-              onClick={(e) => handleClick(e, index)}
+              onClick={(e) => handleClick(e)}
               className="bg-inherit px-2 py-1 hover:brightness-75"
               tabIndex={0}
               onKeyDown={handleKeyPress}
diff --git a/frontend/src/hooks/useLocalStorage.ts b/frontend/src/hooks/useLocalStorage.ts
index e8e3bd43..e712670d 100644
--- a/frontend/src/hooks/useLocalStorage.ts
+++ b/frontend/src/hooks/useLocalStorage.ts
@@ -42,8 +42,7 @@ export default function useLocalStorage<K extends keyof LocalStorageSchema>(
   const id = useId();
 
   const schema = localStorageSchema[key];
-  type OutputSchema = z.output<typeof schema>;
-  type InputSchema = z.input<typeof schema>;
+  type Schema = z.infer<typeof schema>;
 
   const itemKey =
     key +
@@ -54,16 +53,11 @@ export default function useLocalStorage<K extends keyof LocalStorageSchema>(
         : "");
 
   const [state, setState] = useReducer<
-    Reducer<
-      OutputSchema,
-      InputSchema | ((prevState: OutputSchema) => InputSchema)
-    >
+    Reducer<Schema, Schema | ((prevState: Schema) => Schema)>
   >((prevState, action) => {
     const newState = schema.parse(
       action instanceof Function ? action(prevState) : action,
     );
-    console.log({ newState });
-
     window.localStorage.setItem(itemKey, JSON.stringify(newState));
 
     return newState;
@@ -78,6 +72,7 @@ export default function useLocalStorage<K extends keyof LocalStorageSchema>(
       try {
         setState(schema.parse(JSON.parse(e.newValue ?? "")));
       } catch {
+        //@ts-expect-error weirdly specific type narrowing
         setState(null);
       }
     },
@@ -92,6 +87,7 @@ export default function useLocalStorage<K extends keyof LocalStorageSchema>(
         schema.parse(JSON.parse(window.localStorage.getItem(key) ?? "")),
       );
     } catch {
+      //@ts-expect-error weirdly specific type narrowing
       setState(null);
     }
 
diff --git a/frontend/src/schemas/localStorage.ts b/frontend/src/schemas/localStorage.ts
index 0a29e62d..4aa80e4e 100644
--- a/frontend/src/schemas/localStorage.ts
+++ b/frontend/src/schemas/localStorage.ts
@@ -1,3 +1,4 @@
+import { dummyData1, dummyData2 } from "@/components/schedules/dummySchedules";
 import * as z from "zod";
 
 /**
@@ -19,15 +20,65 @@ import * as z from "zod";
  * except the schema does not necessarily have to match null.
  */
 
+const ClassData = z.object({
+  classTitle: z.string(),
+  className: z.string(),
+  description: z.string(),
+  locationLong: z.string(),
+  locationShort: z.string(),
+  prereq: z.string(),
+  coreq: z.string(),
+  professor: z.string(),
+  semester: z.string(),
+
+  credits: z.number(),
+  crn: z.number(),
+  openSeats: z.number(),
+  maxSeats: z.number(),
+  waitlist: z.number(),
+
+  bgColor: z.string(),
+  borderColor: z.string(),
+
+  timeStart: z.string(),
+  timeEnd: z.string(),
+  timeDifference: z.number().nullable(),
+
+  currentDay: z.string(),
+  otherTimes: z.tuple([z.string(), z.string(), z.string()]),
+});
+
+const WeekSchedule = z.record(z.string(), ClassData.array());
+const DaySchedule = z.record(z.string(), ClassData.array());
+
 const localStorage = {
-  test: z
+  schedules: z
     .object({
-      foo: z.string(),
+      id: z.string().uuid(),
+      title: z.string(),
+      data: WeekSchedule,
+      pinned: z.boolean(),
     })
-    .catch({
-      foo: "caught",
-    }),
-  test2: z.object({}).nullable(),
+    .array()
+    .catch([
+      // Remove these objects when we have generated schedules getting auto-saved to local storage
+      {
+        id: crypto.randomUUID(),
+        title: "Schedule 1",
+        data: dummyData1,
+        pinned: false,
+      },
+      {
+        id: crypto.randomUUID(),
+        title: "Schedule 2",
+        data: dummyData2,
+        pinned: false,
+      },
+    ]),
 };
 
+export type SavedPlan = z.infer<(typeof localStorage)["schedules"]>[number];
+export type ClassData = z.infer<typeof ClassData>;
+export type DaySchedule = z.infer<typeof DaySchedule>;
+export type WeekSchedule = z.infer<typeof WeekSchedule>;
 export default localStorage;
diff --git a/frontend/src/schemas/serverQueries.ts b/frontend/src/schemas/serverQueries.ts
index 531659a1..d18846ea 100644
--- a/frontend/src/schemas/serverQueries.ts
+++ b/frontend/src/schemas/serverQueries.ts
@@ -299,6 +299,36 @@ const queries = {
     params: z.object({}),
     result: z.number().int().array(),
   },
+
+  getAvgProfessorRating: {
+    route: "/avgRating",
+    params: z.object({
+      /**
+       * Retrieves a Professor's Average Rating on RateMyProfessor.
+       *
+       * @param lname A String of the professor's last name
+       * @param fname A String of the professor's first name
+       */
+      lname: z.string(),
+      fname: z.string(),
+    }),
+    result: z.number(),
+  },
+
+  getNumProfessorRatings: {
+    route: "/numRatings",
+    params: z.object({
+      /**
+       * Retrieves the number of RateMyProfessor reviews of a professor
+       *
+       * @param lname A String of the professor's last name
+       * @param fname A String of the professor's first name
+       */
+      lname: z.string(),
+      fname: z.string(),
+    }),
+    result: z.number().int(),
+  },
 };
 
 export default queries;
diff --git a/frontend/tailwind.config.ts b/frontend/tailwind.config.ts
index 47c846d4..1b388a1f 100644
--- a/frontend/tailwind.config.ts
+++ b/frontend/tailwind.config.ts
@@ -1,5 +1,6 @@
 import type { Config } from "tailwindcss";
 import defaultTheme from "tailwindcss/defaultTheme";
+import formsPlugin from "@tailwindcss/forms";
 
 export default {
   content: ["./src/**/*.tsx", "./src/**/*.ts"],
@@ -24,6 +25,7 @@ export default {
         peach: "hsl(var(--peach))",
         wave: "hsl(var(--wave))",
       },
+
       keyframes: {
         fadeInOverlay: {
           from: { backgroundColor: "transparent" },
@@ -55,5 +57,5 @@ export default {
       },
     },
   },
-  plugins: [],
+  plugins: [formsPlugin({ strategy: "class" })],
 } satisfies Config;
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index 9a9e384f..7a202039 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -10,7 +10,7 @@
     "strict": true,
     "noUncheckedIndexedAccess": true,
     "checkJs": true,
-    "lib": ["dom", "dom.iterable", "ES2023"],
+    "lib": ["dom", "dom.iterable", "ES2024"],
     "noEmit": true,
     "module": "ESNext",
     "moduleResolution": "Bundler",
diff --git a/package-lock.json b/package-lock.json
index 6bd0f057..9f5ab487 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "Optimal-Schedule-Builder",
+  "name": "Optimal-Schedule-Builder (forked)",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
new file mode 100644
index 00000000..fd4eae75
--- /dev/null
+++ b/pnpm-lock.yaml
@@ -0,0 +1,89 @@
+lockfileVersion: "9.0"
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+  .:
+    devDependencies:
+      prettier:
+        specifier: ^3.5.3
+        version: 3.5.3
+      prettier-plugin-tailwindcss:
+        specifier: ^0.6.11
+        version: 0.6.11(prettier@3.5.3)
+
+packages:
+  prettier-plugin-tailwindcss@0.6.11:
+    resolution:
+      {
+        integrity: sha512-YxaYSIvZPAqhrrEpRtonnrXdghZg1irNg4qrjboCXrpybLWVs55cW2N3juhspVJiO0JBvYJT8SYsJpc8OQSnsA==,
+      }
+    engines: { node: ">=14.21.3" }
+    peerDependencies:
+      "@ianvs/prettier-plugin-sort-imports": "*"
+      "@prettier/plugin-pug": "*"
+      "@shopify/prettier-plugin-liquid": "*"
+      "@trivago/prettier-plugin-sort-imports": "*"
+      "@zackad/prettier-plugin-twig": "*"
+      prettier: ^3.0
+      prettier-plugin-astro: "*"
+      prettier-plugin-css-order: "*"
+      prettier-plugin-import-sort: "*"
+      prettier-plugin-jsdoc: "*"
+      prettier-plugin-marko: "*"
+      prettier-plugin-multiline-arrays: "*"
+      prettier-plugin-organize-attributes: "*"
+      prettier-plugin-organize-imports: "*"
+      prettier-plugin-sort-imports: "*"
+      prettier-plugin-style-order: "*"
+      prettier-plugin-svelte: "*"
+    peerDependenciesMeta:
+      "@ianvs/prettier-plugin-sort-imports":
+        optional: true
+      "@prettier/plugin-pug":
+        optional: true
+      "@shopify/prettier-plugin-liquid":
+        optional: true
+      "@trivago/prettier-plugin-sort-imports":
+        optional: true
+      "@zackad/prettier-plugin-twig":
+        optional: true
+      prettier-plugin-astro:
+        optional: true
+      prettier-plugin-css-order:
+        optional: true
+      prettier-plugin-import-sort:
+        optional: true
+      prettier-plugin-jsdoc:
+        optional: true
+      prettier-plugin-marko:
+        optional: true
+      prettier-plugin-multiline-arrays:
+        optional: true
+      prettier-plugin-organize-attributes:
+        optional: true
+      prettier-plugin-organize-imports:
+        optional: true
+      prettier-plugin-sort-imports:
+        optional: true
+      prettier-plugin-style-order:
+        optional: true
+      prettier-plugin-svelte:
+        optional: true
+
+  prettier@3.5.3:
+    resolution:
+      {
+        integrity: sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==,
+      }
+    engines: { node: ">=14" }
+    hasBin: true
+
+snapshots:
+  prettier-plugin-tailwindcss@0.6.11(prettier@3.5.3):
+    dependencies:
+      prettier: 3.5.3
+
+  prettier@3.5.3: {}
diff --git a/services/bulletin/src/main/java/edu/uga/devdogs/bulletin/webscraping/BulletinScraper.java b/services/bulletin/src/main/java/edu/uga/devdogs/bulletin/webscraping/BulletinScraper.java
index b91f363d..53021098 100644
--- a/services/bulletin/src/main/java/edu/uga/devdogs/bulletin/webscraping/BulletinScraper.java
+++ b/services/bulletin/src/main/java/edu/uga/devdogs/bulletin/webscraping/BulletinScraper.java
@@ -34,7 +34,9 @@ private static String getCourseIDFromTable(String text) {
      * @param courseName The name of the course that these requirements will be associated with.
      * @return An ArrayList of RequirementGroup objects, each representing a set of requirements for the course
      */
-   private static ArrayList<RequirementGroup> getRequirementGroupsFromTable(String text, String courseName) {
+    
+   private static ArrayList<RequirementGroup> getRequirementGroupsFromTable(String text, String courseName, String courseDescription) {
+
        Pattern coursePrefixRegex = Pattern.compile("\\b[A-Z]{4}\\b"); // i.e. "MATH"
        Pattern courseSuffixRegex = Pattern.compile("\\b\\d{4}[A-Z]?\\b"); // i.e. "1113"
 
@@ -131,6 +133,10 @@ names that a class might have. */
        }
 
 
+        for (RequirementGroup group : requirementGroups) {
+            group.setCourseDescription(courseDescription);
+        }
+
        return requirementGroups;
 
 
@@ -167,6 +173,8 @@ private static ArrayList<RequirementGroup> getRequirementsFromBulletin(String co
         Elements resultsTables = courseResults.getElementsByClass("courseresultstable");
         boolean isCourseID = false;
         boolean isRequirement = false;
+        boolean isDescription = false;
+        String pendingDescription = "";
         for (Element table : resultsTables) {
 
             // Loop through each row of the table to find the information we need
@@ -189,10 +197,19 @@ private static ArrayList<RequirementGroup> getRequirementsFromBulletin(String co
                     isRequirement = true;
                 } else if (isRequirement) {
                     // Get the requirements for this course...
-                    ArrayList<RequirementGroup> groups = getRequirementGroupsFromTable(text, className);
+
+                    ArrayList<RequirementGroup> groups = getRequirementGroupsFromTable(text, className, pendingDescription);
                     // and add it to the requirements for all courses that we've collected so far.
                     requirementGroups.addAll(groups);
                     isRequirement = false;
+                    pendingDescription = "";
+
+                } else if (text.contains("Description")) {
+                    isDescription = true;
+                } else if (isDescription) {
+                    pendingDescription = text;
+                    isDescription = false;
+
 
                 }
             }
diff --git a/services/bulletin/src/main/java/edu/uga/devdogs/bulletin/webscraping/DescriptionScraper.java b/services/bulletin/src/main/java/edu/uga/devdogs/bulletin/webscraping/DescriptionScraper.java
new file mode 100644
index 00000000..813b09f6
--- /dev/null
+++ b/services/bulletin/src/main/java/edu/uga/devdogs/bulletin/webscraping/DescriptionScraper.java
@@ -0,0 +1,69 @@
+package edu.uga.devdogs.bulletin.webscraping;
+
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.firefox.FirefoxDriver;
+import org.openqa.selenium.firefox.FirefoxOptions;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.WebDriverWait;
+
+import java.time.Duration;
+import java.util.ArrayList;
+
+public class DescriptionScraper {
+    public static String getCourseDescription(String coursePrefix, String courseSuffix) {
+        FirefoxOptions options = new FirefoxOptions();
+        options.addArguments("--headless");
+        WebDriver driver = new FirefoxDriver(options);
+        WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(10));
+
+        // Navigate to the bulletin site, enter the desired prefix into the prefix field, and click enter.
+        driver.get("https://bulletin.uga.edu/coursesHome");
+        WebElement prefixEntry = driver.findElement(By.id("txtEnterPrefix"));
+        prefixEntry.sendKeys(coursePrefix);
+
+        WebElement suffixEntry = driver.findElement(By.id("txtEnterNumber"));
+        suffixEntry.sendKeys(courseSuffix);
+
+
+
+
+        WebElement btn = driver.findElement(By.id("Imgbut_go_offPrefixCourse"));
+        btn.click();
+
+        // Wait for the next page to load, then parse the HTML.
+        wait.until(ExpectedConditions.presenceOfElementLocated(By.id("lblCourseResultText")));
+        Document document = Jsoup.parse(driver.getPageSource());
+
+        // Find the table with the information about each course.
+
+        Element courseResults = document.getElementById("lblCourseResultText");
+        Elements resultsTables = courseResults.getElementsByClass("courseresultstable");
+        boolean isDescription = false;
+        for (Element table : resultsTables) {
+
+            // Loop through each row of the table to find the information we need
+            Elements allData = table.getElementsByTag("td");
+            for (Element data : allData) {
+                String text = data.text();
+                // The row in the table contains the course ID - print it
+                if (text.contains("Description")) {
+                    isDescription = true;
+                } else if (isDescription) {
+                    return text;
+                }
+            }
+        }
+        return "";
+    }
+
+    public static void main(String[] args) {
+        String description = getCourseDescription("fanr", "1100E");
+        System.out.println(description);
+    }
+}
diff --git a/services/bulletin/src/main/java/edu/uga/devdogs/bulletin/webscraping/RequirementGroup.java b/services/bulletin/src/main/java/edu/uga/devdogs/bulletin/webscraping/RequirementGroup.java
index fc96a535..317306d1 100644
--- a/services/bulletin/src/main/java/edu/uga/devdogs/bulletin/webscraping/RequirementGroup.java
+++ b/services/bulletin/src/main/java/edu/uga/devdogs/bulletin/webscraping/RequirementGroup.java
@@ -18,6 +18,8 @@ public class RequirementGroup {
     private boolean requiresHonors;
     private boolean canSubstituteDepartmentPermission;
     private String courseName;
+    private String courseDescription;
+  
     private ArrayList<String> courses = new ArrayList<>();
 
     /**
@@ -76,6 +78,15 @@ public void setCanSubstituteDepartmentPermission(boolean canSubstituteDepartment
         this.canSubstituteDepartmentPermission = canSubstituteDepartmentPermission;
     }
 
+
+    public String getCourseDescription() {
+        return courseDescription;
+    }
+
+    public void setCourseDescription(String courseDescription) {
+        this.courseDescription = courseDescription;
+    }
+
     /**
      * Adds a course to this RequirementGroup that can fill this requirement.
      * @param prerequisite The name of the course that can fill this requirement represented as a string; i.e. "FANR 1100"
@@ -101,6 +112,7 @@ public ArrayList<String> getCourses() {
     public String toString() {
         String toString = "RequirementGroup [ ";
         toString += "\n\tCourse Name: " + courseName;
+        toString += "\n\tDescription: " + courseDescription;
         toString += "\n\tRequires honors: " + requiresHonors;
         toString += "\n\tCan substitute Dept. Permission: " + canSubstituteDepartmentPermission;
         toString += "\n\tRequires Dept. Permission: " + requiresDepartmentPermission();
diff --git a/services/course-information/pom.xml b/services/course-information/pom.xml
index c05a1b4c..6425e808 100644
--- a/services/course-information/pom.xml
+++ b/services/course-information/pom.xml
@@ -48,6 +48,23 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
+		<dependency>
+		<groupId>org.jsoup</groupId>
+		<artifactId>jsoup</artifactId>
+		<version>1.18.1</version>
+	</dependency>
+
+	<dependency>
+    	<groupId>org.seleniumhq.selenium</groupId>
+		<artifactId>selenium-java</artifactId>
+		<version>4.25.0</version>
+		<exclusions>
+			<exclusion>
+				<groupId>com.vaadin.external.google</groupId>
+				<artifactId>android-json</artifactId>
+			</exclusion>
+		</exclusions>
+	</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -70,7 +87,25 @@
             <artifactId>pdfbox</artifactId>
             <version>3.0.3</version>
         </dependency>
-	</dependencies>
+
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20230227</version>
+        </dependency>
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>okhttp</artifactId>
+			<version>4.12.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.15.3</version>
+		</dependency>
+    </dependencies>
+
+
 
 	<build>
 		<plugins>
@@ -81,4 +116,4 @@
 		</plugins>
 	</build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/BruteForcePrototype.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/BruteForcePrototype.java
new file mode 100644
index 00000000..87b8103f
--- /dev/null
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/BruteForcePrototype.java
@@ -0,0 +1,168 @@
+package edu.uga.devdogs.course_information.Algorithm;
+
+import edu.uga.devdogs.course_information.Algorithm.schedule.Schedule;
+import edu.uga.devdogs.course_information.Algorithm.schedule.ScheduleUtil;
+import edu.uga.devdogs.course_information.Algorithm.records.Course;
+import edu.uga.devdogs.course_information.Algorithm.records.HConstraints;
+import edu.uga.devdogs.course_information.Algorithm.records.SConstraints;
+import edu.uga.devdogs.course_information.Algorithm.records.Section;
+
+import java.util.*;
+
+public class BruteForcePrototype {
+
+
+    /**
+     * Main method for the BruteForcePrototype class.
+     * Calls most of the other functions, manages error handling, and handles I/O.
+     *
+     * @param inputCourses a set of requested courses to generate an optimal schedule from
+     * @param softConstraints the soft constraints on the schedule
+     * @param hardConstraints the hard constraints on the schedule
+     * @return the output of optimize()
+     */
+    public static int[][] algorithmDriver(Set<Course> inputCourses,
+                                          SConstraints softConstraints, HConstraints hardConstraints){
+        Set<Course> outputCourses = new HashSet<>(inputCourses);
+
+        try {
+            outputCourses = BruteForceUtil.dataPreHardFilter(outputCourses, hardConstraints);
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            // If this try block is caught, that means there is an impossible schedule based on the hard constraints
+            // Therefore, the algorithmDriver returns null instead of computing a schedule.
+            return null;
+        }
+
+        try {
+            outputCourses = BruteForceUtil.dataPreSoftFilter(outputCourses, softConstraints);
+            //outputCourses = BruteForceUtil.dayOfWeekConvert(outputCourses);
+            return optimize(outputCourses, softConstraints,false);
+        } catch (Exception e){
+            // If an exception arises from dataPreSoftFilter, we will call an overloaded version of optimize().
+            //outputCourses = BruteForceUtil.dayOfWeekConvert(outputCourses);
+            return optimize(outputCourses, softConstraints, true);
+        }
+    }
+
+    /**
+     * Generates the optimal schedule based on the input courses, distances, and weights.
+     * Iterates through each valid schedule from {@code generateValidSchedules(inputCourses)},
+     * Uses a makeshift priority queue to sort all the schedules that obey the hard constraints
+     * using the overall objective score for each schedule using
+     * {@code ScheduleUtil.computeOverallObjective(schedule, distances, weights)},
+     * and returns the first five items of the list.
+     *
+     * @param inputCourses a set of courses to generate an optimal schedule from
+     * @return the five schedules with the highest overall objective score based on the input courses and weights
+     */
+    public static int[][] optimize(Set<Course> inputCourses,
+                                   SConstraints soft, boolean usesSoft) {
+        Set<Schedule> validSchedules = generateValidSchedules(inputCourses);
+
+        if (validSchedules.isEmpty()){
+            // This block can be expanded in the future to include other methods of handling a lack of
+            // Hard-constraint compliant schedules.
+            System.out.println("No valid schedules found.");
+            return new int[0][];
+        }
+
+        List<Schedule> sortedSchedules = new ArrayList<>();
+        List<Double> sortedOverallObjectives = new ArrayList<>();
+
+
+        // Makeshift Priority Queue; An array sorted by a variable (in this case, overallObjective).
+        // Before an item is added, you find where it should be placed so that the List is still sorted correctly
+        // Without having to call a special sorting function.
+        // Insert time is O(n), so *technically* merge sort is faster, but this function is not called frequently, so
+        // Readability matters much more than performance here.
+        for (Schedule schedule : validSchedules) {
+            double overallObjective = 0;
+            if (usesSoft) {
+                overallObjective = ScheduleUtil.computeOverallObjectiveExtended(schedule, soft);
+            } else {
+                overallObjective = ScheduleUtil.computeOverallObjective(schedule);
+            }
+            // Starting from the back of the array, find where the new schedule belongs based on overallObjective.
+            int i = sortedSchedules.size();
+            while (i != 0 && overallObjective > sortedOverallObjectives.get(i-1)) {
+                i--;
+            }
+            sortedSchedules.add(i, schedule);
+            sortedOverallObjectives.add(i, overallObjective);
+        }
+
+        // Ideally, we would like to output 5 schedules, but if there is less than 5 valid schedules, it will just return all of them.
+        // Accomplishing this is trivial if you use an if-else statement and write the whole code block twice, once for 5 and once for less than 5
+        // But that is both unnecessary and hard to read.
+        // Instead, if you use a size variable set to whichever is smaller between the number of valid schedules and 5 schedules
+        // You only have to write the code block once.
+        int size = Math.min(sortedSchedules.size(), 5);
+        int[][] output = new int[size][];
+
+        for (int i = 0; i < size; i++) {
+            // This line looks very convoluted, but really all it does is convert the (i)th best schedule into the list
+            // of CRNs of its sections.
+            output[i] = ScheduleUtil.sectionsToInts(sortedSchedules.get(i).sections());
+        }
+
+        return output;
+    }
+
+
+    /**
+     * Generates the set of all valid schedules from the provided set of courses.
+     * Each schedule is validated using {@code ScheduleUtil.validate(schedule)} to remove
+     * schedules with time conflicts.
+     * Uses helper function {@code recurGenerateValidSchedules()} to generate schedules and record them
+     *
+     * @param inputCourses the set of courses to generate schedules from
+     * @return the set of unique, valid schedules for the given set of courses
+     */
+    public static Set<Schedule> generateValidSchedules(Set<Course> inputCourses) {
+        Set<Section> sectionList = new HashSet<>();
+        HashSet<Schedule> validSchedules = new HashSet<>();
+
+        generateValidSchedulesRecursive(sectionList, new ArrayList<>(inputCourses), validSchedules);
+
+        return validSchedules;
+    }
+
+    /**
+     *  Adds a section to the schedule and checks if the schedule is still valid, if so, then check if there are anymore
+     *  courses to add, if not it gets added to {@code Set<Schedule> validSchedules} otherwise iterate over all sections
+     *  of the next course and recurse.
+     *  A schedule's validity is determined by {@code ScheduleUtil.validate(schedule)}.
+     * @param sections is the set of all sections in the current schedule
+     * @param currCoursesToAdd is the list of all the courses which do not currently have a section in {@code sections}
+     * @param validSchedules is the set of all discovered full valid schedules, every iteration uses the same
+     *                       validSchedule object.
+     * */
+    private static void generateValidSchedulesRecursive(Set<Section> sections, List<Course> currCoursesToAdd, Set<Schedule> validSchedules){
+        Schedule currSchedule = new Schedule(sections);
+
+        // Gets rid of invalid schedules as soon as they become invalid instead of continuing to recurse
+        if (!ScheduleUtil.validate(currSchedule)){
+            return;
+        }
+
+        // If there are no more courses to add, then it is a full valid schedule
+        if (currCoursesToAdd.isEmpty()){
+            validSchedules.add(currSchedule);
+            return;
+        }
+
+        // Instantiates the list of courses for the next iteration
+        List<Course> nextCoursesToAdd = new ArrayList<>(currCoursesToAdd);
+        nextCoursesToAdd.remove(0);
+
+        // Iterates over all sections for the next course and recurses
+        for (Section sectionToAdd: currCoursesToAdd.get(0).sections()){
+            // Instantiates the set of sections for the next iteration
+            HashSet<Section> nextSections = new HashSet<>(sections);
+            nextSections.add(sectionToAdd);
+
+            generateValidSchedulesRecursive(nextSections, nextCoursesToAdd, validSchedules);
+        }
+    }
+}
\ No newline at end of file
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/BruteForceUtil.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/BruteForceUtil.java
new file mode 100644
index 00000000..7e350bc8
--- /dev/null
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/BruteForceUtil.java
@@ -0,0 +1,182 @@
+package edu.uga.devdogs.course_information.Algorithm;
+
+import edu.uga.devdogs.course_information.Algorithm.records.*;
+import edu.uga.devdogs.course_information.Algorithm.records.Class;
+import edu.uga.devdogs.course_information.Algorithm.schedule.Schedule;
+
+import java.time.DayOfWeek;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class BruteForceUtil {
+
+    /**
+     * Cleans the data being sent into the algorithm to account for certain soft constraints.
+     *
+     * @param inputCourses a set of courses given to be used in the user's schedule.
+     * @param currentConstraints the constraints currently constraining schedule creation.
+     * @throws Exception if {@code inputCourses} is not compliant with the filter.
+     * @return a set of courses cleaned per the user's specification
+     */
+    public static Set<Course> dataPreSoftFilter(Set<Course> inputCourses, SConstraints currentConstraints) throws Exception {
+        Set<Course> output = new HashSet<>();
+
+        if (inputCourses == null) {
+            throw new Exception("Input course list is null.");
+        }
+
+        if (inputCourses.isEmpty()) {
+            throw new Exception("Input course list is empty.");
+        }
+
+        if (inputCourses.size() > 10){
+            throw new Exception("Input course list contains more than ten courses.");
+        }
+
+        if (currentConstraints.gapDay() == null){
+            throw new Exception("Preferred gap day is null.");
+        }
+
+        if (currentConstraints.prefStartTime() == null){
+            throw new Exception("Preferred start time is null.");
+        }
+
+        if (currentConstraints.prefEndTime() == null){
+            throw new Exception("Preferred end time is null.");
+        }
+
+        // Loops through all inputted courses and 'removes' all the sections which violate the constraints.
+        for (Course course : inputCourses){
+            if (course == null){
+                throw new Exception("A requested course is null.");
+            }
+
+            List<Section> validSections = getValidSections(currentConstraints, course);
+
+            // If there are no valid sections of a requested course, we can just remove the course
+            // from the list of courses to output.
+            // We can change this behavior to throwing an exception if needed.
+            if (!validSections.isEmpty()){
+
+                // We create a copy of the inputted course and change the section list in the copy
+                // so that we don't accidentally overwrite or delete the data of the original.
+                Course copy = new Course(course.courseCode(), validSections);
+
+                output.add(copy);
+            }
+        }
+
+        if (output.isEmpty()){
+            throw new Exception("All requested courses are invalid.");
+        }
+
+        return output;
+    }
+
+    /**
+     * Cleans the data being sent into the algorithm to account for certain hard constraints.
+     *
+     * @param inputCourses a set of courses given to be used in the user's schedule.
+     * @param currentConstraints the constraints currently constraining schedule creation.
+     * @throws Exception if {@code inputCourses} is not compliant with the filter.
+     * @return a set of courses cleaned per the user's specification
+     */
+    public static Set<Course> dataPreHardFilter(Set<Course> inputCourses, HConstraints currentConstraints) throws Exception {
+        if(inputCourses == null || currentConstraints == null){     // Throws exception if parameter is null
+            throw new IllegalArgumentException("inputCourses and currentConstraints cannot be null");
+        }
+        Set<Course> validCourses  = new HashSet<>();
+        for (Course course : inputCourses) {   // Checks if course is in excluded courses and adds to return if isn't.
+            if(!currentConstraints.excludedCourses().contains(course)){
+                validCourses.add(course);
+            }
+        }
+        return validCourses;
+    }
+
+
+    /**
+     * Cleans the section list of a course to fit the dataPreFilter
+     *
+     * @param currentConstraints the constraints currently constraining schedule creation.
+     * @param course the course to trim sections of.
+     * @return a list of all sections from {@code course} which pass the filter
+     * */
+    private static List<Section> getValidSections(SConstraints currentConstraints, Course course) {
+        List<Section> validSections = new ArrayList<>();
+        for (Section section: course.sections()){
+            boolean valid = true;
+
+            // If any class in a section breaks one of the constraints,
+            // that section is not valid, according to the filter.
+            for (Class c: section.classes()){
+                boolean isTooEarly = c.startTime().isBefore(currentConstraints.prefStartTime());
+                boolean isTooLate = c.startTime().isAfter(currentConstraints.prefEndTime());
+                boolean isOnGapDay = c.days().contains(currentConstraints.gapDay());
+
+                if (isTooEarly || isTooLate || isOnGapDay){
+                    valid = false;
+                    break;
+                }
+            }
+
+            if (valid){
+                validSections.add(section);
+            }
+        }
+        return validSections;
+    }
+
+    /**
+     * Takes in a day string received from webscraping and returns
+     * the proper DayOfWeek based on the string.
+     * @param day day of the week received from webscraping.
+     * @return the DayOfWeek in algorithms format.
+     */
+    public static DayOfWeek daySwitch(String day) {
+        if (day.equals("M")) {
+            return DayOfWeek.MONDAY;
+        } else if (day.equals("T")) {
+            return DayOfWeek.TUESDAY;
+        } else if (day.equals("W")) {
+            return DayOfWeek.WEDNESDAY;
+        } else if (day.equals("R")) {
+            return DayOfWeek.THURSDAY;
+        } else if (day.equals("F")) {
+            return DayOfWeek.FRIDAY;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Ensures every class requested by the user makes it into the schedule.
+     * If any of the courses in {@code inputCourses} are not in a particular
+     * schedule of {@code validSchedules} an exception is thrown.
+     *
+     * @param inputCourses user inputted courses.
+     * @param validSchedules a set of valid generated schedules
+     * @throws Exception if {@code courseInSchedule} if true
+     */
+    public static void ensureInitialCourses(Set<Course> inputCourses, Set<Schedule> validSchedules) throws Exception {
+        boolean courseInSchedule = false;
+        // for every user inputted course
+        for (Course c : inputCourses) {
+            // for every valid schedule
+            for (Schedule s : validSchedules) {
+                // for every section in said schedule
+                for (Section sect : s.sections()) {
+                    // if the course the user inputted, c, is in the schedule, s
+                    if (c.courseCode().equals(sect.courseCode())) {
+                        courseInSchedule = true;
+                    } // if
+                } // for
+                if (!courseInSchedule) {
+                    throw new Exception("Schedule does not contain specified course.");
+                } // if
+            } // for
+        } // for
+    } // ensureInitialCourse
+}
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/records/Class.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/records/Class.java
new file mode 100644
index 00000000..a5c7776c
--- /dev/null
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/records/Class.java
@@ -0,0 +1,24 @@
+package edu.uga.devdogs.course_information.Algorithm.records;
+
+import java.time.DayOfWeek;
+import java.time.LocalTime;
+import java.util.List;
+
+/**
+ * Represents a class in a course section, including its CRN, meeting days, start time, end time, and building.
+ *
+ * @param crn          The course reference number (CRN) for the section associated with this class.
+ * @param days         The days of the week when the class meets.
+ * @param startTime    The start time of the class.
+ * @param endTime      The end time of the class.
+ * @param buildingName The name of the building where the class is held.
+ * @param campus       The campus the course takes place at.
+ */
+public record Class(int crn,
+                    List<DayOfWeek> days,
+                    LocalTime startTime,
+                    LocalTime endTime,
+                    String buildingName,
+                    String campus,
+                    String buildingNumber) {
+}
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/records/Course.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/records/Course.java
new file mode 100644
index 00000000..ef13563e
--- /dev/null
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/records/Course.java
@@ -0,0 +1,13 @@
+package edu.uga.devdogs.course_information.Algorithm.records;
+
+import java.util.List;
+
+/**
+ * Represents a course with a course code and its associated sections.
+ *
+ * @param courseCode The unique code identifying the course.
+ * @param sections   The sections available for this course.
+ */
+public record Course(String courseCode,
+                     List<Section> sections) {
+}
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/records/HConstraints.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/records/HConstraints.java
new file mode 100644
index 00000000..96732e92
--- /dev/null
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/records/HConstraints.java
@@ -0,0 +1,22 @@
+package edu.uga.devdogs.course_information.Algorithm.records;
+
+import java.util.List;
+
+/**
+ * Representation of the hard constraints considered by the user
+ *
+ * @param excludedCourses The courses the user does not want to take.
+ * @param excludedSections The sections the user does not want to take.
+ * @param campus          The campus the user attends.
+ * @param minCreditHours The minimum number of credit hours the user wants to take.
+ * @param maxCreditHours The maximum number of credit hours the user wants to take.
+ * @param walking         The user uses walking as a means of transportation.
+ *
+ */
+public record HConstraints(List<Course> excludedCourses,
+                           List<Section> excludedSections,
+                           String campus,
+                           int minCreditHours,
+                           int maxCreditHours,
+                           boolean walking) {
+}
\ No newline at end of file
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/records/Professor.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/records/Professor.java
new file mode 100644
index 00000000..5d92567c
--- /dev/null
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/records/Professor.java
@@ -0,0 +1,11 @@
+package edu.uga.devdogs.course_information.Algorithm.records;
+
+/**
+ * Represents a professor with a name and a quality rating.
+ *
+ * @param name    The name of the professor.
+ * @param quality The quality rating of the professor (e.g., on a scale from 1 to 5).
+ */
+public record Professor(String name,
+                        double quality) {
+}
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/records/SConstraints.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/records/SConstraints.java
new file mode 100644
index 00000000..61d4218a
--- /dev/null
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/records/SConstraints.java
@@ -0,0 +1,20 @@
+package edu.uga.devdogs.course_information.Algorithm.records;
+
+import java.time.DayOfWeek;
+import java.time.LocalTime;
+
+/**
+ * Representation of the soft constraints considered by the user
+ *
+ * @param gapDay          The preferred day for a gap.
+ * @param prefStartTime   The preferred time to start their first course of the day.
+ * @param prefEndTime     The preferred time to start their last course of the day.
+ * @param showFilledClasses Whether a user wants to exclude full sections from their schedule
+ *
+ */
+public record SConstraints(
+                           DayOfWeek gapDay,
+                           LocalTime prefStartTime,
+                           LocalTime prefEndTime,
+                           boolean showFilledClasses) {
+}
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/records/SampleData.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/records/SampleData.java
new file mode 100644
index 00000000..a5c557f2
--- /dev/null
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/records/SampleData.java
@@ -0,0 +1,13 @@
+package edu.uga.devdogs.course_information.Algorithm.records;
+
+import java.util.Map;
+
+/**
+ * Represents the sample data used in the scheduling system, containing the available courses and distances between buildings.
+ *
+ * @param courses   The array of courses in the sample data.
+ * @param distances The distances between buildings on campus.
+ */
+public record SampleData(Map<String, Course> courses,
+                         Map<String, Map<String, Double>> distances) {
+}
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/records/Section.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/records/Section.java
new file mode 100644
index 00000000..f813cb8a
--- /dev/null
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/records/Section.java
@@ -0,0 +1,17 @@
+package edu.uga.devdogs.course_information.Algorithm.records;
+
+import java.util.List;
+
+/**
+ * Represents a section of a course, including the course code, CRN, professor, and associated classes.
+ *
+ * @param courseCode The course code for the course associated with this section.
+ * @param crn        The course reference number (CRN) for this section.
+ * @param professor  The professor teaching this section.
+ * @param classes    The array of classes associated with this section.
+ */
+public record Section(String courseCode,
+                      int crn,
+                      Professor professor,
+                      List<Class> classes) {
+}
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/schedule/ClassComparator.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/schedule/ClassComparator.java
new file mode 100644
index 00000000..c82c4243
--- /dev/null
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/schedule/ClassComparator.java
@@ -0,0 +1,34 @@
+package edu.uga.devdogs.course_information.Algorithm.schedule;
+
+import edu.uga.devdogs.course_information.Algorithm.records.Class;
+
+import java.util.Comparator;
+
+/**
+ * A comparator for comparing two Class objects.
+ * The comparison is primarily based on the start time of the class.
+ * If the start times are the same, the comparison falls back to using the CRN.
+ */
+public class ClassComparator implements Comparator<Class> {
+
+    /**
+     * Compares two Class objects based on their start time.
+     * If the start times are the same, it compares them based on their CRN.
+     *
+     * @param class1 the first Class to compare
+     * @param class2 the second Class to compare
+     * @return a negative integer, zero, or a positive integer as the first Class
+     *         is less than, equal to, or greater than the second Class.
+     */
+    @Override
+    public int compare(Class class1, Class class2) {
+        // Compare based on start time
+        int timeComparison = class1.startTime().compareTo(class2.startTime());
+        if (timeComparison != 0) {
+            return timeComparison;
+        }
+
+        // If start times are the same, compare by CRN as a fallback
+        return Integer.compare(class1.crn(), class2.crn());
+    }
+}
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/schedule/Schedule.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/schedule/Schedule.java
new file mode 100644
index 00000000..5f796742
--- /dev/null
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/schedule/Schedule.java
@@ -0,0 +1,68 @@
+package edu.uga.devdogs.course_information.Algorithm.schedule;
+
+import edu.uga.devdogs.course_information.Algorithm.records.Section;
+import edu.uga.devdogs.course_information.Algorithm.records.Class;
+
+import java.time.DayOfWeek;
+import java.util.*;
+
+/**
+ * The Schedule class represents a collection of Sections and their corresponding
+ * Classes organized by days of the week. It organizes the data in a way that
+ * allows for Schedule-level and Class-level objectives to be calculated easily.
+ */
+public class Schedule {
+
+    /**
+     * A set of sections included in the schedule. Each section contains multiple classes.
+     */
+    private final Set<Section> sections;
+
+    /**
+     * An EnumMap that organizes classes by day of the week. Each day is associated
+     * with a TreeSet of classes, which are sorted by start time.
+     */
+    private final EnumMap<DayOfWeek, TreeSet<Class>> days;
+
+    /**
+     * Constructs a Schedule object that organizes sections and their corresponding classes by days of the week.
+     * The classes are sorted by their start time within each day.
+     *
+     * @param sections a set of sections to be included in the schedule.
+     */
+    public Schedule(Set<Section> sections) {
+        this.sections = new HashSet<>(sections);
+
+        this.days = new EnumMap<>(DayOfWeek.class);
+        for (DayOfWeek day : DayOfWeek.values()) {
+            days.put(day, new TreeSet<>(new ClassComparator())); // Creates a new TreeSet for each DayOfWeek that sorts Classes based on startTime as defined in ClassComparator
+        }
+
+        for (Section section : sections) { // Iterates through all sections
+            for (Class _class : section.classes()) { // Iterates through all classes in the current section
+                for (DayOfWeek day : _class.days()) { // Iterates through all days in the current class
+                    days.get(day).add(_class); // Adds the current class to the TreeSet associated with the current DayOfWeek
+                }
+            }
+        }
+    }
+
+    /**
+     * Returns the set of sections included in the schedule.
+     *
+     * @return a Set of Section objects.
+     */
+    public Set<Section> sections() {
+        return sections;
+    }
+
+    /**
+     * Returns an EnumMap that organizes classes by day of the week.
+     * Each day is mapped to a TreeSet of classes, which are sorted by start time.
+     *
+     * @return an EnumMap mapping DayOfWeek to a Set of classes.
+     */
+    public EnumMap<DayOfWeek, TreeSet<Class>> days() {
+        return days;
+    }
+}
\ No newline at end of file
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/schedule/ScheduleUtil.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/schedule/ScheduleUtil.java
new file mode 100644
index 00000000..242ae310
--- /dev/null
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Algorithm/schedule/ScheduleUtil.java
@@ -0,0 +1,406 @@
+package edu.uga.devdogs.course_information.Algorithm.schedule;
+
+import edu.uga.devdogs.course_information.Algorithm.records.SConstraints;
+import edu.uga.devdogs.course_information.Algorithm.records.Section;
+import edu.uga.devdogs.course_information.Algorithm.records.Class;
+import edu.uga.devdogs.course_information.Algorithm.records.HConstraints;
+
+import edu.uga.devdogs.course_information.service.CourseInformationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
+import java.util.EnumMap;
+import java.util.Set;
+
+import java.time.DayOfWeek;
+import java.time.LocalTime;
+
+
+
+/**
+ * Utility class for performing operations and calculations related to a Schedule.
+ * This class includes methods to validate schedules, compute various objectives,
+ * and evaluate overall performance. These computations are defined in the
+ * Algorithm Prototyping document.
+ *
+ * @see <a href="https://drive.google.com/file/d/1J2_vlChwx_oWGYKRrmDkDBzWY6dORn6v/view?usp=sharing">Algorithm Prototyping</a>
+ */
+@Component
+public class ScheduleUtil {
+
+    // Used for bootstrap getting coords
+    @Autowired
+    private static CourseInformationService courseInformationService;
+
+    /**
+     * Validates the given schedule by checking for any time conflicts between classes.
+     * A time conflict occurs when two classes overlap in their scheduled times.
+     *
+     * @param schedule the schedule to be validated
+     * @return true if the schedule is valid and contains no time conflicts, false otherwise
+     */
+    public static boolean validate(Schedule schedule) {
+        if (schedule == null) {
+            throw new IllegalArgumentException("Schedule cannot be null");
+        }
+
+        // Iterates over each day in the schedule
+        for (TreeSet<Class> day : schedule.days().values()) {
+            // Converts the TreeSet to List for direct indexing
+            // TODO: Replace TreeSet with a sorted List for days in Schedule
+            List<Class> dayList = new ArrayList<>(day);
+
+            // Iterates over consecutive class pairs
+            for (int i = 0; i < dayList.size() - 1; i++) {
+                Class currClass = dayList.get(i);
+                Class nextClass = dayList.get(i + 1);
+
+                // Convert time to minutes
+                int currEndTime = currClass.endTime().getHour() * 60 + currClass.endTime().getMinute();
+                int nextStartTime = nextClass.startTime().getHour() * 60 + nextClass.startTime().getMinute();
+
+                // Check if the current class end time overlaps with the next class start time
+                if (currEndTime > nextStartTime) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Computes the average quality rating of professors in the schedule.
+     * This is based on each professor's RateMyProfessor quality rating.
+     *
+     * @param schedule the schedule for which to compute the average professor quality
+     * @return the average professor quality rating for the schedule
+     */
+    public static double computeAverageProfessorQuality(Schedule schedule) {
+        double professorQualitySum = 0.0;
+        int includedProfessorCount = schedule.sections().size();
+        // Used to create the summation of the quality of professors within the schedule.
+        for (Section section : schedule.sections()) {
+            // Ensures that only professors with data are included in calculation.
+            if (section.professor().quality() == (Double)null || section.professor().quality() == 0.0) {
+                // Decreases our professor count to prevent statistical misguidance.
+                includedProfessorCount--;
+            } else {
+                // Adds valid professors to our summation
+                professorQualitySum += section.professor().quality();
+            }
+        }
+
+        return professorQualitySum / includedProfessorCount;
+    }
+
+    /**
+     * Checks if schedule or constraints is null and throws an exception if it is.
+     *
+     * @param schedule the schedule to validate
+     * @param constraints the constraints to validate
+     */
+    public static void validateHard(Schedule schedule, HConstraints constraints) {
+        if(schedule == null || constraints == null) {
+            throw new IllegalArgumentException("Schedule and/or constraints cannot be null");
+        }
+    }
+
+    /**
+     * Computes the maximum distance between buildings for the classes in the schedule.
+     * This is the maximum distance that a student would have to travel
+     * between consecutive classes.
+     *
+     * @param schedule the schedule for which to compute the maximum distance
+     * @return the maximum distance between buildings for consecutive classes
+     */
+    public static double computeMaxDistance(Schedule schedule) {
+        if (schedule == null) {
+            throw new IllegalArgumentException("Schedule cannot be null");
+        }
+
+        double maxDistance = 0.0;
+
+        // Iterates over each day in the schedule
+        for (TreeSet<Class> day : schedule.days().values()) {
+            // Converts the TreeSet to List for direct indexing
+            List<Class> dayList = new ArrayList<>(day);
+
+            // Iterates over consecutive class pairs
+            for (int i = 0; i < dayList.size() - 1; i++) {
+                Class currClass = dayList.get(i);
+                Class nextClass = dayList.get(i + 1);
+
+                double lat1 = courseInformationService.getLatitude(currClass.buildingNumber());
+                double lon1 = courseInformationService.getLongitude(currClass.buildingNumber());
+                double lon2 = courseInformationService.getLongitude(nextClass.buildingNumber());
+                double lat2 = courseInformationService.getLatitude(nextClass.buildingNumber());
+
+                // distance between latitudes and longitudes
+                double dLat = Math.toRadians(lat2 - lat1);
+                double dLon = Math.toRadians(lon2 - lon1);
+
+                // convert to radians
+                lat1 = Math.toRadians(lat1);
+                lat2 = Math.toRadians(lat2);
+
+                // apply Haversine formula
+                double a = Math.pow(Math.sin(dLat / 2), 2) +
+                        Math.pow(Math.sin(dLon / 2), 2) *
+                                Math.cos(lat1) *
+                                Math.cos(lat2);
+
+                // Earth's radius in miles
+                double rad = 3960;
+                double c = 2 * Math.asin(Math.sqrt(a));
+                double distance = rad * c;
+
+                if (distance > maxDistance) {
+                    maxDistance = distance;
+                }
+            }
+        }
+
+        // dimensional analysis. Average human walking speed is 3 miles per hour.
+        // miles * (hours/miles) * (minutes/hours)
+        return maxDistance * (1/3) * (60);
+    }
+
+    /**
+     * Computes the average idle time between consecutive classes in the schedule.
+     * Idle time refers to the time gaps between two consecutive classes.
+     *
+     * @param schedule the schedule for which to compute the average idle time
+     * @return the average idle time between classes in the schedule in minutes
+     * @throws IllegalArgumentException if schedule is not valid
+     */
+    public static double computeAverageIdleTime(Schedule schedule) {
+        int countOfClassGaps = 0;
+        int sumOfTimeGaps = 0;
+
+        // Loop through the days
+        for (TreeSet<Class> day: schedule.days().values()){
+            int prevEndTime = -1;
+
+            // Loop through all the classes in a single day
+            for (Class _class: day){
+                int currStartTime = _class.startTime().getHour()*60 + _class.startTime().getMinute();
+                int currEndTime = _class.endTime().getHour()*60 + _class.endTime().getMinute();
+
+                // Checks for invalid schedules
+                if (currStartTime < prevEndTime){
+                    throw new IllegalArgumentException("Schedule contains time conflicts.");
+                }
+
+                // Only runs if there is a previous class in the current day
+                if (prevEndTime != -1){
+                    sumOfTimeGaps += currStartTime - prevEndTime;
+                    countOfClassGaps++;
+                }
+                prevEndTime = currEndTime;
+            }
+        }
+        if (countOfClassGaps == 0){
+            return 0;
+        }
+
+        return (double) sumOfTimeGaps / countOfClassGaps;
+    }
+
+
+
+    /**
+     * Computes the earliest start time of all classes in a schedule
+     *
+     * @param schedule the schedule for which to compute the earliest start time
+     * @return the earliest start time (in hours) as a double. For example, 4:30 pm would be represented as 16.5
+     */
+    public static double computeStartTime(Schedule schedule) {
+        LocalTime earliestStartTime = LocalTime.of(23,59,59);
+        for (Section eachSection : schedule.sections()) {
+            for (Class eachClass : eachSection.classes()) {
+                if (eachClass.startTime().isBefore(earliestStartTime)) {
+                    earliestStartTime = eachClass.startTime();
+                }
+            }
+        }
+        return earliestStartTime.getHour() + (double) earliestStartTime.getMinute() / 60;
+    }
+
+
+
+    /**
+     * Computes the latest start time of all classes in a schedule
+     *
+     * @param schedule the schedule for which to compute the latest start time
+     * @return the latest start time (in hours) as a double. For example, 4:30 pm would be represented as 16.5
+     */
+    private static double computeEndTime(Schedule schedule) {
+        LocalTime latestStartTime = LocalTime.of(0,0,0);
+        for (Section eachSection : schedule.sections()) {
+            for (Class eachClass : eachSection.classes()) {
+                if (eachClass.startTime().isAfter(latestStartTime)) {
+                    latestStartTime = eachClass.startTime();
+                }
+            }
+        }
+        return latestStartTime.getHour() + (double) latestStartTime.getMinute() / 60;
+    }
+
+
+
+    /**
+     * Determines whether a given schedule has zero classes on a given day
+     *
+     * @param schedule the schedule for which to compute whether it has a gap day or not
+     * @param gapDay the day that is being checked as a gap day or not
+     * @return {@code true} if the given schedule has no classes on the given day, {@code false} if it has at least one class
+     */
+    private static boolean computeGapDay(Schedule schedule, DayOfWeek gapDay) {
+        EnumMap<DayOfWeek, TreeSet<Class>> days = schedule.days();
+        TreeSet<Class> classes = days.get(gapDay);
+        return classes.isEmpty();
+    }
+
+
+
+    /**
+     * Computes the overall objective score for the given schedule based on weighted objectives.
+     * This method computes each objective, normalizes their values using min-max normalization, and computes a weighted sum.
+     * The weighted sum increases as averageProfessorScore increases and decreases as maxDistance and averageIdleTime increase.
+     *
+     * @param schedule the schedule to evaluate
+     *
+     * @return the overall objective score for the schedule
+     */
+    public static double computeOverallObjective(Schedule schedule) {
+        // Checks if the parameters are valid
+        if (schedule == null) {
+            throw new IllegalArgumentException("Parameters cannot be null");
+        }
+
+        // The minimum rating on rate my professor is 1.0(if they have ratings).
+        final double professorQualityMinimum = 1.0;
+        // The maximum rating on rate my professor is 5.0
+        final double professorQualityMaximum = 5.0;
+        // The minimum distance between classes is 0.0 if they are in the same building.
+        final double maxDistanceMinimum = 0.0;
+        // The highest distance shown in the document is 22.1, so 30 should be a good maximum for calculations.
+        final double maxDistanceMaximum = 30.0;
+        // The minimum average idle time is 0 which should only happen if the person has one class a day.
+        final double averageIdleTimeMinimum = 0;
+        // The earliest a class can start is 8:00 a.m. and latest a class can go is 9:00 p.m. which is 780 minutes between those times.
+        final double averageIdleTimeMaximum = 780;
+
+        // finds the values and then plugs them into the normalize function with the minimum and maximum.
+        double normalizedProfessorQuality = normalizeValue(computeAverageProfessorQuality(schedule), professorQualityMinimum, professorQualityMaximum);
+        double normalizedMaxDistance = normalizeValue(computeMaxDistance(schedule), maxDistanceMinimum, maxDistanceMaximum);
+        double normalizedAverageIdleTime = normalizeValue(computeAverageIdleTime(schedule), averageIdleTimeMinimum, averageIdleTimeMaximum);
+
+        // computes the weighted sum. normalizedMaxDistance and normalizedAverageIdleTime are being subtracted from 1 since
+        // the higher the value, the worse the schedule.
+        return normalizedProfessorQuality / 3 + (1 - normalizedMaxDistance) / 3 + (1 - normalizedAverageIdleTime) / 3;
+    }
+
+    public static double computeOverallObjectiveExtended(Schedule schedule, SConstraints softConstraints) {
+        // Checks if the parameters are valid
+        if (schedule == null) {
+            throw new IllegalArgumentException("Parameters cannot be null");
+        }
+
+        // The minimum rating on rate my professor is 1.0(if they have ratings).
+        final double professorQualityMinimum = 1.0;
+        // The maximum rating on rate my professor is 5.0
+        final double professorQualityMaximum = 5.0;
+        // The minimum distance between classes is 0.0 if they are in the same building.
+        final double maxDistanceMinimum = 0.0;
+        // The highest distance shown in the document is 22.1, so 30 should be a good maximum for calculations.
+        final double maxDistanceMaximum = 30.0;
+        // The minimum average idle time is 0 which should only happen if the person has one class a day.
+        final double averageIdleTimeMinimum = 0;
+        // The earliest a class can start is 8:00 a.m. and latest a class can go is 9:00 p.m. which is 780 minutes between those times.
+        final double averageIdleTimeMaximum = 780;
+
+        // The Earliest a class can start is 8 am and the latest a class can start is 9 pm.
+        final double prefTimeMinimum = 8.0;
+        final double prefTimeMaximum = 21.0;
+
+
+        // finds the values and then plugs them into the normalize function with the minimum and maximum.
+        double normalizedProfessorQuality = normalizeValue(computeAverageProfessorQuality(schedule), professorQualityMinimum, professorQualityMaximum);
+        double normalizedMaxDistance = normalizeValue(computeMaxDistance(schedule), maxDistanceMinimum, maxDistanceMaximum);
+        double normalizedAverageIdleTime = normalizeValue(computeAverageIdleTime(schedule), averageIdleTimeMinimum, averageIdleTimeMaximum);
+
+        // Taking an average of all the optional softConstraints and then multiply the average by 0.25.
+        double possSConstraintScore = 0;
+        int possSConstraintsCount = 0;
+
+        if (softConstraints.gapDay() != null) {
+            possSConstraintScore += computeGapDay(schedule, softConstraints.gapDay()) ? 1 : 0;
+            possSConstraintsCount++;
+        }
+        if (softConstraints.prefStartTime() != null) {
+            possSConstraintScore += normalizeValue(computeStartTime(schedule), prefTimeMinimum, prefTimeMaximum);
+            possSConstraintsCount++;
+        }
+        if (softConstraints.prefEndTime() != null) {
+            possSConstraintScore += 1 - normalizeValue(computeEndTime(schedule), prefTimeMinimum, prefTimeMaximum);
+            possSConstraintsCount++;
+        }
+
+        // Takes the sum and divides it by number of summed values, checks for when count = 0 so we don't divide by 0
+        possSConstraintScore = possSConstraintsCount == 0 ? 0 : possSConstraintScore / possSConstraintsCount;
+
+        // computes the weighted sum. normalizedMaxDistance and normalizedAverageIdleTime are being subtracted from 1 since
+        // the higher the value, the worse the schedule.
+        double output = normalizedProfessorQuality / 4 + (1 - normalizedMaxDistance) / 4;
+        output += (1 - normalizedAverageIdleTime) / 4;
+        output += (possSConstraintScore / 4);
+
+        return output;
+    }
+
+
+    /**
+     * Normalizes the values using min-max normalization and clips outliers
+     * to the min or the max.
+     *
+     * @param value the value to normalize
+     * @param max the maximum value that should normally be received
+     * @param min the minimum value that should normally be received
+     *
+     * @return the normalized value, between 0 and 1.
+     */
+    private static double normalizeValue(double value, double min, double max) {
+        // clips the value if below the minimum or above the maximum
+        if (value < min) {
+            return 0.0;
+        } else if (value > max) {
+            return 1.0;
+        } else {
+            // normalizes the values using min-max normalization
+            return (value - min) / (max - min);
+        }
+    }
+
+    /**
+     * Converts Sets containing Sections into arrays of ints for use of other teams.
+     *
+     * @param sections the set containing the sections to convert.
+     * @return the array of CRNs that represent the sections.
+     * */
+    public static int[] sectionsToInts(Set<Section> sections) {
+        int[] output = new int[sections.size()];
+        int i = 0;
+        for (Section section : sections) {
+            output[i] = section.crn();
+            i++;
+        }
+        return output;
+    }
+
+}
\ No newline at end of file
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Building/Building.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Building/Building.java
index e03f1c3a..4146b8e3 100644
--- a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Building/Building.java
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Building/Building.java
@@ -10,9 +10,16 @@
 import java.io.Serializable;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+
 /*
- * Java JPA entity represention for Building
+ * Java JPA entity representation for Building
  */
+
 @Entity
 public class Building implements Serializable {
     
@@ -20,24 +27,26 @@ public class Building implements Serializable {
      * Variables
      */
 
-    // serves as the id.
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private long buildingId;
-
-    /* This can't serve as the id, because many 
-    classes show the building number as NCRR or TBA/
-    */
-    private String buildingNumber;
+    @JsonAlias("Building Code")
+    private String buildingCode;  // Building Code
 
+    @JsonAlias("Name")
     private String name;
-
-    private String grid;
+    
+    @JsonAlias("Address")
+    private String address;
+    
+    @JsonAlias("Latitude")
+    private double latitude;
+    
+    @JsonAlias("Longitude")
+    private double longitude;
 
     /*
      * Relationships
-     * To-Do: add relationships (one-to-one, one-to-many, many-to-one, many-to-many) here
      */
+    @JsonManagedReference("building-classes")
     @OneToMany(mappedBy = "building")
     private List<ClassEntity> classes;
 
@@ -46,37 +55,26 @@ public class Building implements Serializable {
      */
 
     // Default constructor
-    public Building() {
-    }
-
-    // Constructor w/o buildingNumber
-    public Building(String name, String grid) {
-        this.name = name;
-        this.grid = grid;
-    }
+    public Building() {}
 
-    // Constructor w/ buildingNumber
-    public Building(String buildingNumber, String name, String grid) {
-        this.buildingNumber = buildingNumber;
+    // Constructor with parameters
+    public Building(String buildingCode, String name, String address, double latitude, double longitude) {
+        this.buildingCode = buildingCode;
         this.name = name;
-        this.grid = grid;
+        this.address = address;
+        this.latitude = latitude;
+        this.longitude = longitude;
     }
 
-    
     /*
      * Getters and Setters
      */
-
-    public String getBuildingNumber() {
-        return buildingNumber;
+    public String getBuildingCode() {
+        return buildingCode;
     }
 
-    public long getBuildingId() {
-        return buildingId;
-    }
-
-    public void setBuildingNumber(String buildingNumber) {
-        this.buildingNumber = buildingNumber;
+    public void setBuildingCode(String buildingCode) {
+        this.buildingCode = buildingCode;
     }
 
     public String getName() {
@@ -87,12 +85,28 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public String getGrid() {
-        return grid;
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public double getLatitude() {
+        return latitude;
     }
 
-    public void setGrid(String grid) {
-        this.grid = grid;
+    public void setLatitude(double latitude) {
+        this.latitude = latitude;
+    }
+
+    public double getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(double longitude) {
+        this.longitude = longitude;
     }
 
     public List<ClassEntity> getClasses() {
@@ -104,15 +118,16 @@ public void setClasses(List<ClassEntity> classes) {
     }
 
     /*
-     * toString
+     * toString Method
      */
     @Override
     public String toString() {
-        return "Building [ buildingNumber=" + buildingNumber 
-                + ", name='" + name 
-                + ", grid='" + grid 
-                + ']';
+        return "Building{" +
+                "buildingCode=" + buildingCode +
+                ", name='" + name + '\'' +
+                ", address='" + address + '\'' +
+                ", latitude=" + latitude +
+                ", longitude=" + longitude +
+                '}';
     }
-
-    
 }
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Building/BuildingRepository.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Building/BuildingRepository.java
index 8cb9e799..be699b71 100644
--- a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Building/BuildingRepository.java
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Building/BuildingRepository.java
@@ -3,12 +3,12 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
-public interface BuildingRepository extends JpaRepository<Building, Long>{
+public interface BuildingRepository extends JpaRepository<Building, String>{
     
     //This will get a building by its unique ID
-    @Query("SELECT b from Building b WHERE b.id = ?1")
-    Building findById(String id);
+    //@Query("SELECT b from Building b WHERE b.buildingCode = ?1")
+    Building findByBuildingCode(String buildingCode);
 
     //@Query("select u from Building where u.name = ?1")
-    //Building getByName(String name);
+    Building findByName(String name);
 }
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Class/ClassEntity.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Class/ClassEntity.java
index d4869a2f..36adf0df 100644
--- a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Class/ClassEntity.java
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Class/ClassEntity.java
@@ -1,5 +1,6 @@
 package edu.uga.devdogs.course_information.Class;
 
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
@@ -7,14 +8,21 @@
 import jakarta.persistence.ManyToOne;
 
 import java.io.Serializable;
+import java.time.LocalTime;
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 
 import edu.uga.devdogs.course_information.Building.Building;
 import edu.uga.devdogs.course_information.CourseSection.CourseSection;
 import edu.uga.devdogs.course_information.Professor.Professor;
+import edu.uga.devdogs.course_information.webscraping.Course2;
 
 /*
  * Java JPA entity represention for Class
  */
+
 @Entity
 public class ClassEntity implements Serializable{
     
@@ -24,13 +32,32 @@ public class ClassEntity implements Serializable{
 
     @Id
     @GeneratedValue
-    private int classId;
+    @Column(name = "class_id")
+    private long classId;
 
     private String days;
 
-    private  String startTime;
+    private  LocalTime endTime;
+
+    private  LocalTime startTime;
+
+    
+
+    public LocalTime getEndTime() {
+        return endTime;
+    }
 
-    private  String endTime;
+    public void setEndTime(LocalTime endTime) {
+        this.endTime = endTime;
+    }
+
+    public LocalTime getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(LocalTime startTime) {
+        this.startTime = startTime;
+    }
 
     private String room;
 
@@ -41,15 +68,18 @@ public class ClassEntity implements Serializable{
      */
 
     @ManyToOne
-    @JoinColumn(name = "course_section_id")
+    @JoinColumn(name = "course_section_id", referencedColumnName = "course_section_id")
+    @JsonBackReference("coursesection-classes")
     private CourseSection courseSection;
 
     @ManyToOne
-    @JoinColumn(name = "buildingNumber")
+    @JoinColumn(name = "building_code", referencedColumnName = "buildingCode")
+    @JsonBackReference("building-classes")
     private Building building;
 
     @ManyToOne
     @JoinColumn(name = "professor_id")
+    @JsonBackReference("professor-classes")
     private Professor professor;  
 
      /*
@@ -61,7 +91,7 @@ public ClassEntity() {
      }
 
      // Constructor w/o classID
-     public ClassEntity(String days, String startTime, String endTime, Building building, String room, String campus, CourseSection courseSection) {
+     public ClassEntity(String days, LocalTime startTime, LocalTime endTime, Building building, String room, String campus, CourseSection courseSection) {
          this.days = days;
          this.startTime = startTime;
          this.endTime = endTime;
@@ -69,25 +99,15 @@ public ClassEntity(String days, String startTime, String endTime, Building build
          this.room = room;
          this.campus = campus;
          this.courseSection = courseSection;
-     }
+    }
+
 
-     // Constructor w/ classID
-     public ClassEntity(int classId, String days, String startTime, String endTime, Building building, String room, String campus, CourseSection courseSection) {
-         this.classId = classId;
-         this.days = days;
-         this.startTime = startTime;
-         this.endTime = endTime;
-         this.building = building;
-         this.room = room;
-         this.campus = campus;
-         this.courseSection = courseSection;
-     }
 
     /*
     * Getters and Setters
     */
 
-    public int getClassId() {
+    public long getClassId() {
         return classId;
     }
 
@@ -102,22 +122,7 @@ public String getDays() {
     public void setDays(String days) {
         this.days = days;
     }
-
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
+    
 
     public Building getBuilding() {
         return building;
@@ -158,9 +163,18 @@ public void setCourseSection(CourseSection courseSection){
     public String toString() {
         return "Class [classId=" + classId
             + ", days=" + days 
-            + ", startTime=" + startTime 
+            + ", startTime=" + startTime
             + ", endTime=" + endTime
             + ", room=" + room
             + ", campus=" + campus + "]";
     }
+
+    public void updateFrom (Course2 course, LocalTime startTime, LocalTime endTime, Building building, Professor professor) {
+        this.days = course.getMeetingDays();
+        this.startTime = startTime;
+        this.endTime = endTime;
+        this.building = building;
+        this.campus = course.getCampus();
+        this.professor = professor;
+    }
 }
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Class/ClassRepository.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Class/ClassRepository.java
index ea1be950..9ffda095 100644
--- a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Class/ClassRepository.java
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Class/ClassRepository.java
@@ -11,23 +11,24 @@
 public interface ClassRepository extends JpaRepository<ClassEntity, Integer> {
 
     // Find all classes held on specific days (e.g., "MWF" or "TR")
-    List<ClassEntity> findAllByDays(String days);
+    List<Class> findAllByDays(String days);
 
     // Find classes that start at a specific time
-    List<ClassEntity> findAllByStartTime(String startTime);
+    //List<Class> findAllByStartTime(java.sql.Time startTime);
+
+    // Find classes that end between two times
+    //List<Class> findAllByEndTimeBetween(java.sql.Time startTime, java.sql.Time endTime);
 
     // Find classes in a specific building
-    List<ClassEntity> findAllByBuilding(Building building);
+    List<Class> findAllByBuilding(Building building);
 
     // Find classes by campus
-    List<ClassEntity> findAllByCampus(String campus);
+    List<Class> findAllByCampus(String campus);
 
     // Find classes by building and room number
-    List<ClassEntity> findAllByBuildingAndRoom(Building building, String room);
+    List<Class> findAllByBuildingAndRoom(Building building, String room);
 
     // Find a class by its ID
-    List<ClassEntity> findAllByClassId(int classId);
+    List<Class> findAllByClassId(int classId);
     
-    // Find a class by its Course Section ID
-    List<ClassEntity> findByCourseSection_Id(int courseSectionId);
-} 
+}
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Course/Course.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Course/Course.java
index 96525526..506a6e88 100644
--- a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Course/Course.java
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Course/Course.java
@@ -4,9 +4,19 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+
 import edu.uga.devdogs.course_information.CourseSection.CourseSection;
+import edu.uga.devdogs.course_information.webscraping.Course2;
+
 
 @Entity
+@Table(name = "course", uniqueConstraints = {
+    @UniqueConstraint(columnNames = {"subject", "courseNumber"})
+})
 public class Course implements Serializable {
     // Variables
     @Id
@@ -18,62 +28,60 @@ public class Course implements Serializable {
     private String subject;
     private String courseNumber;
     private String department;
+
+    @Column(name = "course_description", columnDefinition = "TEXT")
     private String courseDescription;
+    
     private String athenaTitle;
     private String gradingSystem;
 
     // Relationships
-    @OneToMany(mappedBy = "course")
+    @OneToMany(mappedBy = "course", cascade = CascadeType.ALL, fetch = FetchType.LAZY, orphanRemoval = true)
+    @JsonManagedReference("course-sections")
     private List<CourseSection> courseSections = new ArrayList<>();
     
-    private List<CourseSection> preRequisites;
-    private List<CourseSection> coRequisites;
-
     @ManyToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     @JoinTable(
-        name = "equiv_courses_junction", 
+        name = "pre_req_junction", 
         joinColumns = @JoinColumn(name = "course_id"), 
-        inverseJoinColumns = @JoinColumn(name = "equiv_course_id")
+        inverseJoinColumns = @JoinColumn(name = "prereq_course_id")
     )
-    List<Course> equivalentCourses = new ArrayList<>();
+    private List<Course> preRequisites = new ArrayList<>();
 
-    @ManyToMany
+    @ManyToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
     @JoinTable(
-        name = "pre_req_junction", 
+        name = "co_req_junction", 
         joinColumns = @JoinColumn(name = "course_id"), 
-        inverseJoinColumns = @JoinColumn(name = "prereq_course_id")
+        inverseJoinColumns = @JoinColumn(name = "coreq_course_id")
     )
-    List<Course> prerequisiteCourses = new ArrayList<>();
+    private List<Course> coRequisites = new ArrayList<>();
 
     @ElementCollection
     private List<String> semesters = new ArrayList<>();
 
-    // Default constructor with proper initialization
+    // Default constructor
     public Course() {
         this.courseSections = new ArrayList<>();
         this.preRequisites = new ArrayList<>();
         this.coRequisites = new ArrayList<>();
-        this.equivalentCourses = new ArrayList<>();
-        this.prerequisiteCourses = new ArrayList<>();
         this.semesters = new ArrayList<>();
     }
 
-    // Constructor that properly sets title parameter
-    public Course(String subject, String courseNumber, String title, String department, List<CourseSection> courseSections) {
-        this();  // Call default constructor for initialization
+    public Course(String subject, String courseNumber, String title, String department, List<CourseSection> courseSections, String courseDescription) {
+        this();
         this.subject = subject;
         this.courseNumber = courseNumber;
-        this.title = title;  // Fixed: now setting the title
+        this.title = title;
         this.department = department;
         if (courseSections != null) {
             this.courseSections = courseSections;
         }
+        this.courseDescription = courseDescription;
     }
 
-    // Full constructor for all fields
     public Course(String subject, String courseNumber, String title, String department, 
                  String courseDescription, String athenaTitle, String gradingSystem) {
-        this(); // Call default constructor for initialization
+        this();
         this.subject = subject;
         this.courseNumber = courseNumber;
         this.title = title;
@@ -83,11 +91,10 @@ public Course(String subject, String courseNumber, String title, String departme
         this.gradingSystem = gradingSystem;
     }
 
-    // Original constructor with fixes
     public Course(String subject, String courseNumber, String title, String department, 
-                 List<CourseSection> courseSections, List<CourseSection> preRequisites, 
-                 List<CourseSection> coRequisites) {    
-        this(); // Call default constructor for initialization
+                 List<CourseSection> courseSections, List<Course> preRequisites, 
+                 List<Course> coRequisites) {    
+        this();
         this.title = title;
         this.subject = subject;
         this.courseNumber = courseNumber;
@@ -103,12 +110,10 @@ public Course(String subject, String courseNumber, String title, String departme
         }
     }
 
-    // Full constructor with ID
     public Course(long courseId, String subject, String courseNumber, String title, String department,
             List<CourseSection> courseSections, String courseDescription, String athenaTitle,
-            List<Course> equivalentCourses, List<Course> prerequisiteCourses, List<String> semesters,
-            String gradingSystem) {
-        this(); // Call default constructor for initialization
+            List<String> semesters, String gradingSystem) {
+        this();
         this.courseId = courseId;
         this.subject = subject;
         this.courseNumber = courseNumber;
@@ -119,19 +124,13 @@ public Course(long courseId, String subject, String courseNumber, String title,
         }
         this.courseDescription = courseDescription;
         this.athenaTitle = athenaTitle;
-        if (equivalentCourses != null) {
-            this.equivalentCourses = equivalentCourses;
-        }
-        if (prerequisiteCourses != null) {
-            this.prerequisiteCourses = prerequisiteCourses;
-        }
         if (semesters != null) {
             this.semesters = semesters;
         }
         this.gradingSystem = gradingSystem;
     }
 
-    // Getters and setters...
+    // Getters and setters
     public long getCourseId() {
         return courseId;
     }
@@ -180,19 +179,19 @@ public void setCourseSections(List<CourseSection> courseSections) {
         this.courseSections = courseSections;
     }
 
-    public List<CourseSection> getPrerequisets(long id) {
+    public List<Course> getPreRequisites() {
         return preRequisites;
     }
 
-    public void setPrerequisites(List<CourseSection> preRequisites) {
+    public void setPreRequisites(List<Course> preRequisites) {
         this.preRequisites = preRequisites;
     }
 
-    public List<CourseSection> getCorequisites(long id) {
+    public List<Course> getCoRequisites() {
         return coRequisites;
     }
 
-    public void setCorequisites(List<CourseSection> coRequisites) {
+    public void setCoRequisites(List<Course> coRequisites) {
         this.coRequisites = coRequisites;
     }
 
@@ -212,22 +211,6 @@ public void setAthenaTitle(String athenaTitle) {
         this.athenaTitle = athenaTitle;
     }
 
-    public List<Course> getEquivalentCourses() {
-        return equivalentCourses;
-    }
-
-    public void setEquivalentCourses(List<Course> equivelantCourses) {
-        this.equivalentCourses = equivelantCourses;
-    }
-
-    public List<Course> getPrerequisiteCourses() {
-        return prerequisiteCourses;
-    }
-
-    public void setPrerequisiteCourses(List<Course> prerequisiteCourses) {
-        this.prerequisiteCourses = prerequisiteCourses;
-    }
-
     public List<String> getSemesters() {
         return semesters;
     }
@@ -243,7 +226,7 @@ public String getGradingSystem() {
     public void setGradingSystem(String gradingSystem) {
         this.gradingSystem = gradingSystem;
     }
- 
+
     @Override
     public String toString() {
         return "Course {" +
@@ -252,19 +235,25 @@ public String toString() {
             "subject='" + subject + '\'' + ", " +
             "courseNumber='" + courseNumber + '\'' + ", " +
             "department='" + department + '\'' + ", " +
-            "preRequisites=" + formatList(preRequisites) + ", " +
-            "coRequisites=" + formatList(coRequisites) +
+            "preRequisites=" + formatCourseList(preRequisites) + ", " +
+            "coRequisites=" + formatCourseList(coRequisites) +
             '}';
     }
 
-    private String formatList(List<CourseSection> list) {
+    private String formatCourseList(List<Course> list) {
         if (list == null || list.isEmpty()) {
             return "[]";
         }
         return list.stream()
-               .map(Object::toString)
+               .map(c -> c.getSubject() + " " + c.getCourseNumber())
                .reduce((s1, s2) -> s1 + ", " + s2)
                .map(result -> "[" + result + "]")
                .orElse("[]");
     }
-}
\ No newline at end of file
+
+    public void updateFrom(Course2 course) {
+        this.subject = course.getSubject();
+        this.title = course.getTitle();
+        this.department = course.getDepartment();
+    }
+}
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Course/CourseRepository.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Course/CourseRepository.java
index 89fd36b3..75021963 100644
--- a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Course/CourseRepository.java
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Course/CourseRepository.java
@@ -21,9 +21,9 @@ public interface CourseRepository extends JpaRepository<Course, Long> {
     // Find courses by department
     List<Course> findByDepartment(String department);
 
-    // Find all courses by a certain credit hour
-    @Query("SELECT c FROM Course c JOIN c.courseSections cs WHERE cs.creditHoursLow <= :creditHours AND cs.creditHoursHigh >= :creditHours")
-    List<Course> findAllCoursesByCreditHours(double creditHours);
+    // Find all courses by their subject and course number
+    Course findBySubjectAndCourseNumber(String subject, String courseNumber);
+    
 
     // Find all courses by the term they're offered in
     @Query("SELECT c FROM Course c WHERE :semester MEMBER OF c.semesters")
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/CourseInformationApplication.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/CourseInformationApplication.java
index 2e4060d0..c8fc76ef 100644
--- a/services/course-information/src/main/java/edu/uga/devdogs/course_information/CourseInformationApplication.java
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/CourseInformationApplication.java
@@ -1,14 +1,17 @@
 package edu.uga.devdogs.course_information;
 
-import java.sql.Time;
-import java.util.List;
-import java.util.stream.Stream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.type.CollectionType;
 
+import edu.uga.devdogs.course_information.Professor.Professor;
+import edu.uga.devdogs.course_information.Professor.ProfessorRepository;
 import edu.uga.devdogs.course_information.Building.Building;
 import edu.uga.devdogs.course_information.Building.BuildingRepository;
 import edu.uga.devdogs.course_information.Class.ClassEntity;
@@ -17,96 +20,251 @@
 import edu.uga.devdogs.course_information.Course.CourseRepository;
 import edu.uga.devdogs.course_information.CourseSection.CourseSection;
 import edu.uga.devdogs.course_information.CourseSection.CourseSectionRepository;
+import edu.uga.devdogs.course_information.webscraping.DescriptionScraper;
+import edu.uga.devdogs.course_information.webscraping.Course2;
+import edu.uga.devdogs.course_information.webscraping.Pdf;
+
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.firefox.FirefoxDriver;
+import org.openqa.selenium.firefox.FirefoxOptions;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.annotation.Order;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.transaction.annotation.Transactional;
 
 @SpringBootApplication
+@EnableTransactionManagement
 public class CourseInformationApplication {
 
+    private final CourseRepository courseRepository;
+    private final BuildingRepository buildingRepository;
+    private final ProfessorRepository professorRepository;
+
+    @Value("${update.buildings}")
+    private boolean updateBuildings;
+
+    @Value("${pdf.input.dir}")
+    private String inputDirectory;
+
+    CourseInformationApplication(BuildingRepository buildingRepository, CourseRepository courseRepository, ProfessorRepository professorRepository) {
+        this.courseRepository = courseRepository;
+        this.buildingRepository = buildingRepository;
+        this.professorRepository = professorRepository;
+    }
+
     public static void main(String[] args) {
         SpringApplication.run(CourseInformationApplication.class, args);
     }
 
+    // Helper function to check if the application is running from a JAR
+    private boolean isRunningFromJar() {
+        String classPath = System.getProperty("java.class.path");
+        return classPath.contains(".jar");
+    }
+
     @Bean
+    @Order(1)
+    CommandLineRunner buildingCommandLineRunner(BuildingRepository buildingRepository) {
+        return args -> {
+            if (!updateBuildings) {
+                System.out.println("Skipping building data update as per configuration.");
+                return;
+            }
+
+            String buildingsJsonPath;
+            if (isRunningFromJar()) {
+                buildingsJsonPath = "BOOT-INF/classes/buildingData/AthensBuildingData.json";
+            } else {
+                buildingsJsonPath = "buildingData/AthensBuildingData.json"; // Update this path to the local one
+            }
+
+            ClassPathResource resource = new ClassPathResource(buildingsJsonPath);
+            if (!resource.exists()) {
+                System.err.println("File not found at path: " + buildingsJsonPath);
+                return;
+            }
+
+            try (InputStream inputStream = resource.getInputStream()) {
+                System.out.println("Reading buildings.json...");
+                ObjectMapper objectMapper = new ObjectMapper();
+                CollectionType listType = objectMapper.getTypeFactory().constructCollectionType(List.class, Building.class);
+                List<Building> buildings = objectMapper.readValue(inputStream, listType);
+                List<Building> buildingsToSave = new ArrayList<>();
+                for (Building building : buildings) {
+                    if (!buildingRepository.existsById(building.getBuildingCode())) {
+                        buildingsToSave.add(building);
+                    }
+                }
+                if (!buildingsToSave.isEmpty()) {
+                    buildingRepository.saveAll(buildingsToSave);
+                    System.out.println("Buildings saved successfully.");
+                } else {
+                    System.out.println("No new buildings to save.");
+                }
+            } catch (IOException e) {
+                System.err.println("Failed to read or parse buildings.json: " + e.getMessage());
+            }
+        };
+    }
+
+    @Bean
+    @Order(2)
+    @Transactional
+    @Scheduled(cron = "0 0 4 * * *", zone = "America/New_York") // 4:00 AM EST
     CommandLineRunner courseSecCommandLineRunner(
-        CourseSectionRepository courseSectionRepository,
-        CourseRepository courseRepository,
-        ClassRepository classRepository,
-        BuildingRepository buildingRepository) {
-        
+            CourseSectionRepository courseSectionRepository,
+            CourseRepository courseRepository,
+            ClassRepository classRepository,
+            BuildingRepository buildingRepository,
+            ProfessorRepository professorRepository) {
         return args -> {
-            // Create Buildings
-            Building building1 = new Building("2438", "CAGTECH", "F - 6");
-            Building building2 = new Building("46", "Caldwell Hall", "C - 1");
-            Building building3 = new Building("2118", "Campus Mail/Environmental Safety", "E - 6");
-            Building building4 = new Building("1637", "Campus Transit Facility", "D - 8");
-            Building building5 = new Building("31", "Candler Hall", "C - 1");
-            Building building6 = new Building("1110", "Carlton Street Deck", "B - 4");
-            Building building7 = new Building("2419", "CCRC", "E - 7");
-            Building building8 = new Building("2127", "Center for Applied Isotope Study", "E - 6");
-            Building building9 = new Building("2395", "Center for Molecular Medicine", "E - 7");
-            Building building10 = new Building("178", "Central Campus Mech. Building", "C - 2");
+            FirefoxOptions options = new FirefoxOptions();
+            options.addArguments("--headless");
+            WebDriver driver = new FirefoxDriver(options);
+            DescriptionScraper scraper = new DescriptionScraper(driver);
 
-            buildingRepository.saveAll(List.of(building1, building2, building3, building4, building5, 
-                                               building6, building7, building8, building9, building10));
+            List<Course2> courses = Pdf.parsePdf("spring", inputDirectory);
 
-            // Create Courses
-            Course course1 = new Course("physiology", "420", "pain", "Mary Francis early education", null);
-            Course course2 = new Course("math", "1101", "intro", "Department of Mathematics", null);
+            List<Course> courseEntities = new ArrayList<>();
+            List<ClassEntity> classEntities = new ArrayList<>();
+            Set<String> processedCourses = new HashSet<>();
+            Map<String, Integer> professorIdCache = new HashMap<>();
+            Set<Integer> processedCrns = new HashSet<>();
 
-            course1.setCourseDescription("pain");
-            course1.setSemesters(Stream.of("Spring", "Summer").toList());
+            for (Course2 course : courses) {
+                if (course.getCrn() == 0 || processedCrns.contains(course.getCrn())) {
+                    continue; // Skip invalid or duplicate CRNs
+                }
 
-            course2.setCourseDescription("intro");
-            course2.setSemesters(Stream.of("Fall", "Spring").toList());
+                int crn = course.getCrn();
+                if (crn < 10000 || crn > 99999) {
+                    System.out.println("Skipping invalid CRN: " + crn);
+                    continue;
+                }
 
-            courseRepository.saveAll(List.of(course1, course2));
+                processedCrns.add(crn);
 
-            // Create Course Sections
-            CourseSection section1 = new CourseSection(
-                123456, 4, 'A', 1.0, 4.0, "Barnes", 2, 40, 40, 2024, course1, null
-            );
+                String courseKey = course.getSubject() + "-" + course.getCourseNumber();
+                if (processedCourses.contains(courseKey)) continue;
 
-            CourseSection section2 = new CourseSection(
-                654321, 3, 'B', 2.0, 3.5, "Smith", 1, 30, 30, 2024, course2, null
-            );
+                // Parse credit hours (default to 3 if not parseable)
+                String creditHoursStr = course.getCreditHours().replaceAll("[^0-9.-]", "").trim();
+                int creditHours = 3;
+                if (creditHoursStr.contains("-")) {
+                    try {
+                        creditHours = (int) Float.parseFloat(creditHoursStr.split("-")[0].trim());
+                    } catch (NumberFormatException e) {
+                        System.err.println("Invalid credit hours: " + course.getCreditHours());
+                    }
+                }
 
-            courseSectionRepository.saveAll(List.of(section1, section2));
+                // Parse meeting times
+                String[] times = course.getMeetingTimes().split("-");
+                String startTime = times.length > 0 ? times[0].trim() : "";
+                String endTime = times.length > 1 ? times[1].trim() : "";
+                LocalTime start = parseTime(startTime);
+                LocalTime end = parseTime(endTime);
 
-            // Create ClassEntities
-            ClassEntity class1 = new ClassEntity(
-                "MWF", "08:00:00", "09:15:00", building10, "101", "Main Campus", section1
-            );
+                // Lookup or create Professor using cached value
+                String professorLastName = course.getProfessor();
+                Professor existingProfessor = null;
+                if (professorLastName != null && !professorLastName.trim().isEmpty()) {
+                    professorLastName = professorLastName.trim();
+                    if (professorIdCache.containsKey(professorLastName)) {
+                        Integer cachedId = professorIdCache.get(professorLastName);
+                        existingProfessor = professorRepository.findById(cachedId).orElse(null);
+                    } else {
+                        Professor newProfessor = new Professor("", professorLastName, 10, 3.0f, 3.0f, 50, course.getDepartment());
+                        professorRepository.saveAndFlush(newProfessor);
+                        professorIdCache.put(professorLastName, newProfessor.getProfessorId());
+                        existingProfessor = newProfessor;
+                    }
+                }
 
-            ClassEntity class2 = new ClassEntity(
-                "TR", "13:00:00", "14:15:00", building6, "205", "North Campus", section1
-            );
+                // Lookup Course entity
+                Course existingCourse = courseRepository.findBySubjectAndCourseNumber(course.getSubject(), course.getCourseNumber());
+                Course courseEntity;
+                if (existingCourse == null) {
+                    String description = "Description not found";
+                    try {
+                        description = scraper.getCourseDescription(course.getSubject(), course.getCourseNumber());
+                    } catch (Exception e) {
+                        System.err.println("Error fetching description for " + course.getSubject() + " " + course.getCourseNumber());
+                        description = "Description not found"; // fallback
+                    }
+                    courseEntity = new Course(course.getSubject(), course.getCourseNumber(), course.getTitle(), course.getDepartment(), new ArrayList<>(), description);
+                    courseEntity = courseRepository.saveAndFlush(courseEntity);
+                    courseEntities.add(courseEntity);
+                } else {
+                    existingCourse.updateFrom(course);
+                    courseEntity = courseRepository.saveAndFlush(existingCourse);
+                }
+                processedCourses.add(courseKey);
 
-            ClassEntity class3 = new ClassEntity(
-                "MWF", "10:00:00", "11:15:00", building2, "301", "Main Campus", section2
-            );
+                // Create or update CourseSection
+                CourseSection courseSection = courseSectionRepository.findByCrn(course.getCrn());
+                if (courseSection == null) {
+                    courseSection = new CourseSection();
+                    courseSection.setCrn(course.getCrn());
+                    courseEntity.getCourseSections().add(courseSection); // only add if new
+                }
+                
+                courseSection.updateFrom(course, start, end);
+                courseSection.setCreditHours(creditHours);
+                courseSection.setCourse(courseEntity);
+                courseSection = courseSectionRepository.saveAndFlush(courseSection);
 
-            ClassEntity class4 = new ClassEntity(
-                "TR", "15:00:00", "16:15:00", building5, "102", "North Campus", section2
-            );
+                // Lookup Building
+                Building building = buildingRepository.findByBuildingCode(course.getBuilding());
+                if (building == null) {
+                    System.err.println("Building not found: " + course.getBuilding());
+                    continue;
+                }
 
-            classRepository.saveAll(List.of(class1, class2, class3, class4));
+                // Create new ClassEntity for this section
+                ClassEntity classEntity = new ClassEntity();
+                classEntity.updateFrom(course, start, end, building, existingProfessor);
+                classEntity.setCourseSection(courseSection);
 
-            // Link classes to sections
-            section1.setClasses(List.of(class1, class2));
-            section2.setClasses(List.of(class3, class4));
-            courseSectionRepository.saveAll(List.of(section1, section2));
+                // Collect the new section and class for later saving
+                classEntities.add(classEntity);
+            }
 
-            // Print Test Data
-            System.out.println("\n\n\n\n\n\nAll CourseSections for Instructor Barnes:");
-            System.out.println(courseSectionRepository.findAllByInstructor("Barnes"));
+            System.out.println("Saving to database...");
+            // Now, because Course already cascades to CourseSections, we only need to save/update Courses and ClassEntities.
+            courseRepository.saveAll(courseEntities);
 
-            System.out.println("\nAll Courses with Subject 'physiology':");
-            System.out.println(courseRepository.findAllBySubject("physiology"));
+            courseRepository.flush();
+            courseSectionRepository.flush();
 
-            System.out.println("\nBuilding with ID '178':");
-            System.out.println(buildingRepository.findById("178"));
 
-            System.out.println("\nAll Courses with Spring Semester:");
-            System.out.println(courseRepository.findAllBySemester("Spring"));
+            System.out.println("Saved courses and course sections successfully.");
+            classRepository.saveAll(classEntities);
+            classRepository.flush();
+
+            driver.quit();
+            System.out.println("Database updated successfully.");
         };
     }
-}
\ No newline at end of file
+
+    private LocalTime parseTime(String time) {
+        try {
+            if (time == null || time.isEmpty() || time.trim().equalsIgnoreCase("TBA")) {
+                return null;
+            }
+            // Normalize by removing spaces
+            String normalized = time.toUpperCase().replaceAll("\\s+", "");
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("hh:mma");
+            return LocalTime.parse(normalized, formatter);
+        } catch (DateTimeParseException e) {
+            System.err.println("Invalid time format: " + time);
+            return null;
+        }
+    }
+}
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/CourseSection/CourseSection.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/CourseSection/CourseSection.java
index 0179597f..8029253c 100644
--- a/services/course-information/src/main/java/edu/uga/devdogs/course_information/CourseSection/CourseSection.java
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/CourseSection/CourseSection.java
@@ -1,10 +1,17 @@
 package edu.uga.devdogs.course_information.CourseSection;
 
 import java.io.Serializable;
+import java.time.LocalTime;
 import java.util.List;
 
-import edu.uga.devdogs.course_information.Course.Course;
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+
 import edu.uga.devdogs.course_information.Class.ClassEntity;
+import edu.uga.devdogs.course_information.Course.Course;
+import edu.uga.devdogs.course_information.webscraping.Course2;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -15,6 +22,11 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+
+
+
+
 
 @Entity
 public class CourseSection implements Serializable {
@@ -22,21 +34,20 @@ public class CourseSection implements Serializable {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "course_section_id")
-    private long courseSectionId;
+    private Long courseSectionId;
 
+    @Column(nullable = false, unique = true)
     private int crn;
 
-    private int sec;
+    private String sec;
 
     private char stat;
 
-    private double creditHoursLow;
-
-    private double creditHoursHigh;
+    @Column(nullable = false) 
+    private int creditHours = 3;
 
-    private String instructor;
 
-    private int term;
+    private String term;
 
     private int classSize;
 
@@ -46,6 +57,41 @@ public class CourseSection implements Serializable {
 
     private String daysOfTheWeek;
 
+    private LocalTime startTime;
+
+    
+    private LocalTime endTime;
+
+    // instructor is the name
+    private String instructor;
+
+    public void setInstructor(String instructor) {
+        this.instructor = instructor;
+    }
+
+    public String getInstructor() {
+        return instructor;
+    }
+
+
+    public LocalTime getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(LocalTime startTime) {
+        this.startTime = startTime;
+    }
+
+    public LocalTime getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(LocalTime endTime) {
+        this.endTime = endTime;
+    }
+
+    
+
     public String getDaysOfTheWeek() {
         return daysOfTheWeek;
     }
@@ -55,36 +101,47 @@ public void setDaysOfTheWeek(String daysOfTheWeek) {
     }
 
     // Relationships
+    @JsonBackReference("course-sections")
     @ManyToOne
-    @JoinColumn(name = "course_Id", nullable = false)
+    @JoinColumn(name = "course_id", referencedColumnName = "course_id")
     private Course course;
 
     @OneToMany(mappedBy = "courseSection", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @JsonManagedReference("coursesection-classes")
     private List<ClassEntity> classes;
 
-    @ManyToOne
-    @JoinColumn(name = "class_id")
-    private ClassEntity classEntity;
+
+
+    
+    public List<ClassEntity> getClasses() {
+        return classes;
+    }
+
+    public void setClasses(List<ClassEntity> classes) {
+        this.classes = classes;
+    }
+
 
 
 
     // Constructors, getters, setters, and toString 
     public CourseSection() {}
 
-    public CourseSection(int crn, int sec, char stat, double creditHoursLow, double creditHoursHigh, String instructor,
-        int term, int classSize, int seatsAvailable, int year, Course course, List<ClassEntity> classes) {
+    public CourseSection(int crn, String sec, char stat, int creditHours, String instructor,
+        String term, int classSize, int seatsAvailable, int year, Course course, List<ClassEntity> classes, String daysOfTheWeek, LocalTime startTime, LocalTime endTime) {
     this.crn = crn;
     this.sec = sec;
     this.stat = stat;
-    this.creditHoursLow = creditHoursLow;
-    this.creditHoursHigh = creditHoursHigh;
+    this.creditHours = creditHours;
     this.instructor = instructor;
     this.term = term;
     this.classSize = classSize;
     this.seatsAvailable = seatsAvailable;
     this.year = year;
     this.course = course;
-    this.classes = classes;
+    this.daysOfTheWeek = daysOfTheWeek;
+    this.startTime = startTime;
+    this.endTime = endTime;
 }
 
     public long getId() {
@@ -103,11 +160,11 @@ public void setCrn(int crn) {
         this.crn = crn;
     }
 
-    public int getSec() {
+    public String getSec() {
         return sec;
     }
 
-    public void setSec(int sec) {
+    public void setSec(String sec) {
         this.sec = sec;
     }
 
@@ -115,39 +172,28 @@ public char getStat() {
         return stat;
     }
 
+
     public void setStat(char stat) {
         this.stat = stat;
     }
 
-    public double getCreditHoursLow() {
-        return creditHoursLow;
+    public int getCreditHours() {
+        return creditHours;
     }
 
-    public void setCreditHoursLow(double creditHoursLow) {
-        this.creditHoursLow = creditHoursLow;
+    public void setCreditHours(int creditHours) {
+        this.creditHours = creditHours;
     }
 
-    public double getCreditHoursHigh() {
-        return creditHoursHigh;
-    }
 
-    public void setCreditHoursHigh(double creditHoursHigh) {
-        this.creditHoursHigh = creditHoursHigh;
-    }
 
-    public String getInstructor() {
-        return instructor;
-    }
 
-    public void setInstructor(String instructor) {
-        this.instructor = instructor;
-    }
 
-    public int getTerm() {
+    public String getTerm() {
         return term;
     }
 
-    public void setTerm(int term) {
+    public void setTerm(String term) {
         this.term = term;
     }
 
@@ -179,26 +225,34 @@ public Course getCourse() {
         return course;
     }
 
-    public void setCourse(Course course) {
-        this.course = course;
+    public Long getCourseSectionId() {
+        return courseSectionId;
     }
 
-    public List<ClassEntity> getClasses() {
-        return classes;
+    public void setCourse(Course course) {
+        this.course = course;
     }
 
-    public void setClasses(List<ClassEntity> classes) {
-        this.classes = classes;
-    }
 
     @Override
     public String toString() {
         return "CourseSection [courseSectionId=" + courseSectionId + ", crn=" + crn + ", sec=" + sec + ", stat="
-                + stat + ", creditHoursLow=" + creditHoursLow + ", creditHoursHigh=" + creditHoursHigh + ", instructor="
+                + stat + ", creditHoursLow=" + creditHours + ", instructor="
                 + instructor + ", term=" + term + ", classSize=" + classSize + ", seatsAvailable=" + seatsAvailable
                 + ", year=" + year + "]";
     }
 
+    public void updateFrom(Course2 course, LocalTime start, LocalTime end) {
+        this.instructor = course.getProfessor();
+        this.sec = course.getSec();
+        this.startTime = start;
+        this.endTime = end;
+        this.daysOfTheWeek = course.getMeetingDays();
+        this.seatsAvailable = course.getAvailableSeats();
+        this.classSize = course.getClassSize();
+    }
+
+    
 
 }
 
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/CourseSection/CourseSectionRepository.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/CourseSection/CourseSectionRepository.java
index 353f0bbb..febe0833 100644
--- a/services/course-information/src/main/java/edu/uga/devdogs/course_information/CourseSection/CourseSectionRepository.java
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/CourseSection/CourseSectionRepository.java
@@ -5,6 +5,7 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.time.LocalTime;
 import java.util.List;
 
 public interface CourseSectionRepository extends JpaRepository<CourseSection, Long> {
@@ -17,9 +18,12 @@ public interface CourseSectionRepository extends JpaRepository<CourseSection, Lo
     List<CourseSection> findAllByInstructor(String instructor);
 
     // Get a list of course sections that match the time range
-    @Query("SELECT cs FROM CourseSection cs JOIN cs.classEntity c WHERE c.startTime <= :time AND c.endTime >= :time")
-    List<CourseSection> findAllCourseSectionsByTime(@Param("time") String time);
+    //@Query("SELECT cs FROM CourseSection cs JOIN cs.classEntity c WHERE c.startTime >= :startTime AND c.endTime <= :endTime")
+    List<CourseSection> findByStartTimeGreaterThanEqualAndEndTimeLessThanEqual(LocalTime start, LocalTime end);
+
+    List<Course> findAllCourseSectionsByCreditHours(int creditHours);
 
     // Find a course section by its CRN
     CourseSection findByCrn(Integer crn);
+
 }
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Professor/Professor.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Professor/Professor.java
index bbe124b7..ddb45e37 100644
--- a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Professor/Professor.java
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Professor/Professor.java
@@ -6,17 +6,24 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
 
 import java.io.Serializable;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+
 import edu.uga.devdogs.course_information.Class.ClassEntity;
 
+
+
 @Entity
 public class Professor implements Serializable {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private int professorId;
 
     private String firstName;
@@ -25,24 +32,28 @@ public class Professor implements Serializable {
     private float averageRating = 0.0f;
     private float difficultyRating = 0.0f;
     private int wouldTakeAgainRating;
+    private String department;
+
 
-    @OneToMany(mappedBy = "professor",
-    fetch = FetchType.LAZY
-    )
+    @OneToMany(mappedBy = "professor", fetch = FetchType.LAZY)
+    @JsonManagedReference("professor-classes")
     private List<ClassEntity> classes;
 
+
     // Default constructor
-    public Professor() {}
+    public Professor() {
+
+    }
 
     // Constructor without ID
-    public Professor(String firstName, String lastName, int totalReviews, float averageRating, float difficultyRating, int wouldTakeAgainRating, List<ClassEntity> classes) {
+    public Professor(String firstName, String lastName, int totalReviews, float rating, float difficultyRating, int wouldTakeAgainRating, String department) {
         this.firstName = firstName;
         this.lastName = lastName;
         this.totalReviews = totalReviews;
-        this.averageRating = averageRating;
+        this.averageRating = rating;
         this.difficultyRating = difficultyRating;
         this.wouldTakeAgainRating = wouldTakeAgainRating;
-        this.classes = classes;
+        this.department = department;
     }
 
     // Constructor with ID
@@ -65,6 +76,14 @@ public void setProfessorId(int professorId) {
         this.professorId = professorId;
     }
 
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
     public String getFirstName() {
         return firstName;
     }
@@ -120,4 +139,9 @@ public List<ClassEntity> getClasses() {
     public void setClasses(List<ClassEntity> classes) {
         this.classes = classes;
     }
+
+    public Professor orElseThrow(Object object) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'orElseThrow'");
+    }
 }
\ No newline at end of file
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Professor/ProfessorRepository.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Professor/ProfessorRepository.java
index 3b6b69d1..f1412181 100644
--- a/services/course-information/src/main/java/edu/uga/devdogs/course_information/Professor/ProfessorRepository.java
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/Professor/ProfessorRepository.java
@@ -6,7 +6,6 @@
 
 @Repository
 public interface ProfessorRepository extends JpaRepository<Professor, Integer> {
-
     @Query("SELECT p FROM Professor p WHERE p.professorId = ?1")
     Professor findById(int id);
 
@@ -14,5 +13,7 @@ public interface ProfessorRepository extends JpaRepository<Professor, Integer> {
     Professor findByLastName(String lastName);
 
     Professor findByLastNameAndFirstNameIgnoreCase(String lastName, String firstName);
+
+    Professor findByLastNameAndDepartment(String lastName, String department);
     
 }
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/controller/CourseInfoController.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/controller/CourseInfoController.java
index ae3be07d..3ec4965e 100644
--- a/services/course-information/src/main/java/edu/uga/devdogs/course_information/controller/CourseInfoController.java
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/controller/CourseInfoController.java
@@ -45,10 +45,44 @@ public CourseInfoController(CourseInformationService courseInformationService) {
         this.courseInformationService = courseInformationService;
     }
 
+    /**
+     * Returns the details of a specified CRN.
+     *
+     * @param crn The CRN of the section
+     * @return returns a section object for the CRN
+     */
+    @Operation(summary = "get section by crn", description = "Retrieves a section from the given CRN.")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "Section found"),
+            @ApiResponse(responseCode = "400", description = "Invalid CRN"),
+            @ApiResponse(responseCode = "500", description = "Internal server error")
+    })
+    @GetMapping("/section-by-crn")
+    @Tag(name="course-information")
+    public ResponseEntity<CourseSection> getSectionDetailsByCrn(@RequestParam String crn) {
+
+        //return 400 for empty CRN
+        if (crn.isEmpty()) {
+            return ResponseEntity.badRequest().body(null);
+        }
+        try {
+            //Call method to get section details
+            CourseSection sectionDetails = courseInformationService.getSectionDetailsByCrn(crn);
+
+            //Return the section if found
+            return ResponseEntity.ok(sectionDetails);
+
+        } catch (Exception e) {
+
+            //Return 500 if a server error occurs
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
+        }
+    }
+
    
     /**
      * Asks for list of course information that relates to the 
-     * @param professor given. Not in use as of 3/10/25.
+     * @param professor given.
      * 
      * @param professor name of the professor teaching the course
      * @return course information list that's related to the given professor.
@@ -111,93 +145,34 @@ public ResponseEntity<List<Course>> getCoursesByMajor(@RequestParam String major
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
         }
     }
-
+  
     /**
-     * Returns the details of a specified CRN. Not in use as of 3/10/25.
-     * 
-     * @param crn The CRN of the section
-     * @return returns a section object for the CRN
+     * Retrieves course details for a given CRN.
+     *
+     * @param crn the course reference number for which to retrieve course details
+     * @return Course object containing details about the course associated with the CRN
      */
-    @Operation(summary = "get section by crn", description = "Retrieves a section from the given CRN.")
+    @Operation(summary = "Get course details by crn", description = "Retrieves information about a course based on a given CRN.")
     @ApiResponses(value = {
-        @ApiResponse(responseCode = "200", description = "Section found"),
+        @ApiResponse(responseCode = "200", description = "Course found"),
         @ApiResponse(responseCode = "400", description = "Invalid CRN"),
         @ApiResponse(responseCode = "500", description = "Internal server error")
     })
-    @GetMapping("/section-by-crn")
+    @GetMapping("/course-by-crn")
     @Tag(name="course-information")
-    public ResponseEntity<CourseSection> getCourseEntity(@RequestParam String crn) {
-
-        //return 400 for empty CRN
+    public ResponseEntity<Course> getCourseDetailsByCrn(@RequestParam String crn) {
         if (crn.isEmpty()) {
             return ResponseEntity.badRequest().body(null);
         }
-        try {
-            //Call method to get section details
-            CourseSection sectionDetails = courseInformationService.getSectionDetailsByCrn(crn);
-
-            //Return the section if found
-            return ResponseEntity.ok(sectionDetails);
-
-        } catch (Exception e) {
-
-            //Return 500 if a server error occurs
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
-        }
-    }
 
-    /**
-     * Retrieves a list of all building objects. Not in use as of 3/10/25.
-     *
-     * @return A list of all building objects in JSON format
-     */
-    @Operation(summary = "Get all buildings", description = "Retrieves a list of all building objects.")
-    @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "Buildings found"),
-            @ApiResponse(responseCode = "500", description = "Internal server error")
-    })
-    @GetMapping("/buildings")
-    @Tag(name="course-information")
-    public ResponseEntity<List<Building>> getAllBuildings() {
         try {
-            List<Building> buildings = courseInformationService.getAllBuildings();
-            return ResponseEntity.ok(buildings);
+            Course courseDetails = courseInformationService.getCourseDetailsByCrn(crn);
+            return ResponseEntity.ok(courseDetails);
         } catch (Exception e) {
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
         }
     }
-
-    /**
-     * Gets a course's special type (e.g. honors/lab/online) from a course ID. Not in use as of 3/10/25.
-     *
-     * @param courseId The course ID of the course to find the special types.
-     * @return A list of Strings that correspond to the special types of that course.
-     */
-    @Operation(summary = "Get special course type by crn", description = "Retrieves if the section is honors, online, or lab based on given crn")
-    @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "Course found"),
-            @ApiResponse(responseCode = "400", description = "Invalid course CRN"),
-            @ApiResponse(responseCode = "500", description = "Internal server error")
-    })
-    @GetMapping("/course/specialCourseTypes")
-    public ResponseEntity<List<String>> getSpecialCourseTypesFromId(
-            @RequestParam(value = "crn", required = true) String courseId
-    ) {
-        if (courseId == null || courseId.isEmpty()) {
-            return ResponseEntity.badRequest().body(Collections.emptyList());
-        }
-
-        try {
-            List<String> specialCourseType = new ArrayList<>();
-            specialCourseType.add(courseInformationService.getCourseTypeById(courseId));
-
-            return ResponseEntity.ok(specialCourseType);
-
-        } catch (Exception e) {
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(Collections.singletonList("An error occurred while fetching course types."));
-        }
-    }
-
+  
     /**
      * Retrieves a list of all academic subjects at UGA .
      *
@@ -226,108 +201,6 @@ public ResponseEntity<List<String>> getAllSubjects() {
         }
     }
 
-
-    /**
-     * Retrieves course information based on the given term, like Fall or Summer.
-     * Not in use as of 3/10/25.
-     *
-     * @param term The term for which the course has to be in.
-     * @return A "Course" List containing the course information from a specific term.
-     */
-    @Operation(summary = "Get courses by term", description = "Retrieves courses based on the given term")
-    @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "Course found"),
-            @ApiResponse(responseCode = "400", description = "Invalid term"),
-            @ApiResponse(responseCode = "500", description = "Internal Server Error")
-    })
-    @GetMapping("/term")
-    @Tag(name = "bulletin")
-    public ResponseEntity<List<Course>> getCourseByTerm(@RequestParam(value = "term", required = true) String term) {
-
-        if(term.isEmpty()){
-            return ResponseEntity.badRequest().body(null); //Returns 400 if parameter isn't given
-        }
-
-        try {
-            List<Course> courseList = courseInformationService.getCoursesByTerm(term); //fetches the courses based on term
-
-            return ResponseEntity.ok(courseList); //Returns course information if everything is correct
-
-        } catch (Exception e) {
-            //Catches any server problems or exceptions
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
-        }
-
-    }
-
-    /**
-     * Retrieves co-requisites for a given course ID or CRN. Not in use as of 3/10/25.
-     *
-     * @param courseId The ID of the course to retrieve co-requisites for.
-     * @return A list of course objects that are co-requisites for the given course.
-     */
-    @Operation(summary = "Get coreqs by course ID", description = "Retrieves co-requisites based on the provided course ID.")
-    @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "Course found"),
-            @ApiResponse(responseCode = "400", description = "Invalid course ID"),
-            @ApiResponse(responseCode = "500", description = "Internal server error")
-    })
-    @GetMapping("/course/coreqs")
-    public ResponseEntity<List<Course>> getCoReqs(@RequestParam(value = "courseId", required = false) String courseId) {
-        // Check if courseId is null or empty
-        if (courseId == null || courseId.isEmpty()) {
-            return ResponseEntity.badRequest().body(null); // Return 400 if parameter is not provided
-        }
-
-        try {
-            // Fetch co-requisite courses using the courseId or crn
-            List<Course> coReqs = courseInformationService.getCoReqCourses(courseId);
-
-            // Return the list of co-requisite courses
-            return ResponseEntity.ok(coReqs);
-
-        } catch (Exception e) {
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
-        }
-    }
-
-
-    /**
-     * Retrieves pre-requisites for a given course ID or CRN. Not in use as of 3/10/25.
-     *
-     * @param courseId The ID of the course to retrieve pre-requisites for. (optional)
-     * @param crn The CRN of the course to retrieve pre-requisites for. (optional)
-     * @return A list of course objects that are pre-requisites for the given course.
-     */
-    @Operation(summary = "Get prereqs by course ID", description = "Retrieves pre-requisites based on the provided course ID or CRN.")
-    @ApiResponses(value = {
-            @ApiResponse(responseCode = "200", description = "Course found"),
-            @ApiResponse(responseCode = "400", description = "Invalid course ID"),
-            @ApiResponse(responseCode = "500", description = "Internal server error")
-    })
-    @GetMapping("/course/prereqs")
-    public ResponseEntity<List<Course>> getPreReqs(
-            @RequestParam(value = "courseId", required = false) String courseId,
-            @RequestParam(value = "crn", required = false) String crn
-    ) {
-        // Check if both courseId and crn are null or empty
-        if ((courseId == null || courseId.isEmpty()) && (crn == null || crn.isEmpty())) {
-            return ResponseEntity.badRequest().body(null); // Return 400 if neither parameter is provided
-        }
-
-        try {
-            // Fetch pre-requisite courses using the courseId or crn
-            List<Course> preReqs = courseInformationService.getPreReqCourses(courseId, crn);
-
-            // Return the list of pre-requisite courses
-            return ResponseEntity.ok(preReqs);
-
-        } catch (Exception e) {
-
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
-        }
-    }
-
     /**
      * Retrieves a list of all CRNs for classes at UGA.
      *
@@ -359,7 +232,7 @@ public ResponseEntity<List<Integer>> getAllCRNs() {
     /**
      * Retrieves coordinates associated with a particular building code of a building at UGA.
      *
-     * @param buildingNumber Building number stored as a string
+     * @param buildingCode Building number stored as a string
      * @return List of all available subjects as strings
      */
     @Operation(summary = "Get coordinates based on building numbers", description = "Retrieves coordinates associated with a particular building code.")
@@ -370,15 +243,14 @@ public ResponseEntity<List<Integer>> getAllCRNs() {
     })
     @GetMapping("/coordinates")
     @Tag(name="course-information")
-    public ResponseEntity<List<String>> getCoordinatesByBuildingNumber(@RequestParam(value="buildingNumber",
-            required = true) String buildingNumber) {
-        if (buildingNumber == null) {
+    public ResponseEntity<List<String>> getCoordinatesByBuildingCode(@RequestParam(value="buildingCode",
+            required = true) String buildingCode) {
+        if (buildingCode == null) {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
         }
         try {
-            // Coordinates of a building number as a string
             List<String> coordinates = new ArrayList<String>();
-            coordinates.add(courseInformationService.getCoordinatesByBuildingNumber(buildingNumber));
+            coordinates.add(courseInformationService.getCoordinatesByBuildingCode(buildingCode));
 
             // Return the list of subject strings if found
             return ResponseEntity.ok(coordinates);
@@ -484,4 +356,44 @@ public ResponseEntity<Integer> getNumProfessorRatings(String lname, String fname
         }
     }
 
+    /**
+     * Returns a list of recommended CRNS given paramters.
+     *
+     * @param inputCourseCrns Potentials CRNs for a schedule
+     * @param gapDay Day of the week to leave open
+     * @param prefStartTime Preferred start time for the schedule
+     * @param prefEndTime Preferred end time for the schedule
+     * @param showFilledClasses Whether to show filled classes
+     * @param excludedCourseCrns List of CRNs to exclude from the schedule
+     * @param excludedSectionCrns List of section CRNs to exclude from the schedule 
+     * @param inputCampus Campus to consider for the schedule
+     * @param minCreditHours Minimum number of credit hours for the schedule
+     * @param maxCreditHours Maximum number of credit hours for the schedule
+     * @param walking Whether to consider walking time between classes
+     * @return returns a list of lists of integers representing recommended CRNs
+     */
+    @Operation(summary = "get recommended schedules", description = "Returns a list of recommended CRNS based on input parameters.")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "Sections found"),
+            @ApiResponse(responseCode = "500", description = "Internal server error")
+    })
+    @GetMapping("/get-recommended-schedules")
+    @Tag(name="course-information")
+    public ResponseEntity<List<List<Integer>>> getRecommendedSchedules(List<Integer> inputCourseCrns, String gapDay, int prefStartTime, int prefEndTime, boolean showFilledClasses,
+    List<Integer> excludedCourseCrns, List<Integer> excludedSectionCrns, String inputCampus, int minCreditHours, int maxCreditHours, boolean walking) {
+        try {
+            // Returns a list of recommended schedules based on input parameters
+            List<List<Integer>> recommendedSchedules = courseInformationService.getRecommendedSchedules(inputCourseCrns, gapDay, prefStartTime, prefEndTime, showFilledClasses,
+                    excludedCourseCrns, excludedSectionCrns, inputCampus, minCreditHours, maxCreditHours, walking);
+
+            // Return the section if found
+            return ResponseEntity.ok(recommendedSchedules);
+
+        } catch (Exception e) {
+
+            // Return 500 if a server error occurs
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
+        }
+    }
+
 } // CourseInfoController
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/controller/TestController.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/controller/TestController.java
new file mode 100644
index 00000000..3d8fadf3
--- /dev/null
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/controller/TestController.java
@@ -0,0 +1,23 @@
+package edu.uga.devdogs.course_information.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class TestController {
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @GetMapping("/test-db")
+    public String testDatabase() {
+        try {
+            jdbcTemplate.execute("SELECT 1");
+            return "Database connection is working!";
+        } catch (Exception e) {
+            return "Database connection failed: " + e.getMessage();
+        }
+    }
+}
\ No newline at end of file
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/exception/CourseNotFoundException.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/exception/CourseNotFoundException.java
new file mode 100644
index 00000000..6a91cf94
--- /dev/null
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/exception/CourseNotFoundException.java
@@ -0,0 +1,12 @@
+package edu.uga.devdogs.course_information.exception;
+
+
+public class CourseNotFoundException extends RuntimeException {
+
+    // Constructor for course not found
+    public CourseNotFoundException(String message){
+
+        super(message); 
+    }
+
+}
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/service/CourseInformationService.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/service/CourseInformationService.java
index 6ee2cffb..95261515 100644
--- a/services/course-information/src/main/java/edu/uga/devdogs/course_information/service/CourseInformationService.java
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/service/CourseInformationService.java
@@ -7,6 +7,7 @@
 import java.util.Date;
 import java.util.List;
 
+import edu.uga.devdogs.course_information.Class.ClassEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,6 +24,20 @@
 import edu.uga.devdogs.course_information.exceptions.CourseNotFoundException;
 import edu.uga.devdogs.course_information.exceptions.ProfessorNotFoundException;
 
+import edu.uga.devdogs.course_information.Algorithm.records.SConstraints;
+import edu.uga.devdogs.course_information.Algorithm.records.HConstraints;
+import edu.uga.devdogs.course_information.Algorithm.BruteForcePrototype;
+import edu.uga.devdogs.course_information.Algorithm.BruteForceUtil;
+import edu.uga.devdogs.course_information.Algorithm.records.Section;
+import edu.uga.devdogs.course_information.Algorithm.records.Class;
+
+import java.time.DayOfWeek;
+import java.time.LocalTime;
+
+import java.util.Set;
+import java.util.HashSet;
+
+
 /**
  * Service class that handles business logic for managing course information.
  *
@@ -64,12 +79,8 @@ public CourseInformationService(CourseSectionRepository courseSectionRepository,
         this.professorRepository = professorRepository;
     }
 
-    // The rest of your methods follow...
-
-
     /**
-     * Method to get a list of section details (tiemslot) matching the given CRN. The method
-     * it calls in the JPA layer will be implemented later.
+     * Method to get section details matching the given CRN.
      *
      * @param crn the given course reference number for which to retrieve section details
      * @return A list of Section Details objects matching the given time slot and CRN
@@ -86,8 +97,31 @@ public CourseSection getSectionDetailsByCrn(String crn){
     }
 
     /**
-     * Method to get a list of Course objects matching the given major. The method
-     * it calls in the JPA layer will be implemented later.
+     * Service method for retrieving course details for a given CRN.
+     *
+     * @param crn the course reference number for which to retrieve course details
+     * @return the Course object associated with the CRN
+     * @throws CourseNotFoundException if no course section is found with the specified CRN
+     */
+    public Course getCourseDetailsByCrn(String crn) {
+        int intCrn = Integer.parseInt(crn);
+        CourseSection courseSection = courseSectionRepository.findByCrn(intCrn);
+
+        if (courseSection != null) {
+            Course course = courseSection.getCourse();
+
+            if (course != null) {
+                return course;
+            } else {
+                throw new CourseNotFoundException("Course details not found for CRN: " + crn);
+            }
+        } else {
+            throw new CourseNotFoundException("No course section found with CRN: " + crn);
+        }
+    }
+
+    /**
+     * Method to get a list of Course objects matching the given major.
      * 
      * @param major the given major for which to retrieve courses
      * @return a list of Course objects matching the given major
@@ -132,21 +166,6 @@ private static Time parseTime(String timeString) throws ParseException {
         return new Time(parsedDate.getTime());
     }
 
-     /**
-     * Retreives a list of all buildings
-     *
-     *  @return List of all building bojects
-     * @throws BuildingNotFoundException if no buildigns are found
-     */
-    public List<Building> getAllBuildings() {
-        List<Building> buildings = buildingRepository.findAll();
-        if (buildings != null) {
-            return buildings;
-        } else {
-            throw new BuildingNotFoundException("No Buildings Found");
-        }
-    }
-
     /**
      *  Retreives a list of all academic subjects at UGA.
      * 
@@ -159,12 +178,10 @@ public List<String> getAllSubjects() {
         if (courses != null) {
             for (Course course : courses) {
                 //so we avoid duplicate subject names
-
-                /* getSubject() should work - JPA issue. Commenting for now
                 if (!subjects.contains(course.getSubject())) {
                     subjects.add(course.getSubject());
                 }
-                */
+
             }
             return subjects;
         } else {
@@ -196,105 +213,16 @@ public List<String> getAllInstructors() {
         return instructors;
     }
 
-    /**
-     * Retrieves a course's type (e.g., Honors, Lab, Online) based on the given course ID.
-     * Not in use as of 3/10/25.
-     *
-     * <p>
-     * This method queries the repository for a {@link Course} object with the specified ID
-     * and returns its type. If the course does not exist, it throws a {@link CourseNotFoundException}.
-     * </p>
-     *
-     * @param courseId the unique identifier for the course
-     * @return the type of the course as a string
-     * @throws CourseNotFoundException if no course with the specified ID is found
-     */
-    public String getCourseTypeById(String courseId) {
-        Long courseIdLong = Long.parseLong(courseId);
-        List<Course> courseList = courseRepository.getCourseInfoByCourseId(courseIdLong);
-        if (courseList == null) {
-            return null;
-        }
-
-        String courseNumber = courseList.get(0).getCourseNumber();
-        if (courseNumber.length() == 9) {
-            char type = courseNumber.charAt(8);
-            switch (type) {
-                case 'E':
-                    return "Online Learning";
-                case 'S':
-                    return "Service-Learning";
-                case 'H':
-                    return "Honors";
-                case 'I':
-                    return "Integrated Language";
-                case 'W':
-                    return "Writing Intensive";
-                case 'D':
-                    return "Non-Credit Discussion Group";
-                case 'L':
-                    return "Lab (Non-Credit and Credit)";
-            }
-        }
-        return "No Special Designation";
-    }
-
-    /**
-     * Service method for getting pre-requisites for a given course ID or CRN.
-     * Not in use as of 3/10/25.
-     *
-     * @param courseID The ID of the course to retrieve pre-requisites for.
-     * @return A list of course objects that are pre-requisites for the given course.
-     */
-    public List<Course> getPreReqCourses(String courseID, String crn) {
-        Long courseIdLong = Long.parseLong(courseID);
-        return courseRepository.findPrerequisitesByCourseId(courseIdLong);
-    }
-
-    /**
-     * Service method for getting co-requisites for a given course ID or CRN.
-     *
-     * @param courseID The ID of the course to retrieve co-requisites for.
-     * @return A list of course objects that are co-requisites for the given course.
-     */
-    public List<Course> getCoReqCourses(String courseID) {
-        Long courseIdLong = Long.parseLong(courseID);
-        return courseRepository.findCorequisitesByCourseId(courseIdLong);
-    }
-
-    /**
-     * Retrieves a list of courses offered in a specified term (e.g., Fall, Spring, Summer).
-     *
-     * <p>
-     * The term parameter determines the academic term for which to retrieve courses.
-     * If no courses are found for the specified term, a {@link CourseNotFoundException} is thrown.
-     * </p>
-     *
-     * @param term the academic term to retrieve courses for
-     * @return a list of {@link Course} objects offered in the specified term
-     * @throws CourseNotFoundException if no courses are found for the specified term
-     */
-    public List<Course> getCoursesByTerm(String term) {
-        List<Course> courses = courseRepository.findAllBySemester(term);
-
-        if (courses != null && !courses.isEmpty()) {
-            return courses;
-        } else {
-            throw new CourseNotFoundException("No courses found for term: " + term);
-        }
-    }
-
     /**
      * Method to get the coordinates of a building based on the building number
      *
-     * @param number The number of specified building
+     * @param code The number of specified building
      * @return A string coordinate of the building
      */
-    public String getCoordinatesByBuildingNumber(String number){
-        //String coordinate = buildingRepository.getCoordinatesByBuildingNumber(number); //not implemented in database, commenting for now
-        String coordinate = null; //returning null until JPA implementation is added
-        if (coordinate != null) {
-            return coordinate;
+    public String getCoordinatesByBuildingCode(String code){
+        String coordinates = "(" + getLatitude(code) + ", " + getLongitude(code);
+        if (coordinates != null) {
+            return coordinates;
         } else {
             throw new BuildingNotFoundException("Building Not Found");
         }
@@ -354,7 +282,142 @@ public int getProfessorTotalReviews(String lastName, String firstName) {
         return professor.getTotalReviews(); // Assuming totalReviews is an int field in Professor entity
     }
 
+    /**
+     * Retrieves the latitude for a given building code.
+     * @param buildingCode the building code for which to retrieve the latitude
+     * @return a double representing the latitude
+     */
+    public double getLatitude(String buildingCode) {
+        List<Building> buildings = buildingRepository.findAll();
+
+        for (Building building : buildings) {
+            if (building.getBuildingCode().equals(buildingCode)) {
+                return building.getLatitude();
+            }
+        }
+
+        //if matching building not found, throw an exception
+        throw new BuildingNotFoundException();
+    }
+
+    /**
+     * Retrieves the longitude for a given building code.
+     * @param buildingCode the building code for which to retrieve the longitude
+     * @return a double representing the longitude
+     */
+    public double getLongitude(String buildingCode) {
+        List<Building> buildings = buildingRepository.findAll();
+
+        for (Building building : buildings) {
+            if (building.getBuildingCode().equals(buildingCode)) {
+                return building.getLongitude();
+            }
+        }
+
+        //if matching building not found, throw an exception
+        throw new BuildingNotFoundException();
+    }
 
+    public List<List<Integer>> getRecommendedSchedules(List<Integer> inputCourseCrns, String gapDay, int prefStartTime, int prefEndTime, boolean showFilledClasses,
+                                                       List<Integer> excludedCourseCrns, List<Integer> excludedSectionCrns, String inputCampus, int minCreditHours, int maxCreditHours, boolean walking) {
+        Set<edu.uga.devdogs.course_information.Algorithm.records.Course> inputCourses = new HashSet<>();
+
+        DayOfWeek dayOfWeekGapDay = BruteForceUtil.daySwitch(gapDay);
+        String prefStartTimeString = prefStartTime + ":00";
+        LocalTime localTimePrefStartTime = LocalTime.parse(prefStartTimeString);
+        String prefEndTimeString = prefEndTime + ":00";
+        LocalTime localTimePrefEndTime = LocalTime.parse(prefEndTimeString);
+
+        SConstraints softConstraints = new SConstraints(dayOfWeekGapDay, localTimePrefStartTime, localTimePrefEndTime, showFilledClasses);
+
+        List<edu.uga.devdogs.course_information.Algorithm.records.Course> excludedCourses = new ArrayList<>();
+
+        //building excluded courses list from given crns
+
+        for (Integer crn : excludedCourseCrns) {
+            CourseSection section = courseSectionRepository.findByCrn(crn);
+            Course course = section.getCourse();
+            String courseNumber = course.getCourseNumber();
+
+            List<Section> sections = new ArrayList<>();
+
+            for (CourseSection courseSection : course.getCourseSections()) {
+                //we get the professor
+                String profLastName = courseSection.getInstructor();
+                float rating = professorRepository.findByLastName(profLastName).getAverageRating();
+                edu.uga.devdogs.course_information.Algorithm.records.Professor professor = new edu.uga.devdogs.course_information.Algorithm.records.Professor(profLastName,rating);
+
+                List<Class> classes = new ArrayList<>();
+
+                for (ClassEntity classEntity : courseSection.getClasses()) {
+                    String daysString = classEntity.getDays();
+                    List<DayOfWeek> daysList = new ArrayList<>();
+                    for (int i = 0; i < daysString.length(); i++) {
+                        daysList.add(BruteForceUtil.daySwitch(daysString.substring(i, i + 1)));
+                    }
+                    LocalTime startTime = classEntity.getStartTime();
+                    LocalTime endTime = classEntity.getEndTime();
+                    String buildingName = classEntity.getBuilding().getName();
+                    String campus = classEntity.getCampus();
+                    String buildingNumber = String.valueOf(classEntity.getBuilding().getBuildingCode());
+                    classes.add(new Class(crn, daysList, startTime, endTime, buildingName, campus, buildingNumber));
+                }
+                sections.add(new Section(courseNumber, crn, professor, classes));
+            }
+
+            excludedCourses.add(new edu.uga.devdogs.course_information.Algorithm.records.Course(courseNumber, sections));
+        }
+
+        //building excluded sections list from given crns
+
+        List<Section> excludedSections = new ArrayList<>();
+
+        for (Integer crn : excludedSectionCrns) {
+            CourseSection courseSection = courseSectionRepository.findByCrn(crn);
+            String courseNumber = courseSection.getCourse().getCourseNumber();
+            String profLastName = courseSection.getInstructor();
+            float rating = professorRepository.findByLastName(profLastName).getAverageRating();
+            edu.uga.devdogs.course_information.Algorithm.records.Professor professor = new edu.uga.devdogs.course_information.Algorithm.records.Professor(profLastName,rating);
+
+            List<Class> classes = new ArrayList<>();
+
+            for (ClassEntity classEntity : courseSection.getClasses()) {
+                String daysString = classEntity.getDays();
+                List<DayOfWeek> daysList = new ArrayList<>();
+                for (int i = 0; i < daysString.length(); i++) {
+                    daysList.add(BruteForceUtil.daySwitch(daysString.substring(i, i + 1)));
+                }
+                LocalTime startTime = classEntity.getStartTime();
+                LocalTime endTime = classEntity.getEndTime();
+                String buildingName = classEntity.getBuilding().getName();
+                String campus = classEntity.getCampus();
+                String buildingNumber = String.valueOf(classEntity.getBuilding().getBuildingCode());
+                classes.add(new Class(crn, daysList, startTime, endTime, buildingName, campus, buildingNumber));
+            }
+
+            excludedSections.add(new Section(courseNumber, crn, professor, classes));
+
+        }
+
+        HConstraints hardConstraints = new HConstraints(excludedCourses, excludedSections, inputCampus, minCreditHours, maxCreditHours, walking);
+
+        //retrieving recommended schedules from algorithm
+        int[][] schedulesArray = BruteForcePrototype.algorithmDriver(inputCourses, softConstraints, hardConstraints);
+
+        //copying from 2D array to nested List
+
+        List<List<Integer>> outputSchedulesList = new ArrayList<>();
+
+        for (int[] schedule : schedulesArray) {
+            List<Integer> outputSchedule = new ArrayList<>();
+            for (int crn : schedule) {
+                outputSchedule.add(Integer.valueOf(crn));
+            }
+            outputSchedulesList.add(outputSchedule);
+        }
+
+        return outputSchedulesList;
+    }
 
 
 }
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/service/ProfessorService.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/service/ProfessorService.java
new file mode 100644
index 00000000..07dfedc5
--- /dev/null
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/service/ProfessorService.java
@@ -0,0 +1,58 @@
+package edu.uga.devdogs.course_information.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import edu.uga.devdogs.course_information.Professor.Professor;
+import edu.uga.devdogs.course_information.Professor.ProfessorRepository;
+import edu.uga.devdogs.course_information.exceptions.ProfessorNotFoundException;
+
+@Service
+public class ProfessorService {
+
+    @Autowired
+    private ProfessorRepository professorRepository;
+
+    public Professor saveOrUpdateProfessor(Professor professor) {
+        Professor existingProfessor = professorRepository.findByLastNameAndFirstNameIgnoreCase(
+            professor.getLastName(), professor.getFirstName());
+
+        if (existingProfessor != null) {
+            existingProfessor.setTotalReviews(professor.getTotalReviews());
+            existingProfessor.setAverageRating(professor.getAverageRating());
+            existingProfessor.setDifficultyRating(professor.getDifficultyRating());
+            existingProfessor.setWouldTakeAgainRating(professor.getWouldTakeAgainRating());
+            return professorRepository.save(existingProfessor);
+        } else {
+            return professorRepository.save(professor);
+        }
+    }
+
+    public List<Professor> getAllProfessors() {
+        return professorRepository.findAll();
+    }
+
+    public Professor getProfessorById(int id) {
+        return professorRepository.findById(id);
+    }
+
+    public void deleteProfessor(int id) {
+        professorRepository.deleteById(id);
+    }
+
+    public float getProfessorAverageRating(String lastName, String firstName) {
+        Professor professor = professorRepository.findByLastNameAndFirstNameIgnoreCase(lastName, firstName);
+        if (professor == null) {
+            throw new ProfessorNotFoundException("Professor " + firstName + " " + lastName + " not found");
+        }
+        return professor.getAverageRating();
+    }
+
+    public int getProfessorTotalReviews(String lastName, String firstName) {
+        Professor professor = professorRepository.findByLastNameAndFirstNameIgnoreCase(lastName, firstName);
+        if (professor == null) {
+            throw new ProfessorNotFoundException("Professor " + firstName + " " + lastName + " not found");
+        }
+        return professor.getTotalReviews();
+    }
+}
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/webscraping/Course2.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/webscraping/Course2.java
index 2a5242bf..69af66c1 100644
--- a/services/course-information/src/main/java/edu/uga/devdogs/course_information/webscraping/Course2.java
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/webscraping/Course2.java
@@ -335,4 +335,29 @@ public int getCrn() {
     public void setCrn(int crn) {
         this.crn = crn;
     } // setCrn
+
+
+ @Override
+public String toString() {
+    return "Course2{" +
+            "subject='" + subject + '\'' +
+            ", courseNumber='" + courseNumber + '\'' +
+            ", title='" + title + '\'' +
+            ", department='" + department + '\'' +
+            ", crn=" + crn +
+            ", sec='" + sec + '\'' +
+            ", stat='" + stat + '\'' +
+            ", creditHours='" + creditHours + '\'' +
+            ", meetingDays='" + meetingDays + '\'' +
+            ", meetingTimes='" + meetingTimes + '\'' +
+            ", building='" + building + '\'' +
+            ", roomNumber='" + roomNumber + '\'' +
+            ", campus='" + campus + '\'' +
+            ", professor='" + professor + '\'' +
+            ", partOfTerm='" + partOfTerm + '\'' +
+            ", classSize=" + classSize +
+            ", availableSeats=" + availableSeats +
+            '}';
+}
+
 } // Course
\ No newline at end of file
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/webscraping/DescriptionScraper.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/webscraping/DescriptionScraper.java
new file mode 100644
index 00000000..eaa03b86
--- /dev/null
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/webscraping/DescriptionScraper.java
@@ -0,0 +1,67 @@
+package edu.uga.devdogs.course_information.webscraping;
+
+
+import org.jsoup.Jsoup;
+import org.openqa.selenium.By;
+import org.openqa.selenium.JavascriptExecutor;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.WebDriverWait;
+
+// Removed incorrect import for jakarta.xml.bind.Element
+
+import java.time.Duration;
+
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+
+public class DescriptionScraper {
+    private final WebDriver driver;
+    private final WebDriverWait wait;
+
+    public DescriptionScraper(WebDriver driver) {
+        this.driver = driver;
+        this.wait = new WebDriverWait(driver, Duration.ofSeconds(12));
+    }
+
+    public String getCourseDescription(String coursePrefix, String courseSuffix) {
+        try {
+            driver.get("https://bulletin.uga.edu/coursesHome");
+
+            WebElement prefixEntry = driver.findElement(By.id("txtEnterPrefix"));
+            WebElement suffixEntry = driver.findElement(By.id("txtEnterNumber"));
+            WebElement btn = driver.findElement(By.id("Imgbut_go_offPrefixCourse"));
+
+            prefixEntry.sendKeys(coursePrefix);
+            suffixEntry.sendKeys(courseSuffix);
+
+            ((JavascriptExecutor) driver).executeScript("arguments[0].click();", btn);
+
+            wait.until(ExpectedConditions.presenceOfElementLocated(By.id("lblCourseResultText")));
+            Document document = Jsoup.parse(driver.getPageSource());
+
+            Element courseResults = document.getElementById("lblCourseResultText");
+            if (courseResults == null) return "Description not found";
+
+            Elements resultsTables = courseResults.getElementsByClass("courseresultstable");
+            boolean isDescription = false;
+
+            for (Element table : resultsTables) {
+                for (Element data : table.getElementsByTag("td")) {
+                    String text = data.text().trim();
+                    if (text.contains("Description")) {
+                        isDescription = true;
+                    } else if (isDescription) {
+                        return text;
+                    }
+                }
+            }
+            return "Description not found";
+        } catch (Exception e) {
+            System.err.println("Error fetching course description (" + coursePrefix + " " + courseSuffix + "): " + e.getMessage());
+            return "Error retrieving description";
+        }
+    }
+}
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/webscraping/Professor2.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/webscraping/Professor2.java
new file mode 100644
index 00000000..ceded42f
--- /dev/null
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/webscraping/Professor2.java
@@ -0,0 +1,411 @@
+package edu.uga.devdogs.course_information.webscraping;
+
+//package edu.uga.devdogs.professor_rating.webscraping;
+
+/**
+ * @author Yuval Deshe
+ * Represents an entry for a professor on the RateMyProfessors website.
+ */
+public class Professor2 {
+    private String name; // The name of the professor.
+    private double quality; // The overall quality of the professor.
+    private double wouldTakeAgainPercent; // The percentage of students who would take 
+                                          // a class with this professor again.
+    private double difficultyRating; // The average difficulty of a professor's classes.
+    private int professorID; // The professor's ID on the RateMyProfessors website.
+    private int numOneStar; // The number of one-star ratings the professor has.
+    private int numTwoStar; // The number of two-star ratings the professor has.
+    private int numThreeStar; // The number of three-star ratings the professor has.
+    private int numFourStar; // The number of four-star ratings the professor has.
+    private int numFiveStar; // The number of five-star ratings the professor has.
+    private int[] ratingDistribution; // The distribution of each star-rating.
+    private int numRatings; // The number of ratings that the professor has.
+    private String[] tags; // The tags associated with the professor.
+    private String department; // The department this professor works in.
+
+    /**
+     * Constructs a {@code Professor} object.
+     */
+    public Professor2() {
+        name = "";
+        quality = 0;
+        wouldTakeAgainPercent = 0;
+        difficultyRating = 0;
+        numOneStar = 0;
+        numTwoStar = 0;
+        numThreeStar = 0;
+        numFourStar = 0;
+        numFiveStar = 0;
+        ratingDistribution = new int[] { numOneStar, numTwoStar, numThreeStar, numFourStar, numFiveStar };
+        numRatings = 0;
+        tags = null;
+        department = "";
+    } // Professor
+
+    /**
+     * Constructs a {@code Professor} object with all variables except {@code ratingDistribution} 
+     * specified as parameters. Uses the values of the star ratings to set 
+     * {@code ratingDistribution}.
+     * 
+     * @param name The name of the professor.
+     * @param quality The overall quality of the professor.
+     * @param wouldTakeAgainPercent The percentage of students who would take this professor again.
+     * @param difficulty The average difficulty of a professor's classes.
+     * @param numOneStar The number of one-star ratings given to this professor.
+     * @param numTwoStar The number of two-star ratings given to this professor.
+     * @param numThreeStar The number of three-star ratings given to this professor.
+     * @param numFourStar The number of four-star ratings given to this professor.
+     * @param numFiveStar The number of five-star ratings given to this professor.
+     * @param numRatings The number of ratings that the professor has.
+     * @param tags The tags associated with the professor.
+     * @param department The department this professor works in.
+     */
+    public Professor2(String name, double quality, double wouldTakeAgainPercent, double difficultyRating,
+                     int numOneStar, int numTwoStar, int numThreeStar, int numFourStar, 
+                     int numFiveStar, int numRatings, String[] tags, String department) {
+        this.name = name;
+        this.quality = quality;
+        this.wouldTakeAgainPercent = wouldTakeAgainPercent;
+        this.difficultyRating = difficultyRating;
+        this.numOneStar = numOneStar;
+        this.numTwoStar = numTwoStar;
+        this.numThreeStar = numThreeStar;
+        this.numFourStar = numFourStar;
+        this.numFiveStar = numFiveStar;
+        this.numRatings = numRatings;
+        this.ratingDistribution = new int[] {numOneStar, numTwoStar, numThreeStar, 
+                                             numFourStar, numFiveStar};
+        this.tags = tags;
+        this.department = department;
+    } // Professor
+
+    /**
+     * Constructs a {@code Professor} object with all variables specified as parameters.
+     * 
+     * @param name The name of the professor.
+     * @param quality The overall quality of the professor.
+     * @param wouldTakeAgainPercent The percentage of students who would take this professor again.
+     * @param difficulty The average difficulty of a professor's classes.
+     * @param numOneStar The number of one-star ratings given to this professor.
+     * @param numTwoStar The number of two-star ratings given to this professor.
+     * @param numThreeStar The number of three-star ratings given to this professor.
+     * @param numFourStar The number of four-star ratings given to this professor.
+     * @param numFiveStar The number of five-star ratings given to this professor.
+     * @param ratingDistribution The distribution of each star-rating.
+     * @param numRatings The number of ratings that the professor has.
+     * @param tags The tags associated with the professor.
+     * @param department The department this professor works in.
+     */
+    public Professor2(String name, double quality, double wouldTakeAgainPercent, double difficultyRating,
+                     int numOneStar, int numTwoStar, int numThreeStar, int numFourStar, 
+                     int numFiveStar, int[] ratingDistribution, int numRatings, String[] tags, 
+                     String department) {
+        this.name = name;
+        this.quality = quality;
+        this.wouldTakeAgainPercent = wouldTakeAgainPercent;
+        this.difficultyRating = difficultyRating;
+        this.numOneStar = numOneStar;
+        this.numTwoStar = numTwoStar;
+        this.numThreeStar = numThreeStar;
+        this.numFourStar = numFourStar;
+        this.numFiveStar = numFiveStar;
+        this.ratingDistribution = ratingDistribution;
+        this.numRatings = numRatings;
+        this.tags = tags;
+        this.department = department;
+    } // Professor
+
+    /**
+     * Returns the name of the professor.
+     *
+     * @return the value of {@code name}.
+     */
+    public String getName() {
+        return name;
+    } // getName
+
+    /**
+     * Sets the name of the professor.
+     * 
+     * @param newName the new value of {@code name}.
+     */
+    public void setName(String newName) {
+        name = newName;
+    } // setname
+
+    /**
+     * Returns the quality of the professor.
+     * 
+     * @return the value of {@code quality}.
+     */
+    public double getQuality() {
+        return quality;
+    } // getQuality
+
+    /**
+     * Sets the quality of the professor.
+     * 
+     * @param newQuality the new value of {@code quality}
+     */
+    public void setQuality(double newQuality) {
+        quality = newQuality;
+    } // setQuality
+
+    /**
+     * Returns the percentage of students who would take a class with this professor again.
+     * 
+     * @return the value of {@code wouldTakeAgainPercent}.
+     */
+    public double getWouldTakeAgainPercent() {
+        return wouldTakeAgainPercent;
+    } // setWouldTakeAgainPercent
+
+    /**
+     * Sets the percentage of students who would take a class with this professor again.
+     * 
+     * @param newPercent the new value of {@code wouldTakeAgainPercent}.
+     */
+    public void setWouldTakeAgainPercent(double newWouldTakeAgainPercent) {
+        wouldTakeAgainPercent = newWouldTakeAgainPercent;
+    } // setWouldTakeAgainPercent
+
+    /**
+     * Returns the difficulty rating of a professor.
+     * 
+     * @return the value of {@code difficultyRating}
+     */
+    public double getDifficultyRating() {
+        return difficultyRating;
+    } // getDifficultyRating
+
+    /**
+     * Sets the difficulty rating of a professor.
+     * 
+     * @param newDifficultyRating the new value of {@code difficultyRating}.
+     */
+    public void setDifficultyRating(double newDifficultyRating) {
+        difficultyRating = newDifficultyRating;
+    } // setDifficultyRating
+
+    /**
+     * Returns the difficulty rating of a professor.
+     * 
+     * @return the value of {@code professorID}.
+     */
+    public int getProfessorID() {
+        return professorID;
+    } // getProfessorID
+
+    /**
+     * Sets the ID of a professor.
+     * 
+     * @param newProfessorID
+     */
+    public void setProfessorID(int newProfessorID) {
+        professorID = newProfessorID;
+    } // setProfessorID
+
+    /**
+     *  Returns the number of one-star reviews.
+     * 
+     * @return the value of {@code numOneStar}.
+     */
+    public int getNumOneStar() {
+        return numOneStar;
+    } // getNumOneStar
+
+    /**
+     * Sets the number of one-star reviews.
+     *
+     * @param newNumOneStar the new value of {@code numOneStar}.
+     */
+    public void setNumOneStar(int newNumOneStar) {
+        numOneStar = newNumOneStar;
+    } // setNumOneStar
+
+    /**
+     *  Returns the number of two-star reviews.
+     * 
+     * @return the value of {@code numTwoStar}.
+     */
+    public int getNumTwoStar() {
+        return numTwoStar;
+    } // getNumTwoStar
+
+    /**
+     * Sets the number of two-star reviews.
+     *
+     * @param newNumOneStar the new value of {@code numTwoStar}.
+     */
+    public void setNumTwoStar(int newNumTwoStar) {
+        numTwoStar = newNumTwoStar;
+    } // setNumTwoStar
+
+    /**
+     *  Returns the number of three-star reviews.
+     * 
+     * @return the value of {@code numThreeStar}.
+     */
+    public int getNumThreeStar() {
+        return numThreeStar;
+    } // getNumThreeStar
+
+    /**
+     * Sets the number of three-star reviews.
+     *
+     * @param newNumOneStar the new value of {@code numThreeStar}.
+     */
+    public void setNumThreeStar(int newNumThreeStar) {
+        numThreeStar = newNumThreeStar;
+    } // setNumThreeStar
+
+    /**
+     *  Returns the number of four-star reviews.
+     * 
+     * @return the value of {@code numFourStar}.
+     */
+    public int getNumFourStar() {
+        return numFourStar;
+    } // getNumFourStar
+
+    /**
+     * Sets the number of four-star reviews.
+     *
+     * @param newNumOneStar the new value of {@code numFourStar}.
+     */
+    public void setNumFourStar(int newNumFourStar) {
+        numFourStar = newNumFourStar;
+    } // setNumFourStar
+
+    /**
+     *  Returns the number of five-star reviews.
+     * 
+     * @return the value of {@code numFiveStar}.
+     */
+    public int getNumFiveStar() {
+        return numFiveStar;
+    } // getNumFiveStar
+
+    /**
+     * Sets the number of five-star reviews.
+     *
+     * @param newNumOneStar the new value of {@code numFiveStar}.
+     */
+    public void setNumFiveStar(int newNumFiveStar) {
+        numFiveStar = newNumFiveStar;
+    } // setNumFiveStar
+
+    /**
+     * Returns the rating distribution of the professor.
+     * 
+     * @return the value of {@code ratingDistribution}.
+     */
+    public int[] getRatingDistribution() {
+        return ratingDistribution;
+    } // getRatingDistribution
+
+    /**
+     * Sets the rating distribution of the professor and updates the number of each star-review 
+     * respectively.
+     * 
+     * @param newRatingDistribution the new value of {@code ratingDistribution}. Must be an int 
+     * array of length 5.
+     */
+    public void setRatingDistribution(int[] newRatingDistribution) {
+        // ensure the provided array has the required size
+        if (newRatingDistribution.length != 5) {
+            System.err.println("Provided array did not have a length of 5 - " +
+                              "did not update ratingDistribution.");
+            return;
+        } // if
+
+        // Update the number of reviews accoringly with the new values that will be 
+        // added to ratingDistribution
+        setNumOneStar(newRatingDistribution[0]);
+        setNumTwoStar(newRatingDistribution[1]);
+        setNumThreeStar(newRatingDistribution[2]);
+        setNumFourStar(newRatingDistribution[3]);
+        setNumFiveStar(newRatingDistribution[4]);
+
+        // Update ratingDistribution
+        ratingDistribution = newRatingDistribution;
+    } // setRatingDistribution
+
+    /**
+     * Sets the rating distribution of the professor by taking the number 
+     * of each star-review as input.
+     * 
+     * @param newOneStar the new value of {@code numOneStar}.
+     * @param newTwoStar the new value of {@code numTwoStar}.
+     * @param newThreeStar the new value of {@code numThreeStar}.
+     * @param newFourStar the new value of {@code numFourStar}.
+     * @param newFiveStar the new value of {@code numFiveStar}.
+     */
+    public void setRatingDistribution(int newOneStar, int newTwoStar, int newThreeStar, 
+                                      int newFourStar, int newFiveStar) {
+        // Update the number of reviews accoringly with the new values 
+        // that will be added to ratingDistribution
+        setNumOneStar(newOneStar);
+        setNumTwoStar(newTwoStar);
+        setNumThreeStar(newThreeStar);
+        setNumFourStar(newFourStar);
+        setNumFiveStar(newFiveStar);
+        // Update ratingDistribution with the new values
+        ratingDistribution = new int[] {numOneStar, numTwoStar, numThreeStar, 
+                                        numFourStar, numFiveStar};
+    } // setRatingDistribution
+
+    /**
+     * Returns the number of ratings that the professor has.
+     *
+     * @return the value of {@code numRatings}.
+     */
+    public int getNumRatings() {
+        return numRatings;
+    } // getNumRatings
+
+    /**
+     * Sets the number of ratings that the professor has.
+     * 
+     * @param newNumRatings the new value of {@code numRatings}.
+     */
+    public void setNumRatings(int newNumRatings) {
+        numRatings = newNumRatings;
+    } // setNumRatings
+
+    /**
+     * Returns the tags associated with a professor.
+     * 
+     * @return the value of {@code tags}.
+     */
+    public String[] getTags() {
+        return tags;
+    } // getTags
+
+    /**
+     * Sets the tags associated with a professor.
+     * 
+     * @param newTags the new value of {@code tags}.
+     */
+    public void setTags(String[] newTags) {
+        tags = newTags;
+    } // setTags
+
+    /**
+     * Returns the department that the professor works in.
+     *
+     * @return the value of {@code department}.
+     */
+    public String getDepartment() {
+        return department;
+    } // getDepartment
+
+    /**
+     * Sets the department that the professor works in.
+     * 
+     * @param newDepartment the new value of {@code department}.
+     */
+    public void setDepartment(String newDepartment) {
+        department = newDepartment;
+    } // setDepartment
+} // Professor
\ No newline at end of file
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/webscraping/ProfessorRating.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/webscraping/ProfessorRating.java
new file mode 100644
index 00000000..2af55262
--- /dev/null
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/webscraping/ProfessorRating.java
@@ -0,0 +1,26 @@
+package edu.uga.devdogs.course_information.webscraping;
+
+public class ProfessorRating {
+    private final String name;
+    private final String department;
+    private final double avgRating;
+    private final int numRatings;
+
+    public ProfessorRating(String name, String department, double avgRating, int numRatings) {
+        this.name = name;
+        this.department = department;
+        this.avgRating = avgRating;
+        this.numRatings = numRatings;
+    }
+
+    public String getName() { return name; }
+    public String getDepartment() { return department; }
+    public double getAvgRating() { return avgRating; }
+    public int getNumRatings() { return numRatings; }
+
+    @Override
+    public String toString() {
+        return name + " (" + department + ") — Rating: " + avgRating + " [" + numRatings + " ratings]";
+    }
+    
+}
diff --git a/services/course-information/src/main/java/edu/uga/devdogs/course_information/webscraping/RateMyProfessorScraper.java b/services/course-information/src/main/java/edu/uga/devdogs/course_information/webscraping/RateMyProfessorScraper.java
new file mode 100644
index 00000000..79152a1e
--- /dev/null
+++ b/services/course-information/src/main/java/edu/uga/devdogs/course_information/webscraping/RateMyProfessorScraper.java
@@ -0,0 +1,110 @@
+package edu.uga.devdogs.course_information.webscraping;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import okhttp3.*;
+
+import java.io.IOException;
+
+public class RateMyProfessorScraper {
+
+    private static final String GRAPHQL_URL = "https://www.ratemyprofessors.com/graphql";
+    private static final String TARGET_SCHOOL_NAME = "University of Georgia";
+    private static final OkHttpClient client = new OkHttpClient();
+
+    public static Double getRatingForProfessor(String lastName) {
+        try {
+            String query = """
+                {
+                  searchTeachers(query: "%s") {
+                    edges {
+                      node {
+                        id
+                        firstName
+                        lastName
+                        school {
+                          name
+                        }
+                        avgRating
+                      }
+                    }
+                  }
+                }
+                """.formatted(lastName);
+
+            RequestBody body = RequestBody.create(
+                    new ObjectMapper().writeValueAsString(new GraphQLQuery(query)),
+                    MediaType.parse("application/json")
+            );
+
+            Request request = new Request.Builder()
+                    .url(GRAPHQL_URL)
+                    .post(body)
+                    .header("Content-Type", "application/json")
+                    .build();
+
+            Response response = client.newCall(request).execute();
+
+            if (!response.isSuccessful()) {
+                System.err.println("HTTP error fetching RMP data: " + response.code() + ", URL=" + GRAPHQL_URL);
+                return null;
+            }
+
+            ObjectMapper mapper = new ObjectMapper();
+            JsonNode root = mapper.readTree(response.body().string());
+
+            JsonNode edges = root.at("/data/searchTeachers/edges");
+
+            if (!edges.isArray() || edges.size() == 0) {
+                System.out.println("No RMP results found for: " + lastName);
+                return null;
+            }
+
+            for (JsonNode edge : edges) {
+                JsonNode node = edge.get("node");
+                String schoolName = node.get("school").get("name").asText();
+                String firstName = node.get("firstName").asText();
+                String matchedLastName = node.get("lastName").asText();
+
+                System.out.println("Found: " + firstName + " " + matchedLastName + " at " + schoolName);
+
+                if (schoolName.equalsIgnoreCase(TARGET_SCHOOL_NAME)) {
+                    double rating = node.get("avgRating").asDouble();
+                    System.out.println("Matched " + firstName + " " + matchedLastName + " (UGA) with rating: " + rating);
+                    return rating;
+                }
+            }
+
+            System.out.println("No matching UGA professor found for: " + lastName);
+            return null;
+
+        } catch (IOException e) {
+            System.err.println("Error while scraping RateMyProfessor data: " + e.getMessage());
+            return null;
+        }
+    }
+
+    // Helper class to wrap GraphQL query
+    static class GraphQLQuery {
+        public String query;
+
+        public GraphQLQuery(String query) {
+            this.query = query;
+        }
+    }
+
+    public static void main(String[] args) {
+        // Test a few example professors
+        String[] lastNames = {"Shonkwiler", "Colson", "Yuan", "Nath", "Beveridge", "Kraemer"};
+
+        for (String lastName : lastNames) {
+            System.out.println("\n--- Searching for: " + lastName + " ---");
+            Double rating = RateMyProfessorScraper.getRatingForProfessor(lastName);
+            if (rating != null) {
+                System.out.printf("RMP Rating for %s: %.2f%n", lastName, rating);
+            } else {
+                System.out.println("No rating found for " + lastName);
+            }
+        }
+    }
+}
diff --git a/services/course-information/src/main/resources/application.properties b/services/course-information/src/main/resources/application.properties
index a412fef5..2ecfaf37 100644
--- a/services/course-information/src/main/resources/application.properties
+++ b/services/course-information/src/main/resources/application.properties
@@ -1,10 +1,23 @@
 spring.application.name=course-information
 
-spring.datasource.url=jdbc:mysql://localhost:3306/CourseInformation
-spring.datasource.username=root
-spring.datasource.password=password
-spring.jpa.show-sql=true
-spring.jpa.generate-ddl=true
-spring.jpa.hibernate.ddl-auto=update
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
 
+spring.datasource.url=jdbc:mysql://optimalscheduledatabase.cj6soes8wsjl.us-east-2.rds.amazonaws.com:3306/CourseInformation
+spring.datasource.username= ${DB_USERNAME}
+spring.datasource.password= ${DB_PASSWORD}
+
+
+spring.jpa.hibernate.ddl-auto= update
+spring.jpa.show-sql=false
+spring.jpa.properties.hibernate.format_sql=true
+logging.level.org.hibernate.type.descriptor.sql=trace
+
+
+spring.jackson.serialization.INDENT_OUTPUT=true
+spring.jackson.deserialization.FAIL_ON_UNKNOWN_PROPERTIES=false
+spring.jackson.default-property-inclusion=non-null
+
+pdf.input.dir=/home/ec2-user/input
+
+
+# will control when we update the building
+update.buildings= true
diff --git a/services/course-information/src/main/resources/buildingData/AthensBuildingData.json b/services/course-information/src/main/resources/buildingData/AthensBuildingData.json
new file mode 100644
index 00000000..fdd3b7ff
--- /dev/null
+++ b/services/course-information/src/main/resources/buildingData/AthensBuildingData.json
@@ -0,0 +1,1949 @@
+[
+  {
+    "Address": "",
+    "Name": "NCRR",
+    "Longitude": -83.37477185,
+    "Latitude": 33.95143912, 
+    "Building Code": "NCRR"
+  },
+  {
+    "Address": "",
+    "Name": "TBA",
+    "Longitude": -83.37477185,
+    "Latitude": 33.95143912, 
+    "Building Code": "TBA"
+  },
+  {
+    "Address": "106 Herty Dr",
+    "Name": "Meigs Hall",
+    "Longitude": -83.3754287,
+    "Latitude": 33.95720729,
+    "Building Code": "0024"
+  },
+  {
+    "Address": "286 OCONEE ST",
+    "Name": "Hodgson Oil Building",
+    "Longitude": -83.37092125,
+    "Latitude": 33.95720317,
+    "Building Code": "0019"
+  },
+  {
+    "Address": "200 S JACKSON ST",
+    "Name": "Phi Kappa Hall",
+    "Longitude": -83.37420571,
+    "Latitude": 33.95713815,
+    "Building Code": "0020"
+  },
+  {
+    "Address": "105 N HERTY DR",
+    "Name": "Demosthenian Hall",
+    "Longitude": -83.37519617,
+    "Latitude": 33.95688555,
+    "Building Code": "0021"
+  },
+  {
+    "Address": "109 N HERTY DR",
+    "Name": "Chapel",
+    "Longitude": -83.37520216,
+    "Latitude": 33.95665922,
+    "Building Code": "0022"
+  },
+  {
+    "Address": "210 S JACKSON ST",
+    "Name": "Terrell Hall",
+    "Longitude": -83.37417688,
+    "Latitude": 33.95677504,
+    "Building Code": "0023"
+  },
+  {
+    "Address": "106 N HERTY DR",
+    "Name": "Meigs Hall",
+    "Longitude": -83.37627927,
+    "Latitude": 33.95656661,
+    "Building Code": "0024"
+  },
+  {
+    "Address": "108 N HERTY DR",
+    "Name": "Moore Hall",
+    "Longitude": -83.37580568,
+    "Latitude": 33.95651324,
+    "Building Code": "0025"
+  },
+  {
+    "Address": "205 N HERTY DR",
+    "Name": "New College",
+    "Longitude": -83.37493607,
+    "Latitude": 33.95616667,
+    "Building Code": "0030"
+  },
+  {
+    "Address": "202 N HERTY DR",
+    "Name": "Candler Hall",
+    "Longitude": -83.37614494,
+    "Latitude": 33.95606601,
+    "Building Code": "0031"
+  },
+  {
+    "Address": "235 S JACKSON ST",
+    "Name": "Bishop House",
+    "Longitude": -83.37316974,
+    "Latitude": 33.95586197,
+    "Building Code": "0032"
+  },
+  {
+    "Address": "279 WILLIAMS ST",
+    "Name": "School of Social Work Building",
+    "Longitude": -83.36929324,
+    "Latitude": 33.95285899,
+    "Building Code": "0033"
+  },
+  {
+    "Address": "285 S JACKSON ST",
+    "Name": "Jackson Street Building",
+    "Longitude": -83.37279925,
+    "Latitude": 33.95522775,
+    "Building Code": "0040"
+  },
+  {
+    "Address": "240 S JACKSON ST",
+    "Name": "Waddel Hall",
+    "Longitude": -83.37388569,
+    "Latitude": 33.95540649,
+    "Building Code": "0041"
+  },
+  {
+    "Address": "290 S JACKSON ST",
+    "Name": "Peabody Hall",
+    "Longitude": -83.37354682,
+    "Latitude": 33.95492364,
+    "Building Code": "0042"
+  },
+  {
+    "Address": "225 N HERTY DR",
+    "Name": "Hirsch Hall",
+    "Longitude": -83.37447163,
+    "Latitude": 33.9546902,
+    "Building Code": "0043"
+  },
+  {
+    "Address": "115 BOCOCK ST",
+    "Name": "Denmark Hall",
+    "Longitude": -83.37561101,
+    "Latitude": 33.95469885,
+    "Building Code": "0044"
+  },
+  {
+    "Address": "325 S HERTY DR",
+    "Name": "Dean Rusk Hall",
+    "Longitude": -83.37437242,
+    "Latitude": 33.9540178,
+    "Building Code": "0045"
+  },
+  {
+    "Address": "302 S HERTY DR",
+    "Name": "Caldwell Hall",
+    "Longitude": -83.375299,
+    "Latitude": 33.95489824,
+    "Building Code": "0046"
+  },
+  {
+    "Address": "355 S JACKSON ST",
+    "Name": "Baldwin Hall",
+    "Longitude": -83.37230889,
+    "Latitude": 33.95370945,
+    "Building Code": "0050"
+  },
+  {
+    "Address": "250 BALDWIN ST",
+    "Name": "LeConte Hall",
+    "Longitude": -83.37342925,
+    "Latitude": 33.95343253,
+    "Building Code": "0053"
+  },
+  {
+    "Address": "320 S JACKSON ST",
+    "Name": "Main Library",
+    "Longitude": -83.37378624,
+    "Latitude": 33.95404106,
+    "Building Code": "0054"
+  },
+  {
+    "Address": "310 S HERTY DR",
+    "Name": "Brooks Hall",
+    "Longitude": -83.37526084,
+    "Latitude": 33.9541909,
+    "Building Code": "0055"
+  },
+  {
+    "Address": "200 BALDWIN ST",
+    "Name": "Park Hall",
+    "Longitude": -83.37524289,
+    "Latitude": 33.95333913,
+    "Building Code": "0056"
+  },
+  {
+    "Address": "312 S HERTY DR",
+    "Name": "Sanford Hall",
+    "Longitude": -83.37501321,
+    "Latitude": 33.95368383,
+    "Building Code": "0058"
+  },
+  {
+    "Address": "255 BALDWIN ST",
+    "Name": "Fine Arts Building",
+    "Longitude": -83.37587671,
+    "Latitude": 33.95250989,
+    "Building Code": "0060"
+  },
+  {
+    "Address": "265 BALDWIN ST",
+    "Name": "Military Building Army ROTC",
+    "Longitude": -83.37498095,
+    "Latitude": 33.95259535,
+    "Building Code": "0061"
+  },
+  {
+    "Address": "120 HOOPER ST",
+    "Name": "Journalism Building",
+    "Longitude": -83.3739534,
+    "Latitude": 33.95219116,
+    "Building Code": "0062"
+  },
+  {
+    "Address": "110 HOOPER STREET",
+    "Name": "Psychology Building",
+    "Longitude": -83.37290943,
+    "Latitude": 33.95253227,
+    "Building Code": "0064"
+  },
+  {
+    "Address": "185 BALDWIN ST",
+    "Name": "Instructional Plaza",
+    "Longitude": -83.37339835,
+    "Latitude": 33.9524087,
+    "Building Code": "0066"
+  },
+  {
+    "Address": "48 BAXTER ST",
+    "Name": "Zell B. Miller Learning Center",
+    "Longitude": -83.37577163,
+    "Latitude": 33.95168412,
+    "Building Code": "0081"
+  },
+  {
+    "Address": "400 S HULL ST",
+    "Name": "Hull Street Deck",
+    "Longitude": -83.37871668,
+    "Latitude": 33.95286379,
+    "Building Code": "0082"
+  },
+  {
+    "Address": "815 S LUMPKIN ST",
+    "Name": "Geology Hydrothermal Lab",
+    "Longitude": -83.37600032,
+    "Latitude": 33.94939881,
+    "Building Code": "0090"
+  },
+  {
+    "Address": "1180 E BROAD ST",
+    "Name": "Chicopee Main Building No.1",
+    "Longitude": -83.36480076,
+    "Latitude": 33.95934284,
+    "Building Code": "0101"
+  },
+  {
+    "Address": "456 E BROAD ST",
+    "Name": "Business Services",
+    "Longitude": -83.37319154,
+    "Latitude": 33.95781976,
+    "Building Code": "0110"
+  },
+  {
+    "Address": "382 EAST BROAD ST",
+    "Name": "Small Business Development Center",
+    "Longitude": -83.37354229,
+    "Latitude": 33.9577437,
+    "Building Code": "0113"
+  },
+  {
+    "Address": "101 N HERTY DR",
+    "Name": "Holmes/Hunter Academic Building",
+    "Longitude": -83.3754287,
+    "Latitude": 33.95720729,
+    "Building Code": "0120"
+  },
+  {
+    "Address": "210 SPRING ST",
+    "Name": "Delta Innovation Hub",
+    "Longitude": -83.37347599,
+    "Latitude": 33.95735514,
+    "Building Code": "0121"
+  },
+  {
+    "Address": "231 S JACKSON ST",
+    "Name": "North Campus Deck",
+    "Longitude": -83.37257438,
+    "Latitude": 33.95615602,
+    "Building Code": "0122"
+  },
+  {
+    "Address": "199 FULTON ST",
+    "Name": "Tanner Building",
+    "Longitude": -83.37304386,
+    "Latitude": 33.95689612,
+    "Building Code": "0123"
+  },
+  {
+    "Address": "215 S THOMAS ST",
+    "Name": "Sculpture Canopy",
+    "Longitude": -83.37162959,
+    "Latitude": 33.95672405,
+    "Building Code": "0124"
+  },
+  {
+    "Address": "215 N HERTY DR",
+    "Name": "Old College",
+    "Longitude": -83.3745085,
+    "Latitude": 33.95579243,
+    "Building Code": "0130"
+  },
+  {
+    "Address": "595 S LUMPKIN ST",
+    "Name": "Joseph E. Brown Hall",
+    "Longitude": -83.3760898,
+    "Latitude": 33.95333843,
+    "Building Code": "0250"
+  },
+  {
+    "Address": "101 HOOPER ST",
+    "Name": "Payne Hall",
+    "Longitude": -83.37183369,
+    "Latitude": 33.95169295,
+    "Building Code": "0270"
+  },
+  {
+    "Address": "103 HOOPER ST",
+    "Name": "Milledge Hall",
+    "Longitude": -83.37227365,
+    "Latitude": 33.95158699,
+    "Building Code": "0271"
+  },
+  {
+    "Address": "105 HOOPER ST",
+    "Name": "Reed Hall",
+    "Longitude": -83.37266825,
+    "Latitude": 33.95104086,
+    "Building Code": "0280"
+  },
+  {
+    "Address": "825 S LUMPKIN ST",
+    "Name": "Clark Howell Hall",
+    "Longitude": -83.37697569,
+    "Latitude": 33.94951444,
+    "Building Code": "0290"
+  },
+  {
+    "Address": "215 S JACKSON ST",
+    "Name": "Human Resources",
+    "Longitude": -83.3735331,
+    "Latitude": 33.95668984,
+    "Building Code": "0620"
+  },
+  {
+    "Address": "220 S JACKSON ST",
+    "Name": "Administration Building",
+    "Longitude": -83.37402336,
+    "Latitude": 33.95625466,
+    "Building Code": "0631"
+  },
+  {
+    "Address": "230 S JACKSON ST",
+    "Name": "Lustrat House",
+    "Longitude": -83.37383344,
+    "Latitude": 33.95576169,
+    "Building Code": "0632"
+  },
+  {
+    "Address": "210 N HERTY DR",
+    "Name": "Gilbert Hall",
+    "Longitude": -83.37606251,
+    "Latitude": 33.95551156,
+    "Building Code": "0640"
+  },
+  {
+    "Address": "425 S LUMPKIN ST",
+    "Name": "Founders Garden House",
+    "Longitude": -83.376136,
+    "Latitude": 33.95420986,
+    "Building Code": "0650"
+  },
+  {
+    "Address": "705 S LUMPKIN ST",
+    "Name": "Tate Center Deck",
+    "Longitude": -83.37652966,
+    "Latitude": 33.95066713,
+    "Building Code": "0669"
+  },
+  {
+    "Address": "101 SANFORD DR",
+    "Name": "Memorial Hall",
+    "Longitude": -83.3736172,
+    "Latitude": 33.9512641,
+    "Building Code": "0670"
+  },
+  {
+    "Address": "40 BAXTER ST",
+    "Name": "University Bookstore",
+    "Longitude": -83.37477185,
+    "Latitude": 33.95143912,
+    "Building Code": "0671"
+  },
+  {
+    "Address": "45 BAXTER ST",
+    "Name": "Tate Student Center",
+    "Longitude": -83.37499668,
+    "Latitude": 33.95043103,
+    "Building Code": "0672"
+  },
+  {
+    "Address": "280 E CAMPUS RD",
+    "Name": "Sanford Stadium",
+    "Longitude": -83.3724072,
+    "Latitude": 33.94891382,
+    "Building Code": "0678"
+  },
+  {
+    "Address": "650 S LUMPKIN ST",
+    "Name": "Ivester Hall",
+    "Longitude": -83.37713637,
+    "Latitude": 33.95189003,
+    "Building Code": "0734"
+  },
+  {
+    "Address": "630 S LUMPKIN ST",
+    "Name": "Benson Hall",
+    "Longitude": -83.37706272,
+    "Latitude": 33.95234405,
+    "Building Code": "0735"
+  },
+  {
+    "Address": "620 S LUMPKIN ST",
+    "Name": "Amos Hall",
+    "Longitude": -83.37744174,
+    "Latitude": 33.95228223,
+    "Building Code": "0736"
+  },
+  {
+    "Address": "475 S HULL ST",
+    "Name": "Sanford & Barbara Orkin Hall",
+    "Longitude": -83.37781323,
+    "Latitude": 33.95190541,
+    "Building Code": "0737"
+  },
+  {
+    "Address": "415 S HULL ST",
+    "Name": "Moore-Rooker Hall",
+    "Longitude": -83.37781566,
+    "Latitude": 33.95237135,
+    "Building Code": "0738"
+  },
+  {
+    "Address": "600 S LUMPKIN ST",
+    "Name": "Correll Hall",
+    "Longitude": -83.37743804,
+    "Latitude": 33.95279983,
+    "Building Code": "0739"
+  },
+  {
+    "Address": "300 S HULL ST",
+    "Name": "Richard B. Russell Jr. Special Collections",
+    "Longitude": -83.37821532,
+    "Latitude": 33.95405923,
+    "Building Code": "0740"
+  },
+  {
+    "Address": "185 S NEWTON ST",
+    "Name": "District Energy Plant #1",
+    "Longitude": -83.37918206,
+    "Latitude": 33.95200125,
+    "Building Code": "0741"
+  },
+  {
+    "Address": "298 S HULL ST",
+    "Name": "Wray-Nicholson House",
+    "Longitude": -83.37827,
+    "Latitude": 33.95494839,
+    "Building Code": "0751"
+  },
+  {
+    "Address": "240 S. HULL ST",
+    "Name": "Wray-Nicholson Prop 240",
+    "Longitude": -83.37821247,
+    "Latitude": 33.95563211,
+    "Building Code": "0752"
+  },
+  {
+    "Address": "290 S HULL ST",
+    "Name": "Wray-Nicholson Prop 290",
+    "Longitude": -83.37810741,
+    "Latitude": 33.95537823,
+    "Building Code": "0753"
+  },
+  {
+    "Address": "150 WADDELL ST",
+    "Name": "Wray-Nicholson Prop 150",
+    "Longitude": -83.37832721,
+    "Latitude": 33.95461434,
+    "Building Code": "0754"
+  },
+  {
+    "Address": "154 WADDELL ST",
+    "Name": "Wray-Nicholson Prop 154",
+    "Longitude": -83.3786856,
+    "Latitude": 33.95453697,
+    "Building Code": "0755"
+  },
+  {
+    "Address": "198 WADDELL ST",
+    "Name": "Government Relations",
+    "Longitude": -83.37893462,
+    "Latitude": 33.95459655,
+    "Building Code": "0756"
+  },
+  {
+    "Address": "225 W BROAD ST",
+    "Name": "Studio 225",
+    "Longitude": -83.37875985,
+    "Latitude": 33.95659795,
+    "Building Code": "0766"
+  },
+  {
+    "Address": "257 W BROAD ST",
+    "Name": "Interior Design Studios",
+    "Longitude": -83.37905397,
+    "Latitude": 33.95652157,
+    "Building Code": "0767"
+  },
+  {
+    "Address": "287 W BROAD ST",
+    "Name": "The Athenaeum",
+    "Longitude": -83.37936642,
+    "Latitude": 33.95648342,
+    "Building Code": "0768"
+  },
+  {
+    "Address": "120 CEDAR ST",
+    "Name": "Cedar Street Building B",
+    "Longitude": -83.37271187,
+    "Latitude": 33.94796062,
+    "Building Code": "1000"
+  },
+  {
+    "Address": "136 CEDAR ST",
+    "Name": "Cedar Street Building C",
+    "Longitude": -83.37412108,
+    "Latitude": 33.94849115,
+    "Building Code": "1001"
+  },
+  {
+    "Address": "210 FIELD ST",
+    "Name": "Geography and Geology",
+    "Longitude": -83.37539954,
+    "Latitude": 33.9487058,
+    "Building Code": "1002"
+  },
+  {
+    "Address": "220 CEDAR ST",
+    "Name": "Physics Building",
+    "Longitude": -83.3761268,
+    "Latitude": 33.94817231,
+    "Building Code": "1003"
+  },
+  {
+    "Address": "140 CEDAR ST",
+    "Name": "Cedar Street Building D",
+    "Longitude": -83.37482148,
+    "Latitude": 33.94825059,
+    "Building Code": "1004"
+  },
+  {
+    "Address": "305 SANFORD DR",
+    "Name": "Speirs Hall",
+    "Longitude": -83.37526315,
+    "Latitude": 33.9469264,
+    "Building Code": "1010"
+  },
+  {
+    "Address": "147 CEDAR ST",
+    "Name": "Conner Hall",
+    "Longitude": -83.37384438,
+    "Latitude": 33.94750977,
+    "Building Code": "1011"
+  },
+  {
+    "Address": "145 CEDAR ST",
+    "Name": "Lumpkin House",
+    "Longitude": -83.37393486,
+    "Latitude": 33.94780263,
+    "Building Code": "1012"
+  },
+  {
+    "Address": "110 CEDAR ST",
+    "Name": "Cedar Street Building A",
+    "Longitude": -83.37252542,
+    "Latitude": 33.946807,
+    "Building Code": "1013"
+  },
+  {
+    "Address": "100 CEDAR ST",
+    "Name": "Food Science Building",
+    "Longitude": -83.37214982,
+    "Latitude": 33.94606601,
+    "Building Code": "1020"
+  },
+  {
+    "Address": "115 D. W. BROOKS DR",
+    "Name": "Barrow Hall",
+    "Longitude": -83.37370058,
+    "Latitude": 33.94650925,
+    "Building Code": "1021"
+  },
+  {
+    "Address": "137 CEDAR ST",
+    "Name": "Food Processing Lab",
+    "Longitude": -83.37344475,
+    "Latitude": 33.94619918,
+    "Building Code": "1022"
+  },
+  {
+    "Address": "200 DW BROOKS DR",
+    "Name": "Boyd Rsrch and Edu Ctr",
+    "Longitude": -83.37481699,
+    "Latitude": 33.94589811,
+    "Building Code": "1023"
+  },
+  {
+    "Address": "110 Cedar St",
+    "Name": "Poultry Science",
+    "Longitude": -83.3725588,
+    "Latitude": 33.94680,
+    "Building Code": "1025"
+  },
+
+  {
+    "Address": "325 SANFORD DR",
+    "Name": "Marine Science / Dance",
+    "Longitude": -83.37577092,
+    "Latitude": 33.94520752,
+    "Building Code": "1030"
+  },
+  {
+    "Address": "325 SANFORD DR",
+    "Name": "Marine Science / Dance",
+    "Longitude": -83.37577092,
+    "Latitude": 33.94520752,
+    "Building Code": "1030"
+  },
+  {
+    "Address": "201 DW BROOKS DR",
+    "Name": "Hardman Hall",
+    "Longitude": -83.37415125,
+    "Latitude": 33.94507902,
+    "Building Code": "1031"
+  },
+  {
+    "Address": "140 E GREEN ST",
+    "Name": "Ecology",
+    "Longitude": -83.37328111,
+    "Latitude": 33.94434657,
+    "Building Code": "1033"
+  },
+  {
+    "Address": "130 CARLTON ST",
+    "Name": "Science Learning Center",
+    "Longitude": -83.37625283,
+    "Latitude": 33.9427513,
+    "Building Code": "1035"
+  },
+  {
+    "Address": "240 W GREEN ST",
+    "Name": "Pharmacy South",
+    "Longitude": -83.37591404,
+    "Latitude": 33.94343971,
+    "Building Code": "1038"
+  },
+  {
+    "Address": "190 E GREEN ST",
+    "Name": "Forestry Resources 1",
+    "Longitude": -83.37467331,
+    "Latitude": 33.94408307,
+    "Building Code": "1040"
+  },
+  {
+    "Address": "250 W GREEN ST",
+    "Name": "R. C. Wilson Pharmacy",
+    "Longitude": -83.37542445,
+    "Latitude": 33.94418311,
+    "Building Code": "1041"
+  },
+  {
+    "Address": "300 CARLTON ST",
+    "Name": "Hoke Smith Annex",
+    "Longitude": -83.37895387,
+    "Latitude": 33.94389715,
+    "Building Code": "1042"
+  },
+  {
+    "Address": "1225 LUMPKIN ST",
+    "Name": "Coop. Ext. Serv. - Hoke Smith",
+    "Longitude": -83.37953338,
+    "Latitude": 33.94433469,
+    "Building Code": "1043"
+  },
+  {
+    "Address": "170 EAST GREEN ST",
+    "Name": "Forestry Resources 3",
+    "Longitude": -83.37408149,
+    "Latitude": 33.94394901,
+    "Building Code": "1044"
+  },
+  {
+    "Address": "160 EAST GREEN ST",
+    "Name": "Forestry Resources 4",
+    "Longitude": -83.37448656,
+    "Latitude": 33.94365542,
+    "Building Code": "1046"
+  },
+  {
+    "Address": "150 E GREEN ST",
+    "Name": "Environmental Health Sciences",
+    "Longitude": -83.37480919,
+    "Latitude": 33.94332125,
+    "Building Code": "1050"
+  },
+  {
+    "Address": "120 E GREEN ST",
+    "Name": "Davison Life Sciences Complex",
+    "Longitude": -83.37235379,
+    "Latitude": 33.94320559,
+    "Building Code": "1057"
+  },
+  {
+    "Address": "110 EAST GREEN ST",
+    "Name": "Life Sciences Fermentation Lab",
+    "Longitude": -83.3718029,
+    "Latitude": 33.9432408,
+    "Building Code": "1058"
+  },
+  {
+    "Address": "110 CARLTON ST",
+    "Name": "Aderhold",
+    "Longitude": -83.37296634,
+    "Latitude": 33.94176381,
+    "Building Code": "1060"
+  },
+  {
+    "Address": "120 CARLTON ST",
+    "Name": "Miller Plant Science",
+    "Longitude": -83.37507242,
+    "Latitude": 33.94238652,
+    "Building Code": "1061"
+  },
+  {
+    "Address": "115 VETERINARY LOOP RD",
+    "Name": "Locomotive Diag. Center",
+    "Longitude": -83.3732856,
+    "Latitude": 33.94042846,
+    "Building Code": "1064"
+  },
+  {
+    "Address": "125 VETERINARY LOOP RD",
+    "Name": "Pet Health Center",
+    "Longitude": -83.37392751,
+    "Latitude": 33.9405576,
+    "Building Code": "1065"
+  },
+  {
+    "Address": "135 VETERINARY LOOP RD",
+    "Name": "Vet. Medicine 10",
+    "Longitude": -83.37368872,
+    "Latitude": 33.94023625,
+    "Building Code": "1066"
+  },
+  {
+    "Address": "145 VETERINARY LOOP RD",
+    "Name": "Vet. Medicine 11",
+    "Longitude": -83.37333523,
+    "Latitude": 33.93989157,
+    "Building Code": "1067"
+  },
+  {
+    "Address": "501 DW BROOKS DR",
+    "Name": "College of Veterinary Medicine 1",
+    "Longitude": -83.37545718,
+    "Latitude": 33.94006719,
+    "Building Code": "1070"
+  },
+  {
+    "Address": "130 VETERINARY LOOP RD",
+    "Name": "Vet. Medicine 2",
+    "Longitude": -83.374637,
+    "Latitude": 33.94036943,
+    "Building Code": "1072"
+  },
+  {
+    "Address": "501 DW BROOKS DR",
+    "Name": "Vet. Medicine 6",
+    "Longitude": -83.37531252,
+    "Latitude": 33.93963592,
+    "Building Code": "1073"
+  },
+  {
+    "Address": "111 CARLTON ST",
+    "Name": "Animal Health Research Center",
+    "Longitude": -83.37295263,
+    "Latitude": 33.94091427,
+    "Building Code": "1077"
+  },
+  {
+    "Address": "120 VETERINARY LOOP RD",
+    "Name": "Veterinary Diagnostic Lab",
+    "Longitude": -83.37490425,
+    "Latitude": 33.94060786,
+    "Building Code": "1079"
+  },
+  {
+    "Address": "589 DW BROOKS DR",
+    "Name": "Wildlife Health",
+    "Longitude": -83.37470486,
+    "Latitude": 33.93949709,
+    "Building Code": "1082"
+  },
+  {
+    "Address": "150 VETERINARY LOOP RD",
+    "Name": "Vet Med BioResources Facility",
+    "Longitude": -83.37449174,
+    "Latitude": 33.9399363,
+    "Building Code": "1084"
+  },
+  {
+    "Address": "597 DW BROOKS DR",
+    "Name": "Driftmier Engineering Center",
+    "Longitude": -83.37506535,
+    "Latitude": 33.93883498,
+    "Building Code": "1090"
+  },
+  {
+    "Address": "597 DW BROOKS DR",
+    "Name": "Driftmier Engineering Annex",
+    "Longitude": -83.37392539,
+    "Latitude": 33.93894126,
+    "Building Code": "1094"
+  },
+  {
+    "Address": "125 SMITH ST",
+    "Name": "Carlton Street Deck",
+    "Longitude": -83.37794931,
+    "Latitude": 33.94121004,
+    "Building Code": "1110"
+  },
+  {
+    "Address": "500 D W BROOKS DR",
+    "Name": "Paul D. Coverdell Center",
+    "Longitude": -83.37675666,
+    "Latitude": 33.94107153,
+    "Building Code": "1111"
+  },
+  {
+    "Address": "101 CEDAR ST",
+    "Name": "Computing Services",
+    "Longitude": -83.37185316,
+    "Latitude": 33.94518817,
+    "Building Code": "1130"
+  },
+  {
+    "Address": "302 E CAMPUS RD",
+    "Name": "STEM Research Building I",
+    "Longitude": -83.37281786,
+    "Latitude": 33.94492722,
+    "Building Code": "1131"
+  },
+  {
+    "Address": "312 E CAMPUS RD",
+    "Name": "STEM Research Building II",
+    "Longitude": -83.37281786,
+    "Latitude": 33.94492722,
+    "Building Code": "1132"
+  },
+  {
+    "Address": "100 GREEN ST",
+    "Name": "South Campus Deck",
+    "Longitude": -83.37753203,
+    "Latitude": 33.94554479,
+    "Building Code": "1139"
+  },
+  {
+    "Address": "180 E GREEN ST",
+    "Name": "Forestry Resources 2",
+    "Longitude": -83.37438817,
+    "Latitude": 33.94401225,
+    "Building Code": "1140"
+  },
+  {
+    "Address": "305 CEDAR ST",
+    "Name": "Rutherford Hall",
+    "Longitude": -83.37667073,
+    "Latitude": 33.94694628,
+    "Building Code": "1215"
+  },
+  {
+    "Address": "315 SANFORD DR",
+    "Name": "Soule Hall",
+    "Longitude": -83.3759875,
+    "Latitude": 33.94620719,
+    "Building Code": "1220"
+  },
+  {
+    "Address": "310 SANFORD DR",
+    "Name": "Mary Lyndon Hall",
+    "Longitude": -83.37702431,
+    "Latitude": 33.94599026,
+    "Building Code": "1221"
+  },
+  {
+    "Address": "1055 S. LUMPKIN ST",
+    "Name": "Myers Hall",
+    "Longitude": -83.37780384,
+    "Latitude": 33.94667885,
+    "Building Code": "1222"
+  },
+  {
+    "Address": "403 SANFORD DR",
+    "Name": "Family Science Center 1",
+    "Longitude": -83.37664371,
+    "Latitude": 33.94401826,
+    "Building Code": "1246"
+  },
+  {
+    "Address": "407 SANFORD DR",
+    "Name": "Charles Schwab Financial Planning Center",
+    "Longitude": -83.37694059,
+    "Latitude": 33.94380836,
+    "Building Code": "1247"
+  },
+  {
+    "Address": "415 SANFORD DR",
+    "Name": "Housing and Consumer Research Center",
+    "Longitude": -83.37712012,
+    "Latitude": 33.94401512,
+    "Building Code": "1248"
+  },
+  {
+    "Address": "405 SANFORD DR",
+    "Name": "Family Science Center 2",
+    "Longitude": -83.37682565,
+    "Latitude": 33.94421114,
+    "Building Code": "1249"
+  },
+  {
+    "Address": "310 E CAMPUS RD",
+    "Name": "Tucker Hall",
+    "Longitude": -83.37113462,
+    "Latitude": 33.9426488,
+    "Building Code": "1250"
+  },
+  {
+    "Address": "220 W GREEN ST",
+    "Name": "Horticulture Greenhouse",
+    "Longitude": -83.37602332,
+    "Latitude": 33.94405284,
+    "Building Code": "1340"
+  },
+  {
+    "Address": "425 RIVER RD",
+    "Name": "Rhodes Animal Science Center - A",
+    "Longitude": -83.36906943,
+    "Latitude": 33.93536298,
+    "Building Code": "1501"
+  },
+  {
+    "Address": "425 RIVER RD",
+    "Name": "Rhodes Animal Science Center - C",
+    "Longitude": -83.36845464,
+    "Latitude": 33.936349,
+    "Building Code": "1502"
+  },
+  {
+    "Address": "425 RIVER RD",
+    "Name": "Rhodes Animal Science Center - B",
+    "Longitude": -83.36861235,
+    "Latitude": 33.93582156,
+    "Building Code": "1503"
+  },
+  {
+    "Address": "335 RIVER RD",
+    "Name": "East Village Deck",
+    "Longitude": -83.36629955,
+    "Latitude": 33.93841982,
+    "Building Code": "1510"
+  },
+  {
+    "Address": "80 CARLTON ST",
+    "Name": "Joe Frank Harris Commons",
+    "Longitude": -83.37082376,
+    "Latitude": 33.93908655,
+    "Building Code": "1511"
+  },
+  {
+    "Address": "365 RIVER RD",
+    "Name": "George D. Busbee Hall",
+    "Longitude": -83.36810892,
+    "Latitude": 33.93802864,
+    "Building Code": "1512"
+  },
+  {
+    "Address": "385 RIVER RD",
+    "Name": "Rooker Hall",
+    "Longitude": -83.36790387,
+    "Latitude": 33.93709262,
+    "Building Code": "1513"
+  },
+  {
+    "Address": "375 RIVER RD",
+    "Name": "Vandiver Hall",
+    "Longitude": -83.36731193,
+    "Latitude": 33.93752201,
+    "Building Code": "1514"
+  },
+  {
+    "Address": "355 RIVER RD",
+    "Name": "McWhorter Hall",
+    "Longitude": -83.36712829,
+    "Latitude": 33.93820183,
+    "Building Code": "1515"
+  },
+  {
+    "Address": "395 RIVER RD",
+    "Name": "Building 1516",
+    "Longitude": -83.36709952,
+    "Latitude": 33.93670381,
+    "Building Code": "1516"
+  },
+  {
+    "Address": "117 CEDAR STREET",
+    "Name": "District Energy Plant #2",
+    "Longitude": -83.37281786,
+    "Latitude": 33.94492722,
+    "Building Code": "1617"
+  },
+  {
+    "Address": "210 DW BROOKS DR",
+    "Name": "Shirley Mathis McBay Science Library",
+    "Longitude": -83.37532078,
+    "Latitude": 33.94600768,
+    "Building Code": "1621"
+  },
+  {
+    "Address": "203 DW BROOKS DR",
+    "Name": "Ecology Centers",
+    "Longitude": -83.37347897,
+    "Latitude": 33.94501093,
+    "Building Code": "1632"
+  },
+  {
+    "Address": "205 RIVERBEND RD",
+    "Name": "Vehicle Transporation & Maintenance",
+    "Longitude": -83.36563043,
+    "Latitude": 33.92935148,
+    "Building Code": "1634"
+  },
+  {
+    "Address": "2505 RIVERBEND RD",
+    "Name": "Campus Transit Facility",
+    "Longitude": -83.37141577,
+    "Latitude": 33.92350502,
+    "Building Code": "1637"
+  },
+  {
+    "Address": "1197 S LUMPKIN ST",
+    "Name": "Georgia Center for Cont Ed",
+    "Longitude": -83.37776814,
+    "Latitude": 33.94456509,
+    "Building Code": "1640"
+  },
+  {
+    "Address": "200 W GREEN ST",
+    "Name": "Snelling Dining Hall",
+    "Longitude": -83.37639234,
+    "Latitude": 33.94472428,
+    "Building Code": "1643"
+  },
+  {
+    "Address": "202 CARLTON ST",
+    "Name": "Child Development Laboratory",
+    "Longitude": -83.37671381,
+    "Latitude": 33.94354604,
+    "Building Code": "1652"
+  },
+  {
+    "Address": "100 SMITH ST",
+    "Name": "Stegeman Coliseum",
+    "Longitude": -83.3781464,
+    "Latitude": 33.94278834,
+    "Building Code": "1654"
+  },
+  {
+    "Address": "1224 S LUMPKIN ST",
+    "Name": "Cobb House",
+    "Longitude": -83.37989517,
+    "Latitude": 33.94559263,
+    "Building Code": "1656"
+  },
+  {
+    "Address": "1234 S LUMPKIN ST",
+    "Name": "Treanor House",
+    "Longitude": -83.38002637,
+    "Latitude": 33.94533716,
+    "Building Code": "1657"
+  },
+  {
+    "Address": "518 DW BROOKS DR",
+    "Name": "Tennis Hall of Fame",
+    "Longitude": -83.37905188,
+    "Latitude": 33.94070384,
+    "Building Code": "1670"
+  },
+  {
+    "Address": "1 SELIG CIR",
+    "Name": "Butts-Mehre Heritage Hall",
+    "Longitude": -83.38123115,
+    "Latitude": 33.94213394,
+    "Building Code": "1671"
+  },
+  {
+    "Address": "1 SELIG CIR",
+    "Name": "Butts-Mehre Heritage Hall",
+    "Longitude": -83.38123115,
+    "Latitude": 33.94213394,
+    "Building Code": "1671"
+  },
+  {
+    "Address": "390 E RUTHERFORD ST",
+    "Name": "Rankin M. Smith, Sr, Student Ath Acad Ctr",
+    "Longitude": -83.37884695,
+    "Latitude": 33.94205417,
+    "Building Code": "1673"
+  },
+  {
+    "Address": "1240 SOUTH LUMPKIN ST",
+    "Name": "J.W. Fanning Building",
+    "Longitude": -83.38027185,
+    "Latitude": 33.94481217,
+    "Building Code": "1675"
+  },
+  {
+    "Address": "514 DW BROOKS DR",
+    "Name": "Women's Tennis Clubhouse",
+    "Longitude": -83.37817108,
+    "Latitude": 33.94047747,
+    "Building Code": "1678"
+  },
+  {
+    "Address": "520 DW BROOKS DR",
+    "Name": "Men's Tennis Clubhouse",
+    "Longitude": -83.3794257,
+    "Latitude": 33.94051399,
+    "Building Code": "1679"
+  },
+  {
+    "Address": "501 DW BROOKS DR",
+    "Name": "Vet. Medicine 5A",
+    "Longitude": -83.37414736,
+    "Latitude": 33.93960298,
+    "Building Code": "1680"
+  },
+  {
+    "Address": "501 DW BROOKS DR",
+    "Name": "Vet. Medicine 5C",
+    "Longitude": -83.37398683,
+    "Latitude": 33.93956384,
+    "Building Code": "1682"
+  },
+  {
+    "Address": "501 DW BROOKS DR",
+    "Name": "Vet. Medicine 5D",
+    "Longitude": -83.37416147,
+    "Latitude": 33.93969828,
+    "Building Code": "1683"
+  },
+  {
+    "Address": "75 PINECREST DR",
+    "Name": "Foley Baseball Stadium",
+    "Longitude": -83.38091475,
+    "Latitude": 33.94102876,
+    "Building Code": "1685"
+  },
+  {
+    "Address": "90 SMITH ST",
+    "Name": "Coliseum Training Facility",
+    "Longitude": -83.37753031,
+    "Latitude": 33.94219695,
+    "Building Code": "1687"
+  },
+  {
+    "Address": "330 RIVER RD",
+    "Name": "Ramsey Center",
+    "Longitude": -83.37135738,
+    "Latitude": 33.93773731,
+    "Building Code": "1690"
+  },
+  {
+    "Address": "250 RIVER RD",
+    "Name": "Hugh Hodgson School of Music",
+    "Longitude": -83.36872883,
+    "Latitude": 33.94122687,
+    "Building Code": "1691"
+  },
+  {
+    "Address": "230 RIVER RD",
+    "Name": "Performing Arts",
+    "Longitude": -83.36953741,
+    "Latitude": 33.94197338,
+    "Building Code": "1692"
+  },
+  {
+    "Address": "90 CARLTON ST",
+    "Name": "Georgia Museum of Art",
+    "Longitude": -83.3701541,
+    "Latitude": 33.94110757,
+    "Building Code": "1693"
+  },
+  {
+    "Address": "270 RIVER RD",
+    "Name": "Lamar Dodd School of Art",
+    "Longitude": -83.36917468,
+    "Latitude": 33.94040489,
+    "Building Code": "1694"
+  },
+  {
+    "Address": "300 RIVER RD",
+    "Name": "East Campus Deck",
+    "Longitude": -83.36931709,
+    "Latitude": 33.93812902,
+    "Building Code": "1698"
+  },
+  {
+    "Address": "220 RIVER RD",
+    "Name": "PAC Deck",
+    "Longitude": -83.37006157,
+    "Latitude": 33.94220744,
+    "Building Code": "1699"
+  },
+  {
+    "Address": "55 CARLTON ST",
+    "Name": "UGA Health Center",
+    "Longitude": -83.37217,
+    "Latitude": 33.93592618,
+    "Building Code": "1701"
+  },
+  {
+    "Address": "1985 NEW JIMMY DANIEL RD",
+    "Name": "Administrative Services Annex",
+    "Longitude": -83.48849603,
+    "Latitude": 33.93780772,
+    "Building Code": "2007"
+  },
+  {
+    "Address": "529 BAXTER ST",
+    "Name": "529 Baxter St",
+    "Longitude": -83.38410481,
+    "Latitude": 33.94965346,
+    "Building Code": "2029"
+  },
+  {
+    "Address": "4435 ATLANTA HWY",
+    "Name": "Administrative Services Warehouse",
+    "Longitude": -83.48875178,
+    "Latitude": 33.9386808,
+    "Building Code": "2037"
+  },
+  {
+    "Address": "240A RIVERBEND RD",
+    "Name": "Environmental Safety Building",
+    "Longitude": -83.36735638,
+    "Latitude": 33.93000781,
+    "Building Code": "2118"
+  },
+  {
+    "Address": "1088 S LUMPKIN ST",
+    "Name": "Auxiliary Services",
+    "Longitude": -83.37903279,
+    "Latitude": 33.94574139,
+    "Building Code": "2119"
+  },
+  {
+    "Address": "240 RIVERBEND RD",
+    "Name": "Central Food Storage",
+    "Longitude": -83.36698557,
+    "Latitude": 33.93035704,
+    "Building Code": "2122"
+  },
+  {
+    "Address": "110 RIVERBEND RD",
+    "Name": "Riverbend Solvent Storage Bldg",
+    "Longitude": -83.36607048,
+    "Latitude": 33.93138297,
+    "Building Code": "2124"
+  },
+  {
+    "Address": "110 RIVERBEND RD",
+    "Name": "Riverbend Research Lab North",
+    "Longitude": -83.36559735,
+    "Latitude": 33.93134458,
+    "Building Code": "2125"
+  },
+  {
+    "Address": "120 RIVERBEND RD",
+    "Name": "Center for Applied Isotope Study",
+    "Longitude": -83.36652238,
+    "Latitude": 33.93105525,
+    "Building Code": "2127"
+  },
+  {
+    "Address": "190 RIVER RD",
+    "Name": "Ceramics",
+    "Longitude": -83.36971557,
+    "Latitude": 33.9433648,
+    "Building Code": "2131"
+  },
+  {
+    "Address": "305 E CLOVERHURST AVE",
+    "Name": "West Campus Deck",
+    "Longitude": -83.38181182,
+    "Latitude": 33.94880301,
+    "Building Code": "2136"
+  },
+  {
+    "Address": "390 S LUMPKIN ST",
+    "Name": "Morris Hall",
+    "Longitude": -83.37688362,
+    "Latitude": 33.95388344,
+    "Building Code": "2204"
+  },
+  {
+    "Address": "205 BAXTER ST",
+    "Name": "Lipscomb Hall",
+    "Longitude": -83.37826974,
+    "Latitude": 33.95094775,
+    "Building Code": "2208"
+  },
+  {
+    "Address": "215 BAXTER ST",
+    "Name": "Mell Hall",
+    "Longitude": -83.37871485,
+    "Latitude": 33.9508429,
+    "Building Code": "2209"
+  },
+  {
+    "Address": "415 BAXTER ST",
+    "Name": "Creswell Hall",
+    "Longitude": -83.380032,
+    "Latitude": 33.949987,
+    "Building Code": "2211"
+  },
+  {
+    "Address": "515 BAXTER ST",
+    "Name": "Russell Hall",
+    "Longitude": -83.38152096,
+    "Latitude": 33.94993868,
+    "Building Code": "2212"
+  },
+  {
+    "Address": "615 BAXTER ST",
+    "Name": "Brumby Hall",
+    "Longitude": -83.38284979,
+    "Latitude": 33.94966235,
+    "Building Code": "2213"
+  },
+  {
+    "Address": "810 S LUMPKIN ST",
+    "Name": "Hill Hall",
+    "Longitude": -83.37806928,
+    "Latitude": 33.94943685,
+    "Building Code": "2214"
+  },
+  {
+    "Address": "880 S LUMPKIN ST",
+    "Name": "Church Hall",
+    "Longitude": -83.3782837,
+    "Latitude": 33.94896705,
+    "Building Code": "2215"
+  },
+  {
+    "Address": "900 S LUMPKIN ST",
+    "Name": "Boggs Hall",
+    "Longitude": -83.37838061,
+    "Latitude": 33.94859181,
+    "Building Code": "2216"
+  },
+  {
+    "Address": "150 UNIVERSITY CT",
+    "Name": "Oglethorpe House",
+    "Longitude": -83.37934399,
+    "Latitude": 33.94768492,
+    "Building Code": "2217"
+  },
+  {
+    "Address": "1064 S. LUMPKIN ST",
+    "Name": "Alpha Chi Omega Sorority",
+    "Longitude": -83.37893276,
+    "Latitude": 33.94642865,
+    "Building Code": "2218"
+  },
+  {
+    "Address": "1324 S LUMPKIN ST",
+    "Name": "Office of Global Engagement",
+    "Longitude": -83.38192222,
+    "Latitude": 33.94401578,
+    "Building Code": "2219"
+  },
+  {
+    "Address": "1324 S LUMPKIN ST",
+    "Name": "Office of Global Engagement",
+    "Longitude": -83.38192222,
+    "Latitude": 33.94401578,
+    "Building Code": "2219"
+  },
+  {
+    "Address": "525 BLOOMFIELD ST",
+    "Name": "Sigma Delta Tau Sorority",
+    "Longitude": -83.38394588,
+    "Latitude": 33.94300145,
+    "Building Code": "2220"
+  },
+  {
+    "Address": "101 COLLEGE STATION RD",
+    "Name": "University Village A",
+    "Longitude": -83.37553028,
+    "Latitude": 33.93614085,
+    "Building Code": "2221"
+  },
+  {
+    "Address": "103 COLLEGE STATION RD",
+    "Name": "University Village B",
+    "Longitude": -83.37556729,
+    "Latitude": 33.93682773,
+    "Building Code": "2222"
+  },
+  {
+    "Address": "105 COLLEGE STATION RD",
+    "Name": "University Village C",
+    "Longitude": -83.37523202,
+    "Latitude": 33.93573467,
+    "Building Code": "2223"
+  },
+  {
+    "Address": "107 COLLEGE STATION RD",
+    "Name": "University Village D",
+    "Longitude": -83.37480499,
+    "Latitude": 33.93655084,
+    "Building Code": "2224"
+  },
+  {
+    "Address": "104 COLLEGE STATION RD",
+    "Name": "University Village E",
+    "Longitude": -83.37550219,
+    "Latitude": 33.93431451,
+    "Building Code": "2225"
+  },
+  {
+    "Address": "102 COLLEGE STATION RD",
+    "Name": "University Village F",
+    "Longitude": -83.37517354,
+    "Latitude": 33.93496038,
+    "Building Code": "2226"
+  },
+  {
+    "Address": "106 COLLEGE STATION RD",
+    "Name": "University Village G",
+    "Longitude": -83.37532635,
+    "Latitude": 33.93390371,
+    "Building Code": "2227"
+  },
+  {
+    "Address": "108 COLLEGE STATION RD",
+    "Name": "University Village H",
+    "Longitude": -83.37431563,
+    "Latitude": 33.93472779,
+    "Building Code": "2228"
+  },
+  {
+    "Address": "109 COLLEGE STATION RD",
+    "Name": "University Village J",
+    "Longitude": -83.37400265,
+    "Latitude": 33.9359194,
+    "Building Code": "2229"
+  },
+  {
+    "Address": "111 COLLEGE STATION RD",
+    "Name": "University Village K",
+    "Longitude": -83.3738485,
+    "Latitude": 33.93671241,
+    "Building Code": "2230"
+  },
+  {
+    "Address": "113 COLLEGE STATION RD",
+    "Name": "University Village L",
+    "Longitude": -83.37393968,
+    "Latitude": 33.93720621,
+    "Building Code": "2231"
+  },
+  {
+    "Address": "170 RIVER RD",
+    "Name": "Alpha Epsilon Pi",
+    "Longitude": -83.36987668,
+    "Latitude": 33.94405737,
+    "Building Code": "2232"
+  },
+  {
+    "Address": "160 RIVER RD",
+    "Name": "Kappa Sigma",
+    "Longitude": -83.37001684,
+    "Latitude": 33.94523282,
+    "Building Code": "2233"
+  },
+  {
+    "Address": "710 E CAMPUS RD",
+    "Name": "University Village Community Office",
+    "Longitude": -83.37772177,
+    "Latitude": 33.93168162,
+    "Building Code": "2238"
+  },
+  {
+    "Address": "100 ROGERS RD",
+    "Name": "Rogers Road Apts M",
+    "Longitude": -83.37746652,
+    "Latitude": 33.92988459,
+    "Building Code": "2240"
+  },
+  {
+    "Address": "110 ROGERS RD",
+    "Name": "Rogers Road Apts N",
+    "Longitude": -83.37710227,
+    "Latitude": 33.92898781,
+    "Building Code": "2241"
+  },
+  {
+    "Address": "200 ROGERS RD",
+    "Name": "Rogers Road Apts P",
+    "Longitude": -83.37750047,
+    "Latitude": 33.92828392,
+    "Building Code": "2242"
+  },
+  {
+    "Address": "210 ROGERS RD",
+    "Name": "Rogers Road Apts Q",
+    "Longitude": -83.37714086,
+    "Latitude": 33.92725271,
+    "Building Code": "2243"
+  },
+  {
+    "Address": "300 ROGERS RD",
+    "Name": "Rogers Road Apts R",
+    "Longitude": -83.37678354,
+    "Latitude": 33.92621945,
+    "Building Code": "2244"
+  },
+  {
+    "Address": "310 ROGERS RD",
+    "Name": "Rogers Road Apts S",
+    "Longitude": -83.37642777,
+    "Latitude": 33.92519143,
+    "Building Code": "2245"
+  },
+  {
+    "Address": "195 BURNETT ST",
+    "Name": "Alpha Psi Vet. Frat.",
+    "Longitude": -83.37962231,
+    "Latitude": 33.93982965,
+    "Building Code": "2255"
+  },
+  {
+    "Address": "205 BURNETT ST",
+    "Name": "Omega Tau Sigma Frat.",
+    "Longitude": -83.37853883,
+    "Latitude": 33.93978223,
+    "Building Code": "2256"
+  },
+  {
+    "Address": "160 UNIVERSITY CT",
+    "Name": "Oglethorpe Dining Commons",
+    "Longitude": -83.37944509,
+    "Latitude": 33.94709889,
+    "Building Code": "2257"
+  },
+  {
+    "Address": "1683 MILLEDGE AVE EXT",
+    "Name": "Brandon Oaks T",
+    "Longitude": -83.379352,
+    "Latitude": 33.93012934,
+    "Building Code": "2260"
+  },
+  {
+    "Address": "1683 MILLEDGE AVE EXT",
+    "Name": "Brandon Oaks U",
+    "Longitude": -83.3788521,
+    "Latitude": 33.93010419,
+    "Building Code": "2261"
+  },
+  {
+    "Address": "1683 MILLEDGE AVE EXT",
+    "Name": "Brandon Oaks V",
+    "Longitude": -83.37894787,
+    "Latitude": 33.92972837,
+    "Building Code": "2262"
+  },
+  {
+    "Address": "315 BAXTER ST",
+    "Name": "Black-Diallo-Miller Hall",
+    "Longitude": -83.37871485,
+    "Latitude": 33.9508429,
+    "Building Code": "2264"
+  },
+  {
+    "Address": "790 S LUMPKIN ST",
+    "Name": "Bolton Dining Commons",
+    "Longitude": -83.37750237,
+    "Latitude": 33.95102131,
+    "Building Code": "2265"
+  },
+  {
+    "Address": "115 GREEK PARK CIR",
+    "Name": "Sigma Nu",
+    "Longitude": -83.37030928,
+    "Latitude": 33.94651323,
+    "Building Code": "2291"
+  },
+  {
+    "Address": "125 GREEK PARK CIR",
+    "Name": "Tau Epsilon Phi",
+    "Longitude": -83.36985264,
+    "Latitude": 33.94625657,
+    "Building Code": "2292"
+  },
+  {
+    "Address": "145 GREEK PARK CIR",
+    "Name": "Pi Kappa Alpha",
+    "Longitude": -83.36977671,
+    "Latitude": 33.94581171,
+    "Building Code": "2294"
+  },
+  {
+    "Address": "2555 RIVERBEND RD",
+    "Name": "Vet. Medicine  Shop",
+    "Longitude": -83.37158861,
+    "Latitude": 33.9221868,
+    "Building Code": "2368"
+  },
+  {
+    "Address": "2555 RIVERBEND RD",
+    "Name": "Vet. Medicine  Storage",
+    "Longitude": -83.37148194,
+    "Latitude": 33.92191222,
+    "Building Code": "2369"
+  },
+  {
+    "Address": "2555 RIVERBEND RD",
+    "Name": "Vet. Medicine Block Building",
+    "Longitude": -83.37145608,
+    "Latitude": 33.92171242,
+    "Building Code": "2370"
+  },
+  {
+    "Address": "2555 RIVERBEND RD",
+    "Name": "Vet. Medicine  Barn",
+    "Longitude": -83.37121064,
+    "Latitude": 33.92167672,
+    "Building Code": "2371"
+  },
+  {
+    "Address": "2555 RIVERBEND RD",
+    "Name": "Vet. Medicine Fish Barn",
+    "Longitude": -83.37194882,
+    "Latitude": 33.92198589,
+    "Building Code": "2383"
+  },
+  {
+    "Address": "325 RIVERBEND RD",
+    "Name": "Center for Molecular Medicine",
+    "Longitude": -83.36717665,
+    "Latitude": 33.92627253,
+    "Building Code": "2395"
+  },
+  {
+    "Address": "107 RIVERBEND RD",
+    "Name": "Agronomy Soil Building",
+    "Longitude": -83.36350825,
+    "Latitude": 33.93099538,
+    "Building Code": "2408"
+  },
+  {
+    "Address": "109 RIVERBEND RD",
+    "Name": "Headhouse Horticulture",
+    "Longitude": -83.36390321,
+    "Latitude": 33.93094186,
+    "Building Code": "2410"
+  },
+  {
+    "Address": "107 RIVERBEND RD",
+    "Name": "Headhouse Plants Agronomy",
+    "Longitude": -83.36319617,
+    "Latitude": 33.93104109,
+    "Building Code": "2411"
+  },
+  {
+    "Address": "105 RIVERBEND RD",
+    "Name": "Soil Storage Building",
+    "Longitude": -83.36213822,
+    "Latitude": 33.93092342,
+    "Building Code": "2413"
+  },
+  {
+    "Address": "115 RIVERBEND RD",
+    "Name": "Lath Greenhouse 3 Botany",
+    "Longitude": -83.363032,
+    "Latitude": 33.92910221,
+    "Building Code": "2414"
+  },
+  {
+    "Address": "220 RIVERBEND RD",
+    "Name": "Riverbend Research Lab South",
+    "Longitude": -83.36602933,
+    "Latitude": 33.93041916,
+    "Building Code": "2418"
+  },
+  {
+    "Address": "315 RIVERBEND RD",
+    "Name": "CCRC",
+    "Longitude": -83.36706869,
+    "Latitude": 33.92728463,
+    "Building Code": "2419"
+  },
+  {
+    "Address": "103 RIVERBEND RD",
+    "Name": "Horticulture Greenhouse 1",
+    "Longitude": -83.36430215,
+    "Latitude": 33.9307923,
+    "Building Code": "2423"
+  },
+  {
+    "Address": "RIVERBEND RD",
+    "Name": "Entomology Greenhouse/Headhouse",
+    "Longitude": -83.36252506,
+    "Latitude": 33.93043288,
+    "Building Code": "2425"
+  },
+  {
+    "Address": "107 RIVERBEND RD",
+    "Name": "Agronomy Seed Lab",
+    "Longitude": -83.36303801,
+    "Latitude": 33.93022952,
+    "Building Code": "2426"
+  },
+  {
+    "Address": "104 RIVERBEND RD",
+    "Name": "Soil Chemical &  Equipment Bldg",
+    "Longitude": -83.36219539,
+    "Latitude": 33.93037693,
+    "Building Code": "2437"
+  },
+  {
+    "Address": "111 RIVERBEND RD",
+    "Name": "CAGTECH",
+    "Longitude": -83.3620174,
+    "Latitude": 33.93161987,
+    "Building Code": "2438"
+  },
+  {
+    "Address": "111 LAKE HERRICK DR",
+    "Name": "Lake Herrick Pavilion",
+    "Longitude": -83.37182399,
+    "Latitude": 33.93177601,
+    "Building Code": "2440"
+  },
+  {
+    "Address": "215 S. THOMAS ST",
+    "Name": "Thomas Street South",
+    "Longitude": -83.37219841,
+    "Latitude": 33.95680759,
+    "Building Code": "2600"
+  },
+  {
+    "Address": "215 S. THOMAS ST",
+    "Name": "Thomas Street Art Studio",
+    "Longitude": -83.37196411,
+    "Latitude": 33.95708672,
+    "Building Code": "2606"
+  },
+  {
+    "Address": "516 DW BROOKS DR",
+    "Name": "Henry Feild Tennis Stadium",
+    "Longitude": -83.37909859,
+    "Latitude": 33.94024158,
+    "Building Code": "2622"
+  },
+  {
+    "Address": "512 DW BROOKS DR",
+    "Name": "Lindsey Hopkins Indoor Tennis Stadium",
+    "Longitude": -83.37817108,
+    "Latitude": 33.94047747,
+    "Building Code": "2623"
+  },
+  {
+    "Address": "1242 1/2 S LUMPKIN ST",
+    "Name": "Office of Service-Learning",
+    "Longitude": -83.38105208,
+    "Latitude": 33.94537878,
+    "Building Code": "2627"
+  },
+  {
+    "Address": "110 LAKE HERRICK DR",
+    "Name": "Intramural Fields Restrooms",
+    "Longitude": -83.37287022,
+    "Latitude": 33.93336527,
+    "Building Code": "2632"
+  },
+  {
+    "Address": "110 LAKE HERRICK DR",
+    "Name": "Intramural Field Equipment Shed",
+    "Longitude": -83.37271434,
+    "Latitude": 33.93368091,
+    "Building Code": "2634"
+  },
+  {
+    "Address": "1260 S LUMPKIN ST",
+    "Name": "1260 S. Lumpkin St.",
+    "Longitude": -83.38110381,
+    "Latitude": 33.94429289,
+    "Building Code": "2635"
+  },
+  {
+    "Address": "1280 S LUMPKIN ST",
+    "Name": "UGAREF",
+    "Longitude": -83.38126354,
+    "Latitude": 33.94422205,
+    "Building Code": "2636"
+  },
+  {
+    "Address": "215 S. THOMAS ST",
+    "Name": "Jewelry & Metalwork Art Studios",
+    "Longitude": -83.37155863,
+    "Latitude": 33.95702129,
+    "Building Code": "2680"
+  },
+  {
+    "Address": "315 S THOMAS ST",
+    "Name": "Learning & Development Center",
+    "Longitude": -83.37155828,
+    "Latitude": 33.9553702,
+    "Building Code": "2685"
+  },
+  {
+    "Address": "215 THOMAS ST",
+    "Name": "Thomas Street Sculpture",
+    "Longitude": -83.37193076,
+    "Latitude": 33.95683536,
+    "Building Code": "2691"
+  },
+  {
+    "Address": "405 COLLEGE STATION RD",
+    "Name": "Four Towers",
+    "Longitude": -83.37023156,
+    "Latitude": 33.93598942,
+    "Building Code": "2835"
+  },
+  {
+    "Address": "160 LAKE HERRICK DR",
+    "Name": "Intramural Tennis Pavilion",
+    "Longitude": -83.37566658,
+    "Latitude": 33.93059441,
+    "Building Code": "2970"
+  },
+  {
+    "Address": "110 LAKE HERRICK DR",
+    "Name": "Intramural Fields Deck",
+    "Longitude": -83.37234771,
+    "Latitude": 33.93251042,
+    "Building Code": "2972"
+  },
+  {
+    "Address": "135 VETERINARY LOOP RD",
+    "Name": "Vet. Medicine 12",
+    "Longitude": -83.37368872,
+    "Latitude": 33.94023625,
+    "Building Code": "1068"
+  },
+  {
+    "Address": "2360 RAINWATER RD",
+    "Name": "Physical Plant Utility",
+    "Longitude": -83.53082898,
+    "Latitude": 31.47466884,
+    "Building Code": "1641"
+  },
+  {
+    "Address": "2360 RAINWATER RD",
+    "Name": "Physical Plant Grounds",
+    "Longitude": -83.53082898,
+    "Latitude": 31.47466884,
+    "Building Code": "1642"
+  },
+  {
+    "Address": "HENRY FEILD TENNIS CTS",
+    "Name": "Baseball Maintenance & Storage",
+    "Longitude": -83.37806956,
+    "Latitude": 33.9399155,
+    "Building Code": "1686"
+  },
+  {
+    "Address": "130 GREEK PARK CIR",
+    "Name": "Phi Delta Theta",
+    "Longitude": -83.37050914,
+    "Latitude": 33.94601642,
+    "Building Code": "2296"
+  },
+  {
+    "Address": "135 VETERINARY LOOP RD",
+    "Name": "Vet. Medicine Pole Barn",
+    "Longitude": -83.37368872,
+    "Latitude": 33.94023625,
+    "Building Code": "2352"
+  },
+  {
+    "Address": "107 RIVERBEND RD",
+    "Name": "Soil Building 2",
+    "Longitude": -83.36350825,
+    "Latitude": 33.93099538,
+    "Building Code": "2409"
+  },
+  {
+    "Address": "PHOENIX RD",
+    "Name": "Rhizotron Building",
+    "Longitude": -83.35830422,
+    "Latitude": 33.89462172,
+    "Building Code": "2417"
+  },
+  {
+    "Address": "802 S LUMPKIN ST",
+    "Name": "Legion Pool",
+    "Longitude": -83.37856916,
+    "Latitude": 33.94981062,
+    "Building Code": "2604"
+  },
+  {
+    "Address": "300 S HULL ST",
+    "Name": "Learning Ally",
+    "Longitude": -83.37821532,
+    "Latitude": 33.95405923,
+    "Building Code": "2614"
+  }
+]
\ No newline at end of file
diff --git a/services/professor-rating/pom.xml b/services/professor-rating/pom.xml
index 218d383c..a3c4432c 100644
--- a/services/professor-rating/pom.xml
+++ b/services/professor-rating/pom.xml
@@ -66,6 +66,12 @@
             <artifactId>jsoup</artifactId>
             <version>1.18.1</version>
         </dependency>
+
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20240303</version>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/services/professor-rating/src/main/java/edu/uga/devdogs/professor_rating/services/ProfessorRatingService.java b/services/professor-rating/src/main/java/edu/uga/devdogs/professor_rating/services/RateMyProfessorService.java
similarity index 100%
rename from services/professor-rating/src/main/java/edu/uga/devdogs/professor_rating/services/ProfessorRatingService.java
rename to services/professor-rating/src/main/java/edu/uga/devdogs/professor_rating/services/RateMyProfessorService.java
diff --git a/services/professor-rating/src/main/java/edu/uga/devdogs/professor_rating/webscraping/Professor.java b/services/professor-rating/src/main/java/edu/uga/devdogs/professor_rating/webscraping/Professor2.java
similarity index 98%
rename from services/professor-rating/src/main/java/edu/uga/devdogs/professor_rating/webscraping/Professor.java
rename to services/professor-rating/src/main/java/edu/uga/devdogs/professor_rating/webscraping/Professor2.java
index e3fa69e1..3607217c 100644
--- a/services/professor-rating/src/main/java/edu/uga/devdogs/professor_rating/webscraping/Professor.java
+++ b/services/professor-rating/src/main/java/edu/uga/devdogs/professor_rating/webscraping/Professor2.java
@@ -4,7 +4,7 @@
  * @author Yuval Deshe
  * Represents an entry for a professor on the RateMyProfessors website.
  */
-public class Professor {
+public class Professor2 {
     private String name; // The name of the professor.
     private double quality; // The overall quality of the professor.
     private double wouldTakeAgainPercent; // The percentage of students who would take 
@@ -24,7 +24,7 @@ public class Professor {
     /**
      * Constructs a {@code Professor} object.
      */
-    public Professor() {
+    public Professor2() {
         name = "";
         quality = 0;
         wouldTakeAgainPercent = 0;
@@ -58,7 +58,7 @@ public Professor() {
      * @param tags The tags associated with the professor.
      * @param department The department this professor works in.
      */
-    public Professor(String name, double quality, double wouldTakeAgainPercent, double difficultyRating,
+    public Professor2(String name, double quality, double wouldTakeAgainPercent, double difficultyRating,
                      int numOneStar, int numTwoStar, int numThreeStar, int numFourStar, 
                      int numFiveStar, int numRatings, String[] tags, String department) {
         this.name = name;
@@ -94,7 +94,7 @@ public Professor(String name, double quality, double wouldTakeAgainPercent, doub
      * @param tags The tags associated with the professor.
      * @param department The department this professor works in.
      */
-    public Professor(String name, double quality, double wouldTakeAgainPercent, double difficultyRating,
+    public Professor2(String name, double quality, double wouldTakeAgainPercent, double difficultyRating,
                      int numOneStar, int numTwoStar, int numThreeStar, int numFourStar, 
                      int numFiveStar, int[] ratingDistribution, int numRatings, String[] tags, 
                      String department) {
diff --git a/services/professor-rating/src/main/java/edu/uga/devdogs/professor_rating/webscraping/RateMyProfessorScraper.java b/services/professor-rating/src/main/java/edu/uga/devdogs/professor_rating/webscraping/RateMyProfessorScraper.java
new file mode 100644
index 00000000..947f7da1
--- /dev/null
+++ b/services/professor-rating/src/main/java/edu/uga/devdogs/professor_rating/webscraping/RateMyProfessorScraper.java
@@ -0,0 +1,145 @@
+package edu.uga.devdogs.professor_rating.webscraping;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URL;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
+
+public class RateMyProfessorScraper {
+
+    public static int getRateMyProfessorId(String professorName) {
+        String apiUrl = "https://www.ratemyprofessors.com/graphql";
+        String authHeader = "Basic dGVzdDp0ZXN0";
+        String jsonInputString = " {\"query\":\"query NewSearchTeachersQuery(\\n  $query: TeacherSearchQuery!\\n  $count: Int\\n  $includeCompare: Boolean!\\n) {\\n  newSearch {\\n    teachers(query: $query, first: $count) {\\n      didFallback\\n      edges {\\n        cursor\\n        node {\\n          id\\n          legacyId\\n          firstName\\n          lastName\\n          department\\n          departmentId\\n          school {\\n            legacyId\\n            name\\n            id\\n          }\\n          ...CompareProfessorsColumn_teacher @include(if: $includeCompare)\\n        }\\n      }\\n    }\\n  }\\n}\\n\\nfragment CompareProfessorsColumn_teacher on Teacher {\\n  id\\n  legacyId\\n  firstName\\n  lastName\\n  school {\\n    legacyId\\n    name\\n    id\\n  }\\n  department\\n  departmentId\\n  avgRating\\n  avgDifficulty\\n  numRatings\\n  wouldTakeAgainPercentRounded\\n  mandatoryAttendance {\\n    yes\\n    no\\n    neither\\n    total\\n  }\\n  takenForCredit {\\n    yes\\n    no\\n    neither\\n    total\\n  }\\n  ...NoRatingsArea_teacher\\n  ...RatingDistributionWrapper_teacher\\n}\\n\\nfragment NoRatingsArea_teacher on Teacher {\\n  lastName\\n  ...RateTeacherLink_teacher\\n}\\n\\nfragment RateTeacherLink_teacher on Teacher {\\n  legacyId\\n  numRatings\\n  lockStatus\\n}\\n\\nfragment RatingDistributionChart_ratingsDistribution on ratingsDistribution {\\n  r1\\n  r2\\n  r3\\n  r4\\n  r5\\n}\\n\\nfragment RatingDistributionWrapper_teacher on Teacher {\\n  ...NoRatingsArea_teacher\\n  ratingsDistribution {\\n    total\\n    ...RatingDistributionChart_ratingsDistribution\\n  }\\n}\\n\",\"variables\":{\"query\":{\"text\":\"" + professorName + "\"},\"count\":10,\"includeCompare\":false}}";
+
+        HttpClient client = HttpClient.newHttpClient();
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(apiUrl))
+                .header("Content-Type", "application/json")
+                .header("Authorization", authHeader)
+                .POST(HttpRequest.BodyPublishers.ofString(jsonInputString, StandardCharsets.UTF_8))
+                .build();
+
+        try {
+            HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
+            System.out.println("Response Code: " + response.statusCode());
+            System.out.println("Response: " + response.body());
+            JSONObject jsonResponse = new JSONObject(response.body());
+            JSONArray professors = jsonResponse.getJSONObject("data").getJSONObject("newSearch").getJSONObject("teachers").getJSONArray("edges");
+
+            for (int i = 0; i < professors.length(); i++) {
+                JSONObject teacherNode = professors.getJSONObject(i).getJSONObject("node");
+                String firstName = teacherNode.getString("firstName");
+                String lastName = teacherNode.getString("lastName");
+                int id = teacherNode.getInt("legacyId");
+                JSONObject schoolNode = teacherNode.getJSONObject("school");
+                String schoolName = schoolNode.getString("name");
+                if (schoolName.equals("University of Georgia")) {
+                    System.out.println("Professor: " + firstName + " " + lastName + " " + schoolName + " " + id);
+                    return id;
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return Integer.parseInt(null);
+    }
+
+    private static String getStyledFeedbackItem(int id, int index) {
+        String apiUrl = "https://www.ratemyprofessors.com/professor/" + id;
+        HttpClient client = HttpClient.newHttpClient();
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(apiUrl))
+                .GET()
+                .build();
+
+
+        HttpResponse<String> response = null;
+        try {
+            response = client.send(request, HttpResponse.BodyHandlers.ofString());
+        } catch (IOException | InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        String html = response.body();
+
+        Document doc = Jsoup.parse(html);
+
+        Elements elements = doc.select("[class*=StyledFeedbackItem]");
+
+        // Print out the matching elements
+        Element targetElement = elements.get(index).child(0);
+        return targetElement.text();
+    }
+
+    public static int getWouldTakeAgainPercentage(int id) {
+        String percentage = getStyledFeedbackItem(id, 0);
+        String cleaned = percentage.replace("%", "");
+
+        return Integer.parseInt(cleaned);
+
+
+
+    }
+
+    public static int getDifficultyLevel(int id) {
+        String difficultyLevel = getStyledFeedbackItem(id, 1);
+
+        return Integer.parseInt(difficultyLevel);
+    }
+
+    private static double getRating(int id) {
+        String apiUrl = "https://www.ratemyprofessors.com/professor/" + id;
+        HttpClient client = HttpClient.newHttpClient();
+        HttpRequest request = HttpRequest.newBuilder()
+                .uri(URI.create(apiUrl))
+                .GET()
+                .build();
+
+
+        HttpResponse<String> response = null;
+        try {
+            response = client.send(request, HttpResponse.BodyHandlers.ofString());
+        } catch (IOException | InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        String html = response.body();
+
+        Document doc = Jsoup.parse(html);
+
+        // Select elements with a class name containing "StyledFeedbackItem"
+        Elements elements = doc.select("[class*=RatingValue__Numerator]");
+        String text = elements.first().text();
+        return Double.parseDouble(text);
+
+    }
+    public static void main(String[] args) {
+
+        int id = getRateMyProfessorId("Jessica Tripp");
+        
+        int percentage = getWouldTakeAgainPercentage(id);
+        System.out.println(percentage);
+
+        int difficulty = getDifficultyLevel(id);
+        System.out.println(difficulty);
+
+        double rating = getRating(id);
+        System.out.println(rating);
+
+
+    }
+}