diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000..a9468a4
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,6 @@
+{
+    "extends": [
+        "next/core-web-vitals",
+        "next/typescript"
+    ]
+}
diff --git a/package.json b/package.json
index 3523f69..ab9c854 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,8 @@
         "cors": "2.8.5",
         "drizzle-orm": "0.33.0",
         "emblor": "1.4.6",
+        "eslint": "9.15.0",
+        "eslint-config-next": "15.0.3",
         "express": "4.21.0",
         "express-rate-limit": "7.4.0",
         "glob": "11.0.0",
diff --git a/scripts/hydrate.ts b/scripts/hydrate.ts
index bf3f711..9d549e5 100644
--- a/scripts/hydrate.ts
+++ b/scripts/hydrate.ts
@@ -1,4 +1,4 @@
-// import { orgs, sites, resources, exitNodes, targets } from "@server/db/schema";
+import { orgs, sites, resources, exitNodes, targets } from "@server/db/schema";
 // import db from "@server/db";
 // import { createAdminRole } from "@server/db/ensureActions";
 
diff --git a/src/components/ButtonWithLoading.tsx b/src/components/ButtonWithLoading.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/src/components/SiteSearch.tsx b/src/components/SiteSearch.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/src/providers/OrgUserProvider.tsx b/src/providers/OrgUserProvider.tsx
index 1707cec..9234f9b 100644
--- a/src/providers/OrgUserProvider.tsx
+++ b/src/providers/OrgUserProvider.tsx
@@ -6,16 +6,14 @@ import { useState } from "react";
 
 interface OrgUserProviderProps {
     children: React.ReactNode;
-    orgUser: GetOrgUserResponse | null;
+    orgUser: GetOrgUserResponse;
 }
 
 export function OrgUserProvider({
     children,
     orgUser: serverOrgUser,
 }: OrgUserProviderProps) {
-    const [orgUser, setOrgUser] = useState<GetOrgUserResponse | null>(
-        serverOrgUser
-    );
+    const [orgUser, setOrgUser] = useState<GetOrgUserResponse>(serverOrgUser);
 
     const updateOrgUser = (updateOrgUser: Partial<GetOrgUserResponse>) => {
         if (!orgUser) {