diff --git a/apps/api/package.json b/apps/api/package.json
index 34a9311a..64e57f11 100644
--- a/apps/api/package.json
+++ b/apps/api/package.json
@@ -35,12 +35,13 @@
     "zod": "^3.25.62"
   },
   "dependencies": {
+    "@crosspost/scheduler-sdk": "^0.1.1",
     "@crosspost/sdk": "^0.3.0",
     "@crosspost/types": "^0.3.0",
-    "@crosspost/scheduler-sdk": "^0.1.1",
     "@curatedotfun/shared-db": "workspace:*",
     "@curatedotfun/types": "workspace:*",
     "@curatedotfun/utils": "workspace:*",
+    "@fastnear/utils": "^0.9.7",
     "@hono/node-server": "^1.8.2",
     "@hono/zod-openapi": "^0.9.5",
     "@hono/zod-validator": "^0.5.0",
@@ -60,7 +61,7 @@
     "lodash": "^4.17.21",
     "mustache": "^4.2.0",
     "near-api-js": "^5.1.1",
-    "near-sign-verify": "^0.3.6",
+    "near-sign-verify": "^0.4.1",
     "ora": "^8.1.1",
     "pg": "^8.15.6",
     "pinata-web3": "^0.5.4",
diff --git a/apps/api/src/middlewares/auth.middleware.ts b/apps/api/src/middlewares/auth.middleware.ts
index 831f4efc..394b8a36 100644
--- a/apps/api/src/middlewares/auth.middleware.ts
+++ b/apps/api/src/middlewares/auth.middleware.ts
@@ -1,54 +1,31 @@
 import { Context, MiddlewareHandler, Next } from "hono";
-import { verify } from "near-sign-verify";
+import { verify } from "hono/jwt";
+import { getCookie } from "hono/cookie";
 
 export function createAuthMiddleware(): MiddlewareHandler {
   return async (c: Context, next: Next) => {
-    const method = c.req.method;
+    const token = getCookie(c, "token");
     let accountId: string | null = null;
 
-    if (method === "GET") {
-      const nearAccountHeader = c.req.header("X-Near-Account");
-      if (
-        nearAccountHeader &&
-        nearAccountHeader.toLowerCase() !== "anonymous"
-      ) {
-        accountId = nearAccountHeader;
+    if (token) {
+      const secret = process.env.JWT_SECRET;
+      if (!secret) {
+        console.error("JWT_SECRET is not set.");
+        c.status(500);
+        return c.json({ error: "Internal Server Error" });
+      }
+      try {
+        const decodedPayload = await verify(token, secret);
+        if (decodedPayload && typeof decodedPayload.sub === "string") {
+          accountId = decodedPayload.sub;
+        }
+      } catch (error) {
+        // Invalid token, proceed as anonymous
+        console.warn("JWT verification failed:", error);
       }
-      // If header is missing or "anonymous", accountId remains null
-      c.set("accountId", accountId);
-      await next();
-      return;
-    }
-
-    // For non-GET requests (POST, PUT, DELETE, PATCH, etc.)
-    const authHeader = c.req.header("Authorization");
-    if (!authHeader || !authHeader.startsWith("Bearer ")) {
-      c.status(401);
-      return c.json({
-        error: "Unauthorized",
-        details: "Missing or malformed Authorization header.",
-      });
     }
 
-    const token = authHeader.substring(7); // Remove "Bearer "
-
-    try {
-      const verificationResult = await verify(token, {
-        expectedRecipient: "curatefun.near",
-        requireFullAccessKey: false,
-        nonceMaxAge: 300000, // 5 mins
-      });
-
-      accountId = verificationResult.accountId;
-      c.set("accountId", accountId);
-      await next();
-    } catch (error) {
-      console.error("Token verification error:", error);
-      c.status(401);
-      return c.json({
-        error: "Unauthorized",
-        details: "Invalid token signature or recipient.",
-      });
-    }
+    c.set("accountId", accountId);
+    await next();
   };
 }
diff --git a/apps/api/src/routes/api/auth.ts b/apps/api/src/routes/api/auth.ts
new file mode 100644
index 00000000..6e714e08
--- /dev/null
+++ b/apps/api/src/routes/api/auth.ts
@@ -0,0 +1,67 @@
+import { Hono } from "hono";
+import { zValidator } from "@hono/zod-validator";
+import { z } from "zod";
+import { AuthService } from "../../services/auth.service";
+import { Env } from "../../types/app";
+import { setCookie } from "hono/cookie";
+
+export const authRoutes = new Hono<Env>();
+
+const CreateAuthRequestSchema = z.object({
+  accountId: z.string(),
+});
+
+const VerifyAuthRequestSchema = z.object({
+  token: z.string(),
+  accountId: z.string(),
+});
+
+authRoutes.post(
+  "/initiate-login",
+  zValidator("json", CreateAuthRequestSchema),
+  async (c) => {
+    const payload = c.req.valid("json");
+    const sp = c.var.sp;
+    const authService = sp.getService<AuthService>("authService");
+    const result = await authService.createAuthRequest(payload);
+    return c.json(result);
+  },
+);
+
+authRoutes.post(
+  "/verify-login",
+  zValidator("json", VerifyAuthRequestSchema),
+  async (c) => {
+    const payload = c.req.valid("json");
+    const sp = c.var.sp;
+    const authService = sp.getService<AuthService>("authService");
+    try {
+      const { jwt } = await authService.verifyAuthRequest(payload);
+      setCookie(c, "token", jwt, {
+        httpOnly: true,
+        secure: process.env.NODE_ENV === "production",
+        sameSite: "Strict",
+        path: "/",
+        maxAge: 60 * 60 * 24 * 7, // 7 days
+      });
+      return c.json({ success: true });
+    } catch (error: unknown) {
+      c.status(401);
+      return c.json({
+        success: false,
+        error: error instanceof Error ? error.message : "Authentication failed",
+      });
+    }
+  },
+);
+
+authRoutes.post("/logout", async (c) => {
+  setCookie(c, "token", "", {
+    httpOnly: true,
+    secure: process.env.NODE_ENV === "production",
+    sameSite: "Strict",
+    path: "/",
+    maxAge: 0,
+  });
+  return c.json({ success: true });
+});
diff --git a/apps/api/src/routes/api/feeds.ts b/apps/api/src/routes/api/feeds.ts
index 56e071e4..72765ed0 100644
--- a/apps/api/src/routes/api/feeds.ts
+++ b/apps/api/src/routes/api/feeds.ts
@@ -1,266 +1,308 @@
+import {
+  ApiErrorResponseSchema,
+  CanModerateResponseSchema,
+  CreateFeedRequestSchema,
+  FeedsWrappedResponseSchema,
+  FeedWrappedResponseSchema,
+  UpdateFeedRequestSchema,
+} from "@curatedotfun/types";
+import { zValidator } from "@hono/zod-validator";
 import { Hono } from "hono";
+import { z } from "zod";
 import { Env } from "../../types/app";
-import { badRequest } from "../../utils/error";
+import { ForbiddenError, NotFoundError } from "../../types/errors";
 import { logger } from "../../utils/logger";
-import { insertFeedSchema, updateFeedSchema } from "@curatedotfun/shared-db";
-import { z } from "zod"; // Added import for z
-import { zValidator } from "@hono/zod-validator"; // Added import for zValidator
-import { ModerationService } from "../../services/moderation.service"; // Added import for ModerationService
+import { ServiceProvider } from "../../utils/service-provider";
 
 const feedsRoutes = new Hono<Env>();
 
-/**
- * Get all feeds
- */
+const feedIdParamSchema = z.object({
+  feedId: z.string().min(1, "Feed ID is required"),
+});
+
+// GET /api/feeds - Get all feeds
 feedsRoutes.get("/", async (c) => {
-  const sp = c.get("sp");
-  const feedService = sp.getFeedService();
   try {
+    const feedService = ServiceProvider.getInstance().getFeedService();
     const feeds = await feedService.getAllFeeds();
-    return c.json(feeds);
-  } catch (error) {
-    logger.error("Error fetching all feeds:", error);
-    return c.json({ error: "Failed to fetch feeds" }, 500);
-  }
-});
-
-/**
- * Create a new feed
- */
-feedsRoutes.post("/", async (c) => {
-  const accountId = c.get("accountId");
-  if (!accountId) {
     return c.json(
-      { error: "Unauthorized. User must be logged in to create a feed." },
-      401,
-    );
-  }
-
-  const body = await c.req.json();
-  const partialValidationResult = insertFeedSchema
-    .omit({ created_by: true })
-    .safeParse(body);
-
-  if (!partialValidationResult.success) {
-    return badRequest(
-      c,
-      "Invalid feed data",
-      partialValidationResult.error.flatten(),
-    );
-  }
-
-  const feedDataWithCreator = {
-    ...partialValidationResult.data,
-    created_by: accountId,
-  };
-
-  const finalValidationResult = insertFeedSchema.safeParse(feedDataWithCreator);
-  if (!finalValidationResult.success) {
-    logger.error(
-      "Error in final validation after adding created_by",
-      finalValidationResult.error,
+      FeedsWrappedResponseSchema.parse({
+        statusCode: 200,
+        success: true,
+        data: feeds.map((feed) => ({
+          ...feed,
+          config: feed.config,
+        })),
+      }),
     );
-    return badRequest(
-      c,
-      "Internal validation error",
-      finalValidationResult.error.flatten(),
-    );
-  }
-
-  const sp = c.get("sp");
-  const feedService = sp.getFeedService();
-  try {
-    const newFeed = await feedService.createFeed(finalValidationResult.data);
-    return c.json(newFeed, 201);
-  } catch (error) {
-    logger.error("Error creating feed:", error);
-    return c.json({ error: "Failed to create feed" }, 500);
-  }
-});
-
-/**
- * Get a specific feed by its ID
- */
-feedsRoutes.get("/:feedId", async (c) => {
-  const feedId = c.req.param("feedId");
-  const sp = c.get("sp");
-  const feedService = sp.getFeedService();
-  try {
-    const feed = await feedService.getFeedById(feedId);
-    if (!feed) {
-      return c.notFound();
-    }
-    return c.json(feed);
   } catch (error) {
-    logger.error(`Error fetching feed ${feedId}:`, error);
-    return c.json({ error: "Failed to fetch feed" }, 500);
-  }
-});
-
-/**
- * Update an existing feed
- */
-feedsRoutes.put("/:feedId", async (c) => {
-  const accountId = c.get("accountId");
-  if (!accountId) {
-    return c.json(
-      { error: "Unauthorized. User must be logged in to update a feed." },
-      401,
-    );
-  }
-
-  const feedId = c.req.param("feedId");
-  const sp = c.get("sp");
-  const feedService = sp.getFeedService();
-
-  const canUpdate = await feedService.hasPermission(
-    accountId,
-    feedId,
-    "update",
-  );
-  if (!canUpdate) {
+    logger.error({ error }, "Error fetching all feeds");
     return c.json(
-      { error: "Forbidden. You do not have permission to update this feed." },
-      403,
+      ApiErrorResponseSchema.parse({
+        statusCode: 500,
+        success: false,
+        error: { message: "Failed to fetch feeds" },
+      }),
+      500,
     );
   }
+});
 
-  const body = await c.req.json();
-  const validationResult = updateFeedSchema.safeParse(body);
-
-  if (!validationResult.success) {
-    return badRequest(c, "Invalid feed data", validationResult.error.flatten());
-  }
-
-  try {
-    const updatedFeed = await feedService.updateFeed(
-      feedId,
-      validationResult.data,
-    );
-    if (!updatedFeed) {
-      return c.notFound();
+// POST /api/feeds - Create a new feed
+feedsRoutes.post(
+  "/",
+  zValidator("json", CreateFeedRequestSchema),
+  async (c) => {
+    const accountId = c.get("accountId");
+    if (!accountId) {
+      return c.json(
+        ApiErrorResponseSchema.parse({
+          statusCode: 401,
+          success: false,
+          error: { message: "Unauthorized. User must be logged in." },
+        }),
+        401,
+      );
     }
-    return c.json(updatedFeed);
-  } catch (error) {
-    logger.error(`Error updating feed ${feedId}:`, error);
-    return c.json({ error: "Failed to update feed" }, 500);
-  }
-});
 
-/**
- * Process approved submissions for a feed
- * Optional query parameter: distributors - comma-separated list of distributor plugins to use
- * Example: /api/feeds/solana/process?distributors=@curatedotfun/rss
- */
-feedsRoutes.post("/:feedId/process", async (c) => {
-  const accountId = c.get("accountId");
-  if (!accountId) {
-    return c.json(
-      { error: "Unauthorized. User must be logged in to process a feed." },
-      401,
-    );
-  }
+    try {
+      const feedConfig = c.req.valid("json");
+      const feedService = ServiceProvider.getInstance().getFeedService();
+      const newFeed = await feedService.createFeed(feedConfig, accountId);
 
-  const sp = c.get("sp");
-  const feedService = sp.getFeedService();
+      return c.json(
+        FeedWrappedResponseSchema.parse({
+          statusCode: 201,
+          success: true,
+          data: {
+            ...newFeed,
+            config: newFeed.config,
+          },
+        }),
+        201,
+      );
+    } catch (error) {
+      logger.error({ error, accountId }, "Error creating feed");
+      return c.json(
+        ApiErrorResponseSchema.parse({
+          statusCode: 500,
+          success: false,
+          error: { message: "Failed to create feed" },
+        }),
+        500,
+      );
+    }
+  },
+);
 
-  const feedId = c.req.param("feedId");
-  const distributorsParam = c.req.query("distributors");
+// GET /api/feeds/:feedId - Get a specific feed
+feedsRoutes.get(
+  "/:feedId",
+  zValidator("param", feedIdParamSchema),
+  async (c) => {
+    try {
+      const { feedId } = c.req.valid("param");
+      const feedService = ServiceProvider.getInstance().getFeedService();
+      const feed = await feedService.getFeedById(feedId);
 
-  try {
-    const result = await feedService.processFeed(feedId, distributorsParam);
-    return c.json(result);
-  } catch (error: any) {
-    logger.error(`Error processing feed ${feedId}:`, error);
-    // FeedService.processFeed might throw specific errors (e.g., NotFoundError)
-    // For now, a generic 500, but could be more specific based on error type
-    if (error.message && error.message.startsWith("Feed not found")) {
-      return c.json({ error: error.message }, 404);
+      return c.json(
+        FeedWrappedResponseSchema.parse({
+          statusCode: 200,
+          success: true,
+          data: {
+            ...feed,
+            config: feed.config,
+          },
+        }),
+      );
+    } catch (error) {
+      logger.error({ error }, `Error fetching feed`);
+      if (error instanceof NotFoundError) {
+        return c.json(
+          ApiErrorResponseSchema.parse({
+            statusCode: 404,
+            success: false,
+            error: { message: error.message },
+          }),
+          404,
+        );
+      }
+      return c.json(
+        ApiErrorResponseSchema.parse({
+          statusCode: 500,
+          success: false,
+          error: { message: "Failed to fetch feed" },
+        }),
+        500,
+      );
     }
-    if (
-      error.message &&
-      error.message.startsWith("Feed configuration not found")
-    ) {
-      return c.json({ error: error.message }, 404); // Or 500 if it's an internal config issue
+  },
+);
+
+// PUT /api/feeds/:feedId - Update an existing feed
+feedsRoutes.put(
+  "/:feedId",
+  zValidator("param", feedIdParamSchema),
+  zValidator("json", UpdateFeedRequestSchema),
+  async (c) => {
+    const accountId = c.get("accountId");
+    if (!accountId) {
+      return c.json(
+        ApiErrorResponseSchema.parse({
+          statusCode: 401,
+          success: false,
+          error: { message: "Unauthorized. User must be logged in." },
+        }),
+        401,
+      );
     }
-    return c.json({ error: "Failed to process feed" }, 500);
-  }
-});
 
-/**
- * Delete a specific feed by its ID
- */
-feedsRoutes.delete("/:feedId", async (c) => {
-  const accountId = c.get("accountId");
-  if (!accountId) {
-    return c.json(
-      { error: "Unauthorized. User must be logged in to delete a feed." },
-      401,
-    );
-  }
+    try {
+      const { feedId } = c.req.valid("param");
+      const feedConfig = c.req.valid("json");
+      const feedService = ServiceProvider.getInstance().getFeedService();
 
-  const feedId = c.req.param("feedId");
-  const sp = c.get("sp");
-  const feedService = sp.getFeedService();
+      const updatedFeed = await feedService.updateFeed(
+        feedId,
+        feedConfig,
+        accountId,
+      );
 
-  const canDelete = await feedService.hasPermission(
-    accountId,
-    feedId,
-    "delete",
-  );
-  if (!canDelete) {
-    return c.json(
-      { error: "Forbidden. You do not have permission to delete this feed." },
-      403,
-    );
-  }
+      return c.json(
+        FeedWrappedResponseSchema.parse({
+          statusCode: 200,
+          success: true,
+          data: {
+            ...updatedFeed,
+            config: updatedFeed.config,
+          },
+        }),
+      );
+    } catch (error) {
+      logger.error({ error, accountId }, "Error updating feed");
+      if (error instanceof NotFoundError) {
+        return c.json(
+          ApiErrorResponseSchema.parse({
+            statusCode: 404,
+            success: false,
+            error: { message: error.message },
+          }),
+          404,
+        );
+      }
+      if (error instanceof ForbiddenError) {
+        return c.json(
+          ApiErrorResponseSchema.parse({
+            statusCode: 403,
+            success: false,
+            error: { message: error.message },
+          }),
+          403,
+        );
+      }
+      return c.json(
+        ApiErrorResponseSchema.parse({
+          statusCode: 500,
+          success: false,
+          error: { message: "Failed to update feed" },
+        }),
+        500,
+      );
+    }
+  },
+);
 
-  try {
-    const result = await feedService.deleteFeed(feedId);
-    if (!result) {
-      return c.notFound();
+// DELETE /api/feeds/:feedId - Delete a feed
+feedsRoutes.delete(
+  "/:feedId",
+  zValidator("param", feedIdParamSchema),
+  async (c) => {
+    const accountId = c.get("accountId");
+    if (!accountId) {
+      return c.json(
+        ApiErrorResponseSchema.parse({
+          statusCode: 401,
+          success: false,
+          error: { message: "Unauthorized. User must be logged in." },
+        }),
+        401,
+      );
     }
-    return c.json({ message: "Feed deleted successfully" }, 200);
-  } catch (error) {
-    logger.error(`Error deleting feed ${feedId}:`, error);
-    return c.json({ error: "Failed to delete feed" }, 500);
-  }
-});
 
-const feedParamSchemaCanModerate = z.object({
-  // Renamed to avoid conflict if other schemas exist
-  feedId: z.string().min(1, "Feed ID is required"),
-});
+    try {
+      const { feedId } = c.req.valid("param");
+      const feedService = ServiceProvider.getInstance().getFeedService();
+      await feedService.deleteFeed(feedId, accountId);
+      return c.body(null, 204);
+    } catch (error: unknown) {
+      logger.error({ error, accountId }, "Error deleting feed");
+      if (error instanceof NotFoundError) {
+        return c.json(
+          ApiErrorResponseSchema.parse({
+            statusCode: 404,
+            success: false,
+            error: { message: error.message },
+          }),
+          404,
+        );
+      }
+      if (error instanceof ForbiddenError) {
+        return c.json(
+          ApiErrorResponseSchema.parse({
+            statusCode: 403,
+            success: false,
+            error: { message: error.message },
+          }),
+          403,
+        );
+      }
+      return c.json(
+        ApiErrorResponseSchema.parse({
+          statusCode: 500,
+          success: false,
+          error: { message: "Failed to delete feed" },
+        }),
+        500,
+      );
+    }
+  },
+);
 
+// GET /api/feeds/:feedId/can-moderate - Check moderation permission
 feedsRoutes.get(
   "/:feedId/can-moderate",
-  zValidator("param", feedParamSchemaCanModerate),
+  zValidator("param", feedIdParamSchema),
   async (c) => {
-    const { feedId } = c.req.valid("param");
-    const sp = c.get("sp");
-    const moderationService =
-      sp.getService<ModerationService>("moderationService");
-
     const actingAccountId = c.get("accountId");
-
     if (!actingAccountId) {
-      return c.json({ canModerate: false, reason: "User not authenticated" });
+      return c.json(
+        CanModerateResponseSchema.parse({
+          canModerate: false,
+          reason: "User not authenticated",
+        }),
+      );
     }
 
     try {
+      const { feedId } = c.req.valid("param");
+      const moderationService =
+        ServiceProvider.getInstance().getModerationService();
       const canModerate =
         await moderationService.checkUserFeedModerationPermission(
           feedId,
           actingAccountId,
         );
-      return c.json({ canModerate });
-    } catch (error: any) {
+      return c.json(CanModerateResponseSchema.parse({ canModerate }));
+    } catch (error: unknown) {
       logger.error(
-        `Error in /:feedId/can-moderate for feed ${feedId}, user ${actingAccountId}:`,
-        error,
+        { error, actingAccountId },
+        "Error in /:feedId/can-moderate",
       );
       return c.json(
-        { canModerate: false, error: "Failed to check moderation permission" },
+        CanModerateResponseSchema.parse({
+          canModerate: false,
+          error: "Failed to check moderation permission",
+        }),
         500,
       );
     }
diff --git a/apps/api/src/routes/api/index.ts b/apps/api/src/routes/api/index.ts
index 6fde926d..436b81d4 100644
--- a/apps/api/src/routes/api/index.ts
+++ b/apps/api/src/routes/api/index.ts
@@ -14,6 +14,7 @@ import { activityRoutes } from "./activity";
 import { uploadRoutes } from "./upload";
 import { pluginsRoutes } from "./plugins";
 import { moderationRoutes } from "./moderation";
+import { authRoutes } from "./auth";
 
 // Create main API router
 export const apiRoutes = new Hono<Env>();
@@ -36,3 +37,4 @@ apiRoutes.route("/users", usersRoutes);
 apiRoutes.route("/activity", activityRoutes);
 apiRoutes.route("/upload", uploadRoutes);
 apiRoutes.route("/moderate", moderationRoutes);
+apiRoutes.route("/auth", authRoutes);
diff --git a/apps/api/src/routes/api/moderation.ts b/apps/api/src/routes/api/moderation.ts
index 337c6423..f783cdd6 100644
--- a/apps/api/src/routes/api/moderation.ts
+++ b/apps/api/src/routes/api/moderation.ts
@@ -37,7 +37,7 @@ moderationRoutes.post(
         }),
         201,
       );
-    } catch (error: any) {
+    } catch (error: unknown) {
       console.error("Error in moderationRoutes.post('/'):", error);
 
       if (error instanceof NotFoundError || error instanceof ServiceError) {
@@ -91,7 +91,7 @@ moderationRoutes.get(
           data: moderation,
         }),
       );
-    } catch (error: any) {
+    } catch (error: unknown) {
       console.error("Error in moderationRoutes.get('/:id'):", error);
 
       if (error instanceof NotFoundError || error instanceof ServiceError) {
@@ -136,7 +136,7 @@ moderationRoutes.get(
           data: moderations,
         }),
       );
-    } catch (error: any) {
+    } catch (error: unknown) {
       console.error(
         "Error in moderationRoutes.get('/submission/:submissionId'):",
         error,
@@ -187,7 +187,7 @@ moderationRoutes.get(
           data: moderations,
         }),
       );
-    } catch (error: any) {
+    } catch (error: unknown) {
       console.error(
         "Error in moderationRoutes.get('/submission/:submissionId/feed/:feedId'):",
         error,
diff --git a/apps/api/src/routes/api/plugins.ts b/apps/api/src/routes/api/plugins.ts
index fdd5b4f5..9e03cc1a 100644
--- a/apps/api/src/routes/api/plugins.ts
+++ b/apps/api/src/routes/api/plugins.ts
@@ -28,7 +28,7 @@ pluginsRoutes.post(
     try {
       const newPlugin = await pluginRepository.createPlugin(pluginData);
       return c.json(newPlugin, 201);
-    } catch (error: any) {
+    } catch (error: unknown) {
       console.error("Error registering plugin:", { error, pluginData });
       if (error.code === "PLUGIN_ALREADY_EXISTS") {
         throw new HTTPException(409, { message: error.message });
diff --git a/apps/api/src/routes/api/users.ts b/apps/api/src/routes/api/users.ts
index d88c4273..96468191 100644
--- a/apps/api/src/routes/api/users.ts
+++ b/apps/api/src/routes/api/users.ts
@@ -92,7 +92,7 @@ usersRoutes.post(
         }),
         201,
       );
-    } catch (error: any) {
+    } catch (error: unknown) {
       logger.error({ error }, "Error in usersRoutes.post('/')");
 
       if (
@@ -228,7 +228,7 @@ usersRoutes.delete("/me", async (c) => {
         500,
       );
     }
-  } catch (error: any) {
+  } catch (error: unknown) {
     logger.error({ error }, "Error in usersRoutes.delete('/me')");
 
     if (
diff --git a/apps/api/src/services/auth.service.ts b/apps/api/src/services/auth.service.ts
new file mode 100644
index 00000000..568da260
--- /dev/null
+++ b/apps/api/src/services/auth.service.ts
@@ -0,0 +1,103 @@
+import {
+  AuthRequestRepository,
+  InsertAuthRequest,
+} from "@curatedotfun/shared-db";
+import { toHex } from "@fastnear/utils";
+import { randomBytes } from "crypto";
+import { sign } from "hono/jwt";
+import { verify } from "near-sign-verify";
+import { z } from "zod";
+import { UserService } from "./users.service";
+
+const AUTH_REQUEST_EXPIRY_MS = 5 * 60 * 1000; // 5 minutes
+const JWT_EXPIRY_SECONDS = 60 * 60 * 24 * 7; // 7 days
+
+const CreateAuthRequestSchema = z.object({
+  accountId: z.string(),
+});
+
+const VerifyAuthRequestSchema = z.object({
+  token: z.string(),
+  accountId: z.string(),
+});
+
+export class AuthService {
+  private userService: UserService;
+  private authRequestRepository: AuthRequestRepository;
+
+  constructor(
+    authRequestRepository: AuthRequestRepository,
+    userService: UserService,
+  ) {
+    this.authRequestRepository = authRequestRepository;
+    this.userService = userService;
+  }
+
+  async createAuthRequest(payload: z.infer<typeof CreateAuthRequestSchema>) {
+    const { accountId } = payload;
+    await this.userService.ensureUserProfile(accountId);
+
+    const nonce = randomBytes(32).toString("hex");
+
+    const expiresAt = new Date(Date.now() + AUTH_REQUEST_EXPIRY_MS);
+
+    const newAuthRequest: InsertAuthRequest = {
+      nonce,
+      accountId,
+      expiresAt,
+    };
+
+    await this.authRequestRepository.create(newAuthRequest);
+
+    return {
+      nonce,
+      recipient: "curatefun.near",
+    };
+  }
+
+  async verifyAuthRequest(payload: z.infer<typeof VerifyAuthRequestSchema>) {
+    const { token, accountId } = payload;
+
+    const latestRequest =
+      await this.authRequestRepository.findLatestByAccountId(accountId);
+
+    if (!latestRequest) {
+      throw new Error("No recent auth request found for this account.");
+    }
+
+    if (latestRequest.expiresAt < new Date()) {
+      await this.authRequestRepository.deleteById(latestRequest.id);
+      throw new Error("Auth request has expired.");
+    }
+
+    const message = `Authorize Curate.fun`;
+
+    const verificationResult = await verify(token, {
+      expectedRecipient: "curatefun.near",
+      expectedMessage: message,
+      validateNonce: (nonceFromToken) => {
+        const receivedNonceHex = toHex(nonceFromToken);
+        return receivedNonceHex === latestRequest.nonce;
+      },
+    });
+
+    if (verificationResult.accountId !== accountId) {
+      throw new Error("Account ID mismatch.");
+    }
+
+    await this.authRequestRepository.deleteById(latestRequest.id);
+
+    const jwtPayload = {
+      sub: accountId,
+      exp: Math.floor(Date.now() / 1000) + JWT_EXPIRY_SECONDS,
+    };
+
+    const secret = process.env.JWT_SECRET;
+    if (!secret) {
+      throw new Error("JWT_SECRET is not set.");
+    }
+
+    const jwt = await sign(jwtPayload, secret);
+    return { jwt };
+  }
+}
diff --git a/apps/api/src/services/feed.service.ts b/apps/api/src/services/feed.service.ts
index 43e37474..c5cd25cd 100644
--- a/apps/api/src/services/feed.service.ts
+++ b/apps/api/src/services/feed.service.ts
@@ -1,22 +1,24 @@
 import {
-  DistributorConfig,
   FeedRepository,
   InsertFeed,
   RichSubmission,
-  StreamConfig,
   submissionStatusZodEnum,
   UpdateFeed,
   type DB,
 } from "@curatedotfun/shared-db";
+import {
+  DistributorConfig,
+  FeedConfig,
+  StreamConfig,
+} from "@curatedotfun/types";
 import { Logger } from "pino";
+import { ForbiddenError, NotFoundError } from "../types/errors";
+import { isSuperAdmin } from "../utils/auth.utils";
 import { IBaseService } from "./interfaces/base-service.interface";
 import { ProcessorService } from "./processor.service";
-import { isSuperAdmin } from "../utils/auth.utils";
+import { merge } from "lodash";
 
-export type FeedAction =
-  | "update" // For general updates to feed config, name, description
-  | "delete"
-  | "manage_admins"; // For adding/removing users from the feed's admin list
+export type FeedAction = "update" | "delete" | "manage_admins";
 
 export class FeedService implements IBaseService {
   public readonly logger: Logger;
@@ -50,7 +52,7 @@ export class FeedService implements IBaseService {
       return true;
     }
 
-    const feed = await this.feedRepository.getFeedById(feedId);
+    const feed = await this.feedRepository.findFeedById(feedId);
     if (!feed) {
       this.logger.warn(
         { accountId, feedId, action },
@@ -83,33 +85,80 @@ export class FeedService implements IBaseService {
     return this.feedRepository.getAllFeeds();
   }
 
-  async createFeed(data: InsertFeed) {
+  async createFeed(feedConfig: FeedConfig, accountId: string) {
+    const dbData: InsertFeed = {
+      id: feedConfig.id,
+      name: feedConfig.name,
+      description: feedConfig.description,
+      created_by: accountId,
+      config: feedConfig,
+    };
+
     return this.db.transaction(async (tx) => {
-      return this.feedRepository.createFeed(data, tx);
+      return this.feedRepository.createFeed(dbData, tx);
     });
   }
 
   async getFeedById(feedId: string) {
-    return this.feedRepository.getFeedById(feedId);
+    const feed = await this.feedRepository.findFeedById(feedId);
+    if (!feed) {
+      throw new NotFoundError("Feed", feedId);
+    }
+    return feed;
   }
 
-  async updateFeed(feedId: string, data: UpdateFeed) {
+  async updateFeed(
+    feedId: string,
+    data: Partial<FeedConfig>,
+    accountId: string,
+  ) {
+    const hasPermission = await this.hasPermission(accountId, feedId, "update");
+    if (!hasPermission) {
+      throw new ForbiddenError(
+        "You do not have permission to update this feed.",
+      );
+    }
+
+    // Fetch the existing feed to merge the config
+    const existingFeed = await this.getFeedById(feedId);
+    const existingConfig = existingFeed.config as FeedConfig;
+
+    const newConfig: FeedConfig = merge({}, existingConfig, data);
+
+    const dbData: UpdateFeed = {
+      name: newConfig.name,
+      description: newConfig.description,
+      config: newConfig,
+      admins: newConfig.admins as string[],
+    };
+
     return this.db.transaction(async (tx) => {
-      return this.feedRepository.updateFeed(feedId, data, tx);
+      const updatedFeed = await this.feedRepository.updateFeed(
+        feedId,
+        dbData,
+        tx,
+      );
+      if (!updatedFeed) {
+        throw new NotFoundError("Feed", feedId);
+      }
+      return updatedFeed;
     });
   }
 
-  async deleteFeed(feedId: string) {
+  async deleteFeed(feedId: string, accountId: string) {
+    const hasPermission = await this.hasPermission(accountId, feedId, "delete");
+    if (!hasPermission) {
+      throw new ForbiddenError(
+        "You do not have permission to delete this feed.",
+      );
+    }
+
     return this.db.transaction(async (tx) => {
-      const result = await this.feedRepository.deleteFeed(feedId, tx);
-      if (result === 0) {
-        this.logger.warn(
-          { feedId },
-          "FeedService: deleteFeed - Feed not found or not deleted",
-        );
-        return 0;
+      const deletedFeed = await this.feedRepository.deleteFeed(feedId, tx);
+      if (!deletedFeed) {
+        throw new NotFoundError("Feed", feedId);
       }
-      return result;
+      return deletedFeed;
     });
   }
 
@@ -117,16 +166,16 @@ export class FeedService implements IBaseService {
   // In order to process a feed, you must be the feed owner
   // this will be called by trigger/
   async processFeed(feedId: string, distributorsParam?: string) {
-    const feed = await this.feedRepository.getFeedById(feedId);
+    const feed = await this.feedRepository.findFeedById(feedId);
     if (!feed) {
       this.logger.error(
         { feedId },
         "FeedService: processFeed - Feed not found",
       );
-      throw new Error(`Feed not found: ${feedId}`); // Or a custom NotFoundError
+      throw new NotFoundError("Feed", feedId);
     }
 
-    const feedConfig = await this.feedRepository.getFeedConfig(feedId); // Get config from DB
+    const feedConfig = await this.feedRepository.getFeedConfig(feedId);
     if (!feedConfig) {
       this.logger.error(
         { feedId },
@@ -176,7 +225,8 @@ export class FeedService implements IBaseService {
             .split(",")
             .map((d) => d.trim());
           const availableDistributors =
-            streamConfig.distribute?.map((d) => d.plugin) || [];
+            streamConfig.distribute?.map((d: DistributorConfig) => d.plugin) ||
+            [];
           const validDistributors = requestedDistributors.filter((d) =>
             availableDistributors.includes(d),
           );
@@ -187,7 +237,11 @@ export class FeedService implements IBaseService {
           if (invalidDistributors.length > 0) {
             this.logger.warn(
               { feedId, invalidDistributors, availableDistributors },
-              `Invalid distributor(s) specified for feed ${feedId}: ${invalidDistributors.join(", ")}. Available: ${availableDistributors.join(", ")}`,
+              `Invalid distributor(s) specified for feed ${
+                feedId
+              }: ${invalidDistributors.join(
+                ", ",
+              )}. Available: ${availableDistributors.join(", ")}`,
             );
           }
 
@@ -204,7 +258,11 @@ export class FeedService implements IBaseService {
             validDistributors.forEach((d) => usedDistributors.add(d));
             this.logger.info(
               { submissionId: submission.tweetId, feedId, validDistributors },
-              `Processing submission ${submission.tweetId} for feed ${feedId} with selected distributors: ${validDistributors.join(", ")}`,
+              `Processing submission ${
+                submission.tweetId
+              } for feed ${feedId} with selected distributors: ${validDistributors.join(
+                ", ",
+              )}`,
             );
           }
         }
diff --git a/apps/api/src/services/moderation.service.ts b/apps/api/src/services/moderation.service.ts
index b49aba31..62feea26 100644
--- a/apps/api/src/services/moderation.service.ts
+++ b/apps/api/src/services/moderation.service.ts
@@ -259,7 +259,7 @@ export class ModerationService implements IBaseService {
         },
         "Moderation action processed successfully via API.",
       );
-    } catch (error: any) {
+    } catch (error: unknown) {
       if (
         error instanceof NotFoundError ||
         error instanceof AuthorizationError ||
@@ -333,7 +333,7 @@ export class ModerationService implements IBaseService {
           feedConfig.outputs.stream,
         );
       }
-    } catch (error: any) {
+    } catch (error: unknown) {
       if (
         error instanceof NotFoundError ||
         error instanceof ModerationServiceError
diff --git a/apps/api/src/services/users.service.ts b/apps/api/src/services/users.service.ts
index 2bc0ae72..af54e869 100644
--- a/apps/api/src/services/users.service.ts
+++ b/apps/api/src/services/users.service.ts
@@ -46,6 +46,16 @@ export class UserService implements IBaseService {
     return UserProfileSchema.parse(parsedUser);
   }
 
+  async ensureUserProfile(nearAccountId: string): Promise<UserProfile> {
+    const existingUser = await this.findUserByNearAccountId(nearAccountId);
+    if (existingUser) {
+      return existingUser;
+    }
+
+    const newUser = await this.createUser({ nearAccountId });
+    return newUser;
+  }
+
   /**
    * Find a user by NEAR account ID and return as API UserProfile
    */
@@ -77,7 +87,7 @@ export class UserService implements IBaseService {
 
       const parsedUser = selectUserSchema.parse(newUser);
       return UserProfileSchema.parse(parsedUser);
-    } catch (error: any) {
+    } catch (error: unknown) {
       // If the error is already a UserServiceError or NearAccountError, rethrow it
       if (
         error instanceof UserServiceError ||
@@ -115,7 +125,7 @@ export class UserService implements IBaseService {
       }
       const parsedUser = selectUserSchema.parse(updatedUser);
       return UserProfileSchema.parse(parsedUser);
-    } catch (error: any) {
+    } catch (error: unknown) {
       if (error instanceof UserServiceError || error instanceof NotFoundError) {
         throw error;
       }
@@ -149,7 +159,7 @@ export class UserService implements IBaseService {
 
       const parsedUser = selectUserSchema.parse(updatedUser);
       return UserProfileSchema.parse(parsedUser);
-    } catch (error: any) {
+    } catch (error: unknown) {
       if (error instanceof UserServiceError || error instanceof NotFoundError) {
         throw error;
       }
@@ -213,7 +223,7 @@ export class UserService implements IBaseService {
       });
 
       logger.info(`Successfully deleted NEAR account: ${nearAccountId}`);
-    } catch (nearError: any) {
+    } catch (nearerror: unknown) {
       logger.error(
         { error: nearError },
         `Error deleting NEAR account ${nearAccountId}`,
@@ -252,7 +262,7 @@ export class UserService implements IBaseService {
         );
       }
       return true;
-    } catch (error: any) {
+    } catch (error: unknown) {
       if (
         error instanceof UserServiceError ||
         error instanceof NotFoundError ||
@@ -318,7 +328,7 @@ export class UserService implements IBaseService {
       });
 
       logger.info(`Successfully deleted NEAR account: ${nearAccountId}`);
-    } catch (nearError: any) {
+    } catch (nearerror: unknown) {
       logger.error(
         { error: nearError },
         `Error deleting NEAR account ${nearAccountId}`,
@@ -354,7 +364,7 @@ export class UserService implements IBaseService {
         );
       }
       return true;
-    } catch (error: any) {
+    } catch (error: unknown) {
       if (
         error instanceof UserServiceError ||
         error instanceof NotFoundError ||
diff --git a/apps/api/src/types/errors.ts b/apps/api/src/types/errors.ts
index 039edb2f..f8ce905e 100644
--- a/apps/api/src/types/errors.ts
+++ b/apps/api/src/types/errors.ts
@@ -1,240 +1,69 @@
-/**
- * Base application error class
- * All application errors should extend this class
- */
-export class AppError extends Error {
+import { z } from "zod";
+
+export class ApiError extends Error {
   constructor(
     message: string,
-    public statusCode: number = 500,
-    public cause?: Error,
+    public statusCode: number,
+    public details?: any,
   ) {
     super(message);
     this.name = this.constructor.name;
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, this.constructor);
-    }
-  }
-
-  /**
-   * Serializes the error for API responses
-   */
-  toJSON() {
-    return {
-      error: this.name,
-      message: this.message,
-      statusCode: this.statusCode,
-    };
   }
 }
 
-/**
- * Authentication related errors
- */
-export class AuthError extends AppError {
-  constructor(message: string, statusCode: number = 401, cause?: Error) {
-    super(message, statusCode, cause);
+export class NotFoundError extends ApiError {
+  constructor(resource: string, id: string | number) {
+    super(`${resource} with ID ${id} not found`, 404);
   }
 }
 
-/**
- * Validation related errors
- */
-export class ValidationError extends AppError {
-  constructor(
-    message: string,
-    public details?: Record<string, string[]>,
-    cause?: Error,
-  ) {
-    super(message, 400, cause);
-  }
-
-  toJSON() {
-    return {
-      ...super.toJSON(),
-      details: this.details,
-    };
+export class BadRequestError extends ApiError {
+  constructor(message: string, details?: any) {
+    super(message, 400, details);
   }
 }
 
-/**
- * Service layer errors
- */
-export class ServiceError extends AppError {
-  constructor(message: string, statusCode: number = 500, cause?: Error) {
-    super(message, statusCode, cause);
-  }
-}
-
-/**
- * Database related errors
- */
-export class DatabaseError extends AppError {
-  constructor(
-    message: string,
-    public code?: string,
-    cause?: Error,
-  ) {
-    super(message, 500, cause);
-  }
-
-  toJSON() {
-    return {
-      ...super.toJSON(),
-      code: this.code,
-    };
-  }
-}
-
-/**
- * Authorization errors (e.g., insufficient permissions)
- */
-export class AuthorizationError extends AppError {
-  constructor(message: string, statusCode: number = 403, cause?: Error) {
-    super(message, statusCode, cause);
-  }
-}
-
-/**
- * Not found errors
- */
-export class NotFoundError extends AppError {
-  constructor(resource: string, identifier?: string | number) {
-    const message = identifier
-      ? `${resource} with identifier ${identifier} not found`
-      : `${resource} not found`;
-    super(message, 404);
-  }
-}
-
-/**
- * Conflict errors (e.g., duplicate resources)
- */
-export class ConflictError extends AppError {
-  constructor(message: string, cause?: Error) {
-    super(message, 409, cause);
-  }
-}
-
-/**
- * User service specific errors
- */
-export class UserServiceError extends ServiceError {
-  constructor(message: string, statusCode: number = 500, cause?: Error) {
-    super(message, statusCode, cause);
-  }
-}
-
-/**
- * Moderation service specific errors
- */
-export class ModerationServiceError extends ServiceError {
-  constructor(message: string, statusCode: number = 500, cause?: Error) {
-    super(message, statusCode, cause);
-  }
-}
-
-/**
- * Activity service specific errors
- */
-export class ActivityServiceError extends ServiceError {
-  constructor(
-    message: string,
-    options?: { statusCode?: number; cause?: Error },
-  ) {
-    super(message, options?.statusCode || 500, options?.cause);
-  }
-}
-
-/**
- * NEAR account related errors
- */
-export class NearAccountError extends ServiceError {
-  constructor(message: string, statusCode: number = 400, cause?: Error) {
-    super(message, statusCode, cause);
-  }
-}
-
-export class PluginError extends AppError {
-  constructor(
-    message: string,
-    public cause?: Error,
-  ) {
-    super(message, 500, cause);
-    this.name = "PluginError";
-  }
-}
-
-export class PluginLoadError extends PluginError {
-  constructor(name: string, url: string, cause?: Error) {
-    super(`Failed to load plugin ${name} from ${url}`, cause);
-    this.name = "PluginLoadError";
-  }
-}
-
-export class PluginInitError extends PluginError {
-  constructor(name: string, cause?: Error) {
-    super(`Failed to initialize plugin ${name}`, cause);
-    this.name = "PluginInitError";
+export class UnauthorizedError extends ApiError {
+  constructor(message = "Unauthorized") {
+    super(message, 401);
   }
 }
 
-export class PluginExecutionError extends PluginError {
-  constructor(name: string, operation: string, cause?: Error) {
-    super(`Plugin ${name} failed during ${operation}`, cause);
-    this.name = "PluginExecutionError";
+export class ForbiddenError extends ApiError {
+  constructor(message = "Forbidden") {
+    super(message, 403);
   }
 }
 
-export type TransformStage = "global" | "distributor" | "batch";
-
-export class TransformError extends AppError {
-  constructor(
-    public readonly plugin: string,
-    public readonly stage: TransformStage,
-    public readonly index: number,
-    message: string,
-    public readonly cause?: Error,
-  ) {
-    super(
-      `Transform error in ${stage} transform #${index + 1} (${plugin}): ${message}`,
-      500,
-      cause,
-    );
-    this.name = "TransformError";
+export class InternalServerError extends ApiError {
+  constructor(message = "Internal Server Error", details?: any) {
+    super(message, 500, details);
   }
 }
 
-export class ProcessorError extends AppError {
-  constructor(
-    public readonly feedId: string,
-    message: string,
-    public readonly cause?: Error,
-  ) {
-    super(`Processing error for feed ${feedId}: ${message}`, 500, cause);
-    this.name = "ProcessorError";
+export class NearAccountError extends ApiError {
+  constructor(message: string, statusCode = 500, details?: any) {
+    super(message, statusCode, details);
   }
 }
 
-/**
- * JWT token related errors
- */
-export class JwtTokenInvalid extends AuthError {
-  constructor(message = "Invalid JWT token") {
-    super(message, 401);
-    this.name = "JwtTokenInvalid";
+export class UserServiceError extends ApiError {
+  constructor(message: string, statusCode = 500, details?: any) {
+    super(message, statusCode, details);
   }
 }
 
-export class JwtTokenExpired extends AuthError {
-  constructor(message = "JWT token has expired") {
-    super(message, 401);
-    this.name = "JwtTokenExpired";
+export class ActivityServiceError extends ApiError {
+  constructor(message: string, statusCode = 500, details?: any) {
+    super(message, statusCode, details);
   }
 }
 
-export class JwtTokenSignatureMismatched extends AuthError {
-  constructor(message = "JWT token signature mismatch") {
-    super(message, 401);
-    this.name = "JwtTokenSignatureMismatched";
-  }
-}
+export const ApiErrorResponseSchema = z.object({
+  statusCode: z.number(),
+  success: z.literal(false),
+  error: z.object({
+    message: z.string(),
+    details: z.any().optional(),
+  }),
+});
diff --git a/apps/api/src/utils/plugin.ts b/apps/api/src/utils/plugin.ts
index 7dda2c17..7a7abdd2 100644
--- a/apps/api/src/utils/plugin.ts
+++ b/apps/api/src/utils/plugin.ts
@@ -235,7 +235,7 @@ export async function fetchPackageJsonFromRepo(
       );
     }
     return null;
-  } catch (error: any) {
+  } catch (error: unknown) {
     logger.error(
       `Error processing repo URL ${repoUrl} (last attempted URL: ${packageJsonUrlAttempted}): ${error.message}`,
       { error },
diff --git a/apps/api/src/utils/service-provider.ts b/apps/api/src/utils/service-provider.ts
index 325ba39c..1587c91c 100644
--- a/apps/api/src/utils/service-provider.ts
+++ b/apps/api/src/utils/service-provider.ts
@@ -1,5 +1,6 @@
 import {
   ActivityRepository,
+  AuthRequestRepository,
   FeedRepository,
   LeaderboardRepository,
   ModerationRepository,
@@ -11,6 +12,7 @@ import { SubmissionService } from "services/submission.service";
 import { MockTwitterService } from "../__test__/mocks/twitter-service.mock";
 import { db } from "../db";
 import { ActivityService } from "../services/activity.service";
+import { AuthService } from "../services/auth.service";
 import { ConfigService, isProduction } from "../services/config.service";
 import { DistributionService } from "../services/distribution.service";
 import { FeedService } from "../services/feed.service";
@@ -86,6 +88,10 @@ export class ServiceProvider {
     );
     this.services.set("userService", userService);
 
+    const authRequestRepository = new AuthRequestRepository(db);
+    const authService = new AuthService(authRequestRepository, userService);
+    this.services.set("authService", authService);
+
     const feedService = new FeedService(
       feedRepository,
       processorService,
@@ -207,6 +213,14 @@ export class ServiceProvider {
     return this.getService<UserService>("userService");
   }
 
+  /**
+   * Get the auth service
+   * @returns The auth service
+   */
+  public getAuthService(): AuthService {
+    return this.getService<AuthService>("authService");
+  }
+
   /**
    * Get the activity service
    * @returns The activity service
@@ -239,6 +253,10 @@ export class ServiceProvider {
     return this.getService<FeedService>("feedService");
   }
 
+  public getModerationService(): ModerationService {
+    return this.getService<ModerationService>("moderationService");
+  }
+
   /**
    * Get all services that implement IBackgroundTaskService
    * @returns An array of background task services
diff --git a/apps/app/package.json b/apps/app/package.json
index f2cd386e..f19ae52f 100644
--- a/apps/app/package.json
+++ b/apps/app/package.json
@@ -14,14 +14,15 @@
   },
   "dependencies": {
     "@crosspost/sdk": "^0.3.0",
+    "@fastnear/utils": "^0.9.7",
     "@hookform/resolvers": "^5.0.1",
     "@radix-ui/react-avatar": "^1.1.3",
     "@radix-ui/react-checkbox": "^1.1.5",
     "@radix-ui/react-dialog": "^1.1.6",
     "@radix-ui/react-dropdown-menu": "^2.1.6",
-    "@radix-ui/react-label": "^2.1.2",
+    "@radix-ui/react-label": "^2.1.7",
     "@radix-ui/react-popover": "^1.1.6",
-    "@radix-ui/react-progress": "^1.1.2",
+    "@radix-ui/react-progress": "^1.1.7",
     "@radix-ui/react-select": "^2.2.2",
     "@radix-ui/react-slot": "^1.1.2",
     "@radix-ui/react-switch": "^1.1.4",
@@ -29,16 +30,21 @@
     "@radix-ui/react-toast": "^1.2.11",
     "@radix-ui/react-tooltip": "^1.2.4",
     "@tailwindcss/typography": "^0.5.15",
+    "@tanstack/react-form": "^1.12.3",
     "@tanstack/react-query": "^5.64.1",
-    "@tanstack/react-router": "1.97.0",
+    "@tanstack/react-router": "^1.121.27",
+    "@tanstack/zod-form-adapter": "^0.42.1",
+    "@tanstack/react-table": "^8.21.3",
     "autoprefixer": "^10.4.20",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
     "date-fns": "^4.1.0",
     "fastintear": "latest",
+    "immer": "^10.1.1",
+    "lodash": "^4.17.21",
     "lucide-react": "^0.483.0",
-    "near-sign-verify": "^0.3.6",
+    "near-sign-verify": "^0.4.1",
     "pinata-web3": "^0.5.4",
     "postcss": "^8.4.49",
     "react": "^18.3.1",
@@ -59,7 +65,8 @@
     "@rsbuild/core": "1.1.13",
     "@rsbuild/plugin-react": "1.1.0",
     "@tanstack/router-devtools": "1.97.23",
-    "@tanstack/router-plugin": "1.69.1",
+    "@tanstack/router-plugin": "^1.121.29",
+    "@types/lodash": "^4.17.16",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
     "@vitejs/plugin-react": "^4.3.4",
diff --git a/apps/app/rsbuild.config.ts b/apps/app/rsbuild.config.ts
index ef8a3c43..7e502bb8 100644
--- a/apps/app/rsbuild.config.ts
+++ b/apps/app/rsbuild.config.ts
@@ -1,6 +1,6 @@
 import { defineConfig, rspack } from "@rsbuild/core";
 import { pluginReact } from "@rsbuild/plugin-react";
-import TanStackRouterRspack from "@tanstack/router-plugin/rspack";
+import { tanstackRouter } from "@tanstack/router-plugin/rspack";
 import "dotenv/config";
 import path from "path";
 
@@ -24,6 +24,7 @@ export default defineConfig({
   },
   source: {
     alias: {
+      "@": path.resolve(__dirname, "./src"),
       "@fonts": path.resolve(__dirname, "public/fonts"),
     },
     define: {
@@ -45,9 +46,9 @@ export default defineConfig({
   tools: {
     rspack: {
       plugins: [
-        TanStackRouterRspack({
+        tanstackRouter({
           routesDirectory: "./src/routes",
-          enableRouteGeneration: false,
+          enableRouteGeneration: true,
         }),
         ...(isProduction || isStaging
           ? []
diff --git a/apps/app/src/components/BasicInformationForm.tsx b/apps/app/src/components/BasicInformationForm.tsx
index 90010f21..ad80e808 100644
--- a/apps/app/src/components/BasicInformationForm.tsx
+++ b/apps/app/src/components/BasicInformationForm.tsx
@@ -30,7 +30,7 @@ export default function BasicInformationForm() {
 
   const {
     profileImage: storedProfileImage,
-    feedName,
+    name,
     description,
     hashtags,
     setBasicInfo,
diff --git a/apps/app/src/components/ContentApprovers.tsx b/apps/app/src/components/ContentApprovers.tsx
index 7f41624f..4b0fb1e8 100644
--- a/apps/app/src/components/ContentApprovers.tsx
+++ b/apps/app/src/components/ContentApprovers.tsx
@@ -1,8 +1,8 @@
-import { useState } from "react";
+import { useState, useEffect } from "react";
+import { useFieldArray, useFormContext } from "react-hook-form";
 import { Button } from "./ui/button";
 import { Input } from "./ui/input";
 import { Plus, X } from "lucide-react";
-import { useFeedCreationStore } from "../store/feed-creation-store";
 import {
   Select,
   SelectContent,
@@ -10,16 +10,24 @@ import {
   SelectTrigger,
   SelectValue,
 } from "./ui/select";
+import { useFeedCreationStore, Approver } from "../store/feed-creation-store";
 
 export default function ContentApprovers() {
-  const { approvers, setApprovers } = useFeedCreationStore();
+  const { control, watch } = useFormContext();
+  const { setApprovers } = useFeedCreationStore();
+  const { fields, append, remove } = useFieldArray({
+    control,
+    name: "approvers",
+  });
   const [showForm, setShowForm] = useState(false);
   const [handle, setHandle] = useState("");
   const [platform, setPlatform] = useState("Twitter");
 
-  const handleDeleteApprover = (id: number) => {
-    setApprovers(approvers.filter((approver) => approver.id !== id));
-  };
+  const approvers = watch("approvers");
+
+  useEffect(() => {
+    setApprovers(approvers);
+  }, [approvers, setApprovers]);
 
   const handleAddApprover = () => {
     setShowForm(true);
@@ -27,12 +35,7 @@ export default function ContentApprovers() {
 
   const handleSaveApprover = () => {
     if (handle.trim()) {
-      const newId =
-        approvers.length > 0 ? Math.max(...approvers.map((a) => a.id)) + 1 : 1;
-      setApprovers([
-        ...approvers,
-        { id: newId, name: "", handle: handle.trim() },
-      ]);
+      append({ handle: handle.trim(), platform });
       setHandle("");
       setShowForm(false);
     }
@@ -124,59 +127,61 @@ export default function ContentApprovers() {
       )}
 
       <div className="space-y-3 mt-6">
-        {approvers.map((approver) => (
-          <div
-            key={approver.id}
-            className="flex items-center justify-between py-3 px-4 border border-neutral-400 rounded-lg bg-neutral-50"
-          >
-            <div className="flex flex-col">
-              <span className="font-bold">
-                {approver.name}
-                <span className="text-[#171717] font-normal">
-                  {" "}
-                  @{approver.handle}
+        {fields.map((field, index) => {
+          const typedField = field as Approver & { id: string };
+          return (
+            <div
+              key={typedField.id}
+              className="flex items-center justify-between py-3 px-4 border border-neutral-400 rounded-lg bg-neutral-50"
+            >
+              <div className="flex flex-col">
+                <span className="font-bold">
+                  <span className="text-[#171717] font-normal">
+                    {" "}
+                    @{typedField.handle}
+                  </span>
                 </span>
-              </span>
 
-              <div className="flex items-center  text-xs text-[#171717]">
+                <div className="flex items-center  text-xs text-[#171717]">
+                  <svg
+                    xmlns="http://www.w3.org/2000/svg"
+                    width="14"
+                    height="14"
+                    viewBox="0 0 14 14"
+                    fill="none"
+                  >
+                    <path
+                      d="M10.3494 1.75H12.1299L8.24098 6.22457L12.8327 12.2922H9.22492L6.41367 8.61412L3.18074 12.2922H1.40029L5.5703 7.51305L1.16602 1.75H4.86749L7.42104 5.12349L10.3494 1.75ZM9.71689 11.2145H10.7008L4.32867 2.75736H3.25102L9.71689 11.2145Z"
+                      fill="#020617"
+                    />
+                  </svg>
+                  <span className="text-sm">{typedField.platform}</span>
+                </div>
+              </div>
+              <Button
+                variant="ghost"
+                size="default"
+                className="text-gray-400 hover:text-red-500"
+                onClick={() => remove(index)}
+              >
                 <svg
                   xmlns="http://www.w3.org/2000/svg"
-                  width="14"
-                  height="14"
-                  viewBox="0 0 14 14"
+                  width="24"
+                  height="25"
+                  viewBox="0 0 24 25"
                   fill="none"
                 >
                   <path
-                    d="M10.3494 1.75H12.1299L8.24098 6.22457L12.8327 12.2922H9.22492L6.41367 8.61412L3.18074 12.2922H1.40029L5.5703 7.51305L1.16602 1.75H4.86749L7.42104 5.12349L10.3494 1.75ZM9.71689 11.2145H10.7008L4.32867 2.75736H3.25102L9.71689 11.2145Z"
-                    fill="#020617"
+                    d="M3 6.5H21M19 6.5V20.5C19 21.5 18 22.5 17 22.5H7C6 22.5 5 21.5 5 20.5V6.5M8 6.5V4.5C8 3.5 9 2.5 10 2.5H14C15 2.5 16 3.5 16 4.5V6.5M10 11.5V17.5M14 11.5V17.5"
+                    stroke="#020617"
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
                   />
                 </svg>
-                <span className="text-sm">Twitter</span>
-              </div>
+              </Button>
             </div>
-            <Button
-              variant="ghost"
-              size="default"
-              className="text-gray-400 hover:text-red-500"
-              onClick={() => handleDeleteApprover(approver.id)}
-            >
-              <svg
-                xmlns="http://www.w3.org/2000/svg"
-                width="24"
-                height="25"
-                viewBox="0 0 24 25"
-                fill="none"
-              >
-                <path
-                  d="M3 6.5H21M19 6.5V20.5C19 21.5 18 22.5 17 22.5H7C6 22.5 5 21.5 5 20.5V6.5M8 6.5V4.5C8 3.5 9 2.5 10 2.5H14C15 2.5 16 3.5 16 4.5V6.5M10 11.5V17.5M14 11.5V17.5"
-                  stroke="#020617"
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                />
-              </svg>
-            </Button>
-          </div>
-        ))}
+          );
+        })}
       </div>
     </div>
   );
diff --git a/apps/app/src/components/CurationFormSteps.tsx b/apps/app/src/components/CurationFormSteps.tsx
deleted file mode 100644
index b8d6c9da..00000000
--- a/apps/app/src/components/CurationFormSteps.tsx
+++ /dev/null
@@ -1,279 +0,0 @@
-import { useNavigate } from "@tanstack/react-router";
-import { useState } from "react";
-import { toast } from "../hooks/use-toast";
-import { useCreateFeed } from "../lib/api";
-import { useFeedCreationStore } from "../store/feed-creation-store";
-import BasicInformationForm from "./BasicInformationForm";
-import CurationSettingsForm from "./CurationSettingsForm";
-import FeedReviewForm from "./FeedReviewForm";
-import { Button } from "./ui/button";
-import { Progress } from "./ui/progress";
-
-// Define step content types
-type Step = {
-  title: string;
-  description: string;
-  component: React.ReactNode;
-};
-
-// Types for feedConfig outputs
-interface OutputTransformConfig {
-  mappings?: { [key: string]: string };
-  apiKey?: string;
-  prompt?: string;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  schema?: { [key: string]: any }; // Consider making this more specific if possible
-  template?: string;
-  botToken?: string;
-  channelId?: string;
-  threadId?: string;
-  // Add other potential config fields here
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  [key: string]: any; // Add index signature to allow any string keys
-}
-
-interface OutputPluginAction {
-  config: OutputTransformConfig;
-  plugin: string;
-  transform?: OutputPluginAction[];
-}
-
-interface OutputsStream {
-  enabled: boolean;
-  transform: OutputPluginAction[];
-  distribute: OutputPluginAction[];
-}
-
-export default function CurationFormSteps() {
-  const [currentStep, setCurrentStep] = useState(0);
-  const [isSubmitting, setIsSubmitting] = useState(false);
-  const feedData = useFeedCreationStore();
-  const navigate = useNavigate();
-  const createFeedMutation = useCreateFeed();
-
-  // Define the steps
-  const steps: Step[] = [
-    {
-      title: "Basic Information",
-      description: "Enter the basic details for your feed",
-      component: <BasicInformationForm />,
-    },
-    {
-      title: "Curation Settings",
-      description: "Configure how content is curated",
-      component: <CurationSettingsForm />,
-    },
-    {
-      title: "Feed Review",
-      description: "Review your feed before publishing",
-      component: <FeedReviewForm />,
-    },
-  ];
-
-  // Calculate progress percentage
-  const progressValue = ((currentStep + 1) / steps.length) * 100;
-
-  // Navigation handlers
-  const handleNext = () => {
-    if (currentStep < steps.length - 1) {
-      // If moving from BasicInformationForm to the next step, set createdAt and show toast
-      if (currentStep === 0) {
-        feedData.setBasicInfo({ createdAt: new Date() });
-        toast({
-          title: "Information Saved",
-          description: "Your feed information has been saved.",
-          variant: "default",
-        });
-      }
-      setCurrentStep(currentStep + 1);
-    }
-  };
-
-  const handlePrevious = () => {
-    if (currentStep > 0) {
-      setCurrentStep(currentStep - 1);
-    }
-  };
-
-  return (
-    <div className="w-full md:max-w-4xl mx-auto py-4 md:py-8 px-4 md:px-0">
-      <div className="flex flex-col gap-1">
-        <div className="text-sm font-medium text-black">
-          Step {currentStep + 1} of {steps.length}
-        </div>
-        <Progress value={progressValue} />
-        <div className="flex justify-between mb-6 overflow-x-auto pb-2">
-          {steps.map((step, index) => (
-            <div
-              key={index}
-              className="flex flex-col items-center min-w-[100px] px-2"
-            >
-              <span
-                className={`text-sm text-center ${index === currentStep ? "font-bold" : ""}`}
-              >
-                {step.title}
-              </span>
-            </div>
-          ))}
-        </div>
-      </div>
-      <div className="border p-3 md:p-6 rounded-lg flex flex-col gap-4 md:gap-8">
-        {currentStep === 0 && (
-          <div className="flex flex-col gap-1 w-full">
-            <h2 className="text-xl md:text-2xl font-bold mb-2">
-              {steps[currentStep].title}
-            </h2>
-            <p className="text-sm text-[#64748B] mb-3 md:mb-6">
-              {steps[currentStep].description}
-            </p>
-          </div>
-        )}
-
-        {/* Step form content */}
-        <div className="">{steps[currentStep].component}</div>
-        <div className="flex justify-between">
-          <Button
-            variant="outline"
-            onClick={handlePrevious}
-            disabled={currentStep === 0}
-            className="text-sm md:text-base"
-          >
-            Previous
-          </Button>
-
-          {currentStep === steps.length - 1 ? (
-            <Button
-              onClick={async () => {
-                setIsSubmitting(true);
-
-                // Format the approvers data for the API
-                const twitterHandles = feedData.approvers.map(
-                  (approver) => approver.handle,
-                );
-
-                // Create the feed config object
-                const outputsStream: OutputsStream = {
-                  enabled: true,
-                  transform: [
-                    {
-                      config: {
-                        mappings: {
-                          notes: "{{curator.notes}}",
-                          author: "{{username}}",
-                          source:
-                            "https://x.com/{{username}}/status/{{tweetId}}",
-                          content: "{{content}}",
-                          submittedAt: "{{submittedAt}}",
-                        },
-                      },
-                      plugin: "@curatedotfun/object-transform",
-                    },
-                    {
-                      config: {
-                        apiKey: "{{OPENROUTER_API_KEY}}",
-                        prompt:
-                          "Summarize the content into a concise news flash, incorporating relevant details from the curator's notes. Maintain a neutral, third-person tone. Mention the author if relevant, or simply convey the information. When processing social media-style content, convert @mentions into markdown links in the format: [@username](https://x.com/username). Ensure all mentions are accurately linked and preserve their original intent.",
-                        schema: {
-                          tags: {
-                            type: "array",
-                            items: {
-                              type: "string",
-                            },
-                            description: "Relevant tags for the content",
-                          },
-                          title: {
-                            type: "string",
-                            description:
-                              "Title derived from summary of content",
-                          },
-                          summary: {
-                            type: "string",
-                            description:
-                              "Summary of content influenced by curator notes",
-                          },
-                        },
-                      },
-                      plugin: "@curatedotfun/ai-transform",
-                    },
-                  ],
-                  distribute: [],
-                };
-
-                if (feedData.telegramEnabled && feedData.telegramChannelId) {
-                  const telegramDistributor: OutputPluginAction = {
-                    config: {
-                      botToken: "{{TELEGRAM_BOT_TOKEN}}",
-                      channelId: feedData.telegramChannelId,
-                    },
-                    plugin: "@curatedotfun/telegram",
-                    transform: [
-                      {
-                        config: {
-                          template:
-                            "🇻🇳: *[{{title}}](<{{source}}>)*\n\n{{summary}}\n\n👤 Source [@{{author}}](https://x.com/{{author}})",
-                        },
-                        plugin: "@curatedotfun/simple-transform",
-                      },
-                    ],
-                  };
-                  if (feedData.telegramThreadId) {
-                    telegramDistributor.config.threadId =
-                      feedData.telegramThreadId;
-                  }
-                  outputsStream.distribute.push(telegramDistributor);
-                }
-
-                const feedConfig = {
-                  id: feedData.hashtags.replace(/^#/, ""), // Remove # if present
-                  name: feedData.feedName,
-                  description: feedData.description,
-                  enabled: true, // Assuming true, adjust as needed
-                  moderation: {
-                    approvers: {
-                      twitter: twitterHandles,
-                    },
-                  },
-                  outputs: {
-                    stream: outputsStream,
-                  },
-                  // sources: [] // Add if needed, based on your example
-                };
-
-                console.log("Feed config to submit:", feedConfig);
-
-                // Call the API
-                try {
-                  await createFeedMutation.mutateAsync(feedConfig);
-                  toast({
-                    title: "Feed Created Successfully!",
-                    description: `Your feed "${feedData.feedName}" has been created.`,
-                    variant: "default",
-                  });
-                  navigate({ to: "/" });
-                } catch (error) {
-                  console.error("Error creating feed:", error);
-                  toast({
-                    title: "Error Creating Feed",
-                    description:
-                      "There was an error creating your feed. Please try again.",
-                    variant: "destructive",
-                  });
-                } finally {
-                  setIsSubmitting(false);
-                }
-              }}
-              disabled={isSubmitting}
-              className="text-sm md:text-base "
-            >
-              {isSubmitting ? "Submitting..." : "Create Feed"}
-            </Button>
-          ) : (
-            <Button onClick={handleNext} className="text-sm md:text-base">
-              Next
-            </Button>
-          )}
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/apps/app/src/components/CurationSettingsForm.tsx b/apps/app/src/components/CurationSettingsForm.tsx
deleted file mode 100644
index a7129d85..00000000
--- a/apps/app/src/components/CurationSettingsForm.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import ContentApprovers from "./ContentApprovers";
-// import ContentProgress from "./ContentProgress";
-import PublishingIntegrations from "./PublishIntegrations";
-
-const StepHeader = ({
-  number,
-  title,
-  description,
-}: {
-  number: number;
-  title: string;
-  description: string;
-}) => (
-  <div className="flex items-start flex-col gap-2 md:gap-3">
-    <div className="flex gap-2 md:gap-3 items-center">
-      <div className="flex-1 text-[#737373] text-sm md:text-base leading-6 font-londrina border border-neutral-500 rounded-md py-1 px-2 md:px-3 max-w-fit">
-        {number}
-      </div>
-      <h2 className="text-xl md:text-2xl leading-7 font-medium font-londrina text-[#737373]">
-        {title}
-      </h2>
-    </div>
-    <p className="text-xs md:text-sm leading-5 md:leading-7 text-[#64748b]">
-      {description}
-    </p>
-  </div>
-);
-
-type Step = {
-  title: string;
-  id: number;
-  description: string;
-  component: React.ReactNode;
-};
-
-const steps: Step[] = [
-  // {
-  //   title: "Content Progress Configuration",
-  //   description: "Define how content is processed before being published",
-  //   id: 1,
-  //   component: <ContentProgress />,
-  // },
-  {
-    title: "Publishing Integrations",
-    description: "Define how content is processed before being published",
-
-    id: 2,
-    component: <PublishingIntegrations />,
-  },
-  {
-    title: "Content Approvers",
-    description: "Define how content is processed before being published",
-
-    id: 3,
-    component: <ContentApprovers />,
-  },
-  // {
-  //   title: "Submission Rules",
-  //   description: "Set requirements for content submissions to your feed",
-
-  //   id: 4,
-  //   component: <SubmissionRules />,
-  // },
-];
-
-// Fixed function name (was CurationFormSteps)
-export default function CurationSettingsForm() {
-  return (
-    <div className="flex flex-col gap-4 md:gap-8">
-      {steps.map((step) => (
-        <div className="flex flex-col gap-3 md:gap-5" key={step.id}>
-          <StepHeader
-            number={step.id}
-            title={step.title}
-            description={step.description}
-          />
-          <div className="overflow-x-auto">{step.component}</div>
-        </div>
-      ))}
-    </div>
-  );
-}
diff --git a/apps/app/src/components/DistributorBadges.tsx b/apps/app/src/components/DistributorBadges.tsx
index c0217366..322df716 100644
--- a/apps/app/src/components/DistributorBadges.tsx
+++ b/apps/app/src/components/DistributorBadges.tsx
@@ -6,19 +6,18 @@ export function DistributorBadges({
   distribute: { plugin: string }[];
 }) {
   return (
-    <>
-      <p className="flex">Posting to:</p>
-      {distribute.map((distributor) => {
+    <div className="flex flex-wrap gap-1 max-w-full overflow-hidden">
+      {distribute.map((distributor, index) => {
         const pluginName = distributor.plugin.replace("@curatedotfun/", "");
         return (
           <Badge
-            key={distributor.plugin}
-            className="text-black border border-stone-500 rounded-md bg-stone-50 shadow-none capitalize px-2 py-0.5"
+            key={`${distributor.plugin}-${index}`}
+            className="text-black border border-stone-500 rounded-md bg-stone-50 shadow-none capitalize px-2 py-0.5 text-xs whitespace-nowrap flex-shrink-0"
           >
             {pluginName}
           </Badge>
         );
       })}
-    </>
+    </div>
   );
 }
diff --git a/apps/app/src/components/FeedItem.tsx b/apps/app/src/components/FeedItem.tsx
index 5a6f25fc..aed61a19 100644
--- a/apps/app/src/components/FeedItem.tsx
+++ b/apps/app/src/components/FeedItem.tsx
@@ -4,7 +4,7 @@ import {
   useApproveSubmission,
   useRejectSubmission,
 } from "../lib/api/moderation";
-import { useCanModerateFeed } from "../lib/api/feed";
+import { useCanModerateFeed } from "../lib/api/feeds";
 import { getTweetUrl } from "../lib/twitter";
 import { formatDate } from "../utils/datetime";
 import { Badge } from "./ui/badge";
diff --git a/apps/app/src/components/FeedList.tsx b/apps/app/src/components/FeedList.tsx
index 04084929..e9da9a0e 100644
--- a/apps/app/src/components/FeedList.tsx
+++ b/apps/app/src/components/FeedList.tsx
@@ -4,6 +4,8 @@ import { useAllFeeds } from "../lib/api";
 const FeedList = () => {
   const { data: feeds = [] } = useAllFeeds();
 
+  console.log("feeds", feeds);
+
   return (
     <div className="flex flex-col gap-6">
       <div className="flex justify-start items-start gap-6 ">
diff --git a/apps/app/src/components/Leaderboard.tsx b/apps/app/src/components/Leaderboard.tsx
index 8006469b..48099bff 100644
--- a/apps/app/src/components/Leaderboard.tsx
+++ b/apps/app/src/components/Leaderboard.tsx
@@ -1,17 +1,17 @@
-import { Link } from "@tanstack/react-router";
-import { ChevronDown, ChevronUp, Search } from "lucide-react";
-import { useEffect, useMemo, useRef, useState } from "react";
-import { LeaderboardEntry, useAllFeeds } from "../lib/api";
+import React from "react";
+import { LeaderboardEntry } from "../lib/api";
 import { Container } from "./Container";
-import { UserLink } from "./FeedItem";
 import { Hero } from "./Hero";
+import { useLeaderboard } from "../hooks/useLeaderboard";
+import { LeaderboardFilters } from "./leaderboard/LeaderboardFilters";
+import { LeaderboardTable } from "./leaderboard/LeaderboardTable";
 
 interface LeaderboardSearch {
   feed: string;
   timeframe: string;
 }
 
-export default function Leaderboard({
+export default React.memo(function Leaderboard({
   search,
   leaderboard,
   isLoading,
@@ -22,382 +22,54 @@ export default function Leaderboard({
   isLoading: boolean;
   error: Error | null;
 }) {
-  const [expandedRows, setExpandedRows] = useState<number[]>([]);
-  const [searchQuery, setSearchQuery] = useState<string | null>(null);
-  const [showFeedDropdown, setShowFeedDropdown] = useState<boolean>(false);
-  const [showTimeDropdown, setShowTimeDropdown] = useState<boolean>(false);
-  const { data: allFeeds = [] } = useAllFeeds();
-  const feedDropdownRef = useRef<HTMLDivElement>(null);
-  const timeDropdownRef = useRef<HTMLDivElement>(null);
-
-  const timeOptions = [
-    { label: "All Time", value: "all" },
-    { label: "This Month", value: "month" },
-    { label: "This Week", value: "week" },
-    { label: "Today", value: "today" },
-  ];
-
-  const feeds = useMemo(() => {
-    return [
-      {
-        label: "All Feeds",
-        value: "all feeds",
-      },
-      ...(
-        allFeeds.map((feed) => ({
-          label: feed.name,
-          value: feed.id,
-        })) || []
-      ).filter((feed) => feed.value !== "all"),
-    ];
-  }, [allFeeds]);
-
-  useEffect(() => {
-    const handleClickOutside = (event: MouseEvent) => {
-      if (
-        feedDropdownRef.current &&
-        !feedDropdownRef.current.contains(event.target as Node)
-      ) {
-        setShowFeedDropdown(false);
-      }
-      if (
-        timeDropdownRef.current &&
-        !timeDropdownRef.current.contains(event.target as Node)
-      ) {
-        setShowTimeDropdown(false);
-      }
-    };
-
-    document.addEventListener("mousedown", handleClickOutside);
-    return () => document.removeEventListener("mousedown", handleClickOutside);
-  }, []);
-
-  const toggleRow = (index: number) => {
-    setExpandedRows((prev) =>
-      prev.includes(index) ? prev.filter((i) => i !== index) : [...prev, index],
-    );
-  };
-
-  const handleSearch = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setSearchQuery(e.target.value);
-  };
-
-  const filteredLeaderboard = leaderboard?.filter((item) => {
-    const searchTerm = searchQuery?.toLowerCase();
-    const feedFilter =
-      search.feed === "all feeds"
-        ? true
-        : item.feedSubmissions?.some((feed) => feed.feedId === search.feed);
-
-    const matchesSearch =
-      !searchTerm ||
-      item.curatorUsername?.toLowerCase().includes(searchTerm) ||
-      item.feedSubmissions?.some((feed) =>
-        feed.feedId?.toLowerCase().includes(searchTerm),
-      );
-
-    return feedFilter && matchesSearch;
-  });
-
-  // Map the filtered items to include their original index
-  const filteredLeaderboardWithRanks = filteredLeaderboard?.map((item) => {
-    const originalIndex = leaderboard?.findIndex(
-      (entry) => entry.curatorId === item.curatorId,
-    );
-    return {
-      ...item,
-      originalRank: originalIndex !== undefined ? originalIndex + 1 : 0,
-    };
-  });
+  const {
+    searchQuery,
+    showFeedDropdown,
+    showTimeDropdown,
+    feeds,
+    timeOptions,
+    handleSearch,
+    handleFeedDropdownToggle,
+    handleTimeDropdownToggle,
+    handleFeedDropdownClose,
+    handleTimeDropdownClose,
+    feedDropdownRef,
+    timeDropdownRef,
+    table,
+    hasData,
+  } = useLeaderboard(leaderboard, search);
 
   return (
-    <div className=" flex flex-col mx-auto ">
+    <div className="flex flex-col mx-auto">
       <Hero
         title="Leaderboard"
         description="Top performing curators ranked by submissions, engagement, and activities."
       />
 
       <Container>
-        <div className="flex flex-col md:flex-row max-w-[400px] md:max-w-screen-xl md:w-full mx-auto justify-between items-center mb-6 gap-4 px-4 py-8">
-          <div className="relative w-full md:w-auto">
-            <Search className="absolute left-3 top-1/2 transform -translate-y-1/2 text-[#a3a3a3] h-4 w-4" />
-            <input
-              type="text"
-              placeholder="Search by curator or feed"
-              value={searchQuery || ""}
-              onChange={handleSearch}
-              className="pl-10 pr-4 py-2 border border-neutral-300 rounded-md w-full md:w-[300px] focus:outline-none focus:ring-2 focus:ring-[#60a5fa] focus:border-transparent"
-            />
-          </div>
-          <div className="flex gap-3 w-full md:w-auto">
-            <div className="relative w-full md:w-auto" ref={feedDropdownRef}>
-              <button
-                onClick={() => setShowFeedDropdown(!showFeedDropdown)}
-                className="flex items-center justify-between gap-2 px-4 py-2 border border-neutral-300 rounded-md bg-white w-full md:w-[180px]"
-                aria-expanded={showFeedDropdown}
-                aria-haspopup="listbox"
-                aria-controls="feed-dropdown"
-              >
-                <span className="text-[#111111] text-sm">
-                  {feeds.find((feed) => feed.value === search.feed)?.label}
-                </span>
-                <ChevronDown className="h-4 w-4 text-[#64748b]" />
-              </button>
-              {showFeedDropdown && (
-                <div
-                  id="feed-dropdown"
-                  role="listbox"
-                  className="absolute top-full flex flex-col left-0 mt-1 w-full bg-white border border-neutral-200 rounded-md shadow-lg z-20"
-                >
-                  {feeds.map((feed, index) => (
-                    <Link
-                      key={index}
-                      to="/leaderboard"
-                      search={{ feed: feed.value, timeframe: search.timeframe }}
-                      role="option"
-                      aria-selected={search.feed === feed.value}
-                      onClick={() => {
-                        setShowFeedDropdown(false);
-                      }}
-                      className={`w-full px-4 py-2 text-left hover:bg-neutral-100 text-sm ${
-                        search.feed === feed.value ? "bg-neutral-100" : ""
-                      }`}
-                    >
-                      {feed.label}
-                    </Link>
-                  ))}
-                </div>
-              )}
-            </div>
-            <div className="relative w-full md:w-auto" ref={timeDropdownRef}>
-              <button
-                onClick={() => setShowTimeDropdown(!showTimeDropdown)}
-                className="flex items-center justify-between gap-2 px-4 py-2 border border-neutral-300 rounded-md bg-white w-full md:w-[160px]"
-                aria-expanded={showTimeDropdown}
-                aria-haspopup="listbox"
-                aria-controls="time-dropdown"
-              >
-                <span className="text-[#111111] text-sm">
-                  {
-                    timeOptions.find(
-                      (option) => option.value === search.timeframe,
-                    )?.label
-                  }
-                </span>
-                <ChevronDown className="h-4 w-4 text-[#64748b]" />
-              </button>
-              {showTimeDropdown && (
-                <div
-                  id="time-dropdown"
-                  role="listbox"
-                  className="absolute top-full flex flex-col left-0 mt-1 w-full bg-white border border-neutral-200 rounded-md shadow-lg z-20"
-                >
-                  {timeOptions.map((time) => (
-                    <Link
-                      key={time.value}
-                      to="/leaderboard"
-                      search={{
-                        feed: search.feed.toLowerCase(),
-                        timeframe: time.value,
-                      }}
-                      role="option"
-                      aria-selected={search.timeframe === time.label}
-                      onClick={() => {
-                        setShowTimeDropdown(false);
-                      }}
-                      className={`w-full px-4 py-2 text-left hover:bg-neutral-100 text-sm ${
-                        search.timeframe === time.label ? "bg-neutral-100" : ""
-                      }`}
-                    >
-                      {time.label}
-                    </Link>
-                  ))}
-                </div>
-              )}
-            </div>
-          </div>
-        </div>
-
-        <div className="overflow-y-auto max-h-[500px] max-w-[368px] md:max-w-screen-xl md:w-full mx-auto  scrollbar-thin scrollbar-thumb-gray-300 scrollbar-track-transparent">
-          <div className="relative">
-            <table className="w-full border-collapse ">
-              <thead className="sticky top-0 bg-white z-10">
-                <tr className="border-b border-[#e5e5e5]">
-                  <th className="text-left py-4 px-2 font-medium text-sm whitespace-nowrap">
-                    Rank
-                  </th>
-                  {/* <th className="text-left py-4 px-2 font-medium text-sm whitespace-nowrap">
-                  Curator
-                </th> */}
-                  <th className="text-left py-4 px-2 font-medium text-sm whitespace-nowrap">
-                    Username
-                  </th>
-                  <th className="text-left py-4 px-2 font-medium text-sm whitespace-nowrap">
-                    Approval Rate
-                  </th>
-                  <th className=" text-left py-4 px-2 font-medium text-sm whitespace-nowrap">
-                    Submissions
-                  </th>
-                  <th className=" text-left py-4 px-2 font-medium text-sm whitespace-nowrap">
-                    Top Feeds
-                  </th>
-                </tr>
-              </thead>
-              <tbody className="overflow-x-auto">
-                {isLoading && (
-                  <tr>
-                    <td colSpan={5} className="text-left py-8">
-                      <p>Loading leaderboard data...</p>
-                    </td>
-                  </tr>
-                )}
-
-                {error && (
-                  <tr>
-                    <td colSpan={5} className="text-left py-8 text-red-500">
-                      <p>
-                        Error loading leaderboard: {(error as Error).message}
-                      </p>
-                    </td>
-                  </tr>
-                )}
-
-                {leaderboard && leaderboard.length === 0 && (
-                  <tr>
-                    <td colSpan={5} className="text-left py-8">
-                      <p>No curator data available.</p>
-                    </td>
-                  </tr>
-                )}
-                {filteredLeaderboardWithRanks?.map(
-                  (
-                    item: LeaderboardEntry & { originalRank: number },
-                    index,
-                  ) => (
-                    <tr
-                      key={item.curatorId}
-                      className="border-b border-[#e5e5e5] hover:bg-[#f9fafb]"
-                    >
-                      <td className="py-4 px-2 align-top">
-                        <div className="flex items-center w-[35px]">
-                          {item.originalRank === 1 && (
-                            <img
-                              src="/icons/star-gold.svg"
-                              className="h-5 w-5 mr-1"
-                              alt="Gold star - 1st place"
-                            />
-                          )}
-                          {item.originalRank === 2 && (
-                            <img
-                              src="/icons/star-silver.svg"
-                              className="h-5 w-5 mr-1"
-                              alt="Silver star - 2nd place"
-                            />
-                          )}
-                          {item.originalRank === 3 && (
-                            <img
-                              src="/icons/star-bronze.svg"
-                              className="h-5 w-5 mr-1"
-                              alt="Bronze star - 3rd place"
-                            />
-                          )}
-                          <div className="flex w-full text-right justify-end">
-                            <span className="text-[#111111] font-medium">
-                              {item.originalRank}
-                            </span>
-                          </div>
-                        </div>
-                      </td>
-                      {/* <td className="py-4 px-2 align-top">
-                    <div className="flex items-start">
-                    <HexagonAvatar />
-                      <span className="font-medium text-[#111111] capitalize">
-                        {removeSpecialChars(item.curatorUsername)}
-                        </span>
-                        </div>
-                  </td> */}
-                      <td className="py-4 px-2 align-top">
-                        <div className="flex items-start gap-2">
-                          <UserLink username={item.curatorUsername} />
-                        </div>
-                      </td>
-                      <td className="py-4 px-2 align-top">
-                        <div className="flex items-start">
-                          {item.submissionCount > 0
-                            ? `${Math.round((item.approvalCount / item.submissionCount) * 100)}%`
-                            : "0%"}
-                        </div>
-                      </td>
-                      <td className="py-4 px-2 align-top">
-                        <div className="flex items-start text-[#111111] font-medium">
-                          {item.submissionCount}
-                        </div>
-                      </td>
-                      <td className="py-4 px-2 align-top">
-                        <div className="flex flex-col">
-                          <div className="flex items-start gap-2">
-                            {item.feedSubmissions &&
-                              item.feedSubmissions.length > 0 && (
-                                <div className="flex items-center justify-between gap-1 border border-neutral-400 px-2 py-1 rounded-md w-[150px]">
-                                  <span className="text-sm">
-                                    #{item.feedSubmissions[0].feedId}
-                                  </span>
-                                  <span className="text-sm">
-                                    {item.feedSubmissions[0].count}/
-                                    {item.feedSubmissions[0].totalInFeed}
-                                  </span>
-                                </div>
-                              )}
-
-                            {item.feedSubmissions &&
-                              item.feedSubmissions.length > 1 && (
-                                <button
-                                  onClick={() => toggleRow(index)}
-                                  className="w-8 h-8 flex items-center justify-center border border-neutral-400 rounded-md transition-colors"
-                                >
-                                  {expandedRows.includes(index) ? (
-                                    <ChevronUp className="h-5 w-5" />
-                                  ) : (
-                                    <span className="text-xs">
-                                      +{item.feedSubmissions.length - 1}
-                                    </span>
-                                  )}
-                                </button>
-                              )}
-                          </div>
-
-                          {item.feedSubmissions &&
-                            expandedRows.includes(index) && (
-                              <div className="flex flex-col gap-2 mt-2 pl-0">
-                                {item.feedSubmissions
-                                  .slice(1)
-                                  .map((feed, feedIndex) => (
-                                    <div
-                                      key={feedIndex}
-                                      className="flex items-center"
-                                    >
-                                      <div className="flex items-center gap-1 border border-neutral-400 px-2 py-1 rounded-md justify-between w-[150px]">
-                                        <span className="text-sm">
-                                          #{feed.feedId}
-                                        </span>
-                                        <span className="text-sm">
-                                          {feed.count}/{feed.totalInFeed}
-                                        </span>
-                                      </div>
-                                    </div>
-                                  ))}
-                              </div>
-                            )}
-                        </div>
-                      </td>
-                    </tr>
-                  ),
-                )}
-              </tbody>
-            </table>
-          </div>
-        </div>
+        <LeaderboardFilters
+          searchQuery={searchQuery}
+          onSearchChange={handleSearch}
+          feeds={feeds}
+          timeOptions={timeOptions}
+          search={search}
+          showFeedDropdown={showFeedDropdown}
+          showTimeDropdown={showTimeDropdown}
+          onFeedDropdownToggle={handleFeedDropdownToggle}
+          onTimeDropdownToggle={handleTimeDropdownToggle}
+          onFeedDropdownClose={handleFeedDropdownClose}
+          onTimeDropdownClose={handleTimeDropdownClose}
+          feedDropdownRef={feedDropdownRef}
+          timeDropdownRef={timeDropdownRef}
+        />
+
+        <LeaderboardTable
+          table={table}
+          isLoading={isLoading}
+          error={error}
+          hasData={hasData}
+        />
       </Container>
     </div>
   );
-}
+});
diff --git a/apps/app/src/components/PublishIntegrations.tsx b/apps/app/src/components/PublishIntegrations.tsx
index 50672602..43ed370c 100644
--- a/apps/app/src/components/PublishIntegrations.tsx
+++ b/apps/app/src/components/PublishIntegrations.tsx
@@ -1,14 +1,11 @@
+import { useFormContext } from "react-hook-form";
+import { FormControl, FormField, FormItem, FormLabel } from "./ui/form";
+import { Input } from "./ui/input";
 import { Switch } from "./ui/switch";
-import { Button } from "./ui/button";
-import { useFeedCreationStore } from "../store/feed-creation-store";
 
 export default function PublishingIntegrations() {
-  const {
-    telegramEnabled,
-    telegramChannelId,
-    telegramThreadId,
-    setTelegramConfig,
-  } = useFeedCreationStore();
+  const { control, watch } = useFormContext();
+  const telegramEnabled = watch("telegramEnabled");
 
   return (
     <div className="border border-gray-200 rounded-lg ">
@@ -53,116 +50,61 @@ export default function PublishingIntegrations() {
               </p>
             </div>
           </div>
-          {/* <div className="px-3 py-2 flex gap-[4px] bg-white border font-sans border-neutral-600 rounded-md text-sm font-medium self-start md:self-auto">
-            <div>
-              <svg
-                xmlns="http://www.w3.org/2000/svg"
-                width="16"
-                height="16"
-                viewBox="0 0 16 16"
-                fill="none"
-              >
-                <g clipPath="url(#clip0_2539_9441)">
-                  <path
-                    d="M12.0607 6.91406C12.6909 7.14901 13.2517 7.53908 13.6912 8.0482C14.1307 8.55731 14.4348 9.16902 14.5752 9.82677C14.7157 10.4845 14.688 11.1671 14.4947 11.8113C14.3015 12.4555 13.9489 13.0406 13.4697 13.5125C12.9904 13.9843 12.3999 14.3277 11.7527 14.5109C11.1055 14.694 10.4226 14.7111 9.76717 14.5604C9.11169 14.4097 8.50479 14.0961 8.0026 13.6487C7.5004 13.2013 7.11913 12.6345 6.89404 12.0007M4.66732 4.00065H5.33398V6.66732M11.1407 9.25391L11.6074 9.72724L9.72738 11.6072M9.33398 5.33398C9.33398 7.54312 7.54312 9.33398 5.33398 9.33398C3.12485 9.33398 1.33398 7.54312 1.33398 5.33398C1.33398 3.12485 3.12485 1.33398 5.33398 1.33398C7.54312 1.33398 9.33398 3.12485 9.33398 5.33398Z"
-                    stroke="#525252"
-                    stroke-linecap="round"
-                    stroke-linejoin="round"
-                  />
-                </g>
-                <defs>
-                  <clipPath id="clip0_2539_9441">
-                    <rect width="16" height="16" fill="white" />
-                  </clipPath>
-                </defs>
-              </svg>
-            </div>
-            150 $CURATE
-          </div> */}
         </div>
         <div className="flex items-center gap-4 self-end md:self-auto">
-          <Switch
-            checked={telegramEnabled}
-            onCheckedChange={(checked) =>
-              setTelegramConfig({ telegramEnabled: checked })
-            }
+          <FormField
+            control={control}
+            name="telegramEnabled"
+            render={({ field }) => (
+              <FormItem>
+                <FormControl>
+                  <Switch
+                    checked={field.value}
+                    onCheckedChange={field.onChange}
+                  />
+                </FormControl>
+              </FormItem>
+            )}
           />
         </div>
       </div>
       <div className=" ">
         {telegramEnabled && (
           <div className="space-y-4 md:space-y-6 border-t pt-4 md:pt-6 p-4 bg-white">
-            {/* <div className="space-y-2">
-              <label className="text-sm font-medium">Bot Token</label>
-              <input
-                type="text"
-                className="w-full p-2 border border-gray-300 rounded-md text-sm md:text-base"
-                placeholder="Enter your bot token"
-              />
-              <p className="text-xs text-gray-500">
-                Your Telegram bot token from @BotFather
-              </p>
-            </div> */}
+            <FormField
+              control={control}
+              name="telegramChannelId"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Channel ID</FormLabel>
+                  <FormControl>
+                    <Input
+                      placeholder="Enter channel username or ID"
+                      {...field}
+                    />
+                  </FormControl>
+                  <p className="text-xs text-gray-500">
+                    Username or ID of your Channel/group
+                  </p>
+                </FormItem>
+              )}
+            />
 
-            <div className="space-y-2">
-              <label className="text-sm font-medium">Channel ID</label>
-              <input
-                type="text"
-                className="w-full p-2 border border-gray-300 rounded-md text-sm md:text-base"
-                placeholder="Enter channel username or ID"
-                value={telegramChannelId}
-                onChange={(e) =>
-                  setTelegramConfig({ telegramChannelId: e.target.value })
-                }
-              />
-              <p className="text-xs text-gray-500">
-                Username or ID of your Channel/group
-              </p>
-            </div>
-
-            <div className="space-y-2">
-              <label className="text-sm font-medium">
-                Thread ID (optional)
-              </label>
-              <input
-                type="text"
-                className="w-full p-2 border border-gray-300 rounded-md text-sm md:text-base"
-                placeholder="Enter thread ID if applicable"
-                value={telegramThreadId}
-                onChange={(e) =>
-                  setTelegramConfig({ telegramThreadId: e.target.value })
-                }
-              />
-            </div>
-
-            <div className="flex flex-col md:flex-row gap-3 md:gap-0 md:justify-between pt-4">
-              <Button
-                variant="outline"
-                onClick={() => {
-                  // Optionally clear fields when closing, or just hide the section
-                  setTelegramConfig({ telegramEnabled: false });
-                }}
-                className="order-2 md:order-1"
-              >
-                Close
-              </Button>
-              <Button
-                className="order-1 md:order-2"
-                onClick={() => {
-                  // Data is already in the store due to onChange handlers
-                  // This button can be used for explicit save confirmation if needed
-                  // or to trigger other actions. For now, it doesn't need to do much
-                  // if we rely on onChange to update the store.
-                  // We can add a toast notification here if desired.
-                  console.log("Telegram settings saved to store:", {
-                    telegramChannelId,
-                    telegramThreadId,
-                  });
-                }}
-              >
-                Save
-              </Button>
-            </div>
+            <FormField
+              control={control}
+              name="telegramThreadId"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Thread ID (optional)</FormLabel>
+                  <FormControl>
+                    <Input
+                      placeholder="Enter thread ID if applicable"
+                      {...field}
+                    />
+                  </FormControl>
+                </FormItem>
+              )}
+            />
           </div>
         )}
       </div>
diff --git a/apps/app/src/components/TopCurators.tsx b/apps/app/src/components/TopCurators.tsx
index 53442a30..29fbd343 100644
--- a/apps/app/src/components/TopCurators.tsx
+++ b/apps/app/src/components/TopCurators.tsx
@@ -113,22 +113,22 @@ const TopCurators = ({ feedId, limit = 10 }: TopCuratorsProps) => {
                             d="M7.4659 3.32994C8.12994 3.32994 8.76678 3.59373 9.23633 4.06327C9.70587 4.53282 9.96966 5.16966 9.96966 5.8337V8.75476H8.30049V5.8337C8.30049 5.61235 8.21256 5.40007 8.05604 5.24356C7.89952 5.08704 7.68724 4.99911 7.4659 4.99911C7.24455 4.99911 7.03227 5.08704 6.87575 5.24356C6.71924 5.40007 6.63131 5.61235 6.63131 5.8337V8.75476H4.96213V5.8337C4.96213 5.16966 5.22592 4.53282 5.69547 4.06327C6.16501 3.59373 6.80186 3.32994 7.4659 3.32994Z"
                             stroke="#0F172A"
                             stroke-width="0.678103"
-                            stroke-linecap="round"
-                            stroke-linejoin="round"
+                            strokeLinecap="round"
+                            strokeLinejoin="round"
                           />
                           <path
                             d="M3.29296 3.74723H1.62378V8.75476H3.29296V3.74723Z"
                             stroke="#0F172A"
                             stroke-width="0.678103"
-                            stroke-linecap="round"
-                            stroke-linejoin="round"
+                            strokeLinecap="round"
+                            strokeLinejoin="round"
                           />
                           <path
                             d="M2.45837 2.49535C2.9193 2.49535 3.29296 2.12169 3.29296 1.66076C3.29296 1.19983 2.9193 0.826172 2.45837 0.826172C1.99744 0.826172 1.62378 1.19983 1.62378 1.66076C1.62378 2.12169 1.99744 2.49535 2.45837 2.49535Z"
                             stroke="#0F172A"
                             stroke-width="0.678103"
-                            stroke-linecap="round"
-                            stroke-linejoin="round"
+                            strokeLinecap="round"
+                            strokeLinejoin="round"
                           />
                         </g>
                         <defs>
diff --git a/apps/app/src/components/UserMenu.tsx b/apps/app/src/components/UserMenu.tsx
index 91a71c47..73141082 100644
--- a/apps/app/src/components/UserMenu.tsx
+++ b/apps/app/src/components/UserMenu.tsx
@@ -21,8 +21,14 @@ interface UserMenuProps {
 export default function UserMenu({ className }: UserMenuProps) {
   const [dropdownOpen, setDropdownOpen] = useState(false);
   const navigate = useNavigate();
-  const { currentAccountId, handleSignIn, isSignedIn, handleSignOut } =
-    useAuth();
+  const {
+    currentAccountId,
+    handleSignIn,
+    isSignedIn,
+    handleSignOut,
+    isAuthorized,
+    handleAuthorize,
+  } = useAuth();
   const { data: userProfile } = useNearSocialProfile(currentAccountId || "");
 
   const ProfileImage = ({ size = "small" }: { size?: "small" | "medium" }) => {
@@ -41,71 +47,79 @@ export default function UserMenu({ className }: UserMenuProps) {
     return "User";
   };
 
+  if (!isSignedIn) {
+    return (
+      <Button className={className || "hidden md:flex"} onClick={handleSignIn}>
+        Login
+      </Button>
+    );
+  }
+
+  if (!isAuthorized) {
+    return (
+      <Button
+        className={className || "hidden md:flex"}
+        onClick={handleAuthorize}
+      >
+        Authorize App
+      </Button>
+    );
+  }
+
   return (
-    <>
-      {isSignedIn ? (
-        <DropdownMenu onOpenChange={setDropdownOpen}>
-          <DropdownMenuTrigger asChild>
-            <Button variant="outline" className={className || "hidden md:flex"}>
-              <div className="flex gap-1 items-center justify-center">
-                {currentAccountId ? (
-                  <AvatarProfile accountId={currentAccountId} size="small" />
-                ) : (
-                  <ProfileImage size="small" />
-                )}
-                <p className="text-sm font-medium leading-6 hidden sm:block">
-                  {getUserDisplayName()}
-                </p>
-                <ChevronDown
-                  className={`h-4 w-4 transition-transform duration-200 ${
-                    dropdownOpen ? "rotate-180" : ""
-                  }`}
-                />
-              </div>
-            </Button>
-          </DropdownMenuTrigger>
-          <DropdownMenuContent className="w-56 mt-4">
-            <DropdownMenuItem>
-              <div className="flex gap-2 w-full items-start">
-                {currentAccountId ? (
-                  <AvatarProfile accountId={currentAccountId} size="medium" />
-                ) : (
-                  <ProfileImage />
-                )}
-                <div>
-                  <p className="text-sm font-semibold leading-5">
-                    {currentAccountId}
-                  </p>
-                </div>
-              </div>
-            </DropdownMenuItem>
-            <DropdownMenuSeparator />
-            <DropdownMenuItem
-              className="cursor-pointer hover:bg-gray-100"
-              onClick={() => {
-                navigate({ to: "/profile" });
-              }}
-            >
-              <CircleUserRound />
-              <span>Profile</span>
-            </DropdownMenuItem>
-            <DropdownMenuItem
-              onClick={handleSignOut}
-              className="cursor-pointer hover:bg-gray-100"
-            >
-              <LogOut />
-              <span>Disconnect</span>
-            </DropdownMenuItem>
-          </DropdownMenuContent>
-        </DropdownMenu>
-      ) : (
-        <Button
-          className={className || "hidden md:flex"}
-          onClick={handleSignIn}
-        >
-          Login
+    <DropdownMenu onOpenChange={setDropdownOpen}>
+      <DropdownMenuTrigger asChild>
+        <Button variant="outline" className={className || "hidden md:flex"}>
+          <div className="flex gap-1 items-center justify-center">
+            {currentAccountId ? (
+              <AvatarProfile accountId={currentAccountId} size="small" />
+            ) : (
+              <ProfileImage size="small" />
+            )}
+            <p className="text-sm font-medium leading-6 hidden sm:block">
+              {getUserDisplayName()}
+            </p>
+            <ChevronDown
+              className={`h-4 w-4 transition-transform duration-200 ${
+                dropdownOpen ? "rotate-180" : ""
+              }`}
+            />
+          </div>
         </Button>
-      )}
-    </>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent className="w-56 mt-4">
+        <DropdownMenuItem>
+          <div className="flex gap-2 w-full items-start">
+            {currentAccountId ? (
+              <AvatarProfile accountId={currentAccountId} size="medium" />
+            ) : (
+              <ProfileImage />
+            )}
+            <div>
+              <p className="text-sm font-semibold leading-5">
+                {currentAccountId}
+              </p>
+            </div>
+          </div>
+        </DropdownMenuItem>
+        <DropdownMenuSeparator />
+        <DropdownMenuItem
+          className="cursor-pointer hover:bg-gray-100"
+          onClick={() => {
+            navigate({ to: "/profile" });
+          }}
+        >
+          <CircleUserRound />
+          <span>Profile</span>
+        </DropdownMenuItem>
+        <DropdownMenuItem
+          onClick={handleSignOut}
+          className="cursor-pointer hover:bg-gray-100"
+        >
+          <LogOut />
+          <span>Disconnect</span>
+        </DropdownMenuItem>
+      </DropdownMenuContent>
+    </DropdownMenu>
   );
 }
diff --git a/apps/app/src/components/leaderboard/LeaderboardColumns.tsx b/apps/app/src/components/leaderboard/LeaderboardColumns.tsx
new file mode 100644
index 00000000..f2c10534
--- /dev/null
+++ b/apps/app/src/components/leaderboard/LeaderboardColumns.tsx
@@ -0,0 +1,134 @@
+import { ChevronUp } from "lucide-react";
+import { createColumnHelper } from "@tanstack/react-table";
+import { LeaderboardEntry } from "../../lib/api";
+import { UserLink } from "../FeedItem";
+
+export interface ExtendedLeaderboardEntry extends LeaderboardEntry {
+  originalRank: number;
+}
+
+export function createLeaderboardColumns(
+  expandedRows: number[],
+  toggleRow: (index: number) => void,
+) {
+  const columnHelper = createColumnHelper<ExtendedLeaderboardEntry>();
+
+  return [
+    columnHelper.accessor("originalRank", {
+      header: "Rank",
+      cell: (info) => {
+        const rank = info.getValue();
+        return (
+          <div className="flex items-center w-[35px] h-[32px]">
+            {rank === 1 && (
+              <img
+                src="/icons/star-gold.svg"
+                className="h-4 w-4 mr-1"
+                alt="Gold star - 1st place"
+              />
+            )}
+            {rank === 2 && (
+              <img
+                src="/icons/star-silver.svg"
+                className="h-4 w-4 mr-1"
+                alt="Silver star - 2nd place"
+              />
+            )}
+            {rank === 3 && (
+              <img
+                src="/icons/star-bronze.svg"
+                className="h-4 w-4 mr-1"
+                alt="Bronze star - 3rd place"
+              />
+            )}
+            <div className="flex w-full text-right justify-end">
+              <span className="text-[#111111] font-medium">{rank}</span>
+            </div>
+          </div>
+        );
+      },
+    }),
+    columnHelper.accessor("curatorUsername", {
+      header: "Username",
+      cell: (info) => (
+        <div className="flex items-center gap-2 h-[32px]">
+          <UserLink username={info.getValue()} />
+        </div>
+      ),
+    }),
+    columnHelper.accessor(
+      (row) => {
+        return row.submissionCount > 0
+          ? Math.round((row.approvalCount / row.submissionCount) * 100)
+          : 0;
+      },
+      {
+        id: "approvalRate",
+        header: "Approval Rate",
+        cell: (info) => (
+          <div className="flex items-center h-[32px]">{info.getValue()}%</div>
+        ),
+      },
+    ),
+    columnHelper.accessor("submissionCount", {
+      header: "Submissions",
+      cell: (info) => (
+        <div className="flex items-center text-[#111111] font-medium h-[32px]">
+          {info.getValue()}
+        </div>
+      ),
+    }),
+    columnHelper.accessor("feedSubmissions", {
+      header: "Top Feeds",
+      cell: (info) => {
+        const feedSubmissions = info.getValue();
+        const rowIndex = info.row.index;
+
+        return (
+          <div className="flex flex-col min-h-[32px] justify-center">
+            <div className="flex items-center gap-2">
+              {feedSubmissions && feedSubmissions.length > 0 && (
+                <div className="flex items-center justify-between gap-1 border border-neutral-400 px-2 py-1 rounded-md w-[150px]">
+                  <span className="text-sm">#{feedSubmissions[0].feedId}</span>
+                  <span className="text-sm">
+                    {feedSubmissions[0].count}/{feedSubmissions[0].totalInFeed}
+                  </span>
+                </div>
+              )}
+
+              {feedSubmissions && feedSubmissions.length > 1 && (
+                <button
+                  onClick={() => toggleRow(rowIndex)}
+                  className="w-8 h-8 flex items-center justify-center border border-neutral-400 rounded-md transition-colors"
+                >
+                  {expandedRows.includes(rowIndex) ? (
+                    <ChevronUp className="h-4 w-4" />
+                  ) : (
+                    <span className="text-xs">
+                      +{feedSubmissions.length - 1}
+                    </span>
+                  )}
+                </button>
+              )}
+            </div>
+
+            {feedSubmissions && expandedRows.includes(rowIndex) && (
+              <div className="flex flex-col gap-2 mt-2 pl-0">
+                {feedSubmissions.slice(1).map((feed, feedIndex) => (
+                  <div key={feedIndex} className="flex items-center">
+                    <div className="flex items-center gap-1 border border-neutral-400 px-2 py-1 rounded-md justify-between w-[150px]">
+                      <span className="text-sm">#{feed.feedId}</span>
+                      <span className="text-sm">
+                        {feed.count}/{feed.totalInFeed}
+                      </span>
+                    </div>
+                  </div>
+                ))}
+              </div>
+            )}
+          </div>
+        );
+      },
+    }),
+  ];
+}
diff --git a/apps/app/src/components/leaderboard/LeaderboardFilters.tsx b/apps/app/src/components/leaderboard/LeaderboardFilters.tsx
new file mode 100644
index 00000000..812a784f
--- /dev/null
+++ b/apps/app/src/components/leaderboard/LeaderboardFilters.tsx
@@ -0,0 +1,144 @@
+import { Link } from "@tanstack/react-router";
+import { ChevronDown, Search } from "lucide-react";
+
+interface Feed {
+  label: string;
+  value: string;
+}
+
+interface TimeOption {
+  label: string;
+  value: string;
+}
+
+interface LeaderboardFiltersProps {
+  searchQuery: string | null;
+  onSearchChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+  feeds: Feed[];
+  timeOptions: TimeOption[];
+  search: {
+    feed: string;
+    timeframe: string;
+  };
+  showFeedDropdown: boolean;
+  showTimeDropdown: boolean;
+  onFeedDropdownToggle: () => void;
+  onTimeDropdownToggle: () => void;
+  onFeedDropdownClose: () => void;
+  onTimeDropdownClose: () => void;
+  feedDropdownRef: React.RefObject<HTMLDivElement>;
+  timeDropdownRef: React.RefObject<HTMLDivElement>;
+}
+
+export function LeaderboardFilters({
+  searchQuery,
+  onSearchChange,
+  feeds,
+  timeOptions,
+  search,
+  showFeedDropdown,
+  showTimeDropdown,
+  onFeedDropdownToggle,
+  onTimeDropdownToggle,
+  onFeedDropdownClose,
+  onTimeDropdownClose,
+  feedDropdownRef,
+  timeDropdownRef,
+}: LeaderboardFiltersProps) {
+  return (
+    <div className="flex flex-col md:flex-row max-w-[400px] md:max-w-screen-xl md:w-full mx-auto justify-between items-center mb-6 gap-4 px-4 py-8">
+      <div className="relative w-full md:w-auto">
+        <Search className="absolute left-3 top-1/2 transform -translate-y-1/2 text-[#a3a3a3] h-4 w-4" />
+        <input
+          type="text"
+          placeholder="Search by curator or feed"
+          value={searchQuery || ""}
+          onChange={onSearchChange}
+          className="pl-10 pr-4 py-2 border border-neutral-300 rounded-md w-full md:w-[300px] focus:outline-none focus:ring-2 focus:ring-[#60a5fa] focus:border-transparent"
+        />
+      </div>
+      <div className="flex gap-3 w-full md:w-auto">
+        <div className="relative w-full md:w-auto" ref={feedDropdownRef}>
+          <button
+            onClick={onFeedDropdownToggle}
+            className="flex items-center justify-between gap-2 px-4 py-2 border border-neutral-300 rounded-md bg-white w-full md:w-[180px]"
+            aria-expanded={showFeedDropdown}
+            aria-haspopup="listbox"
+            aria-controls="feed-dropdown"
+          >
+            <span className="text-[#111111] text-sm">
+              {feeds.find((feed) => feed.value === search.feed)?.label}
+            </span>
+            <ChevronDown className="h-4 w-4 text-[#64748b]" />
+          </button>
+          {showFeedDropdown && (
+            <div
+              id="feed-dropdown"
+              role="listbox"
+              className="absolute top-full flex flex-col left-0 mt-1 w-full bg-white border border-neutral-200 rounded-md shadow-lg z-20"
+            >
+              {feeds.map((feed, index) => (
+                <Link
+                  key={index}
+                  to="/leaderboard"
+                  search={{ feed: feed.value, timeframe: search.timeframe }}
+                  role="option"
+                  aria-selected={search.feed === feed.value}
+                  onClick={onFeedDropdownClose}
+                  className={`w-full px-4 py-2 text-left hover:bg-neutral-100 text-sm ${
+                    search.feed === feed.value ? "bg-neutral-100" : ""
+                  }`}
+                >
+                  {feed.label}
+                </Link>
+              ))}
+            </div>
+          )}
+        </div>
+        <div className="relative w-full md:w-auto" ref={timeDropdownRef}>
+          <button
+            onClick={onTimeDropdownToggle}
+            className="flex items-center justify-between gap-2 px-4 py-2 border border-neutral-300 rounded-md bg-white w-full md:w-[160px]"
+            aria-expanded={showTimeDropdown}
+            aria-haspopup="listbox"
+            aria-controls="time-dropdown"
+          >
+            <span className="text-[#111111] text-sm">
+              {
+                timeOptions.find((option) => option.value === search.timeframe)
+                  ?.label
+              }
+            </span>
+            <ChevronDown className="h-4 w-4 text-[#64748b]" />
+          </button>
+          {showTimeDropdown && (
+            <div
+              id="time-dropdown"
+              role="listbox"
+              className="absolute top-full flex flex-col left-0 mt-1 w-full bg-white border border-neutral-200 rounded-md shadow-lg z-20"
+            >
+              {timeOptions.map((time) => (
+                <Link
+                  key={time.value}
+                  to="/leaderboard"
+                  search={{
+                    feed: search.feed.toLowerCase(),
+                    timeframe: time.value,
+                  }}
+                  role="option"
+                  aria-selected={search.timeframe === time.label}
+                  onClick={onTimeDropdownClose}
+                  className={`w-full px-4 py-2 text-left hover:bg-neutral-100 text-sm ${
+                    search.timeframe === time.label ? "bg-neutral-100" : ""
+                  }`}
+                >
+                  {time.label}
+                </Link>
+              ))}
+            </div>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/app/src/components/leaderboard/LeaderboardSkeleton.tsx b/apps/app/src/components/leaderboard/LeaderboardSkeleton.tsx
new file mode 100644
index 00000000..311e2646
--- /dev/null
+++ b/apps/app/src/components/leaderboard/LeaderboardSkeleton.tsx
@@ -0,0 +1,60 @@
+import { TableCell, TableRow } from "../ui/table";
+
+function SkeletonRow() {
+  return (
+    <TableRow className="border-b border-[#e5e5e5]">
+      {/* Rank column */}
+      <TableCell className="py-2 px-2 align-middle">
+        <div className="flex items-center w-[35px] h-[32px]">
+          <div className="w-4 h-4 bg-gray-200 rounded animate-pulse mr-1" />
+          <div className="w-6 h-4 bg-gray-200 rounded animate-pulse" />
+        </div>
+      </TableCell>
+
+      {/* Username column */}
+      <TableCell className="py-2 px-2 align-middle">
+        <div className="flex items-center gap-2 h-[32px]">
+          <div className="w-24 h-4 bg-gray-200 rounded animate-pulse" />
+        </div>
+      </TableCell>
+
+      {/* Approval Rate column */}
+      <TableCell className="py-2 px-2 align-middle">
+        <div className="flex items-center h-[32px]">
+          <div className="w-12 h-4 bg-gray-200 rounded animate-pulse" />
+        </div>
+      </TableCell>
+
+      {/* Submissions column */}
+      <TableCell className="py-2 px-2 align-middle">
+        <div className="flex items-center h-[32px]">
+          <div className="w-8 h-4 bg-gray-200 rounded animate-pulse" />
+        </div>
+      </TableCell>
+
+      {/* Top Feeds column */}
+      <TableCell className="py-2 px-2 align-middle">
+        <div className="flex flex-col min-h-[40px] justify-center">
+          <div className="flex items-center gap-2">
+            <div className="w-[150px] h-8 bg-gray-200 rounded animate-pulse" />
+            <div className="w-8 h-8 bg-gray-200 rounded animate-pulse" />
+          </div>
+        </div>
+      </TableCell>
+    </TableRow>
+  );
+}
+
+interface LeaderboardSkeletonProps {
+  rows?: number;
+}
+
+export function LeaderboardSkeleton({ rows = 8 }: LeaderboardSkeletonProps) {
+  return (
+    <>
+      {Array.from({ length: rows }).map((_, index) => (
+        <SkeletonRow key={index} />
+      ))}
+    </>
+  );
+}
diff --git a/apps/app/src/components/leaderboard/LeaderboardTable.tsx b/apps/app/src/components/leaderboard/LeaderboardTable.tsx
new file mode 100644
index 00000000..97098c87
--- /dev/null
+++ b/apps/app/src/components/leaderboard/LeaderboardTable.tsx
@@ -0,0 +1,111 @@
+import { flexRender, Table as TanStackTable } from "@tanstack/react-table";
+import { ChevronUp, ChevronDown } from "lucide-react";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from "../ui/table";
+import { ExtendedLeaderboardEntry } from "./LeaderboardColumns";
+import { LeaderboardSkeleton } from "./LeaderboardSkeleton";
+
+interface LeaderboardTableProps {
+  table: TanStackTable<ExtendedLeaderboardEntry>;
+  isLoading: boolean;
+  error: Error | null;
+  hasData: boolean;
+}
+
+export function LeaderboardTable({
+  table,
+  isLoading,
+  error,
+  hasData,
+}: LeaderboardTableProps) {
+  return (
+    <div className="overflow-y-auto max-w-[368px] md:max-w-screen-xl md:w-full mx-auto scrollbar-thin scrollbar-thumb-gray-300 scrollbar-track-transparent">
+      <div className="relative">
+        <Table className="w-full border-collapse">
+          <TableHeader className="sticky top-0 bg-white z-10">
+            {table.getHeaderGroups().map((headerGroup) => (
+              <TableRow
+                key={headerGroup.id}
+                className="border-b border-[#e5e5e5]"
+              >
+                {headerGroup.headers.map((header) => (
+                  <TableHead
+                    key={header.id}
+                    className="text-left py-3 px-2 font-medium text-sm whitespace-nowrap cursor-pointer"
+                    onClick={header.column.getToggleSortingHandler()}
+                  >
+                    <div className="flex items-center gap-1">
+                      {flexRender(
+                        header.column.columnDef.header,
+                        header.getContext(),
+                      )}
+                      {header.column.getIsSorted() === "asc" ? (
+                        <ChevronUp className="h-4 w-4 text-gray-500" />
+                      ) : header.column.getIsSorted() === "desc" ? (
+                        <ChevronDown className="h-4 w-4 text-gray-500" />
+                      ) : null}
+                    </div>
+                  </TableHead>
+                ))}
+              </TableRow>
+            ))}
+          </TableHeader>
+          <TableBody className="overflow-x-auto">
+            {isLoading && <LeaderboardSkeleton rows={8} />}
+
+            {error && (
+              <TableRow>
+                <TableCell colSpan={5} className="text-left py-8 text-red-500">
+                  <p>Error loading leaderboard: {error.message}</p>
+                </TableCell>
+              </TableRow>
+            )}
+
+            {!hasData && !isLoading && !error && (
+              <TableRow>
+                <TableCell colSpan={5} className="text-left py-8">
+                  <p>No curator data available.</p>
+                </TableCell>
+              </TableRow>
+            )}
+
+            {!isLoading && !error && table.getRowModel().rows.length > 0
+              ? table.getRowModel().rows.map((row) => (
+                  <TableRow
+                    key={row.id}
+                    className="border-b border-[#e5e5e5] hover:bg-[#f9fafb]"
+                  >
+                    {row.getVisibleCells().map((cell) => (
+                      <TableCell
+                        key={cell.id}
+                        className="py-2 px-2 align-middle"
+                      >
+                        {flexRender(
+                          cell.column.columnDef.cell,
+                          cell.getContext(),
+                        )}
+                      </TableCell>
+                    ))}
+                  </TableRow>
+                ))
+              : !isLoading &&
+                !error &&
+                table.getRowModel().rows.length === 0 && (
+                  <TableRow>
+                    <TableCell colSpan={5} className="text-left py-8">
+                      <p>No matching results found.</p>
+                    </TableCell>
+                  </TableRow>
+                )}
+          </TableBody>
+        </Table>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/app/src/components/leaderboard/index.ts b/apps/app/src/components/leaderboard/index.ts
new file mode 100644
index 00000000..4cf65642
--- /dev/null
+++ b/apps/app/src/components/leaderboard/index.ts
@@ -0,0 +1,7 @@
+export { LeaderboardFilters } from "./LeaderboardFilters";
+export { LeaderboardTable } from "./LeaderboardTable";
+export {
+  createLeaderboardColumns,
+  type ExtendedLeaderboardEntry,
+} from "./LeaderboardColumns";
+export { LeaderboardSkeleton } from "./LeaderboardSkeleton";
diff --git a/apps/app/src/components/profile/ProfileHeader.tsx b/apps/app/src/components/profile/ProfileHeader.tsx
index 3ca48d21..64cafcbb 100644
--- a/apps/app/src/components/profile/ProfileHeader.tsx
+++ b/apps/app/src/components/profile/ProfileHeader.tsx
@@ -78,20 +78,20 @@ export function ProfileHeader({ accountId }: { accountId: string }) {
               <path
                 d="M11.4671 5.33301C12.528 5.33301 13.5454 5.75444 14.2956 6.50458C15.0457 7.25473 15.4671 8.27214 15.4671 9.33301V13.9997H12.8005V9.33301C12.8005 8.97939 12.66 8.64025 12.4099 8.3902C12.1599 8.14015 11.8207 7.99967 11.4671 7.99967C11.1135 7.99967 10.7744 8.14015 10.5243 8.3902C10.2743 8.64025 10.1338 8.97939 10.1338 9.33301V13.9997H7.46712V9.33301C7.46712 8.27214 7.88855 7.25473 8.6387 6.50458C9.38884 5.75444 10.4063 5.33301 11.4671 5.33301Z"
                 stroke="black"
-                stroke-linecap="round"
-                stroke-linejoin="round"
+                strokeLinecap="round"
+                strokeLinejoin="round"
               />
               <path
                 d="M4.80046 5.99967H2.13379V13.9997H4.80046V5.99967Z"
                 stroke="black"
-                stroke-linecap="round"
-                stroke-linejoin="round"
+                strokeLinecap="round"
+                strokeLinejoin="round"
               />
               <path
                 d="M3.46712 3.99967C4.2035 3.99967 4.80046 3.40272 4.80046 2.66634C4.80046 1.92996 4.2035 1.33301 3.46712 1.33301C2.73074 1.33301 2.13379 1.92996 2.13379 2.66634C2.13379 3.40272 2.73074 3.99967 3.46712 3.99967Z"
                 stroke="black"
-                stroke-linecap="round"
-                stroke-linejoin="round"
+                strokeLinecap="round"
+                strokeLinejoin="round"
               />
             </svg>
             /web3.plungrel
diff --git a/apps/app/src/contexts/auth-context.tsx b/apps/app/src/contexts/auth-context.tsx
index 53282b43..0209673b 100644
--- a/apps/app/src/contexts/auth-context.tsx
+++ b/apps/app/src/contexts/auth-context.tsx
@@ -1,24 +1,25 @@
-import { ensureUserProfile } from "../lib/api/users";
-import { toast } from "../hooks/use-toast";
-import { near } from "../lib/near";
+import { sign } from "near-sign-verify";
 import React, {
   createContext,
+  useCallback,
   useContext,
   useEffect,
-  useRef,
   useState,
-  type Dispatch,
   type ReactNode,
-  type SetStateAction,
 } from "react";
+import { toast } from "../hooks/use-toast";
+import { apiClient } from "../lib/api-client";
+import { near } from "../lib/near";
+import { fromHex } from "@fastnear/utils";
 
 interface IAuthContext {
   currentAccountId: string | null;
   isSignedIn: boolean;
-  setCurrentAccountId: Dispatch<SetStateAction<string | null>>;
-  setIsSignedIn: Dispatch<SetStateAction<boolean>>;
+  isAuthorized: boolean;
   handleSignIn: () => Promise<void>;
-  handleSignOut: () => void;
+  handleSignOut: () => Promise<void>;
+  handleAuthorize: () => Promise<void>;
+  checkAuthorization: () => Promise<void>;
 }
 
 const AuthContext = createContext<IAuthContext | undefined>(undefined);
@@ -38,84 +39,113 @@ interface AuthProviderProps {
 export function AuthProvider({
   children,
 }: AuthProviderProps): React.ReactElement {
-  const [currentAccountId, setCurrentAccountId] = useState<string | null>(
-    near.accountId() ?? null,
-  );
-  const [isSignedIn, setIsSignedIn] = useState<boolean>(
-    near.authStatus() === "SignedIn",
-  );
-  const previousAccountIdRef = useRef<string | null>(currentAccountId);
+  const [currentAccountId, setCurrentAccountId] = useState<string | null>(null);
+  const [isSignedIn, setIsSignedIn] = useState<boolean>(false);
+  const [isAuthorized, setIsAuthorized] = useState<boolean>(false);
 
-  useEffect(() => {
-    const accountListener = near.event.onAccount((newAccountId) => {
-      setCurrentAccountId(newAccountId);
-      setIsSignedIn(!!newAccountId);
-
-      if (newAccountId) {
-        // any init?
-        // client.setAccountHeader(newAccountId);
-      } else {
-        // any clean up?
-      }
-    });
-
-    return () => {
-      near.event.offAccount(accountListener);
-    };
+  const checkAuthorization = useCallback(async () => {
+    try {
+      await apiClient.makeRequest("GET", "/users/me");
+      setIsAuthorized(true);
+    } catch (error) {
+      console.error("Authorization check failed:", error);
+      setIsAuthorized(false);
+    }
   }, []);
 
   useEffect(() => {
-    console.log("AuthProvider main useEffect triggered:", {
-      currentAccountId,
-      prev: previousAccountIdRef.current,
-    });
+    const accountId = near.accountId();
+    if (accountId) {
+      setCurrentAccountId(accountId);
+      setIsSignedIn(true);
+      checkAuthorization();
+    }
+  }, [checkAuthorization]);
 
-    if (currentAccountId && currentAccountId !== previousAccountIdRef.current) {
+  const handleSignIn = async (): Promise<void> => {
+    try {
+      await near.requestSignIn();
+    } catch (e: unknown) {
       toast({
-        title: "Success!",
-        description: `Connected as: ${currentAccountId}`,
-        variant: "success",
+        title: "Sign-in failed",
+        description: e instanceof Error ? e.message : String(e),
+        variant: "destructive",
       });
-    } else if (!currentAccountId && previousAccountIdRef.current !== null) {
+    }
+  };
+
+  const handleAuthorize = async (): Promise<void> => {
+    if (!currentAccountId) {
       toast({
-        title: "Signed out",
-        description: "You have been signed out successfully.",
-        variant: "success",
+        title: "Not Signed In",
+        description: "Please sign in before authorizing.",
+        variant: "destructive",
       });
+      return;
     }
-    previousAccountIdRef.current = currentAccountId;
-  }, [currentAccountId]);
-
-  const handleSignIn = async (): Promise<void> => {
     try {
-      await near.requestSignIn();
+      const { nonce, recipient } = await apiClient.makeRequest<{
+        nonce: string;
+        recipient: string;
+      }>("POST", "/auth/initiate-login", { accountId: currentAccountId });
+
+      const message = "Authorize Curate.fun";
+
+      const authToken = await sign(message, {
+        signer: near,
+        recipient,
+        nonce: fromHex(nonce),
+      });
+
+      await apiClient.makeRequest("POST", "/auth/verify-login", {
+        token: authToken,
+        accountId: currentAccountId,
+      });
 
-      // Get the account ID after sign-in
-      const accountId = near.accountId();
-      if (accountId) {
-        // Ensure user profile exists
-        await ensureUserProfile(accountId);
-      }
+      setIsAuthorized(true);
+      toast({
+        title: "Authorization Successful!",
+        description: "You have successfully authorized the application.",
+        variant: "success",
+      });
     } catch (e: unknown) {
+      setIsAuthorized(false);
       toast({
-        title: "Sign-in failed",
+        title: "Authorization failed",
         description: e instanceof Error ? e.message : String(e),
         variant: "destructive",
       });
     }
   };
 
-  const handleSignOut = (): void => {
+  const handleSignOut = async (): Promise<void> => {
+    try {
+      await apiClient.makeRequest("POST", "/auth/logout");
+    } catch (error) {
+      console.error(
+        "Logout failed on backend, signing out on client anyway.",
+        error,
+      );
+    }
     near.signOut();
+    setCurrentAccountId(null);
+    setIsSignedIn(false);
+    setIsAuthorized(false);
+    toast({
+      title: "Signed out",
+      description: "You have been signed out successfully.",
+      variant: "success",
+    });
   };
 
   const contextValue: IAuthContext = {
     currentAccountId,
     isSignedIn,
-    setCurrentAccountId,
-    setIsSignedIn,
+    isAuthorized,
     handleSignIn,
     handleSignOut,
+    handleAuthorize,
+    checkAuthorization,
   };
 
   return (
diff --git a/apps/app/src/hooks/api-client.ts b/apps/app/src/hooks/api-client.ts
index cf68f534..06e7dd5c 100644
--- a/apps/app/src/hooks/api-client.ts
+++ b/apps/app/src/hooks/api-client.ts
@@ -27,13 +27,7 @@ export function useApiQuery<
     "queryKey" | "queryFn"
   >,
 ) {
-  const { currentAccountId, isSignedIn } = useAuth();
-
-  const queryFunction = () =>
-    apiClient.makeRequest<TQueryFnData>("GET", path, {
-      currentAccountId,
-      isSignedIn,
-    });
+  const queryFunction = () => apiClient.makeRequest<TQueryFnData>("GET", path);
 
   const finalQueryOptions: UseQueryOptions<
     TQueryFnData,
@@ -80,9 +74,7 @@ export function useApiMutation<
     return apiClient.makeRequest<TData, TVariables>(
       mutationConfig.method,
       mutationConfig.path,
-      { currentAccountId, isSignedIn },
       variables, // Pass 'variables' from mutate() as requestData
-      mutationConfig.message,
     );
   };
 
@@ -118,16 +110,11 @@ export function useApiInfiniteQuery<
     "queryKey" | "queryFn" | "initialPageParam" // initialPageParam is now required in options
   > & { initialPageParam: TPageParam }, // Ensure initialPageParam is provided
 ) {
-  const { currentAccountId, isSignedIn } = useAuth();
-
   const queryFunction = (
     context: QueryFunctionContext<TQueryKey, TPageParam>,
   ) => {
     const path = pathFn(context.pageParam as TPageParam);
-    return apiClient.makeRequest<TQueryFnData>("GET", path, {
-      currentAccountId,
-      isSignedIn,
-    });
+    return apiClient.makeRequest<TQueryFnData>("GET", path);
   };
 
   const finalQueryOptions: UseInfiniteQueryOptions<
diff --git a/apps/app/src/hooks/useLeaderboard.ts b/apps/app/src/hooks/useLeaderboard.ts
new file mode 100644
index 00000000..c0a28a43
--- /dev/null
+++ b/apps/app/src/hooks/useLeaderboard.ts
@@ -0,0 +1,178 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import {
+  SortingState,
+  useReactTable,
+  getCoreRowModel,
+  getSortedRowModel,
+} from "@tanstack/react-table";
+import { LeaderboardEntry, useAllFeeds } from "../lib/api";
+import { createLeaderboardColumns } from "../components/leaderboard/LeaderboardColumns";
+
+interface LeaderboardSearch {
+  feed: string;
+  timeframe: string;
+}
+
+export function useLeaderboard(
+  leaderboard: LeaderboardEntry[],
+  search: LeaderboardSearch,
+) {
+  const [expandedRows, setExpandedRows] = useState<number[]>([]);
+  const [searchQuery, setSearchQuery] = useState<string | null>(null);
+  const [debouncedSearchQuery, setDebouncedSearchQuery] = useState<
+    string | null
+  >(null);
+  const [showFeedDropdown, setShowFeedDropdown] = useState<boolean>(false);
+  const [showTimeDropdown, setShowTimeDropdown] = useState<boolean>(false);
+  const [sorting, setSorting] = useState<SortingState>([]);
+  const { data: allFeeds = [] } = useAllFeeds();
+  const feedDropdownRef = useRef<HTMLDivElement>(null);
+  const timeDropdownRef = useRef<HTMLDivElement>(null);
+
+  const timeOptions = [
+    { label: "All Time", value: "all" },
+    { label: "This Month", value: "month" },
+    { label: "This Week", value: "week" },
+    { label: "Today", value: "today" },
+  ];
+
+  const feeds = useMemo(() => {
+    return [
+      {
+        label: "All Feeds",
+        value: "all feeds",
+      },
+      ...(
+        allFeeds.map((feed) => ({
+          label: feed.name,
+          value: feed.id,
+        })) || []
+      ).filter((feed) => feed.value !== "all"),
+    ];
+  }, [allFeeds]);
+
+  useEffect(() => {
+    const handleClickOutside = (event: MouseEvent) => {
+      if (
+        feedDropdownRef.current &&
+        !feedDropdownRef.current.contains(event.target as Node)
+      ) {
+        setShowFeedDropdown(false);
+      }
+      if (
+        timeDropdownRef.current &&
+        !timeDropdownRef.current.contains(event.target as Node)
+      ) {
+        setShowTimeDropdown(false);
+      }
+    };
+
+    document.addEventListener("mousedown", handleClickOutside);
+    return () => document.removeEventListener("mousedown", handleClickOutside);
+  }, []);
+
+  // Debounce search query
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      setDebouncedSearchQuery(searchQuery);
+    }, 300);
+
+    return () => clearTimeout(timer);
+  }, [searchQuery]);
+
+  const toggleRow = useCallback((index: number) => {
+    setExpandedRows((prev) =>
+      prev.includes(index) ? prev.filter((i) => i !== index) : [...prev, index],
+    );
+  }, []);
+
+  const handleSearch = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
+    setSearchQuery(e.target.value);
+  }, []);
+
+  const handleFeedDropdownToggle = useCallback(() => {
+    setShowFeedDropdown((prev) => !prev);
+  }, []);
+
+  const handleTimeDropdownToggle = useCallback(() => {
+    setShowTimeDropdown((prev) => !prev);
+  }, []);
+
+  const handleFeedDropdownClose = useCallback(() => {
+    setShowFeedDropdown(false);
+  }, []);
+
+  const handleTimeDropdownClose = useCallback(() => {
+    setShowTimeDropdown(false);
+  }, []);
+
+  const filteredLeaderboard = useMemo(() => {
+    return leaderboard?.filter((item) => {
+      const searchTerm = debouncedSearchQuery?.toLowerCase();
+      const feedFilter =
+        search.feed === "all feeds"
+          ? true
+          : item.feedSubmissions?.some((feed) => feed.feedId === search.feed);
+
+      const matchesSearch =
+        !searchTerm ||
+        item.curatorUsername?.toLowerCase().includes(searchTerm) ||
+        item.feedSubmissions?.some((feed) =>
+          feed.feedId?.toLowerCase().includes(searchTerm),
+        );
+
+      return feedFilter && matchesSearch;
+    });
+  }, [leaderboard, debouncedSearchQuery, search.feed]);
+
+  const filteredLeaderboardWithRanks = useMemo(() => {
+    return filteredLeaderboard?.map((item) => {
+      const originalIndex = leaderboard?.findIndex(
+        (entry) => entry.curatorId === item.curatorId,
+      );
+      return {
+        ...item,
+        originalRank: originalIndex !== undefined ? originalIndex + 1 : 0,
+      };
+    });
+  }, [filteredLeaderboard, leaderboard]);
+
+  const columns = useMemo(() => {
+    return createLeaderboardColumns(expandedRows, toggleRow);
+  }, [expandedRows, toggleRow]);
+
+  const table = useReactTable({
+    data: filteredLeaderboardWithRanks || [],
+    columns,
+    state: {
+      sorting,
+    },
+    onSortingChange: setSorting,
+    getCoreRowModel: getCoreRowModel(),
+    getSortedRowModel: getSortedRowModel(),
+  });
+
+  return {
+    // State
+    searchQuery,
+    showFeedDropdown,
+    showTimeDropdown,
+    feeds,
+    timeOptions,
+
+    // Handlers
+    handleSearch,
+    handleFeedDropdownToggle,
+    handleTimeDropdownToggle,
+    handleFeedDropdownClose,
+    handleTimeDropdownClose,
+
+    // Refs
+    feedDropdownRef,
+    timeDropdownRef,
+
+    // Table
+    table,
+    hasData: Boolean(leaderboard && leaderboard.length > 0),
+  };
+}
diff --git a/apps/app/src/index.css b/apps/app/src/index.css
index 7e6ee811..a71ca83c 100644
--- a/apps/app/src/index.css
+++ b/apps/app/src/index.css
@@ -33,7 +33,7 @@
   --accent: oklch(0.97 0 0);
   --accent-foreground: oklch(0.205 0 0);
   --destructive: oklch(0.577 0.245 27.325);
-  --destructive-foreground: oklch(0.577 0.245 27.325);
+  --destructive-foreground: #fff;
   --border: oklch(0.922 0 0);
   --input: oklch(0.922 0 0);
   --ring: oklch(0.708 0 0);
diff --git a/apps/app/src/lib/api-client.ts b/apps/app/src/lib/api-client.ts
index 74af0277..f83bf9ed 100644
--- a/apps/app/src/lib/api-client.ts
+++ b/apps/app/src/lib/api-client.ts
@@ -1,6 +1,3 @@
-import { near } from "./near";
-import { sign } from "near-sign-verify";
-
 export class ApiError extends Error {
   constructor(
     message: string,
@@ -22,9 +19,7 @@ class ApiClient {
   async makeRequest<TResponse, TRequest = unknown>(
     method: string,
     path: string,
-    auth: { currentAccountId: string | null; isSignedIn: boolean },
     requestData?: TRequest,
-    message?: string, // Descriptive message for signing non-GET requests
   ): Promise<TResponse> {
     const fullUrl = new URL(this.baseUrl + path, window.location.origin);
     const bodyString =
@@ -39,30 +34,6 @@ class ApiClient {
       headers["Content-Type"] = "application/json";
     }
 
-    if (method === "GET") {
-      if (auth.currentAccountId) {
-        headers["X-Near-Account"] = auth.currentAccountId || "anonymous";
-      }
-    } else {
-      // Non-GET requests (POST, PUT, DELETE, PATCH)
-      if (!auth.currentAccountId) {
-        throw new ApiError(
-          "Account ID missing for authenticated request.",
-          400,
-        );
-      }
-
-      const messageForSigning = message || `${method} request to ${path}`;
-
-      const authToken = await sign({
-        signer: near,
-        recipient: "curatefun.near",
-        message: messageForSigning,
-      });
-
-      headers["Authorization"] = `Bearer ${authToken}`;
-    }
-
     const requestOptions: RequestInit = {
       method,
       headers,
diff --git a/apps/app/src/lib/api/feed.ts b/apps/app/src/lib/api/feed.ts
deleted file mode 100644
index 72165f38..00000000
--- a/apps/app/src/lib/api/feed.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { useApiQuery } from "../../hooks/api-client";
-import { useAuth } from "../../contexts/auth-context";
-
-interface CanModerateResponse {
-  canModerate: boolean;
-  reason?: string;
-  error?: string;
-}
-
-/**
- * Hook to check if the current authenticated user can moderate a specific feed.
- * @param feedId The ID of the feed to check. If undefined, the query will not run.
- * @returns Query result including `canModerate` boolean.
- */
-export const useCanModerateFeed = (feedId: string | undefined) => {
-  const { isSignedIn, currentAccountId } = useAuth();
-
-  const enabled = !!feedId && isSignedIn && !!currentAccountId;
-
-  return useApiQuery<CanModerateResponse>(
-    ["can-moderate", feedId, currentAccountId],
-    `/feeds/${feedId}/can-moderate`,
-    {
-      enabled,
-      staleTime: 5 * 60 * 1000, // 5 minutes
-    },
-  );
-};
diff --git a/apps/app/src/lib/api/feeds.ts b/apps/app/src/lib/api/feeds.ts
index a396a0bd..4f76af7c 100644
--- a/apps/app/src/lib/api/feeds.ts
+++ b/apps/app/src/lib/api/feeds.ts
@@ -1,45 +1,49 @@
-import type { FeedConfig, Submission } from "@curatedotfun/types";
+import type {
+  CanModerateResponse,
+  CreateFeedRequest,
+  FeedResponse,
+  FeedsWrappedResponse,
+  FeedWrappedResponse,
+  Submission,
+  UpdateFeedRequest,
+} from "@curatedotfun/types";
+import { useAuth } from "../../contexts/auth-context";
 import {
-  useApiQuery,
-  useApiMutation,
   useApiInfiniteQuery,
+  useApiMutation,
+  useApiQuery,
 } from "../../hooks/api-client";
 import type {
+  PaginatedResponse,
   SortOrderType,
   StatusFilterType,
   SubmissionFilters,
-  PaginatedResponse,
   TransformedInfiniteData,
 } from "./types";
 
-export interface FeedDetails {
-  id: string;
-  name: string;
-  description: string | null;
-  config: FeedConfig;
-  createdAt: string;
-  updatedAt: string | null;
-}
-
 export function useFeed(feedId: string) {
-  return useApiQuery<FeedDetails>(
+  return useApiQuery<FeedWrappedResponse, Error, FeedResponse | undefined>(
     ["feed-details", feedId],
     `/feeds/${feedId}`,
-    { enabled: !!feedId },
+    {
+      enabled: !!feedId,
+      select: (data) => data.data,
+    },
   );
 }
 
 export function useAllFeeds() {
-  return useApiQuery<FeedDetails[]>(["feeds"], `/feeds`);
+  return useApiQuery<FeedsWrappedResponse, Error, FeedResponse[]>(
+    ["feeds"],
+    `/feeds`,
+    {
+      select: (data) => data.data ?? [],
+    },
+  );
 }
 
 export function useCreateFeed() {
-  type CreateFeedVariables = Omit<FeedConfig, "id"> & {
-    id: string;
-    name: string;
-    description?: string | null;
-  };
-  return useApiMutation<FeedDetails, Error, CreateFeedVariables>(
+  return useApiMutation<FeedResponse, Error, CreateFeedRequest>(
     {
       method: "POST",
       path: `/feeds`,
@@ -52,8 +56,7 @@ export function useCreateFeed() {
 }
 
 export function useUpdateFeed(feedId: string) {
-  type UpdateFeedVariables = { config: FeedConfig };
-  return useApiMutation<FeedDetails, Error, UpdateFeedVariables>(
+  return useApiMutation<FeedResponse, Error, UpdateFeedRequest>(
     {
       method: "PUT",
       path: `/feeds/${feedId}`,
@@ -118,7 +121,7 @@ export function useFeedItems(feedId: string, filters: SubmissionFilters = {}) {
     },
     select: (data) => ({
       pages: data.pages,
-      pageParams: data.pageParams as number[], // Ensure pageParams is number[]
+      pageParams: data.pageParams as number[],
       items: data.pages.flatMap((page) =>
         Array.isArray(page.items) ? page.items : [],
       ),
@@ -129,3 +132,23 @@ export function useFeedItems(feedId: string, filters: SubmissionFilters = {}) {
     enabled: !!feedId,
   });
 }
+
+/**
+ * Hook to check if the current authenticated user can moderate a specific feed.
+ * @param feedId The ID of the feed to check. If undefined, the query will not run.
+ * @returns Query result including `canModerate` boolean.
+ */
+export const useCanModerateFeed = (feedId: string | undefined) => {
+  const { isSignedIn, currentAccountId } = useAuth();
+
+  const enabled = !!feedId && isSignedIn && !!currentAccountId;
+
+  return useApiQuery<CanModerateResponse>(
+    ["can-moderate", feedId, currentAccountId],
+    `/feeds/${feedId}/can-moderate`,
+    {
+      enabled,
+      staleTime: 5 * 60 * 1000, // 5 minutes
+    },
+  );
+};
diff --git a/apps/app/src/routeTree.gen.ts b/apps/app/src/routeTree.gen.ts
index 880a13f6..72bff3cb 100644
--- a/apps/app/src/routeTree.gen.ts
+++ b/apps/app/src/routeTree.gen.ts
@@ -20,12 +20,15 @@ import { Route as LayoutCreatePluginRouteImport } from "./routes/_layout/create/
 import { Route as LayoutCreateFeedRouteImport } from "./routes/_layout/create/feed";
 import { Route as LayoutProfileSettingsIndexRouteImport } from "./routes/_layout/profile/settings/index";
 import { Route as LayoutFeedFeedIdIndexRouteImport } from "./routes/_layout/feed/$feedId/index";
+import { Route as LayoutCreateFeedIndexRouteImport } from "./routes/_layout/create/feed/index";
 import { Route as LayoutFeedFeedIdTokenRouteImport } from "./routes/_layout/feed/$feedId/token";
 import { Route as LayoutFeedFeedIdProposalsRouteImport } from "./routes/_layout/feed/$feedId/proposals";
 import { Route as LayoutFeedFeedIdPointsRouteImport } from "./routes/_layout/feed/$feedId/points";
 import { Route as LayoutFeedFeedIdMembersRouteImport } from "./routes/_layout/feed/$feedId/members";
 import { Route as LayoutFeedFeedIdCurationRouteImport } from "./routes/_layout/feed/$feedId/curation";
 import { Route as LayoutEditFeedFeedIdRouteImport } from "./routes/_layout/edit/feed.$feedId";
+import { Route as LayoutCreateFeedSettingsRouteImport } from "./routes/_layout/create/feed/settings";
+import { Route as LayoutCreateFeedReviewRouteImport } from "./routes/_layout/create/feed/review";
 import { Route as LayoutFeedFeedIdSettingsIndexRouteImport } from "./routes/_layout/feed/$feedId/settings/index";
 import { Route as LayoutFeedFeedIdSettingsConnectedRouteImport } from "./routes/_layout/feed/$feedId/settings/connected";
 
@@ -84,6 +87,11 @@ const LayoutFeedFeedIdIndexRoute = LayoutFeedFeedIdIndexRouteImport.update({
   path: "/",
   getParentRoute: () => LayoutFeedFeedIdRoute,
 } as any);
+const LayoutCreateFeedIndexRoute = LayoutCreateFeedIndexRouteImport.update({
+  id: "/",
+  path: "/",
+  getParentRoute: () => LayoutCreateFeedRoute,
+} as any);
 const LayoutFeedFeedIdTokenRoute = LayoutFeedFeedIdTokenRouteImport.update({
   id: "/token",
   path: "/token",
@@ -116,6 +124,17 @@ const LayoutEditFeedFeedIdRoute = LayoutEditFeedFeedIdRouteImport.update({
   path: "/edit/feed/$feedId",
   getParentRoute: () => LayoutRoute,
 } as any);
+const LayoutCreateFeedSettingsRoute =
+  LayoutCreateFeedSettingsRouteImport.update({
+    id: "/settings",
+    path: "/settings",
+    getParentRoute: () => LayoutCreateFeedRoute,
+  } as any);
+const LayoutCreateFeedReviewRoute = LayoutCreateFeedReviewRouteImport.update({
+  id: "/review",
+  path: "/review",
+  getParentRoute: () => LayoutCreateFeedRoute,
+} as any);
 const LayoutFeedFeedIdSettingsIndexRoute =
   LayoutFeedFeedIdSettingsIndexRouteImport.update({
     id: "/settings/",
@@ -132,18 +151,21 @@ const LayoutFeedFeedIdSettingsConnectedRoute =
 export interface FileRoutesByFullPath {
   "/leaderboard": typeof LayoutLeaderboardRoute;
   "/": typeof LayoutIndexRoute;
-  "/create/feed": typeof LayoutCreateFeedRoute;
+  "/create/feed": typeof LayoutCreateFeedRouteWithChildren;
   "/create/plugin": typeof LayoutCreatePluginRoute;
   "/feed/$feedId": typeof LayoutFeedFeedIdRouteWithChildren;
   "/plugin/$pluginId": typeof LayoutPluginPluginIdRoute;
   "/plugin": typeof LayoutPluginIndexRoute;
   "/profile": typeof LayoutProfileIndexRoute;
+  "/create/feed/review": typeof LayoutCreateFeedReviewRoute;
+  "/create/feed/settings": typeof LayoutCreateFeedSettingsRoute;
   "/edit/feed/$feedId": typeof LayoutEditFeedFeedIdRoute;
   "/feed/$feedId/curation": typeof LayoutFeedFeedIdCurationRoute;
   "/feed/$feedId/members": typeof LayoutFeedFeedIdMembersRoute;
   "/feed/$feedId/points": typeof LayoutFeedFeedIdPointsRoute;
   "/feed/$feedId/proposals": typeof LayoutFeedFeedIdProposalsRoute;
   "/feed/$feedId/token": typeof LayoutFeedFeedIdTokenRoute;
+  "/create/feed/": typeof LayoutCreateFeedIndexRoute;
   "/feed/$feedId/": typeof LayoutFeedFeedIdIndexRoute;
   "/profile/settings": typeof LayoutProfileSettingsIndexRoute;
   "/feed/$feedId/settings/connected": typeof LayoutFeedFeedIdSettingsConnectedRoute;
@@ -152,17 +174,19 @@ export interface FileRoutesByFullPath {
 export interface FileRoutesByTo {
   "/leaderboard": typeof LayoutLeaderboardRoute;
   "/": typeof LayoutIndexRoute;
-  "/create/feed": typeof LayoutCreateFeedRoute;
   "/create/plugin": typeof LayoutCreatePluginRoute;
   "/plugin/$pluginId": typeof LayoutPluginPluginIdRoute;
   "/plugin": typeof LayoutPluginIndexRoute;
   "/profile": typeof LayoutProfileIndexRoute;
+  "/create/feed/review": typeof LayoutCreateFeedReviewRoute;
+  "/create/feed/settings": typeof LayoutCreateFeedSettingsRoute;
   "/edit/feed/$feedId": typeof LayoutEditFeedFeedIdRoute;
   "/feed/$feedId/curation": typeof LayoutFeedFeedIdCurationRoute;
   "/feed/$feedId/members": typeof LayoutFeedFeedIdMembersRoute;
   "/feed/$feedId/points": typeof LayoutFeedFeedIdPointsRoute;
   "/feed/$feedId/proposals": typeof LayoutFeedFeedIdProposalsRoute;
   "/feed/$feedId/token": typeof LayoutFeedFeedIdTokenRoute;
+  "/create/feed": typeof LayoutCreateFeedIndexRoute;
   "/feed/$feedId": typeof LayoutFeedFeedIdIndexRoute;
   "/profile/settings": typeof LayoutProfileSettingsIndexRoute;
   "/feed/$feedId/settings/connected": typeof LayoutFeedFeedIdSettingsConnectedRoute;
@@ -173,18 +197,21 @@ export interface FileRoutesById {
   "/_layout": typeof LayoutRouteWithChildren;
   "/_layout/leaderboard": typeof LayoutLeaderboardRoute;
   "/_layout/": typeof LayoutIndexRoute;
-  "/_layout/create/feed": typeof LayoutCreateFeedRoute;
+  "/_layout/create/feed": typeof LayoutCreateFeedRouteWithChildren;
   "/_layout/create/plugin": typeof LayoutCreatePluginRoute;
   "/_layout/feed/$feedId": typeof LayoutFeedFeedIdRouteWithChildren;
   "/_layout/plugin/$pluginId": typeof LayoutPluginPluginIdRoute;
   "/_layout/plugin/": typeof LayoutPluginIndexRoute;
   "/_layout/profile/": typeof LayoutProfileIndexRoute;
+  "/_layout/create/feed/review": typeof LayoutCreateFeedReviewRoute;
+  "/_layout/create/feed/settings": typeof LayoutCreateFeedSettingsRoute;
   "/_layout/edit/feed/$feedId": typeof LayoutEditFeedFeedIdRoute;
   "/_layout/feed/$feedId/curation": typeof LayoutFeedFeedIdCurationRoute;
   "/_layout/feed/$feedId/members": typeof LayoutFeedFeedIdMembersRoute;
   "/_layout/feed/$feedId/points": typeof LayoutFeedFeedIdPointsRoute;
   "/_layout/feed/$feedId/proposals": typeof LayoutFeedFeedIdProposalsRoute;
   "/_layout/feed/$feedId/token": typeof LayoutFeedFeedIdTokenRoute;
+  "/_layout/create/feed/": typeof LayoutCreateFeedIndexRoute;
   "/_layout/feed/$feedId/": typeof LayoutFeedFeedIdIndexRoute;
   "/_layout/profile/settings/": typeof LayoutProfileSettingsIndexRoute;
   "/_layout/feed/$feedId/settings/connected": typeof LayoutFeedFeedIdSettingsConnectedRoute;
@@ -201,12 +228,15 @@ export interface FileRouteTypes {
     | "/plugin/$pluginId"
     | "/plugin"
     | "/profile"
+    | "/create/feed/review"
+    | "/create/feed/settings"
     | "/edit/feed/$feedId"
     | "/feed/$feedId/curation"
     | "/feed/$feedId/members"
     | "/feed/$feedId/points"
     | "/feed/$feedId/proposals"
     | "/feed/$feedId/token"
+    | "/create/feed/"
     | "/feed/$feedId/"
     | "/profile/settings"
     | "/feed/$feedId/settings/connected"
@@ -215,17 +245,19 @@ export interface FileRouteTypes {
   to:
     | "/leaderboard"
     | "/"
-    | "/create/feed"
     | "/create/plugin"
     | "/plugin/$pluginId"
     | "/plugin"
     | "/profile"
+    | "/create/feed/review"
+    | "/create/feed/settings"
     | "/edit/feed/$feedId"
     | "/feed/$feedId/curation"
     | "/feed/$feedId/members"
     | "/feed/$feedId/points"
     | "/feed/$feedId/proposals"
     | "/feed/$feedId/token"
+    | "/create/feed"
     | "/feed/$feedId"
     | "/profile/settings"
     | "/feed/$feedId/settings/connected"
@@ -241,12 +273,15 @@ export interface FileRouteTypes {
     | "/_layout/plugin/$pluginId"
     | "/_layout/plugin/"
     | "/_layout/profile/"
+    | "/_layout/create/feed/review"
+    | "/_layout/create/feed/settings"
     | "/_layout/edit/feed/$feedId"
     | "/_layout/feed/$feedId/curation"
     | "/_layout/feed/$feedId/members"
     | "/_layout/feed/$feedId/points"
     | "/_layout/feed/$feedId/proposals"
     | "/_layout/feed/$feedId/token"
+    | "/_layout/create/feed/"
     | "/_layout/feed/$feedId/"
     | "/_layout/profile/settings/"
     | "/_layout/feed/$feedId/settings/connected"
@@ -336,6 +371,13 @@ declare module "@tanstack/react-router" {
       preLoaderRoute: typeof LayoutFeedFeedIdIndexRouteImport;
       parentRoute: typeof LayoutFeedFeedIdRoute;
     };
+    "/_layout/create/feed/": {
+      id: "/_layout/create/feed/";
+      path: "/";
+      fullPath: "/create/feed/";
+      preLoaderRoute: typeof LayoutCreateFeedIndexRouteImport;
+      parentRoute: typeof LayoutCreateFeedRoute;
+    };
     "/_layout/feed/$feedId/token": {
       id: "/_layout/feed/$feedId/token";
       path: "/token";
@@ -378,6 +420,20 @@ declare module "@tanstack/react-router" {
       preLoaderRoute: typeof LayoutEditFeedFeedIdRouteImport;
       parentRoute: typeof LayoutRoute;
     };
+    "/_layout/create/feed/settings": {
+      id: "/_layout/create/feed/settings";
+      path: "/settings";
+      fullPath: "/create/feed/settings";
+      preLoaderRoute: typeof LayoutCreateFeedSettingsRouteImport;
+      parentRoute: typeof LayoutCreateFeedRoute;
+    };
+    "/_layout/create/feed/review": {
+      id: "/_layout/create/feed/review";
+      path: "/review";
+      fullPath: "/create/feed/review";
+      preLoaderRoute: typeof LayoutCreateFeedReviewRouteImport;
+      parentRoute: typeof LayoutCreateFeedRoute;
+    };
     "/_layout/feed/$feedId/settings/": {
       id: "/_layout/feed/$feedId/settings/";
       path: "/settings";
@@ -395,6 +451,21 @@ declare module "@tanstack/react-router" {
   }
 }
 
+interface LayoutCreateFeedRouteChildren {
+  LayoutCreateFeedReviewRoute: typeof LayoutCreateFeedReviewRoute;
+  LayoutCreateFeedSettingsRoute: typeof LayoutCreateFeedSettingsRoute;
+  LayoutCreateFeedIndexRoute: typeof LayoutCreateFeedIndexRoute;
+}
+
+const LayoutCreateFeedRouteChildren: LayoutCreateFeedRouteChildren = {
+  LayoutCreateFeedReviewRoute: LayoutCreateFeedReviewRoute,
+  LayoutCreateFeedSettingsRoute: LayoutCreateFeedSettingsRoute,
+  LayoutCreateFeedIndexRoute: LayoutCreateFeedIndexRoute,
+};
+
+const LayoutCreateFeedRouteWithChildren =
+  LayoutCreateFeedRoute._addFileChildren(LayoutCreateFeedRouteChildren);
+
 interface LayoutFeedFeedIdRouteChildren {
   LayoutFeedFeedIdCurationRoute: typeof LayoutFeedFeedIdCurationRoute;
   LayoutFeedFeedIdMembersRoute: typeof LayoutFeedFeedIdMembersRoute;
@@ -424,7 +495,7 @@ const LayoutFeedFeedIdRouteWithChildren =
 interface LayoutRouteChildren {
   LayoutLeaderboardRoute: typeof LayoutLeaderboardRoute;
   LayoutIndexRoute: typeof LayoutIndexRoute;
-  LayoutCreateFeedRoute: typeof LayoutCreateFeedRoute;
+  LayoutCreateFeedRoute: typeof LayoutCreateFeedRouteWithChildren;
   LayoutCreatePluginRoute: typeof LayoutCreatePluginRoute;
   LayoutFeedFeedIdRoute: typeof LayoutFeedFeedIdRouteWithChildren;
   LayoutPluginPluginIdRoute: typeof LayoutPluginPluginIdRoute;
@@ -437,7 +508,7 @@ interface LayoutRouteChildren {
 const LayoutRouteChildren: LayoutRouteChildren = {
   LayoutLeaderboardRoute: LayoutLeaderboardRoute,
   LayoutIndexRoute: LayoutIndexRoute,
-  LayoutCreateFeedRoute: LayoutCreateFeedRoute,
+  LayoutCreateFeedRoute: LayoutCreateFeedRouteWithChildren,
   LayoutCreatePluginRoute: LayoutCreatePluginRoute,
   LayoutFeedFeedIdRoute: LayoutFeedFeedIdRouteWithChildren,
   LayoutPluginPluginIdRoute: LayoutPluginPluginIdRoute,
diff --git a/apps/app/src/routes/_layout.tsx b/apps/app/src/routes/_layout.tsx
index 76430ad8..e9e12dc5 100644
--- a/apps/app/src/routes/_layout.tsx
+++ b/apps/app/src/routes/_layout.tsx
@@ -1,5 +1,5 @@
 import { createFileRoute, Outlet } from "@tanstack/react-router";
-import Header from "../components/Header";
+import Header from "@/components/Header";
 
 export const Route = createFileRoute("/_layout")({
   component: RouteComponent,
diff --git a/apps/app/src/routes/_layout/create/feed.tsx b/apps/app/src/routes/_layout/create/feed.tsx
index a7ae623c..74b5cea3 100644
--- a/apps/app/src/routes/_layout/create/feed.tsx
+++ b/apps/app/src/routes/_layout/create/feed.tsx
@@ -1,12 +1,26 @@
-import { createFileRoute } from "@tanstack/react-router";
-import CurationFormSteps from "../../../components/CurationFormSteps";
-import { Hero } from "../../../components/Hero";
+import { Hero } from "@/components/Hero";
+import { Progress } from "@/components/ui/progress";
+import { createFileRoute, Outlet, useMatchRoute } from "@tanstack/react-router";
 
 export const Route = createFileRoute("/_layout/create/feed")({
-  component: RouteComponent,
+  component: FeedLayoutComponent,
 });
 
-function RouteComponent() {
+function FeedLayoutComponent() {
+  const matchRoute = useMatchRoute();
+
+  const steps = [
+    { id: "/_layout/create/feed/", title: "Basic Information" },
+    { id: "/_layout/create/feed/settings", title: "Curation Settings" },
+    { id: "/_layout/create/feed/review", title: "Feed Review" },
+  ];
+
+  const currentStepIndex = steps.findIndex((step) =>
+    matchRoute({ to: step.id }),
+  );
+  const currentStep = currentStepIndex !== -1 ? currentStepIndex : 0;
+  const progressValue = ((currentStep + 1) / steps.length) * 100;
+
   return (
     <div>
       <Hero
@@ -14,7 +28,36 @@ function RouteComponent() {
         description="Set up your own feed on Twitter, Farcaster and other platforms with automated curation and distribution."
       />
 
-      <CurationFormSteps />
+      <div className="w-full md:max-w-4xl mx-auto py-4 md:py-8 px-4 md:px-0">
+        <div className="flex flex-col gap-1">
+          <div className="text-sm font-medium text-black">
+            Step {currentStep + 1} of {steps.length}
+          </div>
+          <Progress value={progressValue} />
+          <div className="flex justify-between mb-6 overflow-x-auto pb-2">
+            {steps.map((step, index) => (
+              <div
+                key={index}
+                className="flex flex-col items-center min-w-[100px] px-2"
+                role="presentation"
+                aria-current={index === currentStep ? "step" : undefined}
+                aria-label={`Step ${index + 1}: ${step.title}`}
+              >
+                <span
+                  className={`text-sm text-center ${
+                    index === currentStep ? "font-bold" : ""
+                  }`}
+                >
+                  {step.title}
+                </span>
+              </div>
+            ))}
+          </div>
+        </div>
+        <div className="border p-3 md:p-6 rounded-lg flex flex-col gap-4 md:gap-8">
+          <Outlet />
+        </div>
+      </div>
     </div>
   );
 }
diff --git a/apps/app/src/routes/_layout/create/feed/index.tsx b/apps/app/src/routes/_layout/create/feed/index.tsx
new file mode 100644
index 00000000..9ac3ddb0
--- /dev/null
+++ b/apps/app/src/routes/_layout/create/feed/index.tsx
@@ -0,0 +1,150 @@
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useForm } from "react-hook-form";
+import { ImageUpload } from "@/components/ImageUpload";
+import { Button } from "@/components/ui/button";
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { Textarea } from "@/components/ui/textarea";
+import { useAuth } from "@/contexts/auth-context";
+import { useFeedCreationStore } from "@/store/feed-creation-store";
+import { createFileRoute, useNavigate } from "@tanstack/react-router";
+import { z } from "zod";
+
+const BasicInformationFormSchema = z.object({
+  name: z.string().min(3, "Feed name must be at least 3 characters").optional(),
+  description: z
+    .string()
+    .min(10, "Description must be at least 10 characters")
+    .optional(),
+  id: z.string().min(1, "Please provide at least one hashtag").optional(),
+  image: z.string().optional(),
+});
+
+type FormValues = z.infer<typeof BasicInformationFormSchema>;
+
+export const Route = createFileRoute("/_layout/create/feed/")({
+  validateSearch: BasicInformationFormSchema,
+  component: BasicInformationComponent,
+});
+
+function BasicInformationComponent() {
+  const { isSignedIn, handleSignIn } = useAuth();
+  const navigate = useNavigate({ from: Route.fullPath });
+  const search = Route.useSearch();
+  const { feedConfig, setValues } = useFeedCreationStore();
+
+  const form = useForm<FormValues>({
+    resolver: zodResolver(BasicInformationFormSchema),
+    defaultValues: {
+      name: search.name ?? feedConfig.name ?? "",
+      description: search.description ?? feedConfig.description ?? "",
+      id: search.id ?? feedConfig.id ?? "",
+      image: search.image ?? feedConfig.image ?? "",
+    },
+  });
+
+  const onSubmit = (data: FormValues) => {
+    setValues(data);
+    navigate({
+      to: "/create/feed/settings",
+    });
+  };
+
+  return (
+    <div>
+      {isSignedIn ? (
+        <Form {...form}>
+          <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-8">
+            <FormField
+              control={form.control}
+              name="image"
+              render={({ field }) => (
+                <FormItem>
+                  <FormControl>
+                    <ImageUpload
+                      label="Profile Image"
+                      initialImageUrl={field.value || null}
+                      onUploadSuccess={(_ipfsHash, ipfsUrl) => {
+                        field.onChange(ipfsUrl);
+                      }}
+                      recommendedText="Recommended: Square, at least 400x400px. This will be your feed's avatar."
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="name"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Feed Name</FormLabel>
+                  <FormControl>
+                    <Input
+                      placeholder="Name of your feed"
+                      required
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="description"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Description</FormLabel>
+                  <FormControl>
+                    <Textarea
+                      placeholder="Description"
+                      className="min-h-[100px]"
+                      required
+                      {...field}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="id"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>Hashtag (without #)</FormLabel>
+                  <FormControl>
+                    <Input placeholder="Tag" required {...field} />
+                  </FormControl>
+                  <FormMessage />
+                  <p className="text-sm font-normal text-[#64748b]">
+                    This will be used as a unique identifier for your feed.
+                  </p>
+                </FormItem>
+              )}
+            />
+            <div className="flex justify-end">
+              <Button type="submit" disabled={form.formState.isSubmitting}>
+                {form.formState.isSubmitting ? "..." : "Next"}
+              </Button>
+            </div>
+          </form>
+        </Form>
+      ) : (
+        <div className="flex flex-col items-center justify-center py-10">
+          <p className="mb-4 text-gray-600">Please login to create a feed</p>
+          <Button onClick={handleSignIn}>Login</Button>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/apps/app/src/components/FeedReviewForm.tsx b/apps/app/src/routes/_layout/create/feed/review.tsx
similarity index 53%
rename from apps/app/src/components/FeedReviewForm.tsx
rename to apps/app/src/routes/_layout/create/feed/review.tsx
index 1a033138..d2ea410f 100644
--- a/apps/app/src/components/FeedReviewForm.tsx
+++ b/apps/app/src/routes/_layout/create/feed/review.tsx
@@ -1,17 +1,43 @@
-import { format } from "date-fns";
-import { useFeedCreationStore } from "../store/feed-creation-store";
-import { Badge } from "./ui/badge";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { toast } from "@/hooks/use-toast";
+import { useCreateFeed } from "@/lib/api";
+import { useFeedCreationStore } from "@/store/feed-creation-store";
+import { createFileRoute, useNavigate } from "@tanstack/react-router";
+import { useState } from "react";
 
-export default function FeedReviewForm() {
-  const {
-    profileImage,
-    feedName,
-    description,
-    hashtags,
-    createdAt,
-    approvers,
-    // submissionRules,
-  } = useFeedCreationStore();
+export const Route = createFileRoute("/_layout/create/feed/review")({
+  component: FeedReviewComponent,
+});
+
+function FeedReviewComponent() {
+  const navigate = useNavigate({ from: Route.fullPath });
+  const { feedConfig } = useFeedCreationStore();
+  const createFeedMutation = useCreateFeed();
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  const handleSubmit = async () => {
+    setIsSubmitting(true);
+    try {
+      // @ts-expect-error needs to be fixed
+      await createFeedMutation.mutateAsync(feedConfig);
+      toast({
+        title: "Feed Created Successfully!",
+        description: `Your feed "${feedConfig.name}" has been created.`,
+        variant: "default",
+      });
+      navigate({ to: "/" });
+    } catch (error) {
+      console.error("Error creating feed:", error);
+      toast({
+        title: "Error Creating Feed",
+        description: "There was an error creating your feed. Please try again.",
+        variant: "destructive",
+      });
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
 
   return (
     <div className="flex flex-col gap-8">
@@ -24,13 +50,12 @@ export default function FeedReviewForm() {
         </p>
       </div>
       <div className="flex flex-col gap-6">
-        {/* Feed Basic Information */}
         <div className="p-6 rounded-md border-1 flex w-full border border-neutral-300 ">
           <div className="flex items-center gap-[40px] w-full">
             <div className="h-24 w-24 overflow-hidden rounded-full bg-gray-100 flex items-center justify-center">
-              {profileImage ? (
+              {feedConfig.image ? (
                 <img
-                  src={profileImage}
+                  src={feedConfig.image}
                   alt="Feed Profile"
                   className="h-[108px] w-[108px] object-cover"
                 />
@@ -45,40 +70,36 @@ export default function FeedReviewForm() {
             <div className="flex flex-col gap-2 w-full">
               <div className="flex gap-2">
                 <h3 className="text-xl font-semibold">
-                  {feedName || "Untitled Feed"}
+                  {feedConfig.name || "Untitled Feed"}
                 </h3>
                 <Badge className="p-1">
-                  #{hashtags || "No hashtag provided"}
+                  #{feedConfig.id || "No hashtag provided"}
                 </Badge>
               </div>
               <p className="text-gray-700">
-                {description || "No description provided"}
+                {feedConfig.description || "No description provided"}
               </p>
-              {createdAt && (
-                <p className="text-sm text-gray-500">
-                  Created on {format(createdAt, "MMMM d, yyyy")}
-                </p>
-              )}
+              {/* Created at is not part of the new store */}
             </div>
           </div>
         </div>
 
-        {/* Approvers */}
         <div className="flex flex-col gap-[24px]">
           <h3 className="text-2xl text-neutral-500 font-normal">Approvers</h3>
-          {approvers && approvers.length > 0 ? (
+          {feedConfig.moderation?.approvers?.twitter &&
+          feedConfig.moderation.approvers.twitter.length > 0 ? (
             <div className="space-y-2">
-              {approvers.map((approver) => (
+              {feedConfig.moderation.approvers.twitter.map((handle) => (
                 <div
-                  key={approver.id}
+                  key={handle}
                   className="flex items-center justify-between py-3 px-4 border border-neutral-300 rounded-md "
                 >
                   <div className="flex flex-col">
                     <span className="font-bold">
-                      {approver.name}
+                      {/* TODO: Get user name from handle */}
                       <span className="text-[#171717] font-normal">
                         {" "}
-                        @{approver.handle}
+                        @{handle}
                       </span>
                     </span>
                     <div className="flex items-center text-xs text-[#171717]">
@@ -104,64 +125,11 @@ export default function FeedReviewForm() {
             <p className="text-sm text-[#64748B]">No approvers added</p>
           )}
         </div>
-
-        {/* Submission Rules */}
-        {/* <div className="flex flex-col gap-[24px]">
-          <h3 className="text-2xl text-neutral-500 font-normal">
-            Submission Rules
-          </h3>
-          {submissionRules && (
-            <div className="p-6 flex gap-2 border border-neutral-300 rounded-md justify-between">
-              {submissionRules.minFollowersEnabled && (
-                <div className="flex items-start gap-1 flex-col">
-                  <h3 className="text-lg md:text-2xl text-neutral-500 font-normal">
-                    {submissionRules.minFollowers}
-                  </h3>
-                  <span className="text-xs md:text-sm text-[#64748B]">
-                    Minimum Followers
-                  </span>
-                </div>
-              )}
-
-              {submissionRules.minAccountAgeEnabled && (
-                <div className="flex gap-1 flex-col">
-                  <h3 className="text-lg md:text-2xl text-neutral-500 font-normal">
-                    {submissionRules.minAccountAge} Months
-                  </h3>
-                  <span className="text-xs md:text-sm text-[#64748B]">
-                    Minimum Account Age
-                  </span>
-                </div>
-              )}
-
-              <div className="flex gap-1 flex-col">
-                <h3 className="text-lg md:text-2xl text-neutral-500 font-normal">
-                  Blue Tick
-                </h3>
-                <span className="text-xs md:text-sm text-[#64748B]">
-                  {submissionRules.blueTickVerified ? "Verified" : "No"}
-                </span>
-              </div>
-            </div>
-          )}
-        </div> */}
         <div className="p-4 border rounded-md flex justify-start items-start gap-3 border-neutral-400 bg-neutral-50">
-          {/* <div>
-            <TooltipProvider>
-              <Tooltip>
-                <TooltipTrigger>
-                  <Info className="h-4 w-4 text-gray-500" />
-                </TooltipTrigger>
-                <TooltipContent>
-                  Set a minimum follower count requirement
-                </TooltipContent>
-              </Tooltip>
-            </TooltipProvider>
-          </div> */}
           <div className="text-base text-[#020617]">
             <p className="font-semibold">What Happens Next?</p>
             <div className="text-sm">
-              <p>After creating your feed, you&apos;ll be able to:</p>
+              <p>After creating your feed, you'll be able to:</p>
               <ul className="list-disc pl-5 mt-2">
                 <li>Add content sources (Twitter, RSS feeds, etc.)</li>
                 <li>Configure content generation templates</li>
@@ -171,6 +139,22 @@ export default function FeedReviewForm() {
           </div>
         </div>
       </div>
+      <div className="flex justify-between mt-8">
+        <Button
+          variant="outline"
+          onClick={() => navigate({ to: "/create/feed/settings" })}
+          className="text-sm md:text-base"
+        >
+          Previous
+        </Button>
+        <Button
+          onClick={handleSubmit}
+          disabled={isSubmitting}
+          className="text-sm md:text-base "
+        >
+          {isSubmitting ? "Submitting..." : "Create Feed"}
+        </Button>
+      </div>
     </div>
   );
 }
diff --git a/apps/app/src/routes/_layout/create/feed/settings.tsx b/apps/app/src/routes/_layout/create/feed/settings.tsx
new file mode 100644
index 00000000..7e2b3df8
--- /dev/null
+++ b/apps/app/src/routes/_layout/create/feed/settings.tsx
@@ -0,0 +1,104 @@
+import ContentApprovers from "@/components/ContentApprovers";
+import PublishingIntegrations from "@/components/PublishIntegrations";
+import { Button } from "@/components/ui/button";
+import { useFeedCreationStore } from "@/store/feed-creation-store";
+import { createFileRoute, useNavigate } from "@tanstack/react-router";
+import { FormProvider, useForm } from "react-hook-form";
+
+const StepHeader = ({
+  number,
+  title,
+  description,
+}: {
+  number: number;
+  title: string;
+  description: string;
+}) => (
+  <div className="flex items-start flex-col gap-2 md:gap-3">
+    <div className="flex gap-2 md:gap-3 items-center">
+      <div className="flex-1 text-[#737373] text-sm md:text-base leading-6 font-londrina border border-neutral-500 rounded-md py-1 px-2 md:px-3 max-w-fit">
+        {number}
+      </div>
+      <h2 className="text-xl md:text-2xl leading-7 font-medium font-londrina text-[#737373]">
+        {title}
+      </h2>
+    </div>
+    <p className="text-xs md:text-sm leading-5 md:leading-7 text-[#64748b]">
+      {description}
+    </p>
+  </div>
+);
+
+type Step = {
+  title: string;
+  id: number;
+  description: string;
+  component: React.ReactNode;
+};
+
+const steps: Step[] = [
+  {
+    title: "Publishing Integrations",
+    description: "Define how content is processed before being published",
+    id: 1,
+    component: <PublishingIntegrations />,
+  },
+  {
+    title: "Content Approvers",
+    description: "Set up approvers who will review content before publication",
+    id: 2,
+    component: <ContentApprovers />,
+  },
+];
+
+export const Route = createFileRoute("/_layout/create/feed/settings")({
+  component: CurationSettingsComponent,
+});
+
+function CurationSettingsComponent() {
+  const navigate = useNavigate({ from: Route.fullPath });
+  const { feedConfig } = useFeedCreationStore();
+  const methods = useForm({
+    defaultValues: feedConfig,
+  });
+
+  const handleNext = async () => {
+    const isValid = await methods.trigger();
+    if (isValid) {
+      navigate({ to: "/create/feed/review" });
+    }
+  };
+
+  return (
+    <FormProvider {...methods}>
+      <div className="flex flex-col gap-4 md:gap-8">
+        {steps.map((step) => (
+          <div className="flex flex-col gap-3 md:gap-5" key={step.id}>
+            <StepHeader
+              number={step.id}
+              title={step.title}
+              description={step.description}
+            />
+            <div className="overflow-x-auto">{step.component}</div>
+          </div>
+        ))}
+        <div className="flex justify-between">
+          <Button
+            variant="outline"
+            onClick={() =>
+              navigate({
+                to: "/create/feed",
+              })
+            }
+            className="text-sm md:text-base"
+          >
+            Previous
+          </Button>
+          <Button onClick={handleNext} className="text-sm md:text-base">
+            Next
+          </Button>
+        </div>
+      </div>
+    </FormProvider>
+  );
+}
diff --git a/apps/app/src/routes/_layout/feed/$feedId.tsx b/apps/app/src/routes/_layout/feed/$feedId.tsx
index d1e44669..be53e292 100644
--- a/apps/app/src/routes/_layout/feed/$feedId.tsx
+++ b/apps/app/src/routes/_layout/feed/$feedId.tsx
@@ -75,31 +75,41 @@ function FeedPageLayout() {
               </p>
             </div>
           </div>
-          <div className="flex sm:flex-row sm:items-center justify-between sm:justify-between w-full gap-2">
-            <div className="flex  sm:flex-row items-center gap-2 w-full">
-              <p>Curating from:</p>
-              <Badge className="flex gap-1 text-black border border-stone-500 rounded-md bg-stone-50 shadow-none">
-                <svg
-                  xmlns="http://www.w3.org/2000/svg"
-                  width="16"
-                  height="16"
-                  viewBox="0 0 16 16"
-                  fill="none"
-                >
-                  <path
-                    d="M5.47681 2.1748L8.34204 5.96094L8.4729 6.13379L8.6145 5.9707L11.9094 2.1748H13.4788L9.28638 6.99902L9.1936 7.10645L9.27954 7.21973L14.3137 13.873H10.6301L7.46997 9.73828L7.34009 9.56836L7.19849 9.72949L3.55688 13.873H1.9856L6.49829 8.70117L6.59302 8.59375L6.5061 8.47949L1.68774 2.1748H5.47681ZM3.57642 3.25781L10.9661 12.9229L11.0188 12.9922H12.5813L12.3704 12.7109L5.08813 3.0459L5.0354 2.97559H3.36157L3.57642 3.25781Z"
-                    stroke="#57534E"
-                    strokeWidth="0.350493"
-                  />
-                </svg>
-                Twitter
-              </Badge>
+          <div className="grid grid-cols-2 gap-3 sm:flex sm:flex-row sm:items-center sm:justify-between">
+            {/* Mobile: Top left, Desktop: Left side */}
+            <div className="flex flex-col gap-2 sm:flex-row sm:items-center sm:gap-2">
+              <p className="text-sm sm:text-base">Curating from:</p>
+              <div className="flex items-center gap-2 sm:mt-0">
+                <Badge className="flex gap-1 text-black border border-stone-500 rounded-md bg-stone-50 shadow-none">
+                  <svg
+                    xmlns="http://www.w3.org/2000/svg"
+                    width="16"
+                    height="16"
+                    viewBox="0 0 16 16"
+                    fill="none"
+                  >
+                    <path
+                      d="M5.47681 2.1748L8.34204 5.96094L8.4729 6.13379L8.6145 5.9707L11.9094 2.1748H13.4788L9.28638 6.99902L9.1936 7.10645L9.27954 7.21973L14.3137 13.873H10.6301L7.46997 9.73828L7.34009 9.56836L7.19849 9.72949L3.55688 13.873H1.9856L6.49829 8.70117L6.59302 8.59375L6.5061 8.47949L1.68774 2.1748H5.47681ZM3.57642 3.25781L10.9661 12.9229L11.0188 12.9922H12.5813L12.3704 12.7109L5.08813 3.0459L5.0354 2.97559H3.36157L3.57642 3.25781Z"
+                      stroke="#57534E"
+                      strokeWidth="0.350493"
+                    />
+                  </svg>
+                  Twitter
+                </Badge>
+              </div>
             </div>
+
+            {/* Mobile: Top right, Desktop: Right side */}
             {(feed?.config?.outputs?.stream?.distribute?.length ?? 0) > 0 && (
-              <div className="flex sm:flex-row items-center gap-2 justify-end sm:gap-3 w-full sm:w-full">
-                <DistributorBadges
-                  distribute={feed?.config?.outputs?.stream?.distribute ?? []}
-                />
+              <div className="flex flex-col gap-2 sm:flex-row sm:items-center sm:gap-2 justify-self-end sm:justify-self-auto">
+                <p className="text-sm sm:text-base text-right sm:text-left">
+                  Posting to:
+                </p>
+                <div className="flex items-center gap-2 justify-end sm:justify-start">
+                  <DistributorBadges
+                    distribute={feed?.config?.outputs?.stream?.distribute ?? []}
+                  />
+                </div>
               </div>
             )}
           </div>
diff --git a/apps/app/src/store/feed-creation-store.ts b/apps/app/src/store/feed-creation-store.ts
index 1cec17f3..c66213df 100644
--- a/apps/app/src/store/feed-creation-store.ts
+++ b/apps/app/src/store/feed-creation-store.ts
@@ -1,119 +1,141 @@
-import { create } from "zustand";
-
-export interface FeedCreationState {
-  // Basic Information
-  profileImage: string;
-  feedName: string;
-  description: string;
-  hashtags: string;
-  createdAt: Date | null;
-
-  // Approvers
-  approvers: Array<{
-    id: number;
-    name: string;
-    handle: string;
-  }>;
-
-  // Submission Rules
-  submissionRules: {
-    minFollowers: number;
-    minFollowersEnabled: boolean;
-    minAccountAge: number;
-    minAccountAgeEnabled: boolean;
-    blueTickVerified: boolean;
-    cryptoSettingsEnabled: boolean;
-  };
-
-  // Telegram Configuration
-  telegramEnabled: boolean;
-  telegramChannelId: string;
-  telegramThreadId: string;
-
-  // Actions
-  setBasicInfo: (data: {
-    profileImage?: string;
-    feedName?: string;
-    description?: string;
-    hashtags?: string;
-    createdAt?: Date;
-  }) => void;
-
-  setApprovers: (
-    approvers: Array<{
-      id: number;
-      name: string;
-      handle: string;
-    }>,
-  ) => void;
-
-  setSubmissionRules: (rules: {
-    minFollowers?: number;
-    minFollowersEnabled?: boolean;
-    minAccountAge?: number;
-    minAccountAgeEnabled?: boolean;
-    blueTickVerified?: boolean;
-    cryptoSettingsEnabled?: boolean;
-  }) => void;
-
-  setTelegramConfig: (data: {
-    telegramEnabled?: boolean;
-    telegramChannelId?: string;
-    telegramThreadId?: string;
+import { create, StateCreator } from "zustand";
+import type { DistributorConfig, CreateFeedConfig } from "@curatedotfun/types";
+import { immer } from "zustand/middleware/immer";
+import { set, groupBy } from "lodash";
+
+const TELEGRAM_PLUGIN_NAME = "@curatedotfun/telegram-distributor";
+
+export type Approver = {
+  handle: string;
+  platform: string;
+};
+
+type FeedCreationState = {
+  feedConfig: CreateFeedConfig;
+  approvers: Approver[];
+  setValue: (path: string, value: unknown) => void;
+  setValues: (values: CreateFeedConfig) => void;
+  setTelegramConfig: (config: {
+    enabled?: boolean;
+    channelId?: string;
+    threadId?: string;
   }) => void;
-}
-
-export const useFeedCreationStore = create<FeedCreationState>((set) => ({
-  // Basic Information
-  profileImage: "",
-  feedName: "",
-  description: "",
-  hashtags: "",
-  createdAt: new Date(),
-
-  // Approvers
+  setApprovers: (approvers: Approver[]) => void;
+};
+
+const feedCreationStateCreator: StateCreator<
+  FeedCreationState,
+  [["zustand/immer", never]]
+> = (setState) => ({
+  feedConfig: {
+    name: "",
+    description: "",
+    id: "",
+    enabled: true,
+    moderation: {
+      approvers: {
+        twitter: [],
+      },
+    },
+    outputs: {
+      stream: {
+        enabled: true,
+        transform: [
+          {
+            plugin: "@curatedotfun/object-transform",
+            config: {
+              mappings: {
+                notes: "{{curator.notes}}",
+                author: "{{username}}",
+                source: "https://x.com/{{username}}/status/{{tweetId}}",
+                content: "{{content}}",
+                submittedAt: "{{submittedAt}}",
+              },
+            },
+          },
+          {
+            plugin: "@curatedotfun/ai-transform",
+            config: {
+              apiKey: "{{OPENROUTER_API_KEY}}",
+              prompt:
+                "Summarize the content into a concise news flash, incorporating relevant details from the curator's notes. Maintain a neutral, third-person tone. Mention the author if relevant, or simply convey the information. When processing social media-style content, convert @mentions into markdown links in the format: [@username](https://x.com/username). Ensure all mentions are accurately linked and preserve their original intent.",
+              schema: {
+                tags: {
+                  type: "array",
+                  items: {
+                    type: "string",
+                  },
+                  description: "Relevant tags for the content",
+                },
+                title: {
+                  type: "string",
+                  description: "Title derived from summary of content",
+                },
+                summary: {
+                  type: "string",
+                  description: "Summary of content influenced by curator notes",
+                },
+              },
+            },
+          },
+        ],
+        distribute: [],
+      },
+    },
+  },
   approvers: [],
-
-  // Submission Rules
-  submissionRules: {
-    minFollowers: 1000,
-    minFollowersEnabled: true,
-    minAccountAge: 30,
-    minAccountAgeEnabled: true,
-    blueTickVerified: true,
-    cryptoSettingsEnabled: false,
+  setValue: (path, value) => {
+    setState((state) => {
+      set(state.feedConfig, path, value);
+    });
   },
+  setValues: (values) => {
+    setState((state) => {
+      state.feedConfig = { ...state.feedConfig, ...values };
+    });
+  },
+  setTelegramConfig: ({ enabled, channelId, threadId }) => {
+    setState((state) => {
+      const distribute = state.feedConfig.outputs?.stream?.distribute ?? [];
+      const telegramDistributorIndex = distribute.findIndex(
+        (d) => d.plugin === TELEGRAM_PLUGIN_NAME,
+      );
+
+      if (enabled) {
+        const newConfig: DistributorConfig = {
+          plugin: TELEGRAM_PLUGIN_NAME,
+          config: {
+            botToken: "{{TELEGRAM_BOT_TOKEN}}",
+            chatId: channelId ?? "",
+            messageThreadId: threadId ?? "",
+          },
+        };
+        if (telegramDistributorIndex > -1) {
+          distribute[telegramDistributorIndex] = newConfig;
+        } else {
+          distribute.push(newConfig);
+        }
+      } else if (telegramDistributorIndex > -1) {
+        distribute.splice(telegramDistributorIndex, 1);
+      }
+
+      set(state.feedConfig, "outputs.stream.distribute", distribute);
+    });
+  },
+  setApprovers: (approvers) => {
+    setState((state) => {
+      state.approvers = approvers;
+      const groupedByPlatform = groupBy(approvers, "platform");
+      const moderationApprovers = Object.entries(groupedByPlatform).reduce(
+        (acc, [platform, approversList]) => {
+          acc[platform.toLowerCase()] = approversList.map((a) => a.handle);
+          return acc;
+        },
+        {} as Record<string, string[]>,
+      );
+      set(state.feedConfig, "moderation.approvers", moderationApprovers);
+    });
+  },
+});
 
-  // Telegram Configuration
-  telegramEnabled: false,
-  telegramChannelId: "",
-  telegramThreadId: "",
-
-  // Actions
-  setBasicInfo: (data) =>
-    set((state) => ({
-      ...state,
-      ...data,
-    })),
-
-  setApprovers: (approvers) =>
-    set((state) => ({
-      ...state,
-      approvers,
-    })),
-
-  setSubmissionRules: (rules) =>
-    set((state) => ({
-      ...state,
-      submissionRules: {
-        ...state.submissionRules,
-        ...rules,
-      },
-    })),
-
-  setTelegramConfig: (data) =>
-    set((state) => ({
-      ...state,
-      ...data,
-    })),
-}));
+export const useFeedCreationStore = create(immer(feedCreationStateCreator));
diff --git a/apps/app/tailwind.config.js b/apps/app/tailwind.config.js
index b394bff8..070b24a2 100644
--- a/apps/app/tailwind.config.js
+++ b/apps/app/tailwind.config.js
@@ -16,8 +16,8 @@ export default {
       },
       colors: {
         destructive: {
-          DEFAULT: "oklch(var(--destructive))",
-          foreground: "oklch(var(--destructive-foreground))",
+          DEFAULT: "var(--destructive)",
+          foreground: "var(--destructive-foreground)",
         },
       },
     },
diff --git a/apps/app/tsconfig.json b/apps/app/tsconfig.json
index b3a69870..fec8c8e5 100644
--- a/apps/app/tsconfig.json
+++ b/apps/app/tsconfig.json
@@ -7,7 +7,7 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "@/*": ["./*"]
+      "@/*": ["./src/*"]
     }
   }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index ff4a7c0b..73be8ced 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -36,22 +36,19 @@ services:
 
   # handles data migration and database seeding
   db-migrate-dev:
-    image: oven/bun:latest
-    working_dir: /app/packages/shared-db
-    volumes:
-      - ./:/app
-      - node_modules_cache:/app/node_modules
+    build:
+      context: .
+      dockerfile: packages/shared-db/Dockerfile.dev
     environment:
       DATABASE_URL: postgresql://postgres:postgres@postgres_dev:5432/curatedotfun
     depends_on:
       postgres_dev:
         condition: service_healthy
-    command: sh -c "bunx drizzle-kit migrate"
     profiles: ["dev"]
 
   db-seed-dev:
     extends: db-migrate-dev
-    command: sh -c "bun ./scripts/seed-dev.ts"
+    command: ["seed:dev"]
     profiles: ["dev"]
 
   # Application service
diff --git a/packages/shared-db/Dockerfile.dev b/packages/shared-db/Dockerfile.dev
new file mode 100644
index 00000000..1f820cf9
--- /dev/null
+++ b/packages/shared-db/Dockerfile.dev
@@ -0,0 +1,40 @@
+FROM node:18-alpine AS base
+
+RUN npm install -g pnpm turbo
+
+# Pruner stage
+FROM base AS pruner
+WORKDIR /app
+COPY . .
+# Prune for the shared-db package and its dependencies
+RUN turbo prune --scope=@curatedotfun/shared-db --docker
+
+# Builder stage
+FROM base AS builder
+WORKDIR /app
+COPY --from=pruner /app/out/full/ .
+COPY --from=pruner /app/out/json/ .
+COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
+COPY --from=pruner /app/pnpm-workspace.yaml ./pnpm-workspace.yaml
+
+RUN pnpm install --frozen-lockfile
+
+# Production stage: Minimal image to run migrations
+FROM node:18-alpine AS production
+WORKDIR /app
+
+RUN npm install -g pnpm
+
+COPY --from=builder /app/node_modules ./node_modules
+COPY --from=builder /app/package.json ./package.json
+COPY --from=builder /app/pnpm-workspace.yaml ./pnpm-workspace.yaml
+COPY --from=builder /app/packages/shared-db ./packages/shared-db
+
+# Set the working directory for commands
+WORKDIR /app/packages/shared-db
+
+# The entrypoint is just 'pnpm', commands will be appended
+ENTRYPOINT ["pnpm"]
+
+# The default command to run when nothing is specified
+CMD ["db:migrate"]
diff --git a/packages/shared-db/migrations/0015_ambiguous_the_watchers.sql b/packages/shared-db/migrations/0015_ambiguous_the_watchers.sql
index 5b5375a6..84d5f185 100644
--- a/packages/shared-db/migrations/0015_ambiguous_the_watchers.sql
+++ b/packages/shared-db/migrations/0015_ambiguous_the_watchers.sql
@@ -4,6 +4,7 @@ ALTER TABLE "moderation_history" DROP CONSTRAINT IF EXISTS "moderation_history_t
 --> statement-breakpoint
 DROP INDEX IF EXISTS "moderation_history_tweet_idx";--> statement-breakpoint
 DROP INDEX IF EXISTS "moderation_history_admin_idx";--> statement-breakpoint
+
 ALTER TABLE "moderation_history" ADD COLUMN "moderator_account_id_type" text;--> statement-breakpoint
 ALTER TABLE "moderation_history" ADD COLUMN "source" text;--> statement-breakpoint
 
diff --git a/packages/shared-db/migrations/0017_warm_cerebro.sql b/packages/shared-db/migrations/0017_warm_cerebro.sql
new file mode 100644
index 00000000..46d4caf7
--- /dev/null
+++ b/packages/shared-db/migrations/0017_warm_cerebro.sql
@@ -0,0 +1,13 @@
+CREATE TABLE "auth_requests" (
+	"id" serial PRIMARY KEY NOT NULL,
+	"nonce" text NOT NULL,
+	"state" text,
+	"account_id" text NOT NULL,
+	"expires_at" timestamp with time zone NOT NULL,
+	"created_at" timestamp with time zone DEFAULT now() NOT NULL,
+	"updated_at" timestamp with time zone DEFAULT now(),
+	CONSTRAINT "auth_requests_nonce_unique" UNIQUE("nonce"),
+	CONSTRAINT "auth_requests_state_unique" UNIQUE("state")
+);
+--> statement-breakpoint
+CREATE INDEX "auth_requests_account_id_created_at_idx" ON "auth_requests" USING btree ("account_id","created_at");
\ No newline at end of file
diff --git a/packages/shared-db/migrations/meta/0017_snapshot.json b/packages/shared-db/migrations/meta/0017_snapshot.json
new file mode 100644
index 00000000..a142e05f
--- /dev/null
+++ b/packages/shared-db/migrations/meta/0017_snapshot.json
@@ -0,0 +1,1530 @@
+{
+  "id": "b69c918c-1d07-4586-a203-c127f2e4c4e0",
+  "prevId": "44639cd2-5a48-4df4-a04f-1b99d8cc672b",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.activities": {
+      "name": "activities",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "activity_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "feed_id": {
+          "name": "feed_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "submission_id": {
+          "name": "submission_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "data": {
+          "name": "data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "activities_user_id_idx": {
+          "name": "activities_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "activities_type_idx": {
+          "name": "activities_type_idx",
+          "columns": [
+            {
+              "expression": "type",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "activities_timestamp_idx": {
+          "name": "activities_timestamp_idx",
+          "columns": [
+            {
+              "expression": "timestamp",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "activities_feed_id_idx": {
+          "name": "activities_feed_id_idx",
+          "columns": [
+            {
+              "expression": "feed_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "activities_submission_id_idx": {
+          "name": "activities_submission_id_idx",
+          "columns": [
+            {
+              "expression": "submission_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "activities_metadata_type_idx": {
+          "name": "activities_metadata_type_idx",
+          "columns": [
+            {
+              "expression": "(\"metadata\" ->> 'type')",
+              "asc": true,
+              "isExpression": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "activities_user_id_users_id_fk": {
+          "name": "activities_user_id_users_id_fk",
+          "tableFrom": "activities",
+          "tableTo": "users",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "activities_feed_id_feeds_id_fk": {
+          "name": "activities_feed_id_feeds_id_fk",
+          "tableFrom": "activities",
+          "tableTo": "feeds",
+          "columnsFrom": ["feed_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "activities_submission_id_submissions_tweet_id_fk": {
+          "name": "activities_submission_id_submissions_tweet_id_fk",
+          "tableFrom": "activities",
+          "tableTo": "submissions",
+          "columnsFrom": ["submission_id"],
+          "columnsTo": ["tweet_id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.feed_user_stats": {
+      "name": "feed_user_stats",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "feed_id": {
+          "name": "feed_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "submissions_count": {
+          "name": "submissions_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "approvals_count": {
+          "name": "approvals_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "points": {
+          "name": "points",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "curator_rank": {
+          "name": "curator_rank",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "approver_rank": {
+          "name": "approver_rank",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "data": {
+          "name": "data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "feed_user_stats_user_feed_idx": {
+          "name": "feed_user_stats_user_feed_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "feed_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "feed_user_stats_curator_rank_idx": {
+          "name": "feed_user_stats_curator_rank_idx",
+          "columns": [
+            {
+              "expression": "feed_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "curator_rank",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "feed_user_stats_approver_rank_idx": {
+          "name": "feed_user_stats_approver_rank_idx",
+          "columns": [
+            {
+              "expression": "feed_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "approver_rank",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "feed_user_stats_user_id_users_id_fk": {
+          "name": "feed_user_stats_user_id_users_id_fk",
+          "tableFrom": "feed_user_stats",
+          "tableTo": "users",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "feed_user_stats_feed_id_feeds_id_fk": {
+          "name": "feed_user_stats_feed_id_feeds_id_fk",
+          "tableFrom": "feed_user_stats",
+          "tableTo": "feeds",
+          "columnsFrom": ["feed_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user_stats": {
+      "name": "user_stats",
+      "schema": "",
+      "columns": {
+        "user_id": {
+          "name": "user_id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "total_submissions": {
+          "name": "total_submissions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_approvals": {
+          "name": "total_approvals",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_points": {
+          "name": "total_points",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "data": {
+          "name": "data",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_stats_user_id_users_id_fk": {
+          "name": "user_stats_user_id_users_id_fk",
+          "tableFrom": "user_stats",
+          "tableTo": "users",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.feed_plugins": {
+      "name": "feed_plugins",
+      "schema": "",
+      "columns": {
+        "feed_id": {
+          "name": "feed_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "plugin_id": {
+          "name": "plugin_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "config": {
+          "name": "config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "feed_plugins_feed_idx": {
+          "name": "feed_plugins_feed_idx",
+          "columns": [
+            {
+              "expression": "feed_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "feed_plugins_plugin_idx": {
+          "name": "feed_plugins_plugin_idx",
+          "columns": [
+            {
+              "expression": "plugin_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "feed_plugins_feed_id_feeds_id_fk": {
+          "name": "feed_plugins_feed_id_feeds_id_fk",
+          "tableFrom": "feed_plugins",
+          "tableTo": "feeds",
+          "columnsFrom": ["feed_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "feed_plugins_feed_id_plugin_id_pk": {
+          "name": "feed_plugins_feed_id_plugin_id_pk",
+          "columns": ["feed_id", "plugin_id"]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.feed_recaps_state": {
+      "name": "feed_recaps_state",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "feed_id": {
+          "name": "feed_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "recap_id": {
+          "name": "recap_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "external_job_id": {
+          "name": "external_job_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_successful_completion": {
+          "name": "last_successful_completion",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_run_error": {
+          "name": "last_run_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "feed_recap_id_idx": {
+          "name": "feed_recap_id_idx",
+          "columns": [
+            {
+              "expression": "feed_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "recap_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "feed_recaps_state_feed_id_feeds_id_fk": {
+          "name": "feed_recaps_state_feed_id_feeds_id_fk",
+          "tableFrom": "feed_recaps_state",
+          "tableTo": "feeds",
+          "columnsFrom": ["feed_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "feed_recaps_state_external_job_id_unique": {
+          "name": "feed_recaps_state_external_job_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["external_job_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.feeds": {
+      "name": "feeds",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "config": {
+          "name": "config",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "admins": {
+          "name": "admins",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'::jsonb"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "feeds_created_by_users_near_account_id_fk": {
+          "name": "feeds_created_by_users_near_account_id_fk",
+          "tableFrom": "feeds",
+          "tableTo": "users",
+          "columnsFrom": ["created_by"],
+          "columnsTo": ["near_account_id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.twitter_cache": {
+      "name": "twitter_cache",
+      "schema": "",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.twitter_cookies": {
+      "name": "twitter_cookies",
+      "schema": "",
+      "columns": {
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "cookies": {
+          "name": "cookies",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.submission_counts": {
+      "name": "submission_counts",
+      "schema": "",
+      "columns": {
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "count": {
+          "name": "count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "last_reset_date": {
+          "name": "last_reset_date",
+          "type": "date",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "submission_counts_date_idx": {
+          "name": "submission_counts_date_idx",
+          "columns": [
+            {
+              "expression": "last_reset_date",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.submission_feeds": {
+      "name": "submission_feeds",
+      "schema": "",
+      "columns": {
+        "submission_id": {
+          "name": "submission_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "feed_id": {
+          "name": "feed_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "submission_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "submission_feeds_feed_idx": {
+          "name": "submission_feeds_feed_idx",
+          "columns": [
+            {
+              "expression": "feed_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "submission_feeds_submission_id_submissions_tweet_id_fk": {
+          "name": "submission_feeds_submission_id_submissions_tweet_id_fk",
+          "tableFrom": "submission_feeds",
+          "tableTo": "submissions",
+          "columnsFrom": ["submission_id"],
+          "columnsTo": ["tweet_id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "submission_feeds_feed_id_feeds_id_fk": {
+          "name": "submission_feeds_feed_id_feeds_id_fk",
+          "tableFrom": "submission_feeds",
+          "tableTo": "feeds",
+          "columnsFrom": ["feed_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "submission_feeds_submission_id_feed_id_pk": {
+          "name": "submission_feeds_submission_id_feed_id_pk",
+          "columns": ["submission_id", "feed_id"]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.submissions": {
+      "name": "submissions",
+      "schema": "",
+      "columns": {
+        "tweet_id": {
+          "name": "tweet_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "curator_id": {
+          "name": "curator_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "curator_username": {
+          "name": "curator_username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "curator_tweet_id": {
+          "name": "curator_tweet_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "curator_notes": {
+          "name": "curator_notes",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "submitted_at": {
+          "name": "submitted_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "submissions_user_id_idx": {
+          "name": "submissions_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "submissions_submitted_at_idx": {
+          "name": "submissions_submitted_at_idx",
+          "columns": [
+            {
+              "expression": "submitted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.users": {
+      "name": "users",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "auth_provider_id": {
+          "name": "auth_provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "near_account_id": {
+          "name": "near_account_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "near_public_key": {
+          "name": "near_public_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "profile_image": {
+          "name": "profile_image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "users_auth_provider_id_idx": {
+          "name": "users_auth_provider_id_idx",
+          "columns": [
+            {
+              "expression": "auth_provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "users_near_account_id_idx": {
+          "name": "users_near_account_id_idx",
+          "columns": [
+            {
+              "expression": "near_account_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "users_near_public_key_idx": {
+          "name": "users_near_public_key_idx",
+          "columns": [
+            {
+              "expression": "near_public_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "users_auth_provider_id_unique": {
+          "name": "users_auth_provider_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["auth_provider_id"]
+        },
+        "users_near_account_id_unique": {
+          "name": "users_near_account_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["near_account_id"]
+        },
+        "users_near_public_key_unique": {
+          "name": "users_near_public_key_unique",
+          "nullsNotDistinct": false,
+          "columns": ["near_public_key"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.plugins": {
+      "name": "plugins",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "repo_url": {
+          "name": "repo_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "entry_point": {
+          "name": "entry_point",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "plugin_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "schema_definition": {
+          "name": "schema_definition",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "plugins_name_unique": {
+          "name": "plugins_name_unique",
+          "nullsNotDistinct": false,
+          "columns": ["name"]
+        },
+        "plugins_repo_url_unique": {
+          "name": "plugins_repo_url_unique",
+          "nullsNotDistinct": false,
+          "columns": ["repo_url"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.moderation_history": {
+      "name": "moderation_history",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "submission_id": {
+          "name": "submission_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "feed_id": {
+          "name": "feed_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "moderator_account_id": {
+          "name": "moderator_account_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "moderator_account_id_type": {
+          "name": "moderator_account_id_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source": {
+          "name": "source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "action": {
+          "name": "action",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "note": {
+          "name": "note",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "moderation_history_submission_idx": {
+          "name": "moderation_history_submission_idx",
+          "columns": [
+            {
+              "expression": "submission_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "moderation_history_moderator_account_idx": {
+          "name": "moderation_history_moderator_account_idx",
+          "columns": [
+            {
+              "expression": "moderator_account_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "moderation_history_feed_idx": {
+          "name": "moderation_history_feed_idx",
+          "columns": [
+            {
+              "expression": "feed_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "moderation_history_submission_id_submissions_tweet_id_fk": {
+          "name": "moderation_history_submission_id_submissions_tweet_id_fk",
+          "tableFrom": "moderation_history",
+          "tableTo": "submissions",
+          "columnsFrom": ["submission_id"],
+          "columnsTo": ["tweet_id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "moderation_history_feed_id_feeds_id_fk": {
+          "name": "moderation_history_feed_id_feeds_id_fk",
+          "tableFrom": "moderation_history",
+          "tableTo": "feeds",
+          "columnsFrom": ["feed_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.auth_requests": {
+      "name": "auth_requests",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "nonce": {
+          "name": "nonce",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "state": {
+          "name": "state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "account_id": {
+          "name": "account_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "auth_requests_account_id_created_at_idx": {
+          "name": "auth_requests_account_id_created_at_idx",
+          "columns": [
+            {
+              "expression": "account_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "auth_requests_nonce_unique": {
+          "name": "auth_requests_nonce_unique",
+          "nullsNotDistinct": false,
+          "columns": ["nonce"]
+        },
+        "auth_requests_state_unique": {
+          "name": "auth_requests_state_unique",
+          "nullsNotDistinct": false,
+          "columns": ["state"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {
+    "public.activity_type": {
+      "name": "activity_type",
+      "schema": "public",
+      "values": [
+        "CONTENT_SUBMISSION",
+        "CONTENT_APPROVAL",
+        "CONTENT_REJECTION",
+        "TOKEN_BUY",
+        "TOKEN_SELL",
+        "POINTS_REDEMPTION",
+        "POINTS_AWARDED"
+      ]
+    },
+    "public.submission_status": {
+      "name": "submission_status",
+      "schema": "public",
+      "values": ["pending", "approved", "rejected"]
+    },
+    "public.plugin_type": {
+      "name": "plugin_type",
+      "schema": "public",
+      "values": ["transformer", "distributor", "source", "rule", "outcome"]
+    }
+  },
+  "schemas": {},
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
diff --git a/packages/shared-db/migrations/meta/_journal.json b/packages/shared-db/migrations/meta/_journal.json
index d1a2170b..284b3546 100644
--- a/packages/shared-db/migrations/meta/_journal.json
+++ b/packages/shared-db/migrations/meta/_journal.json
@@ -120,6 +120,13 @@
       "when": 1750451880375,
       "tag": "0016_ambitious_blazing_skull",
       "breakpoints": true
+    },
+    {
+      "idx": 17,
+      "version": "7",
+      "when": 1750522673585,
+      "tag": "0017_warm_cerebro",
+      "breakpoints": true
     }
   ]
 }
diff --git a/packages/shared-db/package.json b/packages/shared-db/package.json
index 4654f2f7..e3464b79 100644
--- a/packages/shared-db/package.json
+++ b/packages/shared-db/package.json
@@ -23,6 +23,7 @@
   },
   "devDependencies": {
     "@types/async-retry": "^1.4.9",
+    "@curatedotfun/types": "workspace:*",
     "dotenv": "^16.5.0",
     "drizzle-kit": "^0.31.1",
     "eslint": "^9.28.0",
diff --git a/packages/shared-db/scripts/seed-remote.ts b/packages/shared-db/scripts/seed-remote.ts
index 50991c34..918a10a6 100644
--- a/packages/shared-db/scripts/seed-remote.ts
+++ b/packages/shared-db/scripts/seed-remote.ts
@@ -103,7 +103,7 @@ async function seedRemote() {
     console.log("Data restored to local database.");
 
     console.log("Remote seeding process completed successfully!");
-  } catch (error: any) {
+  } catch (error: unknown) {
     console.error("Error during remote seeding:", error.message);
     console.error("Details:", error);
     process.exit(1);
@@ -114,7 +114,7 @@ async function seedRemote() {
         fs.unlinkSync(dumpFilePath);
         console.log(`Cleaned up dump file: ${dumpFilePath}`);
       }
-    } catch (cleanupError: any) {
+    } catch (cleanuperror: unknown) {
       console.error("Error cleaning up dump file:", cleanupError.message);
     }
   }
diff --git a/packages/shared-db/src/index.ts b/packages/shared-db/src/index.ts
index 0729c2b2..cc217aa8 100644
--- a/packages/shared-db/src/index.ts
+++ b/packages/shared-db/src/index.ts
@@ -15,3 +15,4 @@ export * from "./repositories/submission.repository";
 export * from "./repositories/moderation.repository";
 export * from "./repositories/user.repository";
 export * from "./repositories/plugin.repository";
+export * from "./repositories/authRequest.repository";
diff --git a/packages/shared-db/src/repositories/authRequest.repository.ts b/packages/shared-db/src/repositories/authRequest.repository.ts
new file mode 100644
index 00000000..7542db71
--- /dev/null
+++ b/packages/shared-db/src/repositories/authRequest.repository.ts
@@ -0,0 +1,95 @@
+import { and, eq, desc, gte, lt } from "drizzle-orm";
+import { InsertAuthRequest, authRequests } from "../schema";
+import { executeWithRetry, withErrorHandling } from "../utils";
+import { DB } from "../validators";
+
+export class AuthRequestRepository {
+  private readonly db: DB;
+
+  constructor(db: DB) {
+    this.db = db;
+  }
+
+  async create(data: InsertAuthRequest) {
+    return withErrorHandling(
+      async () => {
+        return executeWithRetry(async (dbInstance) => {
+          const result = await dbInstance
+            .insert(authRequests)
+            .values(data)
+            .returning();
+          return result[0] ?? null;
+        }, this.db);
+      },
+      {
+        operationName: "create auth request",
+        additionalContext: { data },
+      },
+    );
+  }
+
+  async findLatestByAccountId(accountId: string) {
+    return withErrorHandling(
+      async () => {
+        return executeWithRetry(async (dbInstance) => {
+          const fiveMinutesAgo = new Date(Date.now() - 5 * 60 * 1000);
+          const result = await dbInstance
+            .select()
+            .from(authRequests)
+            .where(
+              and(
+                eq(authRequests.accountId, accountId),
+                gte(authRequests.createdAt, fiveMinutesAgo),
+              ),
+            )
+            .orderBy(desc(authRequests.createdAt))
+            .limit(1);
+          return result[0] ?? null;
+        }, this.db);
+      },
+      {
+        operationName: "find latest auth request by account id",
+        additionalContext: { accountId },
+      },
+      null,
+    );
+  }
+
+  async deleteById(id: number): Promise<boolean> {
+    return withErrorHandling(
+      async () => {
+        return executeWithRetry(async (dbInstance) => {
+          const result = await dbInstance
+            .delete(authRequests)
+            .where(eq(authRequests.id, id))
+            .returning();
+          return result.length > 0;
+        }, this.db);
+      },
+      {
+        operationName: "delete auth request by id",
+        additionalContext: { id },
+      },
+      false,
+    );
+  }
+
+  async deleteExpired(): Promise<number> {
+    return withErrorHandling(
+      async () => {
+        return executeWithRetry(async (dbInstance) => {
+          const now = new Date();
+          const result = await dbInstance
+            .delete(authRequests)
+            .where(lt(authRequests.expiresAt, now))
+            .returning();
+          return result.length;
+        }, this.db);
+      },
+      {
+        operationName: "delete expired auth requests",
+      },
+      0,
+    );
+  }
+}
diff --git a/packages/shared-db/src/repositories/feed.repository.ts b/packages/shared-db/src/repositories/feed.repository.ts
index 93ec2eea..61a6b7c6 100644
--- a/packages/shared-db/src/repositories/feed.repository.ts
+++ b/packages/shared-db/src/repositories/feed.repository.ts
@@ -11,23 +11,18 @@ import {
   SQL,
 } from "drizzle-orm";
 import * as schema from "../schema";
-import {
-  FeedConfig,
-  SubmissionStatus,
-  submissionStatusZodEnum,
-} from "../schema";
+import { SubmissionStatus, submissionStatusZodEnum } from "../schema";
 import { executeWithRetry, withErrorHandling } from "../utils";
 import {
   DB,
-  InsertFeed,
   InsertSubmissionFeed,
   RichSubmission,
-  SelectFeed,
   SelectSubmissionFeed,
-  UpdateFeed,
 } from "../validators";
+import type { InsertFeed, SelectFeed, UpdateFeed } from "../schema/feeds";
 import { SelectModerationHistory } from "../schema/moderation";
 import { PaginatedResponse } from "./submission.repository";
+import type { FeedConfig } from "@curatedotfun/types";
 
 /**
  * Repository for feed-related database operations
@@ -42,18 +37,17 @@ export class FeedRepository {
   /**
    * Get a feed by ID
    */
-  async getFeedById(feedId: string): Promise<SelectFeed | null> {
+  async findFeedById(feedId: string): Promise<SelectFeed | null> {
     return withErrorHandling(
-      async () =>
-        executeWithRetry(async (dbInstance) => {
-          const result = await dbInstance
-            .select()
-            .from(schema.feeds)
-            .where(eq(schema.feeds.id, feedId))
-            .limit(1);
-          return result.length > 0 ? (result[0] as SelectFeed) : null;
-        }, this.db),
-      { operationName: "getFeedById", additionalContext: { feedId } },
+      async () => {
+        return executeWithRetry(async (dbInstance) => {
+          const result = await dbInstance.query.feeds.findFirst({
+            where: eq(schema.feeds.id, feedId),
+          });
+          return result ? (result as SelectFeed) : null;
+        }, this.db);
+      },
+      { operationName: "findFeedById", additionalContext: { feedId } },
       null,
     );
   }
@@ -80,6 +74,9 @@ export class FeedRepository {
     return withErrorHandling(
       async () => {
         const result = await txDb.insert(schema.feeds).values(data).returning();
+        if (result.length === 0) {
+          throw new Error("Failed to create feed, no record returned.");
+        }
         return result[0] as SelectFeed;
       },
       { operationName: "createFeed", additionalContext: { data } },
@@ -110,22 +107,27 @@ export class FeedRepository {
   /**
    * Delete a feed by ID.
    */
-  async deleteFeed(feedId: string, txDb: DB): Promise<number> {
+  async deleteFeed(feedId: string, txDb: DB): Promise<SelectFeed | null> {
     return withErrorHandling(
       async () => {
+        // First, delete related entries in other tables
         await txDb
           .delete(schema.submissionFeeds)
           .where(eq(schema.submissionFeeds.feedId, feedId));
         await txDb
-          .delete(schema.feedRecapsState) // Still need to delete from feedRecapsState here if a feed is deleted
+          .delete(schema.feedRecapsState)
           .where(eq(schema.feedRecapsState.feedId, feedId));
+
+        // Now, delete the feed and return the deleted record
         const result = await txDb
           .delete(schema.feeds)
           .where(eq(schema.feeds.id, feedId))
-          .returning({ id: schema.feeds.id });
-        return result.length;
+          .returning();
+
+        return result.length > 0 ? (result[0] as SelectFeed) : null;
       },
       { operationName: "deleteFeed", additionalContext: { feedId } },
+      null,
     );
   }
 
diff --git a/packages/shared-db/src/repositories/user.repository.ts b/packages/shared-db/src/repositories/user.repository.ts
index 40beadfa..c5cf3931 100644
--- a/packages/shared-db/src/repositories/user.repository.ts
+++ b/packages/shared-db/src/repositories/user.repository.ts
@@ -109,17 +109,25 @@ export class UserRepository {
           }
 
           return newUser;
-        } catch (error: any) {
+        } catch (error: unknown) {
           // Handle unique constraint violations
-          if (error?.code === "23505") {
+          if (
+            error &&
+            typeof error === "object" &&
+            "code" in error &&
+            error.code === "23505"
+          ) {
             // Extract the constraint name to provide a more specific error message
-            const constraintMatch = error.detail?.match(/Key \((.*?)\)=/);
+            const detail =
+              "detail" in error && typeof error.detail === "string"
+                ? error.detail
+                : "";
+            const constraintMatch = detail.match(/Key \((.*?)\)=/);
             const field = constraintMatch ? constraintMatch[1] : "unknown";
 
-            throw new Error(
-              `A user with this ${field} already exists`,
-              error.code,
-            );
+            throw new Error(`A user with this ${field} already exists`, {
+              cause: error,
+            });
           }
           throw error;
         }
diff --git a/packages/shared-db/src/schema/auth.ts b/packages/shared-db/src/schema/auth.ts
new file mode 100644
index 00000000..c2d27799
--- /dev/null
+++ b/packages/shared-db/src/schema/auth.ts
@@ -0,0 +1,45 @@
+import {
+  serial,
+  pgTable as table,
+  text,
+  timestamp,
+  index,
+} from "drizzle-orm/pg-core";
+import { relations } from "drizzle-orm";
+import { users } from "./users";
+import { timestamps } from "./common";
+import { createInsertSchema } from "drizzle-zod";
+import { z } from "zod";
+
+export const authRequests = table(
+  "auth_requests",
+  {
+    id: serial("id").primaryKey(),
+    nonce: text("nonce").notNull().unique(),
+    state: text("state").unique(),
+    accountId: text("account_id").notNull(),
+    expiresAt: timestamp("expires_at", { withTimezone: true }).notNull(),
+    ...timestamps,
+  },
+  (authRequests) => [
+    index("auth_requests_account_id_created_at_idx").on(
+      authRequests.accountId,
+      authRequests.createdAt,
+    ),
+  ],
+);
+
+export const authRequestsRelations = relations(authRequests, ({ one }) => ({
+  user: one(users, {
+    fields: [authRequests.accountId],
+    references: [users.nearAccountId],
+  }),
+}));
+
+export const insertAuthRequestSchema = createInsertSchema(authRequests, {
+  id: z.undefined(),
+  createdAt: z.undefined(),
+  updatedAt: z.undefined(),
+});
+
+export type InsertAuthRequest = z.infer<typeof insertAuthRequestSchema>;
diff --git a/packages/shared-db/src/schema/feeds.ts b/packages/shared-db/src/schema/feeds.ts
index 004ebc64..1d094895 100644
--- a/packages/shared-db/src/schema/feeds.ts
+++ b/packages/shared-db/src/schema/feeds.ts
@@ -1,3 +1,4 @@
+import type { FeedConfig } from "@curatedotfun/types";
 import {
   index,
   jsonb,
@@ -14,110 +15,18 @@ import { z } from "zod";
 import { submissionFeeds } from "./submissions";
 import { moderationHistory } from "./moderation";
 import { users } from "./users";
-
-// Schema for ModerationConfig
-export const ModerationConfigSchema = z.object({
-  approvers: z.record(z.string(), z.array(z.string())).optional(),
-  // Key is the platform identifier,
-  // value is an array of approver usernames or IDs for that platform.
-  blacklist: z.record(z.string(), z.array(z.string())).optional(), // e.g. { "twitter": ["user1", "user2"], "all": ["global_spammer"] }
-
-  // TODO: usernames can change, and so we should root in userIds per platform (on feed creation)
-});
-
-// Schema for TransformConfig (used in StreamConfig, DistributorConfig, RecapConfig)
-export const TransformConfigSchema = z.object({
-  plugin: z.string(), // Name/key of the transformer plugin registered in AppConfig.plugins
-  config: z.record(z.string(), z.any()),
-});
-
-// Schema for DistributorConfig (used in StreamConfig, RecapConfig)
-export const DistributorConfigSchema = z.object({
-  plugin: z.string(), // Name/key of the distributor plugin registered in AppConfig.plugins
-  config: z.record(z.string()), // Config specific to this distributor instance
-  transform: z.array(TransformConfigSchema).optional(), // Per-distributor transforms
-});
-
-// Schema for StreamConfig (part of FeedConfig.outputs)
-export const StreamConfigSchema = z.object({
-  enabled: z.boolean(),
-  transform: z.array(TransformConfigSchema).optional(), // Global transforms for the stream
-  distribute: z.array(DistributorConfigSchema).optional(),
-});
-
-// Schema for RecapConfig (using structure from recap.ts)
-export const RecapConfigSchema = z.object({
-  id: z.string(),
-  name: z.string(),
-  enabled: z.boolean(),
-  schedule: z.string(), // Cron expression or interval
-  timezone: z.string().optional(),
-  transform: z.array(TransformConfigSchema).optional(),
-  batchTransform: z.array(TransformConfigSchema).optional(),
-  distribute: z.array(DistributorConfigSchema).optional(),
-});
-
-// Schema for individual search configuration within a source
-export const SourceSearchConfigSchema = z
-  .object({
-    searchId: z.string(), // Unique ID for this search block to manage its state
-    type: z.string(), // Type of search within the plugin (e.g., "twitter-scraper", "reddit-posts")
-    query: z.string().optional(), // General query string
-    pageSize: z.number().int().positive().optional(),
-    language: z.string().optional(), // e.g., "en", "es"
-    platformArgs: z.record(z.string(), z.any()).optional(),
-    // Allow other dynamic properties
-  })
-  .catchall(z.any());
-
-// Schema for SourceConfig (part of FeedConfig)
-export const SourceConfigSchema = z.object({
-  plugin: z.string(), // Name/key of the source plugin registered in AppConfig.plugins
-  // Config for the source plugin instance itself (e.g., API keys, base URLs)
-  // This 'config' is passed to the plugin's initialize method.
-  config: z.record(z.string(), z.any()).optional(),
-  // Array of search configurations for this source instance in this feed.
-  // Each object defines a specific query/task for the source plugin.
-  search: z.array(SourceSearchConfigSchema),
-});
-
-// Schema for feed ingestion scheduling
-export const IngestionConfigSchema = z.object({
-  enabled: z.boolean().default(false).optional(),
-  schedule: z.string().min(1),
-});
-
-export const FeedConfigSchema = z.object({
-  id: z.string(),
-  name: z.string(),
-  description: z.string(),
-  enabled: z.boolean().optional().default(true),
-  pollingIntervalMs: z.number().int().positive().optional(),
-  moderation: ModerationConfigSchema,
-  sources: z.array(SourceConfigSchema).optional(),
-  ingestion: IngestionConfigSchema.optional(), // Configuration for source ingestion scheduling
-  outputs: z.object({
-    stream: StreamConfigSchema.optional(),
-    recap: z.array(RecapConfigSchema).optional(),
-  }),
-});
-
-export type StreamConfig = z.infer<typeof StreamConfigSchema>;
-export type IngestionConfig = z.infer<typeof IngestionConfigSchema>;
-export type ModerationConfig = z.infer<typeof ModerationConfigSchema>;
-export type TransformConfig = z.infer<typeof TransformConfigSchema>;
-export type DistributorConfig = z.infer<typeof DistributorConfigSchema>;
-export type RecapConfig = z.infer<typeof RecapConfigSchema>;
-export type SourceSearchConfig = z.infer<typeof SourceSearchConfigSchema>;
-export type SourceConfig = z.infer<typeof SourceConfigSchema>;
-export type FeedConfig = z.infer<typeof FeedConfigSchema>;
+import {
+  createInsertSchema,
+  createSelectSchema,
+  createUpdateSchema,
+} from "drizzle-zod";
 
 // Feeds Table
 // Stores the entire feed configuration as JSONB
 export const feeds = table("feeds", {
   id: text("id").primaryKey(), // (hashtag)
   // Store the entire configuration as JSONB
-  config: jsonb("config").$type<FeedConfig>().notNull(),
+  config: jsonb("config").$type<FeedConfig>().notNull(), // This should be FeedConfig
   // Keep these fields for backward compatibility and quick lookups
   name: text("name").notNull(),
   description: text("description"),
@@ -189,3 +98,19 @@ export const feedPlugins = table(
     primaryKey({ columns: [table.feedId, table.pluginId] }), // Ensure one config per plugin per feed
   ],
 );
+
+export const insertFeedSchema = createInsertSchema(feeds, {
+  created_by: z.string().min(1),
+  admins: z.array(z.string()).optional(),
+  createdAt: z.undefined(),
+  updatedAt: z.undefined(),
+});
+
+export const updateFeedSchema = createUpdateSchema(feeds).extend({
+  admins: z.array(z.string()).optional(),
+});
+
+export const selectFeedSchema = createSelectSchema(feeds);
+export type InsertFeed = z.infer<typeof insertFeedSchema>;
+export type UpdateFeed = z.infer<typeof updateFeedSchema>;
+export type SelectFeed = z.infer<typeof selectFeedSchema>;
diff --git a/packages/shared-db/src/schema/index.ts b/packages/shared-db/src/schema/index.ts
index 0663f5ad..1fe41ab6 100644
--- a/packages/shared-db/src/schema/index.ts
+++ b/packages/shared-db/src/schema/index.ts
@@ -6,3 +6,4 @@ export * from "./submissions";
 export * from "./users";
 export * from "./plugins";
 export * from "./moderation";
+export * from "./auth";
diff --git a/packages/shared-db/src/utils.ts b/packages/shared-db/src/utils.ts
index 78ed9512..94ef4da2 100644
--- a/packages/shared-db/src/utils.ts
+++ b/packages/shared-db/src/utils.ts
@@ -27,11 +27,17 @@ export const RETRYABLE_ERROR_CODES = [
 /**
  * Determines if an error is retryable (connection-related)
  */
-export function isRetryableError(error: any): boolean {
-  return RETRYABLE_ERROR_CODES.some(
-    (code) =>
-      error.code === code || (error.original && error.original.code === code),
-  );
+export function isRetryableError(error: unknown): boolean {
+  if (typeof error !== "object" || error === null) return false;
+  const errorAsObject = error as Record<string, unknown>;
+  return RETRYABLE_ERROR_CODES.some((code) => {
+    if (errorAsObject.code === code) return true;
+    if (errorAsObject.original && typeof errorAsObject.original === "object") {
+      const originalError = errorAsObject.original as Record<string, unknown>;
+      if (originalError.code === code) return true;
+    }
+    return false;
+  });
 }
 
 /**
@@ -43,16 +49,21 @@ export const DEFAULT_RETRY_OPTIONS: retry.Options = {
   minTimeout: 100,
   maxTimeout: 3000,
   randomize: true,
-  onRetry: (error: any, attempt: number) => {
+  onRetry: (error: unknown, attempt: number) => {
     const maxRetries = 3; // Same as retries above
     const isLastAttempt = attempt === maxRetries;
+    const message = error instanceof Error ? error.message : String(error);
+    const code =
+      typeof error === "object" && error !== null && "code" in error
+        ? (error as { code: unknown }).code
+        : undefined;
 
     console.warn(
       // TODO: Logger
       `Database operation failed (attempt ${attempt}/${maxRetries})`,
       {
-        error: error.message,
-        code: error.code,
+        error: message,
+        code,
         isLastAttempt,
       },
     );
@@ -76,7 +87,7 @@ export async function executeWithRetry<T>(
   return retry(async (bail) => {
     try {
       return await operation(dbInstance);
-    } catch (error: any) {
+    } catch (error: unknown) {
       if (!isRetryableError(error)) {
         bail(error);
         return Promise.reject(error);
@@ -105,13 +116,18 @@ export async function withErrorHandling<T>(
 ): Promise<T> {
   try {
     return await operation();
-  } catch (error: any) {
+  } catch (error: unknown) {
     const { operationName, errorMessage, additionalContext } = context;
+    const message = error instanceof Error ? error.message : String(error);
+    const code =
+      typeof error === "object" && error !== null && "code" in error
+        ? (error as { code: unknown }).code
+        : undefined;
 
     console.error(`Failed to ${operationName}:`, {
       // TODO: Logger
-      error: error.message,
-      code: error.code,
+      error: message,
+      code,
       ...additionalContext,
     });
 
@@ -119,8 +135,6 @@ export async function withErrorHandling<T>(
       return defaultValue;
     }
 
-    throw new Error(
-      errorMessage || `Failed to ${operationName}: ${error.message}`,
-    );
+    throw new Error(errorMessage || `Failed to ${operationName}: ${message}`);
   }
 }
diff --git a/packages/shared-db/src/validators.ts b/packages/shared-db/src/validators.ts
index a9e3d6eb..28654b40 100644
--- a/packages/shared-db/src/validators.ts
+++ b/packages/shared-db/src/validators.ts
@@ -11,10 +11,6 @@ import type { SelectModerationHistory } from "./schema/moderation";
 export type DB = NodePgDatabase<typeof schema>;
 
 const {
-  activities,
-  userStats,
-  feedUserStats,
-  feeds,
   feedRecapsState,
   feedPlugins,
   submissions,
@@ -22,23 +18,6 @@ const {
   submissionCounts,
 } = schema;
 
-// Feed Schemas and Types
-export const insertFeedSchema = createInsertSchema(feeds, {
-  created_by: z.string().min(1),
-  admins: z.array(z.string()).optional(),
-  createdAt: z.undefined(),
-  updatedAt: z.undefined(),
-});
-
-export const updateFeedSchema = createUpdateSchema(feeds).extend({
-  admins: z.array(z.string()).optional(),
-});
-
-export const selectFeedSchema = createSelectSchema(feeds);
-export type InsertFeed = z.infer<typeof insertFeedSchema>;
-export type UpdateFeed = z.infer<typeof updateFeedSchema>;
-export type SelectFeed = z.infer<typeof selectFeedSchema>;
-
 // FeedRecapsState Schemas and Types
 export const insertFeedRecapStateSchema = createInsertSchema(feedRecapsState, {
   id: z.undefined(),
diff --git a/packages/shared-db/tsconfig.json b/packages/shared-db/tsconfig.json
index 634cd0f6..361029ad 100644
--- a/packages/shared-db/tsconfig.json
+++ b/packages/shared-db/tsconfig.json
@@ -6,6 +6,6 @@
     "baseUrl": "."
   },
   "include": ["src/**/*.ts"],
-  "exclude": ["node_modules", "dist", "tests", "**/*.test.ts", "**/*.spec.ts"]
-  // "references": []
+  "exclude": ["node_modules", "dist", "tests", "**/*.test.ts", "**/*.spec.ts"],
+  "references": [{ "path": "../types" }]
 }
diff --git a/packages/types/src/api/feeds.ts b/packages/types/src/api/feeds.ts
new file mode 100644
index 00000000..7426a893
--- /dev/null
+++ b/packages/types/src/api/feeds.ts
@@ -0,0 +1,69 @@
+import { z } from "zod";
+import { FeedConfig, FeedConfigSchema } from "../config";
+import { ApiSuccessResponseSchema } from "./common";
+
+/**
+ * The request body sent to the API to create a new feed.
+ * It's based on the main FeedConfig, as the client sends the entire configuration object.
+ */
+export const CreateFeedRequestSchema = FeedConfigSchema;
+export type CreateFeedRequest = z.infer<typeof CreateFeedRequestSchema>;
+
+export type CreateFeedConfig = Partial<FeedConfig>;
+
+/**
+ * The request body sent to the API to update an existing feed.
+ * It allows for partial updates of the feed's configuration.
+ */
+export const UpdateFeedRequestSchema = FeedConfigSchema.partial();
+export type UpdateFeedRequest = z.infer<typeof UpdateFeedRequestSchema>;
+
+/**
+ * The standard API response for a single feed, combining the core feed data
+ * with its configuration.
+ */
+export const FeedResponseSchema = z.object({
+  id: z.string(),
+  name: z.string(),
+  description: z.string().nullable(),
+  created_by: z.string().nullable(),
+  admins: z.array(z.string()).nullable(),
+  config: FeedConfigSchema,
+  createdAt: z.preprocess(
+    (arg) => (arg instanceof Date ? arg.toISOString() : arg),
+    z.string().datetime(),
+  ),
+  updatedAt: z.preprocess(
+    (arg) => (arg instanceof Date ? arg.toISOString() : arg),
+    z.string().datetime(),
+  ),
+});
+export type FeedResponse = z.infer<typeof FeedResponseSchema>;
+
+/**
+ * The standard API response for a list of feeds.
+ */
+export const FeedsResponseSchema = z.array(FeedResponseSchema);
+export type FeedsResponse = z.infer<typeof FeedsResponseSchema>;
+
+/**
+ * Wrapped successful response for a single feed.
+ */
+export const FeedWrappedResponseSchema =
+  ApiSuccessResponseSchema(FeedResponseSchema);
+export type FeedWrappedResponse = z.infer<typeof FeedWrappedResponseSchema>;
+
+/**
+ * Wrapped successful response for a list of feeds.
+ */
+export const FeedsWrappedResponseSchema =
+  ApiSuccessResponseSchema(FeedsResponseSchema);
+export type FeedsWrappedResponse = z.infer<typeof FeedsWrappedResponseSchema>;
+
+export const CanModerateResponseSchema = z.object({
+  canModerate: z.boolean(),
+  reason: z.string().optional(),
+  error: z.string().optional(),
+});
+
+export type CanModerateResponse = z.infer<typeof CanModerateResponseSchema>;
diff --git a/packages/types/src/config.ts b/packages/types/src/config.ts
index 983db529..55ba5fb0 100644
--- a/packages/types/src/config.ts
+++ b/packages/types/src/config.ts
@@ -19,7 +19,7 @@ export const TransformConfigSchema = z.object({
 // Schema for DistributorConfig (used in StreamConfig, RecapConfig)
 export const DistributorConfigSchema = z.object({
   plugin: z.string(), // Name/key of the distributor plugin registered in AppConfig.plugins
-  config: z.record(z.string()), // Config specific to this distributor instance
+  config: z.record(z.string(), z.any()), // Config specific to this distributor instance
   transform: z.array(TransformConfigSchema).optional(), // Per-distributor transforms
 });
 
@@ -32,10 +32,10 @@ export const StreamConfigSchema = z.object({
 
 // Schema for RecapConfig (using structure from recap.ts)
 export const RecapConfigSchema = z.object({
-  id: z.string(),
-  name: z.string(),
+  id: z.string().optional(),
+  name: z.string().optional(),
   enabled: z.boolean(),
-  schedule: z.string(), // Cron expression or interval
+  schedule: z.string().optional(),
   timezone: z.string().optional(),
   transform: z.array(TransformConfigSchema).optional(),
   batchTransform: z.array(TransformConfigSchema).optional(),
@@ -76,15 +76,21 @@ export const FeedConfigSchema = z.object({
   id: z.string(),
   name: z.string(),
   description: z.string(),
-  image: z.string().url().optional(),
+  image: z.string().url().or(z.literal("")).optional(),
   enabled: z.boolean().optional().default(true),
+  admins: z.array(z.string()).optional(),
   pollingIntervalMs: z.number().int().positive().optional(),
   moderation: ModerationConfigSchema,
   sources: z.array(SourceConfigSchema).optional(),
   ingestion: IngestionConfigSchema.optional(), // Configuration for source ingestion scheduling
   outputs: z.object({
     stream: StreamConfigSchema.optional(),
-    recap: z.array(RecapConfigSchema).optional(),
+    recap: z
+      .preprocess(
+        (val) => (Array.isArray(val) ? val : val ? [val] : undefined),
+        z.array(RecapConfigSchema).optional(),
+      )
+      .optional(),
   }),
 });
 
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index 983821da..3675dd0c 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -1,7 +1,8 @@
 export * from "./config";
 export * from "./plugin";
-export * from "./domain/submission";
-export * from "./api/activity";
 export * from "./api/common";
 export * from "./api/users";
+export * from "./api/activity";
 export * from "./api/moderation";
+export * from "./api/feeds";
+export * from "./domain/submission";
diff --git a/packages/utils/src/errors.ts b/packages/utils/src/errors.ts
index e29f2bed..b16af61f 100644
--- a/packages/utils/src/errors.ts
+++ b/packages/utils/src/errors.ts
@@ -1,4 +1,7 @@
-import { PluginErrorInterface, PluginErrorContext } from "@curatedotfun/types";
+import type {
+  PluginErrorInterface,
+  PluginErrorContext,
+} from "@curatedotfun/types";
 
 export enum PluginErrorCode {
   // General Plugin Errors
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
index dad0db0e..49bbc161 100644
--- a/packages/utils/src/index.ts
+++ b/packages/utils/src/index.ts
@@ -1,2 +1 @@
-export * from "./plugins/index";
 export * from "./errors";
diff --git a/packages/utils/src/plugins/index.ts b/packages/utils/src/plugins/index.ts
deleted file mode 100644
index 644bcb69..00000000
--- a/packages/utils/src/plugins/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Converts a package name to a normalized remote name by removing the @ symbol
- * and converting / to underscore. This is used for consistent remote package naming
- * in build configurations and package management.
- *
- * @example
- * ```ts
- * getNormalizedRemoteName('@curatedotfun/telegram') // 'curatedotfun_telegram'
- * getNormalizedRemoteName('@org/pkg-name') // 'org_pkg-name'
- * getNormalizedRemoteName('simple-package') // 'simple-package'
- * ```
- *
- * @param packageName - The original package name (e.g. '@scope/package')
- * @returns The normalized remote name (e.g. 'scope_package')
- */
-export function getNormalizedRemoteName(packageName: string): string {
-  return packageName.toLowerCase().replace("@", "").replace("/", "_");
-}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4490405a..bf13f791 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -41,6 +41,9 @@ importers:
       '@curatedotfun/utils':
         specifier: workspace:*
         version: link:../../packages/utils
+      '@fastnear/utils':
+        specifier: ^0.9.7
+        version: 0.9.7
       '@hono/node-server':
         specifier: ^1.8.2
         version: 1.14.4(hono@4.7.11)
@@ -99,8 +102,8 @@ importers:
         specifier: ^5.1.1
         version: 5.1.1(encoding@0.1.13)
       near-sign-verify:
-        specifier: ^0.3.6
-        version: 0.3.6
+        specifier: ^0.4.1
+        version: 0.4.1
       ora:
         specifier: ^8.1.1
         version: 8.2.0
@@ -168,6 +171,9 @@ importers:
       '@crosspost/sdk':
         specifier: ^0.3.0
         version: 0.3.0
+      '@fastnear/utils':
+        specifier: ^0.9.7
+        version: 0.9.7
       '@hookform/resolvers':
         specifier: ^5.0.1
         version: 5.1.1(react-hook-form@7.57.0(react@18.3.1))
@@ -184,13 +190,13 @@ importers:
         specifier: ^2.1.6
         version: 2.1.15(@types/react-dom@18.3.7(@types/react@18.3.23))(@types/react@18.3.23)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-label':
-        specifier: ^2.1.2
+        specifier: ^2.1.7
         version: 2.1.7(@types/react-dom@18.3.7(@types/react@18.3.23))(@types/react@18.3.23)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-popover':
         specifier: ^1.1.6
         version: 1.1.14(@types/react-dom@18.3.7(@types/react@18.3.23))(@types/react@18.3.23)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-progress':
-        specifier: ^1.1.2
+        specifier: ^1.1.7
         version: 1.1.7(@types/react-dom@18.3.7(@types/react@18.3.23))(@types/react@18.3.23)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-select':
         specifier: ^2.2.2
@@ -213,12 +219,21 @@ importers:
       '@tailwindcss/typography':
         specifier: ^0.5.15
         version: 0.5.16(tailwindcss@3.4.17)
+      '@tanstack/react-form':
+        specifier: ^1.12.3
+        version: 1.12.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@tanstack/react-query':
         specifier: ^5.64.1
         version: 5.80.7(react@18.3.1)
       '@tanstack/react-router':
-        specifier: 1.97.0
-        version: 1.97.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        specifier: ^1.121.27
+        version: 1.121.27(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@tanstack/react-table':
+        specifier: ^8.21.3
+        version: 8.21.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@tanstack/zod-form-adapter':
+        specifier: ^0.42.1
+        version: 0.42.1(zod@3.25.62)
       autoprefixer:
         specifier: ^10.4.20
         version: 10.4.21(postcss@8.5.5)
@@ -236,13 +251,19 @@ importers:
         version: 4.1.0
       fastintear:
         specifier: latest
-        version: 0.1.13
+        version: 0.1.14
+      immer:
+        specifier: ^10.1.1
+        version: 10.1.1
+      lodash:
+        specifier: ^4.17.21
+        version: 4.17.21
       lucide-react:
         specifier: ^0.483.0
         version: 0.483.0(react@18.3.1)
       near-sign-verify:
-        specifier: ^0.3.6
-        version: 0.3.6
+        specifier: ^0.4.1
+        version: 0.4.1
       pinata-web3:
         specifier: ^0.5.4
         version: 0.5.4
@@ -278,7 +299,7 @@ importers:
         version: 3.25.62
       zustand:
         specifier: ^5.0.3
-        version: 5.0.5(@types/react@18.3.23)(react@18.3.1)(use-sync-external-store@1.5.0(react@18.3.1))
+        version: 5.0.5(@types/react@18.3.23)(immer@10.1.1)(react@18.3.1)(use-sync-external-store@1.5.0(react@18.3.1))
     devDependencies:
       '@crosspost/types':
         specifier: ^0.3.0
@@ -297,10 +318,13 @@ importers:
         version: 1.1.0(@rsbuild/core@1.1.13)
       '@tanstack/router-devtools':
         specifier: 1.97.23
-        version: 1.97.23(@tanstack/react-router@1.97.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(csstype@3.1.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        version: 1.97.23(@tanstack/react-router@1.121.27(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(csstype@3.1.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@tanstack/router-plugin':
-        specifier: 1.69.1
-        version: 1.69.1(@rsbuild/core@1.1.13)(vite@6.3.5(@types/node@22.15.31)(jiti@1.21.7)(terser@5.42.0)(tsx@4.20.1)(yaml@2.8.0))(webpack@5.99.9)
+        specifier: ^1.121.29
+        version: 1.121.29(@rsbuild/core@1.1.13)(@tanstack/react-router@1.121.27(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(vite@6.3.5(@types/node@22.15.31)(jiti@1.21.7)(terser@5.42.0)(tsx@4.20.1)(yaml@2.8.0))(webpack@5.99.9)
+      '@types/lodash':
+        specifier: ^4.17.16
+        version: 4.17.17
       '@types/react':
         specifier: ^18.3.12
         version: 18.3.23
@@ -350,6 +374,9 @@ importers:
         specifier: ^3.25.42
         version: 3.25.62
     devDependencies:
+      '@curatedotfun/types':
+        specifier: workspace:*
+        version: link:../types
       '@types/async-retry':
         specifier: ^1.4.9
         version: 1.4.9
@@ -2123,28 +2150,42 @@ packages:
     peerDependencies:
       tailwindcss: '>=3.0.0 || insiders || >=4.0.0-alpha.20 || >=4.0.0-beta.1'
 
+  '@tanstack/form-core@0.42.1':
+    resolution: {integrity: sha512-jTU0jyHqFceujdtPNv3jPVej1dTqBwa8TYdIyWB5BCwRVUBZEp1PiYEBkC9r92xu5fMpBiKc+JKud3eeVjuMiA==}
+
+  '@tanstack/form-core@1.12.3':
+    resolution: {integrity: sha512-H59XYP8Jxg8vT4IYIZa1BHkYiyiZqFcLSD2HpxefHP/vlG06/spCySVe/vGAP7IJgHHSAlEqBhQoy1Mg2ruTRA==}
+
   '@tanstack/history@1.121.21':
     resolution: {integrity: sha512-8BFGA7fpElicM1aEfZRDoEiWgMrNb/fVuJjSKv+nYtbp7jdtqt57fROi/uDGf6PLlgJbMoT3GWxqveZisOUEKA==}
     engines: {node: '>=12'}
 
-  '@tanstack/history@1.97.0':
-    resolution: {integrity: sha512-xFdpGJqwSLUJW5TYRNjRO5T41KjGkJeHWyhANZsNJ1KDm7uCVNkfLxNXeCI1XhIFbpzJmk13vo/mY0WJDe0A5g==}
-    engines: {node: '>=12'}
-
   '@tanstack/query-core@5.80.7':
     resolution: {integrity: sha512-s09l5zeUKC8q7DCCCIkVSns8zZrK4ZDT6ryEjxNBFi68G4z2EBobBS7rdOY3r6W1WbUDpc1fe5oY+YO/+2UVUg==}
 
+  '@tanstack/react-form@1.12.3':
+    resolution: {integrity: sha512-IlWLVKizjV+CzMgzaSac61bS4/UeSL2gceGOVIv+gKs2SriDIyylJd8AcqsKE/kNplm1K0NYXIF2Vk/re+JfOg==}
+    peerDependencies:
+      '@tanstack/react-start': ^1.112.0
+      react: ^17.0.0 || ^18.0.0 || ^19.0.0
+      vinxi: ^0.5.0
+    peerDependenciesMeta:
+      '@tanstack/react-start':
+        optional: true
+      vinxi:
+        optional: true
+
   '@tanstack/react-query@5.80.7':
     resolution: {integrity: sha512-u2F0VK6+anItoEvB3+rfvTO9GEh2vb00Je05OwlUe/A0lkJBgW1HckiY3f9YZa+jx6IOe4dHPh10dyp9aY3iRQ==}
     peerDependencies:
       react: ^18 || ^19
 
-  '@tanstack/react-router@1.97.0':
-    resolution: {integrity: sha512-0AJbgh3sfZDJCzhHpNzYomH8/BIwz6PQNrwKc9MPrVax23NdFP8pDvxPC6L4AVMDUBetcvnrrzpHgXJTSCj/fA==}
+  '@tanstack/react-router@1.121.27':
+    resolution: {integrity: sha512-zuLy8IC5fF52fzTTG61nMW2pMoK8LW4kSpeW21deb4gx/kMFKDOaYTe/soT63CO9/x0X6TYcbfjRj67038J0pQ==}
     engines: {node: '>=12'}
     peerDependencies:
-      react: '>=18'
-      react-dom: '>=18'
+      react: '>=18.0.0 || >=19.0.0'
+      react-dom: '>=18.0.0 || >=19.0.0'
 
   '@tanstack/react-store@0.7.1':
     resolution: {integrity: sha512-qUTEKdId6QPWGiWyKAPf/gkN29scEsz6EUSJ0C3HgLMgaqTAyBsQ2sMCfGVcqb+kkhEXAdjleCgH6LAPD6f2sA==}
@@ -2152,6 +2193,13 @@ packages:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
+  '@tanstack/react-table@8.21.3':
+    resolution: {integrity: sha512-5nNMTSETP4ykGegmVkhjcS8tTLW6Vl4axfEGQN3v0zdHYbK4UfoqfPChclTrJ4EoK9QynqAu9oUf8VEmrpZ5Ww==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      react: '>=16.8'
+      react-dom: '>=16.8'
+
   '@tanstack/router-core@1.121.27':
     resolution: {integrity: sha512-6lCQ3p7KhJ8Qy33TPRM6wIkQ1XKaikD5qqx3K2fPr3YtyDNefKQValbSAkb2CBB+hlDodfHNyxemE9alnQr55A==}
     engines: {node: '>=12'}
@@ -2168,18 +2216,24 @@ packages:
     resolution: {integrity: sha512-tIb2w8cno85BPu+7v9IK6eki9LIAWJIEaZJvqOwbdhX+X7LgL8K1xMgIRZfcd4a+7VwJaf66cR/0GzIYlWOggg==}
     engines: {node: '>=12'}
 
-  '@tanstack/router-plugin@1.69.1':
-    resolution: {integrity: sha512-GM7qUwtyUPpC1uP6bgIkK6IipKUfdahv7PUyhyK8JhCsgWiymf8X5LuMwgLIKa6G3qr9Hm0DZnbGaAlirFqYFQ==}
+  '@tanstack/router-plugin@1.121.29':
+    resolution: {integrity: sha512-MFVuYQY89Qilu+OIcKpfgOwXFUbCm5eidwYv1V/JG8HuiOIUcC6kcIm9t2OPyCBeroA3ywJSTvoOWMiHe2ybOw==}
     engines: {node: '>=12'}
     peerDependencies:
       '@rsbuild/core': '>=1.0.2'
-      vite: '>=5.0.0'
+      '@tanstack/react-router': ^1.121.27
+      vite: '>=5.0.0 || >=6.0.0'
+      vite-plugin-solid: ^2.11.2
       webpack: '>=5.92.0'
     peerDependenciesMeta:
       '@rsbuild/core':
         optional: true
+      '@tanstack/react-router':
+        optional: true
       vite:
         optional: true
+      vite-plugin-solid:
+        optional: true
       webpack:
         optional: true
 
@@ -2190,10 +2244,19 @@ packages:
   '@tanstack/store@0.7.1':
     resolution: {integrity: sha512-PjUQKXEXhLYj2X5/6c1Xn/0/qKY0IVFxTJweopRfF26xfjVyb14yALydJrHupDh3/d+1WKmfEgZPBVCmDkzzwg==}
 
+  '@tanstack/table-core@8.21.3':
+    resolution: {integrity: sha512-ldZXEhOBb8Is7xLs01fR3YEc3DERiz5silj8tnGkFZytt1abEvl/GhUmCE0PMLaMPTa3Jk4HbKmRlHmu+gCftg==}
+    engines: {node: '>=12'}
+
   '@tanstack/virtual-file-routes@1.121.21':
     resolution: {integrity: sha512-3nuYsTyaq6ZN7jRZ9z6Gj3GXZqBOqOT0yzd/WZ33ZFfv4yVNIvsa5Lw+M1j3sgyEAxKMqGu/FaNi7FCjr3yOdw==}
     engines: {node: '>=12'}
 
+  '@tanstack/zod-form-adapter@0.42.1':
+    resolution: {integrity: sha512-hPRM0lawVKP64yurW4c6KHZH6altMo2MQN14hfi+GMBTKjO9S7bW1x5LPZ5cayoJE3mBvdlahpSGT5rYZtSbXQ==}
+    peerDependencies:
+      zod: ^3.x
+
   '@types/async-retry@1.4.9':
     resolution: {integrity: sha512-s1ciZQJzRh3708X/m3vPExr5KJlzlZJvXsKpbtE2luqNcbROr64qU+3KpJsYHqWMeaxI839OvXf9PrUSw1Xtyg==}
 
@@ -2432,6 +2495,9 @@ packages:
   '@xtuc/long@4.2.2':
     resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==}
 
+  '@zorsh/zorsh@0.3.3':
+    resolution: {integrity: sha512-Fu+iihpwuWPki/I93Bnocj4wmsDaOIfplzvbWGY1zvkGkvPq7y+npE2/Sub0bJJ0EB2C6fH/JvHkbH9B+9OIDQ==}
+
   accepts@1.3.8:
     resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==}
     engines: {node: '>= 0.6'}
@@ -2832,6 +2898,9 @@ packages:
       supports-color:
         optional: true
 
+  decode-formdata@0.9.0:
+    resolution: {integrity: sha512-q5uwOjR3Um5YD+ZWPOF/1sGHVW9A5rCrRwITQChRXlmPkxDFBqCm4jNTIVdGHNH9OnR+V9MoZVgRhsFb+ARbUw==}
+
   deep-equal@1.0.1:
     resolution: {integrity: sha512-bHtC0iYvWhyaTzvV3CZgPeZQqCOBGyGsVV7v4eevpdkLHfiSrXUdBG+qAuSz4RI70sszvjQ1QSZ98An1yNwpSw==}
 
@@ -2883,6 +2952,9 @@ packages:
   detect-node@2.1.0:
     resolution: {integrity: sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==}
 
+  devalue@5.1.1:
+    resolution: {integrity: sha512-maua5KUiapvEwiEAe+XnlZ3Rh0GD+qI1J/nb9vrJc3muPXvcF/8gXYTWF76+5DAqHyDUtOIImEuo0YKE9mshVw==}
+
   didyoumean@1.2.2:
     resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==}
 
@@ -3232,8 +3304,8 @@ packages:
   fast-uri@3.0.6:
     resolution: {integrity: sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==}
 
-  fastintear@0.1.13:
-    resolution: {integrity: sha512-enWIBztIaGz814HTHtOSr0jHQOAWwY9VIvkE51Ai+M4JMMXiozRoI9K+N70XGoQFch8ntTgehopzXXTpm4X9vA==}
+  fastintear@0.1.14:
+    resolution: {integrity: sha512-fwZsvD8TLlBaMm1yFrltIrhzp1EH2cutiR+80+SozD5ugzmeI1/sEI5qghvBdOi+YPnPiNO90tAVm73rOTAJjg==}
 
   fastq@1.19.1:
     resolution: {integrity: sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==}
@@ -3541,6 +3613,9 @@ packages:
     resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==}
     engines: {node: '>= 4'}
 
+  immer@10.1.1:
+    resolution: {integrity: sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==}
+
   import-fresh@3.3.1:
     resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
     engines: {node: '>=6'}
@@ -3961,8 +4036,8 @@ packages:
   near-api-js@5.1.1:
     resolution: {integrity: sha512-h23BGSKxNv8ph+zU6snicstsVK1/CTXsQz4LuGGwoRE24Hj424nSe4+/1tzoiC285Ljf60kPAqRCmsfv9etF2g==}
 
-  near-sign-verify@0.3.6:
-    resolution: {integrity: sha512-HL52BZGLeRNV+BDSF1YtRFMAHv0K0u4rYrVnIrt/ur30bLv9i0qJiCKdT55WYMenZt3GWemwD1CYIgCTbcREYQ==}
+  near-sign-verify@0.4.1:
+    resolution: {integrity: sha512-yQzYUetcv/KjOf7/GIqAfLsy6bQktJyRJQp6i9DCTgVL9jjMHtCD/e5EBqPYSI5iSdPGQ7a/GAcFDvvtV4X7mw==}
 
   negotiator@0.6.3:
     resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
@@ -4969,9 +5044,9 @@ packages:
     resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
     engines: {node: '>= 0.8'}
 
-  unplugin@1.16.1:
-    resolution: {integrity: sha512-4/u/j4FrCKdi17jaxuJA0jClGxB1AvU2hw/IuayPc4ay1XGaJs/rbb4v5WKwAjNifjmXK9PIFyuPiaK8azyR9w==}
-    engines: {node: '>=14.0.0'}
+  unplugin@2.3.5:
+    resolution: {integrity: sha512-RyWSb5AHmGtjjNQ6gIlA67sHOsWpsbWpwDokLwTcejVdOjEkJZh7QKu14J00gDDVSh8kGH4KYC/TNBceXFZhtw==}
+    engines: {node: '>=18.12.0'}
 
   upath@2.0.1:
     resolution: {integrity: sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==}
@@ -6986,21 +7061,38 @@ snapshots:
       postcss-selector-parser: 6.0.10
       tailwindcss: 3.4.17
 
-  '@tanstack/history@1.121.21': {}
+  '@tanstack/form-core@0.42.1':
+    dependencies:
+      '@tanstack/store': 0.7.1
 
-  '@tanstack/history@1.97.0': {}
+  '@tanstack/form-core@1.12.3':
+    dependencies:
+      '@tanstack/store': 0.7.1
+
+  '@tanstack/history@1.121.21': {}
 
   '@tanstack/query-core@5.80.7': {}
 
+  '@tanstack/react-form@1.12.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+    dependencies:
+      '@tanstack/form-core': 1.12.3
+      '@tanstack/react-store': 0.7.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      decode-formdata: 0.9.0
+      devalue: 5.1.1
+      react: 18.3.1
+    transitivePeerDependencies:
+      - react-dom
+
   '@tanstack/react-query@5.80.7(react@18.3.1)':
     dependencies:
       '@tanstack/query-core': 5.80.7
       react: 18.3.1
 
-  '@tanstack/react-router@1.97.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@tanstack/react-router@1.121.27(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@tanstack/history': 1.97.0
+      '@tanstack/history': 1.121.21
       '@tanstack/react-store': 0.7.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@tanstack/router-core': 1.121.27
       jsesc: 3.1.0
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
@@ -7014,15 +7106,21 @@ snapshots:
       react-dom: 18.3.1(react@18.3.1)
       use-sync-external-store: 1.5.0(react@18.3.1)
 
+  '@tanstack/react-table@8.21.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+    dependencies:
+      '@tanstack/table-core': 8.21.3
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+
   '@tanstack/router-core@1.121.27':
     dependencies:
       '@tanstack/history': 1.121.21
       '@tanstack/store': 0.7.1
       tiny-invariant: 1.3.3
 
-  '@tanstack/router-devtools@1.97.23(@tanstack/react-router@1.97.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(csstype@3.1.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@tanstack/router-devtools@1.97.23(@tanstack/react-router@1.121.27(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(csstype@3.1.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@tanstack/react-router': 1.97.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@tanstack/react-router': 1.121.27(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       clsx: 2.1.1
       goober: 2.1.16(csstype@3.1.3)
       react: 18.3.1
@@ -7043,28 +7141,25 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@tanstack/router-plugin@1.69.1(@rsbuild/core@1.1.13)(vite@6.3.5(@types/node@22.15.31)(jiti@1.21.7)(terser@5.42.0)(tsx@4.20.1)(yaml@2.8.0))(webpack@5.99.9)':
+  '@tanstack/router-plugin@1.121.29(@rsbuild/core@1.1.13)(@tanstack/react-router@1.121.27(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(vite@6.3.5(@types/node@22.15.31)(jiti@1.21.7)(terser@5.42.0)(tsx@4.20.1)(yaml@2.8.0))(webpack@5.99.9)':
     dependencies:
       '@babel/core': 7.27.4
-      '@babel/generator': 7.27.5
-      '@babel/parser': 7.27.5
       '@babel/plugin-syntax-jsx': 7.27.1(@babel/core@7.27.4)
       '@babel/plugin-syntax-typescript': 7.27.1(@babel/core@7.27.4)
       '@babel/template': 7.27.2
       '@babel/traverse': 7.27.4
       '@babel/types': 7.27.6
+      '@tanstack/router-core': 1.121.27
       '@tanstack/router-generator': 1.121.27
+      '@tanstack/router-utils': 1.121.21
       '@tanstack/virtual-file-routes': 1.121.21
-      '@types/babel__core': 7.20.5
-      '@types/babel__generator': 7.27.0
-      '@types/babel__template': 7.4.4
-      '@types/babel__traverse': 7.20.7
       babel-dead-code-elimination: 1.0.10
       chokidar: 3.6.0
-      unplugin: 1.16.1
+      unplugin: 2.3.5
       zod: 3.25.62
     optionalDependencies:
       '@rsbuild/core': 1.1.13
+      '@tanstack/react-router': 1.121.27(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       vite: 6.3.5(@types/node@22.15.31)(jiti@1.21.7)(terser@5.42.0)(tsx@4.20.1)(yaml@2.8.0)
       webpack: 5.99.9
     transitivePeerDependencies:
@@ -7083,8 +7178,15 @@ snapshots:
 
   '@tanstack/store@0.7.1': {}
 
+  '@tanstack/table-core@8.21.3': {}
+
   '@tanstack/virtual-file-routes@1.121.21': {}
 
+  '@tanstack/zod-form-adapter@0.42.1(zod@3.25.62)':
+    dependencies:
+      '@tanstack/form-core': 0.42.1
+      zod: 3.25.62
+
   '@types/async-retry@1.4.9':
     dependencies:
       '@types/retry': 0.12.5
@@ -7425,6 +7527,8 @@ snapshots:
 
   '@xtuc/long@4.2.2': {}
 
+  '@zorsh/zorsh@0.3.3': {}
+
   accepts@1.3.8:
     dependencies:
       mime-types: 2.1.35
@@ -7820,6 +7924,8 @@ snapshots:
     dependencies:
       ms: 2.1.3
 
+  decode-formdata@0.9.0: {}
+
   deep-equal@1.0.1: {}
 
   deep-is@0.1.4: {}
@@ -7857,6 +7963,8 @@ snapshots:
 
   detect-node@2.1.0: {}
 
+  devalue@5.1.1: {}
+
   didyoumean@1.2.2: {}
 
   diff@8.0.2: {}
@@ -8227,7 +8335,7 @@ snapshots:
 
   fast-uri@3.0.6: {}
 
-  fastintear@0.1.13:
+  fastintear@0.1.14:
     dependencies:
       '@fastnear/utils': 0.9.7
       '@noble/curves': 1.9.2
@@ -8557,6 +8665,8 @@ snapshots:
 
   ignore@7.0.5: {}
 
+  immer@10.1.1: {}
+
   import-fresh@3.3.1:
     dependencies:
       parent-module: 1.0.1
@@ -8953,13 +9063,12 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
-  near-sign-verify@0.3.6:
+  near-sign-verify@0.4.1:
     dependencies:
-      '@fastnear/utils': 0.9.7
       '@noble/curves': 1.9.2
       '@noble/hashes': 1.8.0
-      borsh: 2.0.0
-      zod: 3.25.62
+      '@scure/base': 1.2.6
+      '@zorsh/zorsh': 0.3.3
 
   negotiator@0.6.3: {}
 
@@ -9994,9 +10103,10 @@ snapshots:
 
   unpipe@1.0.0: {}
 
-  unplugin@1.16.1:
+  unplugin@2.3.5:
     dependencies:
       acorn: 8.15.0
+      picomatch: 4.0.2
       webpack-virtual-modules: 0.6.2
 
   upath@2.0.1: {}
@@ -10288,8 +10398,9 @@ snapshots:
 
   zod@3.25.62: {}
 
-  zustand@5.0.5(@types/react@18.3.23)(react@18.3.1)(use-sync-external-store@1.5.0(react@18.3.1)):
+  zustand@5.0.5(@types/react@18.3.23)(immer@10.1.1)(react@18.3.1)(use-sync-external-store@1.5.0(react@18.3.1)):
     optionalDependencies:
       '@types/react': 18.3.23
+      immer: 10.1.1
       react: 18.3.1
       use-sync-external-store: 1.5.0(react@18.3.1)
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 3ff5faaa..e9cea57a 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,3 +1,7 @@
 packages:
-  - "apps/*"
-  - "packages/*"
+  - apps/*
+  - packages/*
+onlyBuiltDependencies:
+  - core-js
+  - esbuild
+  - secp256k1
diff --git a/scripts/dev.sh b/scripts/dev.sh
index 71725822..406868fd 100755
--- a/scripts/dev.sh
+++ b/scripts/dev.sh
@@ -39,7 +39,7 @@ trap cleanup SIGINT SIGTERM EXIT
 # Set DATABASE_URL environment variable for the dev process
 export DATABASE_URL="postgresql://postgres:postgres@localhost:5432/curatedotfun"
 
-echo "Running pnpm install for monorepo dependencies (if not already done)..."
+echo "Installing packages..."
 pnpm install # Ensure all host dependencies are installed for turbo to work, and for db scripts when volume is mounted.
 
 if [ "$SKIP_DB" = true ]; then