@@ -17,14 +17,24 @@ import SurveyImageUpload from "./SurveyImageUpload";
 const surveySchema = z.object({
   title: z.string().min(1, "Title is required").max(255, "Title too long"),
   description: z.string().min(1, "Description is required"),
-  survey_url: z.string().url("Must be a valid URL"),
+  is_external: z.boolean().default(false),
+  survey_url: z.string().optional(),
   type: z.enum(["general", "feedback", "satisfaction", "research", "onboarding"]),
   image_url: z.string().optional(),
   target_audience: z.enum(["all", "codev", "intern", "hr", "admin"]),
   priority: z.number().min(1).max(100),
   is_active: z.boolean(),
   start_date: z.string(),
   end_date: z.string().optional(),
+}).refine((data) => {
+  // If external survey, survey_url is required and must be valid
+  if (data.is_external) {
+    return data.survey_url && z.string().url().safeParse(data.survey_url).success;
+  }
+  return true;
+}, {
+  message: "Survey URL is required for external surveys",
+  path: ["survey_url"],
 });
 
 type SurveyFormData = z.infer<typeof surveySchema>;
@@ -33,7 +43,8 @@ interface Survey {
   id: string;
   title: string;
   description: string;
-  survey_url: string;
+  is_external: boolean;
+  survey_url?: string;
   type: "general" | "feedback" | "satisfaction" | "research" | "onboarding";
   image_url?: string;
   target_audience: "all" | "codev" | "intern" | "hr" | "admin";
@@ -64,6 +75,7 @@ export default function SurveyForm({ survey, onSuccess }: SurveyFormProps) {
     defaultValues: {
       title: survey?.title || "",
       description: survey?.description || "",
+      is_external: survey?.is_external ?? false,
       survey_url: survey?.survey_url || "",
       type: survey?.type || "general",
       image_url: survey?.image_url || "",
@@ -76,6 +88,7 @@ export default function SurveyForm({ survey, onSuccess }: SurveyFormProps) {
   });
 
   const isActive = watch("is_active");
+  const isExternal = watch("is_external");
 
   const onSubmit = async (data: SurveyFormData) => {
     setLoading(true);
@@ -85,7 +98,8 @@ export default function SurveyForm({ survey, onSuccess }: SurveyFormProps) {
       const surveyData = {
         title: data.title,
         description: data.description,
-        survey_url: data.survey_url,
+        is_external: data.is_external,
+        survey_url: data.is_external ? data.survey_url : null,
         type: data.type,
         image_url: data.image_url || null,
         target_audience: data.target_audience,
@@ -130,6 +144,26 @@ export default function SurveyForm({ survey, onSuccess }: SurveyFormProps) {
 
   return (
     <form onSubmit={handleSubmit(onSubmit)} className="space-y-6">
+      {/* Survey Type Toggle */}
+      <div className="flex items-center space-x-2 p-4 bg-gray-50 dark:bg-gray-800/50 rounded-lg border border-gray-200 dark:border-gray-700">
+        <Switch
+          id="is_external"
+          checked={isExternal}
+          onCheckedChange={(checked) => setValue("is_external", checked)}
+          className="data-[state=checked]:bg-customViolet-100 dark:[&>span]:bg-foreground [&>span]:bg-muted-foreground"
+        />
+        <div className="flex-1">
+          <Label htmlFor="is_external" className="text-foreground dark:text-gray-300 font-medium">
+            External Survey
+          </Label>
+          <p className="text-sm text-gray-500 dark:text-gray-400">
+            {isExternal
+              ? "Link to external survey (Google Forms, Typeform, etc.)"
+              : "Build survey with questions directly in the app"}
+          </p>
+        </div>
+      </div>
+
       <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
         <div className="space-y-2">
           <Label htmlFor="title" className="text-foreground dark:text-gray-300">Title *</Label>
@@ -145,19 +179,21 @@ export default function SurveyForm({ survey, onSuccess }: SurveyFormProps) {
           )}
         </div>
 
-        <div className="space-y-2">
-          <Label htmlFor="survey_url" className="text-foreground dark:text-gray-300">Survey URL *</Label>
-          <Input
-            id="survey_url"
-            variant="lightgray"
-            {...register("survey_url")}
-            placeholder="https://forms.google.com/..."
-            className="rounded"
-          />
-          {errors.survey_url && (
-            <p className="text-sm text-red-600 dark:text-red-400">{errors.survey_url.message}</p>
-          )}
-        </div>
+        {isExternal && (
+          <div className="space-y-2">
+            <Label htmlFor="survey_url" className="text-foreground dark:text-gray-300">Survey URL *</Label>
+            <Input
+              id="survey_url"
+              variant="lightgray"
+              {...register("survey_url")}
+              placeholder="https://forms.google.com/..."
+              className="rounded"
+            />
+            {errors.survey_url && (
+              <p className="text-sm text-red-600 dark:text-red-400">{errors.survey_url.message}</p>
+            )}
+          </div>
+        )}
       </div>
 
       <div className="space-y-2">
 
@@ -13,7 +13,8 @@ interface Survey {
   id: string;
   title: string;
   description: string;
-  survey_url: string;
+  is_external: boolean;
+  survey_url?: string;
   type: "general" | "feedback" | "satisfaction" | "research" | "onboarding";
   image_url?: string;
   target_audience: "all" | "codev" | "intern" | "hr" | "admin";
@@ -253,17 +254,26 @@ export default function SurveysPage() {
                     <p className="text-gray-600 dark:text-gray-300 mb-3">
                       {survey.description}
                     </p>
-                    <div className="flex items-center gap-2 mb-3">
-                      <a
-                        href={survey.survey_url}
-                        target="_blank"
-                        rel="noopener noreferrer"
-                        className="text-sm text-blue-600 dark:text-blue-400 hover:underline flex items-center gap-1"
-                      >
-                        <ExternalLink className="h-3 w-3" />
-                        View Survey
-                      </a>
-                    </div>
+                    {survey.is_external && survey.survey_url && (
+                      <div className="flex items-center gap-2 mb-3">
+                        <a
+                          href={survey.survey_url}
+                          target="_blank"
+                          rel="noopener noreferrer"
+                          className="text-sm text-blue-600 dark:text-blue-400 hover:underline flex items-center gap-1"
+                        >
+                          <ExternalLink className="h-3 w-3" />
+                          View External Survey
+                        </a>
+                      </div>
+                    )}
+                    {!survey.is_external && (
+                      <div className="flex items-center gap-2 mb-3">
+                        <span className="text-sm text-gray-600 dark:text-gray-400 flex items-center gap-1">
+                          📋 In-App Survey
+                        </span>
+                      </div>
+                    )}
                     <div className="text-xs text-gray-500 dark:text-gray-400 space-y-1">
                       <div>Created: {formatDate(survey.start_date)}</div>
                       {survey.end_date && (
 
@@ -0,0 +1,223 @@
+"use server";
+
+import { createClientServerComponent } from "@/utils/supabase/server";
+import { z } from "zod";
+
+// Schema for question settings
+const questionSettingsSchema = z.object({
+  required: z.boolean().default(false),
+  placeholder: z.string().optional(),
+  min_rating: z.number().optional(),
+  max_rating: z.number().optional(),
+  allow_other: z.boolean().optional(),
+});
+
+// Schema for creating/updating a question
+const questionSchema = z.object({
+  question_text: z.string().min(1, "Question text is required"),
+  description: z.string().optional(),
+  question_type: z.enum([
+    "text",
+    "textarea",
+    "multiple_choice",
+    "checkbox",
+    "rating",
+    "date",
+    "email",
+    "number"
+  ]),
+  options: z.array(z.string()).default([]),
+  settings: questionSettingsSchema.default({ required: false }),
+  order_index: z.number().default(0),
+});
+
+export async function createQuestion(surveyId: string, formData: z.infer<typeof questionSchema>) {
+  try {
+    const validatedData = questionSchema.parse(formData);
+    const supabase = await createClientServerComponent();
+
+    // Verify user is admin
+    const { data: user, error: userError } = await supabase.auth.getUser();
+    if (userError || !user.user) {
+      return { error: "Authentication required" };
+    }
+
+    const { data: userRole, error: roleError } = await supabase
+      .from("codev")
+      .select("role_id")
+      .eq("id", user.user.id)
+      .single();
+
+    if (roleError || userRole?.role_id !== 1) {
+      return { error: "Admin access required" };
+    }
+
+    const { data, error } = await supabase
+      .from("survey_questions")
+      .insert({
+        survey_id: surveyId,
+        question_text: validatedData.question_text,
+        description: validatedData.description,
+        question_type: validatedData.question_type,
+        options: validatedData.options,
+        settings: validatedData.settings,
+        order_index: validatedData.order_index,
+      })
+      .select()
+      .single();
+
+    if (error) {
+      return { error: error.message };
+    }
+
+    return { data, success: true };
+  } catch (error) {
+    if (error instanceof z.ZodError) {
+      return { error: error.errors[0].message };
+    }
+    return { error: "Failed to create question" };
+  }
+}
+
+export async function updateQuestion(
+  questionId: string,
+  formData: z.infer<typeof questionSchema>
+) {
+  try {
+    const validatedData = questionSchema.parse(formData);
+    const supabase = await createClientServerComponent();
+
+    // Verify user is admin
+    const { data: user, error: userError } = await supabase.auth.getUser();
+    if (userError || !user.user) {
+      return { error: "Authentication required" };
+    }
+
+    const { data: userRole, error: roleError } = await supabase
+      .from("codev")
+      .select("role_id")
+      .eq("id", user.user.id)
+      .single();
+
+    if (roleError || userRole?.role_id !== 1) {
+      return { error: "Admin access required" };
+    }
+
+    const { data, error } = await supabase
+      .from("survey_questions")
+      .update({
+        question_text: validatedData.question_text,
+        description: validatedData.description,
+        question_type: validatedData.question_type,
+        options: validatedData.options,
+        settings: validatedData.settings,
+        order_index: validatedData.order_index,
+        updated_at: new Date().toISOString(),
+      })
+      .eq("id", questionId)
+      .select()
+      .single();
+
+    if (error) {
+      return { error: error.message };
+    }
+
+    return { data, success: true };
+  } catch (error) {
+    if (error instanceof z.ZodError) {
+      return { error: error.errors[0].message };
+    }
+    return { error: "Failed to update question" };
+  }
+}
+
+export async function deleteQuestion(questionId: string) {
+  try {
+    const supabase = await createClientServerComponent();
+
+    // Verify user is admin
+    const { data: user, error: userError } = await supabase.auth.getUser();
+    if (userError || !user.user) {
+      return { error: "Authentication required" };
+    }
+
+    const { data: userRole, error: roleError } = await supabase
+      .from("codev")
+      .select("role_id")
+      .eq("id", user.user.id)
+      .single();
+
+    if (roleError || userRole?.role_id !== 1) {
+      return { error: "Admin access required" };
+    }
+
+    const { error } = await supabase
+      .from("survey_questions")
+      .delete()
+      .eq("id", questionId);
+
+    if (error) {
+      return { error: error.message };
+    }
+
+    return { success: true };
+  } catch (error) {
+    return { error: "Failed to delete question" };
+  }
+}
+
+export async function getSurveyQuestions(surveyId: string) {
+  try {
+    const supabase = await createClientServerComponent();
+
+    const { data, error } = await supabase
+      .from("survey_questions")
+      .select("*")
+      .eq("survey_id", surveyId)
+      .order("order_index", { ascending: true });
+
+    if (error) {
+      return { error: error.message };
+    }
+
+    return { data: data || [], success: true };
+  } catch (error) {
+    return { error: "Failed to fetch questions" };
+  }
+}
+
+export async function reorderQuestions(updates: Array<{ id: string; order_index: number }>) {
+  try {
+    const supabase = await createClientServerComponent();
+
+    // Verify user is admin
+    const { data: user, error: userError } = await supabase.auth.getUser();
+    if (userError || !user.user) {
+      return { error: "Authentication required" };
+    }
+
+    const { data: userRole, error: roleError } = await supabase
+      .from("codev")
+      .select("role_id")
+      .eq("id", user.user.id)
+      .single();
+
+    if (roleError || userRole?.role_id !== 1) {
+      return { error: "Admin access required" };
+    }
+
+    // Update all questions
+    const updatePromises = updates.map(({ id, order_index }) =>
+      supabase
+        .from("survey_questions")
+        .update({ order_index })
+        .eq("id", id)
+    );
+
+    await Promise.all(updatePromises);
+
+    return { success: true };
+  } catch (error) {
+    return { error: "Failed to reorder questions" };
+  }
+}