diff --git a/web/app/equipment/list/page.tsx b/web/app/equipment/list/page.tsx
index 704773e..54c4f2c 100644
--- a/web/app/equipment/list/page.tsx
+++ b/web/app/equipment/list/page.tsx
@@ -92,7 +92,7 @@ export default function EquipmentListPage() {
                     </p>
                 </div>
                 <Link
-                    href="/equipment"
+                    href="/equipment/register"
                     className="flex items-center gap-2 px-4 py-2.5 rounded-lg bg-[hsl(var(--primary))] text-[hsl(var(--primary-foreground))] text-sm font-medium hover:opacity-90 transition-opacity"
                 >
                     <Plus className="w-4 h-4" />
diff --git a/web/app/equipment/page.tsx b/web/app/equipment/page.tsx
index a54492e..5a38845 100644
--- a/web/app/equipment/page.tsx
+++ b/web/app/equipment/page.tsx
@@ -1,539 +1,11 @@
 "use client";
 
-import { useState } from "react";
-import { cn } from "@/lib/utils";
-import { registerEquipment, type UserIdentity } from "@/lib/api-client";
-import { useAuth } from "@/lib/auth-context";
-import {
-    ChevronRight,
-    ChevronLeft,
-    Check,
-    Cpu,
-    Database,
-    Columns3,
-    Target,
-    AlertTriangle,
-    Gauge,
-    Loader2,
-} from "lucide-react";
-
-const STEPS = [
-    { id: 1, label: "Equipment Metadata", icon: Cpu },
-    { id: 2, label: "Data Source", icon: Database },
-    { id: 3, label: "Schema Definition", icon: Columns3 },
-    { id: 4, label: "Features & Targets", icon: Target },
-    { id: 5, label: "Outlier Rules & DT Mode", icon: AlertTriangle },
-    { id: 6, label: "Review & Submit", icon: Check },
-];
-
-interface FormData {
-    // Step 1
-    name: string;
-    domain_id: string;
-    equipment_model: string;
-    location: string;
-    description: string;
-    // Step 2
-    source_type: string;
-    connection_host: string;
-    connection_port: string;
-    connection_database: string;
-    // Step 3
-    columns: { name: string; type: string; unit: string }[];
-    // Step 4
-    features: string[];
-    primary_target: string;
-    primary_objective: string;
-    secondary_target: string;
-    secondary_objective: string;
-    // Step 5
-    outlier_method: string;
-    outlier_threshold: string;
-    dt_mode: string;
-}
-
-const INITIAL_DATA: FormData = {
-    name: "",
-    domain_id: "",
-    equipment_model: "",
-    location: "",
-    description: "",
-    source_type: "postgresql",
-    connection_host: "",
-    connection_port: "5432",
-    connection_database: "",
-    columns: [
-        { name: "", type: "float", unit: "" },
-        { name: "", type: "float", unit: "" },
-    ],
-    features: [],
-    primary_target: "",
-    primary_objective: "maximize",
-    secondary_target: "",
-    secondary_objective: "minimize",
-    outlier_method: "zscore",
-    outlier_threshold: "3.0",
-    dt_mode: "full",
-};
-
-export default function EquipmentPage() {
-    const { user } = useAuth();
-    const [currentStep, setCurrentStep] = useState(1);
-    const [formData, setFormData] = useState<FormData>(INITIAL_DATA);
-    const [submitting, setSubmitting] = useState(false);
-    const [submitResult, setSubmitResult] = useState<{ status: string; message: string } | null>(null);
-
-    const updateField = (field: keyof FormData, value: unknown) => {
-        setFormData((prev) => ({ ...prev, [field]: value }));
-    };
-
-    const addColumn = () => {
-        setFormData((prev) => ({
-            ...prev,
-            columns: [...prev.columns, { name: "", type: "float", unit: "" }],
-        }));
-    };
-
-    const updateColumn = (index: number, field: string, value: string) => {
-        setFormData((prev) => {
-            const cols = [...prev.columns];
-            cols[index] = { ...cols[index], [field]: value };
-            return { ...prev, columns: cols };
-        });
-    };
-
-    const removeColumn = (index: number) => {
-        setFormData((prev) => ({
-            ...prev,
-            columns: prev.columns.filter((_, i) => i !== index),
-        }));
-    };
-
-    const handleSubmit = async () => {
-        setSubmitting(true);
-        setSubmitResult(null);
-
-        // Auto-populate ownership from the authenticated user
-        const identity: UserIdentity = { id: user.id, organization: user.organization, role: user.role };
-        const payload = { ...formData, owner_id: user.id, owner_org: user.organization };
-        const result = await registerEquipment(payload, identity);
-
-        if (result) {
-            setSubmitResult({ status: "success", message: result.message });
-        } else {
-            setSubmitResult({
-                status: "error",
-                message: "Registration failed. Is the FastAPI server running?",
-            });
-        }
-        setSubmitting(false);
-    };
-
-    const renderInputField = (
-        label: string,
-        field: keyof FormData,
-        placeholder: string,
-        type: string = "text"
-    ) => (
-        <div>
-            <label className="block text-sm font-medium mb-1.5">{label}</label>
-            <input
-                type={type}
-                value={formData[field] as string}
-                onChange={(e) => updateField(field, e.target.value)}
-                placeholder={placeholder}
-                className="w-full px-3 py-2 rounded-lg border border-[hsl(var(--border))] bg-[hsl(var(--background))] text-sm focus:outline-none focus:ring-2 focus:ring-[hsl(var(--ring))]"
-            />
-        </div>
-    );
-
-    const renderStep = () => {
-        switch (currentStep) {
-            case 1:
-                return (
-                    <div className="space-y-4">
-                        <h3 className="text-lg font-semibold">Equipment Metadata</h3>
-                        <p className="text-sm text-[hsl(var(--muted-foreground))]">
-                            Provide basic information about the equipment being registered.
-                        </p>
-                        <div className="grid grid-cols-1 md:grid-cols-2 gap-4 mt-4">
-                            {renderInputField("Equipment Name", "name", "e.g., ICP Etcher")}
-                            {renderInputField("Domain ID", "domain_id", "e.g., etcher (lowercase, no spaces)")}
-                            {renderInputField("Equipment Model", "equipment_model", "e.g., PlasmaTherm Apex SLR")}
-                            {renderInputField("Location", "location", "e.g., Birck Cleanroom Room 1234")}
-                        </div>
-                        <div>
-                            <label className="block text-sm font-medium mb-1.5">Description</label>
-                            <textarea
-                                value={formData.description}
-                                onChange={(e) => updateField("description", e.target.value)}
-                                placeholder="Brief description of what this equipment does and what the digital twin will optimize"
-                                rows={3}
-                                className="w-full px-3 py-2 rounded-lg border border-[hsl(var(--border))] bg-[hsl(var(--background))] text-sm focus:outline-none focus:ring-2 focus:ring-[hsl(var(--ring))] resize-none"
-                            />
-                        </div>
-                    </div>
-                );
-
-            case 2:
-                return (
-                    <div className="space-y-4">
-                        <h3 className="text-lg font-semibold">Data Source Configuration</h3>
-                        <p className="text-sm text-[hsl(var(--muted-foreground))]">
-                            Configure how the platform connects to your equipment&apos;s data source.
-                        </p>
-                        <div>
-                            <label className="block text-sm font-medium mb-1.5">Source Type</label>
-                            <select
-                                value={formData.source_type}
-                                onChange={(e) => updateField("source_type", e.target.value)}
-                                className="w-full px-3 py-2 rounded-lg border border-[hsl(var(--border))] bg-[hsl(var(--background))] text-sm focus:outline-none focus:ring-2 focus:ring-[hsl(var(--ring))]"
-                            >
-                                <option value="postgresql">PostgreSQL</option>
-                                <option value="mysql">MySQL</option>
-                                <option value="csv_upload">CSV File Upload</option>
-                                <option value="api">REST API</option>
-                            </select>
-                        </div>
-                        {(formData.source_type === "postgresql" ||
-                            formData.source_type === "mysql") && (
-                                <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
-                                    {renderInputField("Host", "connection_host", "db.example.com")}
-                                    {renderInputField("Port", "connection_port", "5432")}
-                                    {renderInputField("Database Name", "connection_database", "etcher_db")}
-                                </div>
-                            )}
-                    </div>
-                );
-
-            case 3:
-                return (
-                    <div className="space-y-4">
-                        <h3 className="text-lg font-semibold">Schema Definition</h3>
-                        <p className="text-sm text-[hsl(var(--muted-foreground))]">
-                            Define the columns in your dataset. These will become available as features or targets.
-                        </p>
-                        <div className="space-y-3">
-                            {formData.columns.map((col, i) => (
-                                <div key={i} className="flex items-center gap-3">
-                                    <input
-                                        type="text"
-                                        value={col.name}
-                                        onChange={(e) => updateColumn(i, "name", e.target.value)}
-                                        placeholder="Column name"
-                                        className="flex-1 px-3 py-2 rounded-lg border border-[hsl(var(--border))] bg-[hsl(var(--background))] text-sm focus:outline-none focus:ring-2 focus:ring-[hsl(var(--ring))]"
-                                    />
-                                    <select
-                                        value={col.type}
-                                        onChange={(e) => updateColumn(i, "type", e.target.value)}
-                                        className="px-3 py-2 rounded-lg border border-[hsl(var(--border))] bg-[hsl(var(--background))] text-sm focus:outline-none focus:ring-2 focus:ring-[hsl(var(--ring))]"
-                                    >
-                                        <option value="float">Float</option>
-                                        <option value="integer">Integer</option>
-                                        <option value="string">String</option>
-                                        <option value="datetime">DateTime</option>
-                                        <option value="boolean">Boolean</option>
-                                    </select>
-                                    <input
-                                        type="text"
-                                        value={col.unit}
-                                        onChange={(e) => updateColumn(i, "unit", e.target.value)}
-                                        placeholder="Unit (e.g., W, sccm)"
-                                        className="w-36 px-3 py-2 rounded-lg border border-[hsl(var(--border))] bg-[hsl(var(--background))] text-sm focus:outline-none focus:ring-2 focus:ring-[hsl(var(--ring))]"
-                                    />
-                                    <button
-                                        onClick={() => removeColumn(i)}
-                                        className="text-red-500 hover:text-red-400 text-sm px-2"
-                                    >
-                                        ✕
-                                    </button>
-                                </div>
-                            ))}
-                        </div>
-                        <button
-                            onClick={addColumn}
-                            className="text-sm text-[hsl(var(--primary))] hover:underline"
-                        >
-                            + Add Column
-                        </button>
-                    </div>
-                );
-
-            case 4:
-                return (
-                    <div className="space-y-4">
-                        <h3 className="text-lg font-semibold">Features & Targets</h3>
-                        <p className="text-sm text-[hsl(var(--muted-foreground))]">
-                            Designate which columns are ML features (inputs) and which are optimization targets (outputs).
-                        </p>
-                        <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
-                            <div className="space-y-3">
-                                <h4 className="font-medium text-sm">Primary Target</h4>
-                                {renderInputField("Column Name", "primary_target", "e.g., AvgEtchRate")}
-                                <div>
-                                    <label className="block text-sm font-medium mb-1.5">Objective</label>
-                                    <select
-                                        value={formData.primary_objective}
-                                        onChange={(e) => updateField("primary_objective", e.target.value)}
-                                        className="w-full px-3 py-2 rounded-lg border border-[hsl(var(--border))] bg-[hsl(var(--background))] text-sm focus:outline-none focus:ring-2 focus:ring-[hsl(var(--ring))]"
-                                    >
-                                        <option value="maximize">Maximize</option>
-                                        <option value="minimize">Minimize</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div className="space-y-3">
-                                <h4 className="font-medium text-sm">Secondary Target</h4>
-                                {renderInputField("Column Name", "secondary_target", "e.g., RangeEtchRate")}
-                                <div>
-                                    <label className="block text-sm font-medium mb-1.5">Objective</label>
-                                    <select
-                                        value={formData.secondary_objective}
-                                        onChange={(e) => updateField("secondary_objective", e.target.value)}
-                                        className="w-full px-3 py-2 rounded-lg border border-[hsl(var(--border))] bg-[hsl(var(--background))] text-sm focus:outline-none focus:ring-2 focus:ring-[hsl(var(--ring))]"
-                                    >
-                                        <option value="maximize">Maximize</option>
-                                        <option value="minimize">Minimize</option>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                );
-
-            case 5:
-                return (
-                    <div className="space-y-4">
-                        <h3 className="text-lg font-semibold">Outlier Rules & DT Mode</h3>
-                        <p className="text-sm text-[hsl(var(--muted-foreground))]">
-                            Configure data quality rules and the digital twin operating mode.
-                        </p>
-                        <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-                            <div>
-                                <label className="block text-sm font-medium mb-1.5">Outlier Detection Method</label>
-                                <select
-                                    value={formData.outlier_method}
-                                    onChange={(e) => updateField("outlier_method", e.target.value)}
-                                    className="w-full px-3 py-2 rounded-lg border border-[hsl(var(--border))] bg-[hsl(var(--background))] text-sm focus:outline-none focus:ring-2 focus:ring-[hsl(var(--ring))]"
-                                >
-                                    <option value="zscore">Z-Score</option>
-                                    <option value="iqr">IQR (Interquartile Range)</option>
-                                    <option value="physical_limits">Physical Limits</option>
-                                    <option value="none">None</option>
-                                </select>
-                            </div>
-                            {renderInputField("Threshold", "outlier_threshold", "e.g., 3.0 for Z-score")}
-                        </div>
-                        <div>
-                            <label className="block text-sm font-medium mb-1.5">Digital Twin Mode</label>
-                            <div className="grid grid-cols-2 gap-3">
-                                {[
-                                    {
-                                        value: "full",
-                                        label: "Full Optimization",
-                                        desc: "ML training + Pareto optimization + recipe proposals",
-                                        icon: Gauge,
-                                    },
-                                    {
-                                        value: "dashboard",
-                                        label: "Dashboard Only",
-                                        desc: "Data visualization and monitoring only",
-                                        icon: Columns3,
-                                    },
-                                ].map((mode) => (
-                                    <button
-                                        key={mode.value}
-                                        onClick={() => updateField("dt_mode", mode.value)}
-                                        className={cn(
-                                            "p-4 rounded-lg border text-left transition-all",
-                                            formData.dt_mode === mode.value
-                                                ? "border-[hsl(var(--primary))] bg-[hsl(var(--primary))/0.05] ring-2 ring-[hsl(var(--primary))]"
-                                                : "border-[hsl(var(--border))] hover:border-[hsl(var(--primary))/0.5]"
-                                        )}
-                                    >
-                                        <mode.icon
-                                            className={cn(
-                                                "w-5 h-5 mb-2",
-                                                formData.dt_mode === mode.value
-                                                    ? "text-[hsl(var(--primary))]"
-                                                    : "text-[hsl(var(--muted-foreground))]"
-                                            )}
-                                        />
-                                        <p className="font-medium text-sm">{mode.label}</p>
-                                        <p className="text-xs text-[hsl(var(--muted-foreground))] mt-1">
-                                            {mode.desc}
-                                        </p>
-                                    </button>
-                                ))}
-                            </div>
-                        </div>
-                    </div>
-                );
-
-            case 6:
-                return (
-                    <div className="space-y-4">
-                        <h3 className="text-lg font-semibold">Review & Submit</h3>
-                        <p className="text-sm text-[hsl(var(--muted-foreground))]">
-                            Review your configuration before submitting for admin approval.
-                        </p>
-                        <div className="rounded-lg border border-[hsl(var(--border))] bg-[hsl(var(--background))] p-4 font-mono text-sm overflow-x-auto">
-                            <pre>
-                                {JSON.stringify(
-                                    {
-                                        domain: {
-                                            id: formData.domain_id || "your_domain_id",
-                                            display_name: formData.name || "Equipment Name",
-                                            description: formData.description || "",
-                                            version: "1.0.0",
-                                            equipment: formData.equipment_model || "",
-                                        },
-                                        database: {
-                                            cache_db: `pareto_cache_${formData.domain_id || "domain"}.db`,
-                                            production_db: `pareto_production_${formData.domain_id || "domain"}.db`,
-                                        },
-                                        azure: {
-                                            container: `${formData.domain_id || "domain"}-data`,
-                                            dataset_blob: "full_dataset.csv",
-                                            state_blob: "last_processed_time.txt",
-                                            processed_runs_blob: "processed_runs.json",
-                                        },
-                                        targets: {
-                                            primary: {
-                                                id: formData.primary_target || "primary_metric",
-                                                objective: formData.primary_objective,
-                                            },
-                                            secondary: {
-                                                id: formData.secondary_target || "secondary_metric",
-                                                objective: formData.secondary_objective,
-                                            },
-                                        },
-                                        dt_mode: formData.dt_mode,
-                                    },
-                                    null,
-                                    2
-                                )}
-                            </pre>
-                        </div>
-
-                        {/* Submission result feedback */}
-                        {submitResult && (
-                            <div className={cn(
-                                "flex items-center gap-2 p-3 rounded-lg text-sm",
-                                submitResult.status === "success"
-                                    ? "bg-emerald-500/10 text-emerald-600 dark:text-emerald-400"
-                                    : "bg-red-500/10 text-red-600 dark:text-red-400"
-                            )}>
-                                {submitResult.status === "success" ? (
-                                    <Check className="w-4 h-4 shrink-0" />
-                                ) : (
-                                    <AlertTriangle className="w-4 h-4 shrink-0" />
-                                )}
-                                <span>{submitResult.message}</span>
-                            </div>
-                        )}
-
-                        {!submitResult && (
-                            <div className="flex items-center gap-2 p-3 rounded-lg bg-amber-500/10 text-amber-600 dark:text-amber-400 text-sm">
-                                <AlertTriangle className="w-4 h-4 shrink-0" />
-                                <span>
-                                    On submit, this configuration will be saved as a domain config JSON and sent to a platform admin for review.
-                                </span>
-                            </div>
-                        )}
-                    </div>
-                );
-        }
-    };
-
-    return (
-        <div className="space-y-8">
-            <div>
-                <h1 className="text-3xl font-bold tracking-tight">
-                    Register New Equipment
-                </h1>
-                <p className="text-[hsl(var(--muted-foreground))] mt-1">
-                    Multi-step wizard to register equipment and configure its digital twin.
-                </p>
-            </div>
-
-            {/* Step Indicator */}
-            <div className="flex items-center gap-1">
-                {STEPS.map((step, i) => (
-                    <div key={step.id} className="flex items-center">
-                        <button
-                            onClick={() => setCurrentStep(step.id)}
-                            className={cn(
-                                "flex items-center gap-2 px-3 py-1.5 rounded-full text-xs font-medium transition-colors",
-                                currentStep === step.id
-                                    ? "bg-[hsl(var(--primary))] text-[hsl(var(--primary-foreground))]"
-                                    : currentStep > step.id
-                                        ? "bg-emerald-500/10 text-emerald-500"
-                                        : "bg-[hsl(var(--muted))] text-[hsl(var(--muted-foreground))]"
-                            )}
-                        >
-                            {currentStep > step.id ? (
-                                <Check className="w-3.5 h-3.5" />
-                            ) : (
-                                <step.icon className="w-3.5 h-3.5" />
-                            )}
-                            <span className="hidden md:inline">{step.label}</span>
-                        </button>
-                        {i < STEPS.length - 1 && (
-                            <ChevronRight className="w-4 h-4 mx-1 text-[hsl(var(--muted-foreground))]" />
-                        )}
-                    </div>
-                ))}
-            </div>
-
-            {/* Step Content */}
-            <div className="rounded-xl border border-[hsl(var(--border))] bg-[hsl(var(--card))] p-6">
-                {renderStep()}
-            </div>
-
-            {/* Navigation Buttons */}
-            <div className="flex justify-between">
-                <button
-                    onClick={() => setCurrentStep(Math.max(1, currentStep - 1))}
-                    disabled={currentStep === 1}
-                    className="flex items-center gap-2 px-4 py-2 rounded-lg border border-[hsl(var(--border))] text-sm font-medium disabled:opacity-30 hover:bg-[hsl(var(--accent))] transition-colors"
-                >
-                    <ChevronLeft className="w-4 h-4" />
-                    Previous
-                </button>
-                {currentStep < 6 ? (
-                    <button
-                        onClick={() => setCurrentStep(Math.min(6, currentStep + 1))}
-                        className="flex items-center gap-2 px-4 py-2 rounded-lg bg-[hsl(var(--primary))] text-[hsl(var(--primary-foreground))] text-sm font-medium hover:opacity-90 transition-opacity"
-                    >
-                        Next
-                        <ChevronRight className="w-4 h-4" />
-                    </button>
-                ) : (
-                    <button
-                        onClick={handleSubmit}
-                        disabled={submitting || submitResult?.status === "success"}
-                        className="flex items-center gap-2 px-4 py-2 rounded-lg bg-emerald-600 text-white text-sm font-medium hover:bg-emerald-700 transition-colors disabled:opacity-50"
-                    >
-                        {submitting ? (
-                            <>
-                                <Loader2 className="w-4 h-4 animate-spin" />
-                                Submitting...
-                            </>
-                        ) : submitResult?.status === "success" ? (
-                            <>
-                                <Check className="w-4 h-4" />
-                                Registered
-                            </>
-                        ) : (
-                            <>
-                                <Check className="w-4 h-4" />
-                                Submit for Review
-                            </>
-                        )}
-                    </button>
-                )}
-            </div>
-        </div>
-    );
+import { redirect } from "next/navigation";
+
+/**
+ * /equipment now redirects to the equipment list.
+ * Registration is at /equipment/register (separate wizard).
+ */
+export default function EquipmentRedirect() {
+    redirect("/equipment/list");
 }
diff --git a/web/app/equipment/register/page.tsx b/web/app/equipment/register/page.tsx
new file mode 100644
index 0000000..ab7d1f2
--- /dev/null
+++ b/web/app/equipment/register/page.tsx
@@ -0,0 +1,469 @@
+"use client";
+
+import { useState } from "react";
+import { cn } from "@/lib/utils";
+import { registerEquipment, type UserIdentity } from "@/lib/api-client";
+import { useAuth } from "@/lib/auth-context";
+import {
+    ChevronRight,
+    ChevronLeft,
+    Check,
+    Cpu,
+    Database,
+    SlidersHorizontal,
+    AlertTriangle,
+    Loader2,
+    Plus,
+    Trash2,
+} from "lucide-react";
+
+const STEPS = [
+    { id: 1, label: "Equipment Identity", icon: Cpu },
+    { id: 2, label: "Equipment Parameters", icon: SlidersHorizontal },
+    { id: 3, label: "Data Source & Review", icon: Database },
+];
+
+interface EquipmentParam {
+    name: string;
+    unit: string;
+    min_value: string;
+    max_value: string;
+    description: string;
+}
+
+interface FormData {
+    // Step 1 — Equipment Identity
+    name: string;
+    equipment_type: string;
+    manufacturer: string;
+    model: string;
+    location: string;
+    serial_number: string;
+    description: string;
+    // Step 2 — Equipment Parameters (hardware limits)
+    parameters: EquipmentParam[];
+    // Step 3 — Data Source
+    source_type: string;
+    connection_host: string;
+    connection_port: string;
+    connection_database: string;
+}
+
+const INITIAL_DATA: FormData = {
+    name: "",
+    equipment_type: "",
+    manufacturer: "",
+    model: "",
+    location: "",
+    serial_number: "",
+    description: "",
+    parameters: [
+        { name: "RF Power", unit: "W", min_value: "0", max_value: "2000", description: "RF generator power" },
+        { name: "Pressure", unit: "mTorr", min_value: "0", max_value: "100", description: "Chamber pressure" },
+    ],
+    source_type: "postgresql",
+    connection_host: "",
+    connection_port: "5432",
+    connection_database: "",
+};
+
+export default function EquipmentRegisterPage() {
+    const { user } = useAuth();
+    const [currentStep, setCurrentStep] = useState(1);
+    const [formData, setFormData] = useState<FormData>(INITIAL_DATA);
+    const [submitting, setSubmitting] = useState(false);
+    const [submitResult, setSubmitResult] = useState<{ status: string; message: string } | null>(null);
+
+    const updateField = (field: keyof FormData, value: unknown) => {
+        setFormData((prev) => ({ ...prev, [field]: value }));
+    };
+
+    const addParameter = () => {
+        setFormData((prev) => ({
+            ...prev,
+            parameters: [...prev.parameters, { name: "", unit: "", min_value: "", max_value: "", description: "" }],
+        }));
+    };
+
+    const updateParameter = (index: number, field: keyof EquipmentParam, value: string) => {
+        setFormData((prev) => {
+            const params = [...prev.parameters];
+            params[index] = { ...params[index], [field]: value };
+            return { ...prev, parameters: params };
+        });
+    };
+
+    const removeParameter = (index: number) => {
+        setFormData((prev) => ({
+            ...prev,
+            parameters: prev.parameters.filter((_, i) => i !== index),
+        }));
+    };
+
+    const handleSubmit = async () => {
+        setSubmitting(true);
+        setSubmitResult(null);
+
+        const identity: UserIdentity = { id: user.id, organization: user.organization, role: user.role };
+        const payload = {
+            ...formData,
+            domain_id: formData.name.toLowerCase().replace(/\s+/g, "_"),
+            owner_id: user.id,
+            owner_org: user.organization,
+        };
+        const result = await registerEquipment(payload, identity);
+
+        if (result) {
+            setSubmitResult({ status: "success", message: result.message });
+        } else {
+            setSubmitResult({
+                status: "error",
+                message: "Registration failed. Is the FastAPI server running?",
+            });
+        }
+        setSubmitting(false);
+    };
+
+    const inputClass =
+        "w-full px-3 py-2 rounded-lg border border-[hsl(var(--border))] bg-[hsl(var(--background))] text-sm focus:outline-none focus:ring-2 focus:ring-[hsl(var(--ring))]";
+
+    const renderInputField = (
+        label: string,
+        field: keyof FormData,
+        placeholder: string,
+        type: string = "text",
+    ) => (
+        <div>
+            <label className="block text-sm font-medium mb-1.5">{label}</label>
+            <input
+                type={type}
+                value={formData[field] as string}
+                onChange={(e) => updateField(field, e.target.value)}
+                placeholder={placeholder}
+                className={inputClass}
+            />
+        </div>
+    );
+
+    const renderStep = () => {
+        switch (currentStep) {
+            /* ─── Step 1: Equipment Identity ─── */
+            case 1:
+                return (
+                    <div className="space-y-4">
+                        <h3 className="text-lg font-semibold">Equipment Identity</h3>
+                        <p className="text-sm text-[hsl(var(--muted-foreground))]">
+                            Register the physical machine. This is a <strong>one-time setup</strong> done
+                            by the tool owner or system admin.
+                        </p>
+                        <div className="grid grid-cols-1 md:grid-cols-2 gap-4 mt-4">
+                            {renderInputField("Equipment Name", "name", "e.g., Etcher_01")}
+                            <div>
+                                <label className="block text-sm font-medium mb-1.5">Equipment Type</label>
+                                <select
+                                    value={formData.equipment_type}
+                                    onChange={(e) => updateField("equipment_type", e.target.value)}
+                                    className={inputClass}
+                                >
+                                    <option value="">Select type...</option>
+                                    <option value="icp_etcher">ICP Etcher</option>
+                                    <option value="rie_etcher">RIE Etcher</option>
+                                    <option value="cvd">CVD System</option>
+                                    <option value="pvd">PVD / Sputtering</option>
+                                    <option value="spectrometer">Spectrometer</option>
+                                    <option value="flow_cytometer">Flow Cytometer</option>
+                                    <option value="other">Other</option>
+                                </select>
+                            </div>
+                            {renderInputField("Manufacturer", "manufacturer", "e.g., Lam Research")}
+                            {renderInputField("Model", "model", "e.g., PlasmaTherm Apex SLR")}
+                            {renderInputField("Location", "location", "e.g., Fab 2 – Bay A")}
+                            {renderInputField("Serial Number", "serial_number", "e.g., PT-2024-0891")}
+                        </div>
+                        <div>
+                            <label className="block text-sm font-medium mb-1.5">Description</label>
+                            <textarea
+                                value={formData.description}
+                                onChange={(e) => updateField("description", e.target.value)}
+                                placeholder="Brief description of the equipment's capabilities and what it is used for"
+                                rows={3}
+                                className={cn(inputClass, "resize-none")}
+                            />
+                        </div>
+                    </div>
+                );
+
+            /* ─── Step 2: Equipment Parameters (Hardware Limits) ─── */
+            case 2:
+                return (
+                    <div className="space-y-4">
+                        <h3 className="text-lg font-semibold">Equipment Parameters</h3>
+                        <p className="text-sm text-[hsl(var(--muted-foreground))]">
+                            Define the hardware limits for this equipment — the physical min/max values
+                            from the manufacturer spec sheet. These are <em>not</em> experiment settings.
+                        </p>
+
+                        {/* Header row */}
+                        <div className="grid grid-cols-[2fr_1fr_1fr_1fr_2fr_auto] gap-2 text-xs font-medium text-[hsl(var(--muted-foreground))] px-1">
+                            <span>Parameter Name</span>
+                            <span>Unit</span>
+                            <span>Min Value</span>
+                            <span>Max Value</span>
+                            <span>Description</span>
+                            <span className="w-8" />
+                        </div>
+
+                        {/* Parameter rows */}
+                        <div className="space-y-2">
+                            {formData.parameters.map((param, i) => (
+                                <div
+                                    key={i}
+                                    className="grid grid-cols-[2fr_1fr_1fr_1fr_2fr_auto] gap-2 items-center"
+                                >
+                                    <input
+                                        type="text"
+                                        value={param.name}
+                                        onChange={(e) => updateParameter(i, "name", e.target.value)}
+                                        placeholder="e.g., RF Power"
+                                        className={inputClass}
+                                    />
+                                    <input
+                                        type="text"
+                                        value={param.unit}
+                                        onChange={(e) => updateParameter(i, "unit", e.target.value)}
+                                        placeholder="W"
+                                        className={inputClass}
+                                    />
+                                    <input
+                                        type="text"
+                                        value={param.min_value}
+                                        onChange={(e) => updateParameter(i, "min_value", e.target.value)}
+                                        placeholder="0"
+                                        className={inputClass}
+                                    />
+                                    <input
+                                        type="text"
+                                        value={param.max_value}
+                                        onChange={(e) => updateParameter(i, "max_value", e.target.value)}
+                                        placeholder="2000"
+                                        className={inputClass}
+                                    />
+                                    <input
+                                        type="text"
+                                        value={param.description}
+                                        onChange={(e) => updateParameter(i, "description", e.target.value)}
+                                        placeholder="Description"
+                                        className={inputClass}
+                                    />
+                                    <button
+                                        onClick={() => removeParameter(i)}
+                                        className="text-red-500 hover:text-red-400 p-1.5 rounded-lg hover:bg-red-500/10 transition-colors"
+                                    >
+                                        <Trash2 className="w-4 h-4" />
+                                    </button>
+                                </div>
+                            ))}
+                        </div>
+
+                        <button
+                            onClick={addParameter}
+                            className="flex items-center gap-1.5 text-sm text-[hsl(var(--primary))] hover:underline"
+                        >
+                            <Plus className="w-3.5 h-3.5" />
+                            Add Parameter
+                        </button>
+                    </div>
+                );
+
+            /* ─── Step 3: Data Source & Review ─── */
+            case 3:
+                return (
+                    <div className="space-y-6">
+                        <div className="space-y-4">
+                            <h3 className="text-lg font-semibold">Data Source Configuration</h3>
+                            <p className="text-sm text-[hsl(var(--muted-foreground))]">
+                                How the platform connects to this equipment&apos;s data.
+                            </p>
+                            <div>
+                                <label className="block text-sm font-medium mb-1.5">Source Type</label>
+                                <select
+                                    value={formData.source_type}
+                                    onChange={(e) => updateField("source_type", e.target.value)}
+                                    className={inputClass}
+                                >
+                                    <option value="postgresql">PostgreSQL</option>
+                                    <option value="mysql">MySQL</option>
+                                    <option value="csv_upload">CSV File Upload</option>
+                                    <option value="api">REST API</option>
+                                </select>
+                            </div>
+                            {(formData.source_type === "postgresql" ||
+                                formData.source_type === "mysql") && (
+                                    <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
+                                        {renderInputField("Host", "connection_host", "db.example.com")}
+                                        {renderInputField("Port", "connection_port", "5432")}
+                                        {renderInputField("Database Name", "connection_database", "etcher_db")}
+                                    </div>
+                                )}
+                        </div>
+
+                        <hr className="border-[hsl(var(--border))]" />
+
+                        {/* Review Summary */}
+                        <div className="space-y-3">
+                            <h3 className="text-lg font-semibold">Review</h3>
+                            <div className="rounded-lg border border-[hsl(var(--border))] bg-[hsl(var(--background))] overflow-hidden">
+                                <table className="w-full text-sm">
+                                    <tbody>
+                                        <tr className="border-b border-[hsl(var(--border))]">
+                                            <td className="px-4 py-2.5 font-medium text-[hsl(var(--muted-foreground))] w-40">Equipment</td>
+                                            <td className="px-4 py-2.5">{formData.name || "—"}</td>
+                                        </tr>
+                                        <tr className="border-b border-[hsl(var(--border))]">
+                                            <td className="px-4 py-2.5 font-medium text-[hsl(var(--muted-foreground))]">Type</td>
+                                            <td className="px-4 py-2.5">{formData.equipment_type || "—"}</td>
+                                        </tr>
+                                        <tr className="border-b border-[hsl(var(--border))]">
+                                            <td className="px-4 py-2.5 font-medium text-[hsl(var(--muted-foreground))]">Manufacturer</td>
+                                            <td className="px-4 py-2.5">{formData.manufacturer || "—"}</td>
+                                        </tr>
+                                        <tr className="border-b border-[hsl(var(--border))]">
+                                            <td className="px-4 py-2.5 font-medium text-[hsl(var(--muted-foreground))]">Location</td>
+                                            <td className="px-4 py-2.5">{formData.location || "—"}</td>
+                                        </tr>
+                                        <tr className="border-b border-[hsl(var(--border))]">
+                                            <td className="px-4 py-2.5 font-medium text-[hsl(var(--muted-foreground))]">Parameters</td>
+                                            <td className="px-4 py-2.5">{formData.parameters.filter(p => p.name).length} hardware parameters defined</td>
+                                        </tr>
+                                        <tr>
+                                            <td className="px-4 py-2.5 font-medium text-[hsl(var(--muted-foreground))]">Data Source</td>
+                                            <td className="px-4 py-2.5">{formData.source_type}{formData.connection_host ? ` — ${formData.connection_host}` : ""}</td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+
+                        {/* Submission feedback */}
+                        {submitResult && (
+                            <div className={cn(
+                                "flex items-center gap-2 p-3 rounded-lg text-sm",
+                                submitResult.status === "success"
+                                    ? "bg-emerald-500/10 text-emerald-600 dark:text-emerald-400"
+                                    : "bg-red-500/10 text-red-600 dark:text-red-400"
+                            )}>
+                                {submitResult.status === "success" ? (
+                                    <Check className="w-4 h-4 shrink-0" />
+                                ) : (
+                                    <AlertTriangle className="w-4 h-4 shrink-0" />
+                                )}
+                                <span>{submitResult.message}</span>
+                            </div>
+                        )}
+
+                        {!submitResult && (
+                            <div className="flex items-center gap-2 p-3 rounded-lg bg-amber-500/10 text-amber-600 dark:text-amber-400 text-sm">
+                                <AlertTriangle className="w-4 h-4 shrink-0" />
+                                <span>
+                                    On submit, this equipment will be registered and sent to a platform admin for review.
+                                </span>
+                            </div>
+                        )}
+                    </div>
+                );
+        }
+    };
+
+    const totalSteps = STEPS.length;
+
+    return (
+        <div className="space-y-8">
+            <div>
+                <h1 className="text-3xl font-bold tracking-tight">
+                    Register New Equipment
+                </h1>
+                <p className="text-[hsl(var(--muted-foreground))] mt-1">
+                    Stage 0 — One-time setup for a physical machine and its hardware parameters.
+                </p>
+            </div>
+
+            {/* Step Indicator */}
+            <div className="flex items-center gap-1">
+                {STEPS.map((step, i) => (
+                    <div key={step.id} className="flex items-center">
+                        <button
+                            onClick={() => setCurrentStep(step.id)}
+                            className={cn(
+                                "flex items-center gap-2 px-3 py-1.5 rounded-full text-xs font-medium transition-colors",
+                                currentStep === step.id
+                                    ? "bg-[hsl(var(--primary))] text-[hsl(var(--primary-foreground))]"
+                                    : currentStep > step.id
+                                        ? "bg-emerald-500/10 text-emerald-500"
+                                        : "bg-[hsl(var(--muted))] text-[hsl(var(--muted-foreground))]"
+                            )}
+                        >
+                            {currentStep > step.id ? (
+                                <Check className="w-3.5 h-3.5" />
+                            ) : (
+                                <step.icon className="w-3.5 h-3.5" />
+                            )}
+                            <span className="hidden md:inline">{step.label}</span>
+                        </button>
+                        {i < STEPS.length - 1 && (
+                            <ChevronRight className="w-4 h-4 mx-1 text-[hsl(var(--muted-foreground))]" />
+                        )}
+                    </div>
+                ))}
+            </div>
+
+            {/* Step Content */}
+            <div className="rounded-xl border border-[hsl(var(--border))] bg-[hsl(var(--card))] p-6">
+                {renderStep()}
+            </div>
+
+            {/* Navigation Buttons */}
+            <div className="flex justify-between">
+                <button
+                    onClick={() => setCurrentStep(Math.max(1, currentStep - 1))}
+                    disabled={currentStep === 1}
+                    className="flex items-center gap-2 px-4 py-2 rounded-lg border border-[hsl(var(--border))] text-sm font-medium disabled:opacity-30 hover:bg-[hsl(var(--accent))] transition-colors"
+                >
+                    <ChevronLeft className="w-4 h-4" />
+                    Previous
+                </button>
+                {currentStep < totalSteps ? (
+                    <button
+                        onClick={() => setCurrentStep(Math.min(totalSteps, currentStep + 1))}
+                        className="flex items-center gap-2 px-4 py-2 rounded-lg bg-[hsl(var(--primary))] text-[hsl(var(--primary-foreground))] text-sm font-medium hover:opacity-90 transition-opacity"
+                    >
+                        Next
+                        <ChevronRight className="w-4 h-4" />
+                    </button>
+                ) : (
+                    <button
+                        onClick={handleSubmit}
+                        disabled={submitting || submitResult?.status === "success"}
+                        className="flex items-center gap-2 px-4 py-2 rounded-lg bg-emerald-600 text-white text-sm font-medium hover:bg-emerald-700 transition-colors disabled:opacity-50"
+                    >
+                        {submitting ? (
+                            <>
+                                <Loader2 className="w-4 h-4 animate-spin" />
+                                Submitting...
+                            </>
+                        ) : submitResult?.status === "success" ? (
+                            <>
+                                <Check className="w-4 h-4" />
+                                Registered
+                            </>
+                        ) : (
+                            <>
+                                <Check className="w-4 h-4" />
+                                Register Equipment
+                            </>
+                        )}
+                    </button>
+                )}
+            </div>
+        </div>
+    );
+}
diff --git a/web/app/experiment/new/page.tsx b/web/app/experiment/new/page.tsx
new file mode 100644
index 0000000..29db648
--- /dev/null
+++ b/web/app/experiment/new/page.tsx
@@ -0,0 +1,639 @@
+"use client";
+
+import { useState } from "react";
+import { cn } from "@/lib/utils";
+import { useAuth } from "@/lib/auth-context";
+import {
+    ChevronRight,
+    ChevronLeft,
+    Check,
+    FlaskConical,
+    ClipboardList,
+    FileCheck,
+    AlertTriangle,
+    Loader2,
+    Plus,
+    Trash2,
+} from "lucide-react";
+
+const STEPS = [
+    { id: 1, label: "Experiment Type", icon: FlaskConical },
+    { id: 2, label: "Experiment Definition", icon: ClipboardList },
+    { id: 3, label: "Review & Submit", icon: FileCheck },
+];
+
+/* ─── Mock registered equipment (would come from API) ─── */
+const REGISTERED_EQUIPMENT = [
+    { id: "ETCHER_01", name: "Etcher_01", type: "ICP Etcher", location: "Fab 2 – Bay A" },
+    { id: "CYTOMETER_01", name: "Cytometer_01", type: "Flow Cytometer", location: "Birck Lab 202" },
+];
+
+interface TypeParam {
+    name: string;
+    unit: string;
+    is_variable: boolean;
+    default_value: string;
+    min_value: string;
+    max_value: string;
+}
+
+interface PlannedParam {
+    name: string;
+    planned_value: string;
+    unit: string;
+}
+
+interface FormData {
+    // Step 1 — Experiment Type
+    type_name: string;
+    type_description: string;
+    scientific_objective: string;
+    type_parameters: TypeParam[];
+    // Step 2 — Experiment Definition
+    selected_equipment: string;
+    experiment_name: string;
+    planned_date: string;
+    planned_parameters: PlannedParam[];
+}
+
+const INITIAL_DATA: FormData = {
+    type_name: "",
+    type_description: "",
+    scientific_objective: "",
+    type_parameters: [
+        { name: "Gas Flow", unit: "sccm", is_variable: true, default_value: "50", min_value: "10", max_value: "200" },
+        { name: "RF Power", unit: "W", is_variable: true, default_value: "800", min_value: "500", max_value: "1200" },
+        { name: "Temperature", unit: "°C", is_variable: false, default_value: "700", min_value: "700", max_value: "700" },
+    ],
+    selected_equipment: "",
+    experiment_name: "",
+    planned_date: "",
+    planned_parameters: [],
+};
+
+export default function NewExperimentPage() {
+    const { user } = useAuth();
+    const [currentStep, setCurrentStep] = useState(1);
+    const [formData, setFormData] = useState<FormData>(INITIAL_DATA);
+    const [submitting, setSubmitting] = useState(false);
+    const [submitResult, setSubmitResult] = useState<{ status: string; message: string } | null>(null);
+
+    const updateField = (field: keyof FormData, value: unknown) => {
+        setFormData((prev) => ({ ...prev, [field]: value }));
+    };
+
+    /* ─── Type Parameter management ─── */
+    const addTypeParam = () => {
+        setFormData((prev) => ({
+            ...prev,
+            type_parameters: [...prev.type_parameters, { name: "", unit: "", is_variable: true, default_value: "", min_value: "", max_value: "" }],
+        }));
+    };
+
+    const updateTypeParam = (index: number, field: keyof TypeParam, value: string | boolean) => {
+        setFormData((prev) => {
+            const params = [...prev.type_parameters];
+            params[index] = { ...params[index], [field]: value };
+            return { ...prev, type_parameters: params };
+        });
+    };
+
+    const removeTypeParam = (index: number) => {
+        setFormData((prev) => ({
+            ...prev,
+            type_parameters: prev.type_parameters.filter((_, i) => i !== index),
+        }));
+    };
+
+    /* ─── Planned Parameter management ─── */
+    const addPlannedParam = () => {
+        setFormData((prev) => ({
+            ...prev,
+            planned_parameters: [...prev.planned_parameters, { name: "", planned_value: "", unit: "" }],
+        }));
+    };
+
+    const updatePlannedParam = (index: number, field: keyof PlannedParam, value: string) => {
+        setFormData((prev) => {
+            const params = [...prev.planned_parameters];
+            params[index] = { ...params[index], [field]: value };
+            return { ...prev, planned_parameters: params };
+        });
+    };
+
+    const removePlannedParam = (index: number) => {
+        setFormData((prev) => ({
+            ...prev,
+            planned_parameters: prev.planned_parameters.filter((_, i) => i !== index),
+        }));
+    };
+
+    /* ─── Auto-populate planned params from type params ─── */
+    const populatePlannedFromType = () => {
+        const planned = formData.type_parameters
+            .filter((p) => p.is_variable && p.name)
+            .map((p) => ({
+                name: p.name,
+                planned_value: p.default_value,
+                unit: p.unit,
+            }));
+        updateField("planned_parameters", planned);
+    };
+
+    const handleSubmit = async () => {
+        setSubmitting(true);
+        setSubmitResult(null);
+
+        // Simulate submission (replace with real API call)
+        await new Promise((r) => setTimeout(r, 1200));
+
+        setSubmitResult({
+            status: "success",
+            message: `Experiment "${formData.experiment_name}" submitted successfully. Run it from the Experiment Runs page.`,
+        });
+        setSubmitting(false);
+    };
+
+    const inputClass =
+        "w-full px-3 py-2 rounded-lg border border-[hsl(var(--border))] bg-[hsl(var(--background))] text-sm focus:outline-none focus:ring-2 focus:ring-[hsl(var(--ring))]";
+
+    const renderStep = () => {
+        switch (currentStep) {
+            /* ─── Step 1: Experiment Type (Recipe Template) ─── */
+            case 1:
+                return (
+                    <div className="space-y-5">
+                        <div>
+                            <h3 className="text-lg font-semibold">Experiment Type Definition</h3>
+                            <p className="text-sm text-[hsl(var(--muted-foreground))]">
+                                Define a reusable recipe template. This captures the <strong>scientific intent</strong> —
+                                which parameters are variable vs. fixed, and their allowed ranges.
+                            </p>
+                        </div>
+
+                        <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                            <div>
+                                <label className="block text-sm font-medium mb-1.5">Experiment Type Name</label>
+                                <input
+                                    type="text"
+                                    value={formData.type_name}
+                                    onChange={(e) => updateField("type_name", e.target.value)}
+                                    placeholder="e.g., Oxide Etch – High Selectivity"
+                                    className={inputClass}
+                                />
+                            </div>
+                            <div>
+                                <label className="block text-sm font-medium mb-1.5">Scientific Objective</label>
+                                <input
+                                    type="text"
+                                    value={formData.scientific_objective}
+                                    onChange={(e) => updateField("scientific_objective", e.target.value)}
+                                    placeholder="e.g., Maximize SiO₂:Si selectivity"
+                                    className={inputClass}
+                                />
+                            </div>
+                        </div>
+
+                        <div>
+                            <label className="block text-sm font-medium mb-1.5">Description</label>
+                            <textarea
+                                value={formData.type_description}
+                                onChange={(e) => updateField("type_description", e.target.value)}
+                                placeholder="Describe the workflow, what this experiment type studies"
+                                rows={2}
+                                className={cn(inputClass, "resize-none")}
+                            />
+                        </div>
+
+                        <div className="space-y-3">
+                            <h4 className="font-medium text-sm">Parameter Template</h4>
+                            <p className="text-xs text-[hsl(var(--muted-foreground))]">
+                                Define which parameters this experiment type uses. Mark parameters as &quot;Variable&quot;
+                                if the optimizer should explore them, or &quot;Fixed&quot; if locked.
+                            </p>
+
+                            {/* Header row */}
+                            <div className="grid grid-cols-[2fr_1fr_1fr_1fr_1fr_1fr_auto] gap-2 text-xs font-medium text-[hsl(var(--muted-foreground))] px-1">
+                                <span>Name</span>
+                                <span>Unit</span>
+                                <span>Variable?</span>
+                                <span>Default</span>
+                                <span>Min</span>
+                                <span>Max</span>
+                                <span className="w-8" />
+                            </div>
+
+                            {formData.type_parameters.map((param, i) => (
+                                <div
+                                    key={i}
+                                    className="grid grid-cols-[2fr_1fr_1fr_1fr_1fr_1fr_auto] gap-2 items-center"
+                                >
+                                    <input
+                                        type="text"
+                                        value={param.name}
+                                        onChange={(e) => updateTypeParam(i, "name", e.target.value)}
+                                        placeholder="Parameter"
+                                        className={inputClass}
+                                    />
+                                    <input
+                                        type="text"
+                                        value={param.unit}
+                                        onChange={(e) => updateTypeParam(i, "unit", e.target.value)}
+                                        placeholder="Unit"
+                                        className={inputClass}
+                                    />
+                                    <button
+                                        onClick={() => updateTypeParam(i, "is_variable", !param.is_variable)}
+                                        className={cn(
+                                            "px-2 py-2 rounded-lg text-xs font-medium transition-colors border",
+                                            param.is_variable
+                                                ? "bg-[hsl(var(--primary))] text-[hsl(var(--primary-foreground))] border-transparent"
+                                                : "bg-[hsl(var(--muted))] text-[hsl(var(--muted-foreground))] border-[hsl(var(--border))]"
+                                        )}
+                                    >
+                                        {param.is_variable ? "Yes" : "No"}
+                                    </button>
+                                    <input
+                                        type="text"
+                                        value={param.default_value}
+                                        onChange={(e) => updateTypeParam(i, "default_value", e.target.value)}
+                                        placeholder="800"
+                                        className={inputClass}
+                                    />
+                                    <input
+                                        type="text"
+                                        value={param.min_value}
+                                        onChange={(e) => updateTypeParam(i, "min_value", e.target.value)}
+                                        placeholder="Min"
+                                        className={cn(inputClass, !param.is_variable && "opacity-40")}
+                                        disabled={!param.is_variable}
+                                    />
+                                    <input
+                                        type="text"
+                                        value={param.max_value}
+                                        onChange={(e) => updateTypeParam(i, "max_value", e.target.value)}
+                                        placeholder="Max"
+                                        className={cn(inputClass, !param.is_variable && "opacity-40")}
+                                        disabled={!param.is_variable}
+                                    />
+                                    <button
+                                        onClick={() => removeTypeParam(i)}
+                                        className="text-red-500 hover:text-red-400 p-1.5 rounded-lg hover:bg-red-500/10 transition-colors"
+                                    >
+                                        <Trash2 className="w-4 h-4" />
+                                    </button>
+                                </div>
+                            ))}
+
+                            <button
+                                onClick={addTypeParam}
+                                className="flex items-center gap-1.5 text-sm text-[hsl(var(--primary))] hover:underline"
+                            >
+                                <Plus className="w-3.5 h-3.5" />
+                                Add Parameter
+                            </button>
+                        </div>
+                    </div>
+                );
+
+            /* ─── Step 2: Experiment Definition (Plan) ─── */
+            case 2:
+                return (
+                    <div className="space-y-5">
+                        <div>
+                            <h3 className="text-lg font-semibold">Experiment Definition</h3>
+                            <p className="text-sm text-[hsl(var(--muted-foreground))]">
+                                Bind an experiment type to specific equipment and define the planned parameter values.
+                            </p>
+                        </div>
+
+                        <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                            <div>
+                                <label className="block text-sm font-medium mb-1.5">Select Equipment</label>
+                                <select
+                                    value={formData.selected_equipment}
+                                    onChange={(e) => updateField("selected_equipment", e.target.value)}
+                                    className={inputClass}
+                                >
+                                    <option value="">Choose registered equipment...</option>
+                                    {REGISTERED_EQUIPMENT.map((eq) => (
+                                        <option key={eq.id} value={eq.id}>
+                                            {eq.name} — {eq.type} ({eq.location})
+                                        </option>
+                                    ))}
+                                </select>
+                            </div>
+                            <div>
+                                <label className="block text-sm font-medium mb-1.5">Experiment Name</label>
+                                <input
+                                    type="text"
+                                    value={formData.experiment_name}
+                                    onChange={(e) => updateField("experiment_name", e.target.value)}
+                                    placeholder="e.g., DOE_RF_vs_Pressure"
+                                    className={inputClass}
+                                />
+                            </div>
+                        </div>
+
+                        <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                            <div>
+                                <label className="block text-sm font-medium mb-1.5">Experiment Type</label>
+                                <div className="px-3 py-2 rounded-lg border border-[hsl(var(--border))] bg-[hsl(var(--muted))] text-sm">
+                                    {formData.type_name || "—"} <span className="text-[hsl(var(--muted-foreground))]">(defined in Step 1)</span>
+                                </div>
+                            </div>
+                            <div>
+                                <label className="block text-sm font-medium mb-1.5">Planned Date</label>
+                                <input
+                                    type="date"
+                                    value={formData.planned_date}
+                                    onChange={(e) => updateField("planned_date", e.target.value)}
+                                    className={inputClass}
+                                />
+                            </div>
+                        </div>
+
+                        {/* Planned Parameter Values */}
+                        <div className="space-y-3">
+                            <div className="flex items-center justify-between">
+                                <div>
+                                    <h4 className="font-medium text-sm">Planned Parameters</h4>
+                                    <p className="text-xs text-[hsl(var(--muted-foreground))]">
+                                        Set the actual values for this specific experiment run.
+                                    </p>
+                                </div>
+                                {formData.type_parameters.some((p) => p.is_variable && p.name) && formData.planned_parameters.length === 0 && (
+                                    <button
+                                        onClick={populatePlannedFromType}
+                                        className="text-xs text-[hsl(var(--primary))] hover:underline"
+                                    >
+                                        Auto-fill from type template
+                                    </button>
+                                )}
+                            </div>
+
+                            <div className="grid grid-cols-[2fr_2fr_1fr_auto] gap-2 text-xs font-medium text-[hsl(var(--muted-foreground))] px-1">
+                                <span>Parameter Name</span>
+                                <span>Planned Value</span>
+                                <span>Unit</span>
+                                <span className="w-8" />
+                            </div>
+
+                            {formData.planned_parameters.map((param, i) => (
+                                <div key={i} className="grid grid-cols-[2fr_2fr_1fr_auto] gap-2 items-center">
+                                    <input
+                                        type="text"
+                                        value={param.name}
+                                        onChange={(e) => updatePlannedParam(i, "name", e.target.value)}
+                                        placeholder="e.g., Gas Flow"
+                                        className={inputClass}
+                                    />
+                                    <input
+                                        type="text"
+                                        value={param.planned_value}
+                                        onChange={(e) => updatePlannedParam(i, "planned_value", e.target.value)}
+                                        placeholder="55"
+                                        className={inputClass}
+                                    />
+                                    <input
+                                        type="text"
+                                        value={param.unit}
+                                        onChange={(e) => updatePlannedParam(i, "unit", e.target.value)}
+                                        placeholder="sccm"
+                                        className={cn(inputClass, "text-[hsl(var(--muted-foreground))]")}
+                                    />
+                                    <button
+                                        onClick={() => removePlannedParam(i)}
+                                        className="text-red-500 hover:text-red-400 p-1.5 rounded-lg hover:bg-red-500/10 transition-colors"
+                                    >
+                                        <Trash2 className="w-4 h-4" />
+                                    </button>
+                                </div>
+                            ))}
+
+                            <button
+                                onClick={addPlannedParam}
+                                className="flex items-center gap-1.5 text-sm text-[hsl(var(--primary))] hover:underline"
+                            >
+                                <Plus className="w-3.5 h-3.5" />
+                                Add Parameter
+                            </button>
+                        </div>
+                    </div>
+                );
+
+            /* ─── Step 3: Review & Submit ─── */
+            case 3:
+                return (
+                    <div className="space-y-6">
+                        <h3 className="text-lg font-semibold">Review & Submit</h3>
+                        <p className="text-sm text-[hsl(var(--muted-foreground))]">
+                            Confirm the experiment plan before submitting.
+                        </p>
+
+                        {/* Two-column summary */}
+                        <div className="grid grid-cols-1 lg:grid-cols-2 gap-4">
+                            {/* Experiment Type summary */}
+                            <div className="rounded-lg border border-[hsl(var(--border))] p-4 space-y-3">
+                                <h4 className="font-medium text-sm text-[hsl(var(--primary))]">Experiment Type</h4>
+                                <div className="space-y-1 text-sm">
+                                    <p><span className="text-[hsl(var(--muted-foreground))]">Name:</span> {formData.type_name || "—"}</p>
+                                    <p><span className="text-[hsl(var(--muted-foreground))]">Objective:</span> {formData.scientific_objective || "—"}</p>
+                                </div>
+                                {formData.type_parameters.filter(p => p.name).length > 0 && (
+                                    <div className="rounded border border-[hsl(var(--border))] overflow-hidden">
+                                        <table className="w-full text-xs">
+                                            <thead className="bg-[hsl(var(--muted))]">
+                                                <tr>
+                                                    <th className="px-3 py-1.5 text-left font-medium">Param</th>
+                                                    <th className="px-3 py-1.5 text-left font-medium">Variable?</th>
+                                                    <th className="px-3 py-1.5 text-left font-medium">Default</th>
+                                                    <th className="px-3 py-1.5 text-left font-medium">Range</th>
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+                                                {formData.type_parameters.filter(p => p.name).map((p, i) => (
+                                                    <tr key={i} className="border-t border-[hsl(var(--border))]">
+                                                        <td className="px-3 py-1.5">{p.name} ({p.unit})</td>
+                                                        <td className="px-3 py-1.5">
+                                                            <span className={cn(
+                                                                "px-1.5 py-0.5 rounded text-xs",
+                                                                p.is_variable ? "bg-[hsl(var(--primary))]/10 text-[hsl(var(--primary))]" : "bg-[hsl(var(--muted))]"
+                                                            )}>
+                                                                {p.is_variable ? "Yes" : "Fixed"}
+                                                            </span>
+                                                        </td>
+                                                        <td className="px-3 py-1.5">{p.default_value}</td>
+                                                        <td className="px-3 py-1.5">{p.is_variable ? `${p.min_value}–${p.max_value}` : "—"}</td>
+                                                    </tr>
+                                                ))}
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                )}
+                            </div>
+
+                            {/* Experiment Definition summary */}
+                            <div className="rounded-lg border border-[hsl(var(--border))] p-4 space-y-3">
+                                <h4 className="font-medium text-sm text-[hsl(var(--primary))]">Experiment Definition</h4>
+                                <div className="space-y-1 text-sm">
+                                    <p><span className="text-[hsl(var(--muted-foreground))]">Name:</span> {formData.experiment_name || "—"}</p>
+                                    <p><span className="text-[hsl(var(--muted-foreground))]">Equipment:</span> {formData.selected_equipment || "—"}</p>
+                                    <p><span className="text-[hsl(var(--muted-foreground))]">Date:</span> {formData.planned_date || "—"}</p>
+                                    <p><span className="text-[hsl(var(--muted-foreground))]">Owner:</span> {user.name}</p>
+                                </div>
+                                {formData.planned_parameters.filter(p => p.name).length > 0 && (
+                                    <div className="rounded border border-[hsl(var(--border))] overflow-hidden">
+                                        <table className="w-full text-xs">
+                                            <thead className="bg-[hsl(var(--muted))]">
+                                                <tr>
+                                                    <th className="px-3 py-1.5 text-left font-medium">Parameter</th>
+                                                    <th className="px-3 py-1.5 text-left font-medium">Planned Value</th>
+                                                    <th className="px-3 py-1.5 text-left font-medium">Unit</th>
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+                                                {formData.planned_parameters.filter(p => p.name).map((p, i) => (
+                                                    <tr key={i} className="border-t border-[hsl(var(--border))]">
+                                                        <td className="px-3 py-1.5">{p.name}</td>
+                                                        <td className="px-3 py-1.5 font-mono">{p.planned_value}</td>
+                                                        <td className="px-3 py-1.5 text-[hsl(var(--muted-foreground))]">{p.unit}</td>
+                                                    </tr>
+                                                ))}
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                )}
+                            </div>
+                        </div>
+
+                        {/* Submission feedback */}
+                        {submitResult && (
+                            <div className={cn(
+                                "flex items-center gap-2 p-3 rounded-lg text-sm",
+                                submitResult.status === "success"
+                                    ? "bg-emerald-500/10 text-emerald-600 dark:text-emerald-400"
+                                    : "bg-red-500/10 text-red-600 dark:text-red-400"
+                            )}>
+                                {submitResult.status === "success" ? (
+                                    <Check className="w-4 h-4 shrink-0" />
+                                ) : (
+                                    <AlertTriangle className="w-4 h-4 shrink-0" />
+                                )}
+                                <span>{submitResult.message}</span>
+                            </div>
+                        )}
+
+                        {!submitResult && (
+                            <div className="flex items-center gap-2 p-3 rounded-lg bg-amber-500/10 text-amber-600 dark:text-amber-400 text-sm">
+                                <AlertTriangle className="w-4 h-4 shrink-0" />
+                                <span>
+                                    This will create an experiment definition. Actual runs are triggered separately.
+                                </span>
+                            </div>
+                        )}
+                    </div>
+                );
+        }
+    };
+
+    const totalSteps = STEPS.length;
+
+    return (
+        <div className="space-y-8">
+            <div>
+                <h1 className="text-3xl font-bold tracking-tight">
+                    New Experiment
+                </h1>
+                <p className="text-[hsl(var(--muted-foreground))] mt-1">
+                    Stages 1–2 — Define an experiment type (recipe template) and create a specific experiment plan.
+                </p>
+            </div>
+
+            {/* Step Indicator */}
+            <div className="flex items-center gap-1">
+                {STEPS.map((step, i) => (
+                    <div key={step.id} className="flex items-center">
+                        <button
+                            onClick={() => setCurrentStep(step.id)}
+                            className={cn(
+                                "flex items-center gap-2 px-3 py-1.5 rounded-full text-xs font-medium transition-colors",
+                                currentStep === step.id
+                                    ? "bg-[hsl(var(--primary))] text-[hsl(var(--primary-foreground))]"
+                                    : currentStep > step.id
+                                        ? "bg-emerald-500/10 text-emerald-500"
+                                        : "bg-[hsl(var(--muted))] text-[hsl(var(--muted-foreground))]"
+                            )}
+                        >
+                            {currentStep > step.id ? (
+                                <Check className="w-3.5 h-3.5" />
+                            ) : (
+                                <step.icon className="w-3.5 h-3.5" />
+                            )}
+                            <span className="hidden md:inline">{step.label}</span>
+                        </button>
+                        {i < STEPS.length - 1 && (
+                            <ChevronRight className="w-4 h-4 mx-1 text-[hsl(var(--muted-foreground))]" />
+                        )}
+                    </div>
+                ))}
+            </div>
+
+            {/* Step Content */}
+            <div className="rounded-xl border border-[hsl(var(--border))] bg-[hsl(var(--card))] p-6">
+                {renderStep()}
+            </div>
+
+            {/* Navigation Buttons */}
+            <div className="flex justify-between">
+                <button
+                    onClick={() => setCurrentStep(Math.max(1, currentStep - 1))}
+                    disabled={currentStep === 1}
+                    className="flex items-center gap-2 px-4 py-2 rounded-lg border border-[hsl(var(--border))] text-sm font-medium disabled:opacity-30 hover:bg-[hsl(var(--accent))] transition-colors"
+                >
+                    <ChevronLeft className="w-4 h-4" />
+                    Previous
+                </button>
+                {currentStep < totalSteps ? (
+                    <button
+                        onClick={() => {
+                            const next = Math.min(totalSteps, currentStep + 1);
+                            // Auto-populate planned params when going from step 1 → 2
+                            if (currentStep === 1 && formData.planned_parameters.length === 0) {
+                                populatePlannedFromType();
+                            }
+                            setCurrentStep(next);
+                        }}
+                        className="flex items-center gap-2 px-4 py-2 rounded-lg bg-[hsl(var(--primary))] text-[hsl(var(--primary-foreground))] text-sm font-medium hover:opacity-90 transition-opacity"
+                    >
+                        Next
+                        <ChevronRight className="w-4 h-4" />
+                    </button>
+                ) : (
+                    <button
+                        onClick={handleSubmit}
+                        disabled={submitting || submitResult?.status === "success"}
+                        className="flex items-center gap-2 px-4 py-2 rounded-lg bg-emerald-600 text-white text-sm font-medium hover:bg-emerald-700 transition-colors disabled:opacity-50"
+                    >
+                        {submitting ? (
+                            <>
+                                <Loader2 className="w-4 h-4 animate-spin" />
+                                Submitting...
+                            </>
+                        ) : submitResult?.status === "success" ? (
+                            <>
+                                <Check className="w-4 h-4" />
+                                Submitted
+                            </>
+                        ) : (
+                            <>
+                                <Check className="w-4 h-4" />
+                                Submit Experiment
+                            </>
+                        )}
+                    </button>
+                )}
+            </div>
+        </div>
+    );
+}
diff --git a/web/components/sidebar.tsx b/web/components/sidebar.tsx
index 33c42ef..d05629d 100644
--- a/web/components/sidebar.tsx
+++ b/web/components/sidebar.tsx
@@ -57,7 +57,7 @@ const NAV_SECTIONS = [
         label: "ML & Viz",
         items: [
             { id: "parity", label: "Parity Plots", href: "/ml/parity", icon: ScatterChart },
-            { id: "importance", label: "Feature Import.", href: "/ml/importance", icon: BarChart3 },
+            { id: "importance", label: "Feature Signif.", href: "/ml/importance", icon: BarChart3 },
             { id: "convergence", label: "Convergence", href: "/ml/convergence", icon: TrendingUp },
             { id: "proposals", label: "Proposals", href: "/ml/proposals", icon: Beaker },
         ],
@@ -68,7 +68,8 @@ const NAV_SECTIONS = [
         items: [
             { id: "users", label: "Users", href: "/admin/users", icon: Users },
             { id: "reviews", label: "Reviews", href: "/admin/reviews", icon: ClipboardCheck },
-            { id: "register", label: "Register", href: "/equipment", icon: List },
+            { id: "register", label: "Register Equip.", href: "/equipment/register", icon: List },
+            { id: "new-experiment", label: "New Experiment", href: "/experiment/new", icon: FlaskConical },
             { id: "settings", label: "Settings", href: "/settings", icon: Settings },
         ],
     },
diff --git a/web/lib/auth-context.tsx b/web/lib/auth-context.tsx
index 1871766..0b8e873 100644
--- a/web/lib/auth-context.tsx
+++ b/web/lib/auth-context.tsx
@@ -24,7 +24,7 @@ export const ROLE_PERMISSIONS: Record<UserRole, {
         canSetAccessLevel: true,
         canPublish: true,
         visibleNavSections: ["main", "data", "ml", "admin"],
-        visibleNavItems: ["dashboard", "equipment", "projects", "optimize", "analytics", "upload", "ingestion", "catalog", "parity", "importance", "convergence", "proposals", "users", "reviews", "register", "settings"],
+        visibleNavItems: ["dashboard", "equipment", "projects", "optimize", "analytics", "upload", "ingestion", "catalog", "parity", "importance", "convergence", "proposals", "users", "reviews", "register", "new-experiment", "settings"],
     },
     pi: {
         canRegisterEquipment: false,
@@ -34,8 +34,8 @@ export const ROLE_PERMISSIONS: Record<UserRole, {
         canRunOptimization: true,
         canSetAccessLevel: true,
         canPublish: true,
-        visibleNavSections: ["main", "data", "ml"],
-        visibleNavItems: ["dashboard", "equipment", "projects", "optimize", "analytics", "upload", "ingestion", "catalog", "parity", "importance", "convergence", "proposals", "settings"],
+        visibleNavSections: ["main", "data", "ml", "admin"],
+        visibleNavItems: ["dashboard", "equipment", "projects", "optimize", "analytics", "upload", "ingestion", "catalog", "parity", "importance", "convergence", "proposals", "new-experiment", "settings"],
     },
     equipment_owner: {
         canRegisterEquipment: true,
@@ -45,8 +45,8 @@ export const ROLE_PERMISSIONS: Record<UserRole, {
         canRunOptimization: false,
         canSetAccessLevel: false,
         canPublish: false,
-        visibleNavSections: ["main", "data"],
-        visibleNavItems: ["dashboard", "equipment", "projects", "analytics", "upload", "ingestion", "catalog", "register", "settings"],
+        visibleNavSections: ["main", "data", "admin"],
+        visibleNavItems: ["dashboard", "equipment", "projects", "analytics", "upload", "ingestion", "catalog", "register", "new-experiment", "settings"],
     },
     researcher: {
         canRegisterEquipment: false,
@@ -56,8 +56,8 @@ export const ROLE_PERMISSIONS: Record<UserRole, {
         canRunOptimization: true,
         canSetAccessLevel: false,
         canPublish: false,
-        visibleNavSections: ["main", "data", "ml"],
-        visibleNavItems: ["dashboard", "equipment", "projects", "optimize", "analytics", "upload", "catalog", "parity", "importance", "convergence", "proposals", "settings"],
+        visibleNavSections: ["main", "data", "ml", "admin"],
+        visibleNavItems: ["dashboard", "equipment", "projects", "optimize", "analytics", "upload", "catalog", "parity", "importance", "convergence", "proposals", "new-experiment", "settings"],
     },
 };