diff --git a/contexts/CalenderContext.tsx b/contexts/CalenderContext.tsx
new file mode 100644
index 0000000..f58716b
--- /dev/null
+++ b/contexts/CalenderContext.tsx
@@ -0,0 +1,109 @@
+import React, { createContext, useState, ReactNode, useEffect } from "react";
+import { endOfMonth, getDate } from "date-fns";
+// TODO: import types
+
+type days =
+  | "Sunday"
+  | "Monday"
+  | "Tuesday"
+  | "Wednesday"
+  | "Thursday"
+  | "Friday"
+  | "Saturday";
+
+interface CalenderContextState {
+  today: Date;
+  selectedMonth: Date;
+  endOfCurrMonth: Date;
+  lastDay: number;
+  daysOfMonth: [number] | [null];
+  daysOfWeek: {
+    startOfWeek: {
+      Sunday: [days];
+      Monday: [days];
+    };
+  };
+}
+
+const CalenderContext = createContext({} as CalenderContextState);
+
+const CalenderContextProvider = ({
+  children,
+}: {
+  children: ReactNode;
+}): JSX.Element => {
+  // Today's date
+  const [today] = useState<Date>(new Date());
+
+  // Selected month & year
+  const [selectedMonth, setSelectedMonth] = useState<Date>(today);
+  const [endOfSelectedMonth, SetEndOfSelectedDMonth] = useState<Date>(endOfMonth(selectedMonth));
+  const [lastDayOfSelectedMonth, setLastDayOfSelectedMonth] = useState<number>(getDate(endOfSelectedMonth));
+
+  const [daysOfMonth, setDaysOfMonth] = useState<[number] | [null]>([null]);
+
+  useEffect(() => {
+    if (
+      lastDayOfSelectedMonth !== daysOfMonth[daysOfMonth.length - 1] ||
+      daysOfMonth === null
+    ) {
+      const newDaysOfMonth: [number] = [0];
+      for (let i = daysOfMonth.length; i < lastDayOfSelectedMonth; i++) {
+        if (newDaysOfMonth.length === 1) {
+          newDaysOfMonth[0] = 1;
+        }
+
+        newDaysOfMonth.push(newDaysOfMonth.length + 1);
+      }
+
+      setDaysOfMonth(newDaysOfMonth);
+    }
+  }, [selectedMonth, lastDayOfCurrMonth]);
+
+  // Calender Layout
+  const daysOfWeek = {
+    startOfWeek: {
+      Sunday: [
+        "Sunday",
+        "Monday",
+        "Tuesday",
+        "Wednesday",
+        "Thursday",
+        "Friday",
+        "Saturday",
+      ],
+      Monday: [
+        "Monday",
+        "Tuesday",
+        "Wednesday",
+        "Thursday",
+        "Friday",
+        "Saturday",
+        "Sunday",
+      ],
+    },
+  };
+
+  //TODO: Create an object of arrays that will align with the days on the week. Make two sets for each start of the week setting.
+
+  // Navigation
+  const prevMonth = (): void => {
+    
+  }
+
+  const calenderContextValues = {
+    today,
+    selectedMonth,
+    daysOfMonth,
+    daysOfWeek,
+    prevMonth
+  };
+
+  return (
+    <CalenderContext.Provider value={calenderContextValues}>
+      {children}
+    </CalenderContext.Provider>
+  );
+};
+
+export { CalenderContextProvider, CalenderContext };
diff --git a/contexts/dateContext.tsx b/contexts/dateContext.tsx
deleted file mode 100644
index e3060b2..0000000
--- a/contexts/dateContext.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import * as React from "react";
-import { useState } from "react";
-// TODO: import types
-
-const CalenderContext = React.createContext<any | null>(null);
-
-function CalenderContextProvider({
-  children,
-}: {
-  children: React.ReactNode;
-}): React.ReactElement | null {
-  const [today] = useState<Date>(new Date());
-
-  const dateProviderValues = {
-    today,
-  };
-
-  return (
-    <CalenderContext.Provider value={dateProviderValues}>
-      {children}
-    </CalenderContext.Provider>
-  );
-}
-
-export { CalenderContextProvider, CalenderContext };