diff --git a/calc-backend/src/index.ts b/calc-backend/src/index.ts
index f286aa5..794de31 100644
--- a/calc-backend/src/index.ts
+++ b/calc-backend/src/index.ts
@@ -2,7 +2,7 @@ import express from "express";
 import cors from "cors";
 import routes from "./server.routes";
 import errorMiddleware from "./middlewares/errorHandler.middleware";
-import { toNodeHandler } from "better-auth/node";
+import { toNodeHandler, fromNodeHeaders} from "better-auth/node";
 import { auth } from "./lib/auth";
 
 const PORT = process.env.PORT || 3000;
@@ -18,7 +18,16 @@ app.use(cors({
 
 app.all("/api/auth/*", toNodeHandler(auth));
 
-app.use(express.json())
+/*
+app.get("/api/session", async (req, res) => {
+  const session = await auth.api.getSession({
+     headers: fromNodeHeaders(req.headers),
+   });
+ return res.json(session);
+});
+*/
+
+app.use(express.json()) // use this after better auth
 
 // Prefixes the endpoint with /
 app.use('/',routes);
diff --git a/calc-frontend/src/App/AuthContext.tsx b/calc-frontend/src/App/AuthContext.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/calc-frontend/src/App/RootLayout.tsx b/calc-frontend/src/App/RootLayout.tsx
index 89a5e0a..936f698 100644
--- a/calc-frontend/src/App/RootLayout.tsx
+++ b/calc-frontend/src/App/RootLayout.tsx
@@ -7,6 +7,8 @@ import CalcLogo from "../components/CalcLogo"
 import { authClient } from "../lib/auth-client";
 import { Avatar, AvatarFallback, AvatarImage } from "../components/ui/avatar"
 
+await authClient.getSession(); // get session
+
 function RootLayout() {
   const session = authClient.useSession();