diff --git a/src/views/components/common/CalendarGrid/CalendarGrid.tsx b/src/views/components/common/CalendarGrid/CalendarGrid.tsx
index 9c91fe84..6d931dd7 100644
--- a/src/views/components/common/CalendarGrid/CalendarGrid.tsx
+++ b/src/views/components/common/CalendarGrid/CalendarGrid.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { DAY_MAP } from 'src/shared/types/CourseMeeting';
 import styles from './CalendarGrid.module.scss';
 import CalendarCell from '../CalendarGridCell/CalendarGridCell';
+import { CourseMeeting } from 'src/shared/types/CourseMeeting';
 
 const daysOfWeek = Object.keys(DAY_MAP).filter(key => !['S', 'SU'].includes(key));
 const hoursOfDay = Array.from({ length: 14 }, (_, index) => index + 8);
@@ -20,37 +21,44 @@ for (let i = 0; i < 13; i++) {
     grid.push(row);
 }
 
+interface Props {
+    CourseMeetingBlocks: CourseMeeting[];
+}
+
 /**
  * Grid of CalendarGridCell components forming the user's course schedule calendar view
  * @param props
  */
-const Calendar: React.FC = props => (
-    <div className={styles.calendar}>
-        <div className={styles.dayLabelContainer} />
-        {/* Displaying the rest of the calendar */}
-        <div className={styles.timeAndGrid}>
-            {/* <div className={styles.timeColumn}>
-          <div className={styles.timeBlock}></div>
-          {hoursOfDay.map((hour) => (
-            <div key={hour} className={styles.timeBlock}>
-              <div className={styles.timeLabelContainer}>
-                <p>{hour % 12 === 0 ? 12 : hour % 12} {hour < 12 ? 'AM' : 'PM'}</p>
-              </div>
-            </div>
-          ))}
-        </div> */}
-            <div className={styles.calendarGrid}>
-                {/* Displaying day labels */}
-                <div className={styles.timeBlock} />
-                {daysOfWeek.map(day => (
-                    <div key={day} className={styles.day}>
-                        {day}
-                    </div>
-                ))}
-                {grid.map((row, rowIndex) => row)}
+export function Calendar({ CourseMeetingBlocks }: React.PropsWithChildren<Props>): JSX.Element {
+
+    return (
+        <div className={styles.calendar}>
+            <div className={styles.dayLabelContainer} />
+            {/* Displaying the rest of the calendar */}
+            <div className={styles.timeAndGrid}>
+                {/* <div className={styles.timeColumn}>
+            <div className={styles.timeBlock}></div>
+            {hoursOfDay.map((hour) => (
+                <div key={hour} className={styles.timeBlock}>
+                <div className={styles.timeLabelContainer}>
+                    <p>{hour % 12 === 0 ? 12 : hour % 12} {hour < 12 ? 'AM' : 'PM'}</p>
+                </div>
+                </div>
+            ))}
+            </div> */}
+                <div className={styles.calendarGrid}>
+                    {/* Displaying day labels */}
+                    <div className={styles.timeBlock} />
+                    {daysOfWeek.map(day => (
+                        <div key={day} className={styles.day}>
+                            {day}
+                        </div>
+                    ))}
+                    {grid.map((row, rowIndex) => row)}
+                </div>
             </div>
         </div>
-    </div>
+    );
 );
 
 export default Calendar;
diff --git a/src/views/components/common/Chip/Chip.tsx b/src/views/components/common/Chip/Chip.tsx
index 35dac4a6..90a6009c 100644
--- a/src/views/components/common/Chip/Chip.tsx
+++ b/src/views/components/common/Chip/Chip.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
 import Text from '../Text/Text';
 
-
-export const flags = ["WR", "QR", "GC", "CD", "E", "II"]
+export const flags = ['WR', 'QR', 'GC', 'CD', 'E', 'II'];
 
 interface Props {
     label: string;
@@ -12,15 +11,16 @@ interface Props {
  * A reusable chip component that follows the design system of the extension.
  * @returns
  */
-export function Chip({
-    label
-}: React.PropsWithChildren<Props>): JSX.Element {
+export function Chip({ label }: React.PropsWithChildren<Props>): JSX.Element {
     return (
-        <Text as = 'div' variant = 'h4'
-        className="min-w-5 inline-flex items-center justify-center gap-2.5 rounded-lg px-1 py-0.5" 
-        style={{
-            backgroundColor: "#FFD600"
-        }}>
+        <Text
+            as='div'
+            variant='h4'
+            className='min-w-5 inline-flex items-center justify-center gap-2.5 rounded-lg px-1 py-0.5'
+            style={{
+                backgroundColor: '#FFD600',
+            }}
+        >
             {label}
         </Text>
     );