diff --git a/site/public/order/trucking-new-carrier/index.html b/site/public/order/trucking-new-carrier/index.html
index 5644346..441d49a 100644
--- a/site/public/order/trucking-new-carrier/index.html
+++ b/site/public/order/trucking-new-carrier/index.html
@@ -16,14 +16,114 @@
 </script>
 <link rel="preconnect" href="https://fonts.googleapis.com">
 <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet">
+<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700;800&display=swap" rel="stylesheet">
 <script defer src="https://analytics.performancewest.net/script.js" data-website-id="55250014-ee15-44ac-a1f6-81dabad3fe0f"></script>
 <link rel="stylesheet" href="/_astro/about.DhmoKVOS.css">
 <script type="module" src="/_astro/hoisted.yFz1BYXO.js"></script>
 <style>
-  .svc-card{transition:all 0.15s}
-  .svc-card:has(input:checked){border-color:#f97316;background:#fff7ed}
-  .bundle-card:has(input:checked){border-color:#16a34a;background:#f0fdf4}
+  * { box-sizing: border-box; }
+  .wiz-step { display: none; }
+  .wiz-step.active { display: block; }
+
+  /* Button selector styles */
+  .btn-opt {
+    display: inline-flex; align-items: center; justify-content: center;
+    padding: 14px 20px; border: 2px solid #e2e8f0; border-radius: 10px;
+    background: #fff; color: #334155; font-size: 14px; font-weight: 600;
+    cursor: pointer; transition: all 0.15s; text-align: center;
+    min-height: 52px; user-select: none;
+  }
+  .btn-opt:hover { border-color: #f97316; background: #fff7ed; }
+  .btn-opt.selected { border-color: #f97316; background: #fff7ed; color: #ea580c; box-shadow: 0 0 0 1px #f97316; }
+
+  /* Checkbox option (multi-select) */
+  .chk-opt {
+    display: inline-flex; align-items: center; gap: 10px;
+    padding: 12px 16px; border: 2px solid #e2e8f0; border-radius: 10px;
+    background: #fff; color: #334155; font-size: 14px; font-weight: 500;
+    cursor: pointer; transition: all 0.15s; user-select: none;
+    min-height: 48px;
+  }
+  .chk-opt:hover { border-color: #f97316; background: #fff7ed; }
+  .chk-opt.selected { border-color: #f97316; background: #fff7ed; color: #ea580c; }
+  .chk-opt input[type="checkbox"] { width: 18px; height: 18px; accent-color: #f97316; cursor: pointer; }
+
+  /* Service row in step 2 */
+  .svc-row {
+    display: flex; align-items: center; justify-content: space-between;
+    padding: 14px 16px; border: 2px solid #e2e8f0; border-radius: 10px;
+    background: #fff; margin-bottom: 8px; transition: all 0.15s;
+  }
+  .svc-row.included { border-color: #86efac; background: #f0fdf4; }
+  .svc-row.optional { border-color: #e2e8f0; cursor: pointer; }
+  .svc-row.optional:hover { border-color: #f97316; background: #fff7ed; }
+  .svc-row.optional.selected { border-color: #f97316; background: #fff7ed; }
+
+  /* Progress bar */
+  .prog-bar { display: flex; align-items: center; gap: 0; max-width: 600px; margin: 0 auto; }
+  .prog-dot {
+    width: 32px; height: 32px; border-radius: 50%; display: flex; align-items: center;
+    justify-content: center; font-size: 13px; font-weight: 700; flex-shrink: 0;
+    border: 2px solid #e2e8f0; background: #fff; color: #94a3b8; transition: all 0.2s;
+  }
+  .prog-dot.active { border-color: #f97316; background: #f97316; color: #fff; }
+  .prog-dot.done { border-color: #16a34a; background: #16a34a; color: #fff; }
+  .prog-line { flex: 1; height: 3px; background: #e2e8f0; transition: background 0.2s; }
+  .prog-line.done { background: #16a34a; }
+  .prog-label { font-size: 10px; color: #94a3b8; text-align: center; margin-top: 4px; font-weight: 600; }
+  .prog-label.active { color: #f97316; }
+  .prog-label.done { color: #16a34a; }
+
+  /* Question block */
+  .q-block { margin-bottom: 28px; }
+  .q-label { font-size: 15px; font-weight: 700; color: #1e293b; margin: 0 0 12px; }
+  .q-grid { display: flex; flex-wrap: wrap; gap: 8px; }
+
+  /* State multi-select */
+  .state-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(100px, 1fr)); gap: 6px; }
+  .state-chip {
+    padding: 8px 4px; border: 2px solid #e2e8f0; border-radius: 8px; background: #fff;
+    font-size: 12px; font-weight: 600; color: #64748b; text-align: center;
+    cursor: pointer; transition: all 0.15s; user-select: none;
+  }
+  .state-chip:hover { border-color: #f97316; }
+  .state-chip.selected { border-color: #f97316; background: #fff7ed; color: #ea580c; }
+  .state-chip.base { border-color: #16a34a; background: #f0fdf4; color: #15803d; pointer-events: none; }
+
+  /* Name check */
+  .name-result { padding: 10px 14px; border-radius: 8px; font-size: 13px; margin-top: 8px; display: none; }
+  .name-result.available { background: #f0fdf4; border: 1px solid #bbf7d0; color: #15803d; display: block; }
+  .name-result.taken { background: #fef2f2; border: 1px solid #fecaca; color: #b91c1c; display: block; }
+  .name-result.checking { background: #f8fafc; border: 1px solid #e2e8f0; color: #64748b; display: block; }
+
+  /* Nav buttons */
+  .wiz-nav { display: flex; justify-content: space-between; align-items: center; margin-top: 32px; gap: 12px; }
+  .wiz-btn {
+    padding: 14px 28px; border-radius: 10px; font-size: 15px; font-weight: 700;
+    border: none; cursor: pointer; transition: all 0.15s; display: inline-flex;
+    align-items: center; gap: 8px;
+  }
+  .wiz-btn.primary { background: #f97316; color: #fff; box-shadow: 0 4px 14px rgba(249,115,22,0.3); }
+  .wiz-btn.primary:hover { background: #ea580c; }
+  .wiz-btn.primary:disabled { background: #d4d4d4; color: #9ca3af; box-shadow: none; cursor: not-allowed; }
+  .wiz-btn.secondary { background: #f1f5f9; color: #475569; }
+  .wiz-btn.secondary:hover { background: #e2e8f0; }
+
+  /* Entity option cards */
+  .entity-opt {
+    display: block; padding: 20px; border: 2px solid #e2e8f0; border-radius: 12px;
+    background: #fff; cursor: pointer; transition: all 0.15s; margin-bottom: 10px;
+  }
+  .entity-opt:hover { border-color: #f97316; }
+  .entity-opt.selected { border-color: #f97316; background: #fff7ed; }
+
+  /* Responsive */
+  @media (max-width: 640px) {
+    .q-grid { flex-direction: column; }
+    .btn-opt { width: 100%; }
+    .state-grid { grid-template-columns: repeat(4, 1fr); }
+    .wiz-btn { padding: 12px 20px; font-size: 14px; }
+  }
 </style>
 </head>
 <body class="min-h-screen flex flex-col bg-gray-50">
@@ -45,7 +145,7 @@ Sign out
         New Carrier Startup
       </div>
       <h1 style="font-size:28px;font-weight:800;color:#fff;margin:0 0 12px;line-height:1.2">Start Your Trucking Business</h1>
-      <p style="font-size:15px;color:#94a3b8;margin:0;line-height:1.6;max-width:540px;display:inline-block">Get everything you need to legally operate as a motor carrier. We handle the formation, federal registrations, and compliance setup so you can focus on hauling freight.</p>
+      <p style="font-size:15px;color:#94a3b8;margin:0;line-height:1.6;max-width:540px;display:inline-block">Answer a few questions about your fleet, and we'll build a custom compliance package for you.</p>
     </div>
   </section>
 
@@ -59,270 +159,407 @@ Sign out
     </div>
   </div>
 
-  <section class="py-8">
-    <div class="max-w-3xl mx-auto px-4">
+  <!-- Progress Bar -->
+  <div style="padding:24px 16px 0">
+    <div class="prog-bar" id="progress-bar">
+      <div style="text-align:center">
+        <div class="prog-dot active" data-step="0">1</div>
+        <div class="prog-label active" data-step="0">Fleet</div>
+      </div>
+      <div class="prog-line" data-line="0"></div>
+      <div style="text-align:center">
+        <div class="prog-dot" data-step="1">2</div>
+        <div class="prog-label" data-step="1">Entity</div>
+      </div>
+      <div class="prog-line" data-line="1"></div>
+      <div style="text-align:center">
+        <div class="prog-dot" data-step="2">3</div>
+        <div class="prog-label" data-step="2">Services</div>
+      </div>
+      <div class="prog-line" data-line="2"></div>
+      <div style="text-align:center">
+        <div class="prog-dot" data-step="3">4</div>
+        <div class="prog-label" data-step="3">Checkout</div>
+      </div>
+    </div>
+  </div>
 
-      <!-- ============ BUNDLE ============ -->
-      <div style="margin-bottom:32px">
-        <div style="display:flex;align-items:center;gap:8px;margin-bottom:12px">
-          <span style="font-size:11px;font-weight:700;color:#16a34a;text-transform:uppercase;letter-spacing:0.05em">Recommended</span>
-          <span style="font-size:10px;font-weight:700;color:#fff;background:#16a34a;border-radius:999px;padding:2px 8px">BEST VALUE</span>
+  <section style="padding:24px 0 48px">
+    <div style="max-width:48rem;margin:0 auto;padding:0 16px">
+
+      <!-- ===================== STEP 0: Fleet Profile ===================== -->
+      <div class="wiz-step active" id="step-0">
+        <h2 style="font-size:22px;font-weight:800;color:#1a2744;margin:0 0 8px">Tell us about your fleet</h2>
+        <p style="font-size:14px;color:#64748b;margin:0 0 28px">We'll use this to recommend exactly which registrations and filings you need.</p>
+
+        <!-- Q1: Power units -->
+        <div class="q-block">
+          <p class="q-label">How many power units (trucks/tractors)?</p>
+          <div class="q-grid" id="q-units">
+            <div class="btn-opt" data-val="1">1</div>
+            <div class="btn-opt" data-val="2-5">2 - 5</div>
+            <div class="btn-opt" data-val="6-20">6 - 20</div>
+            <div class="btn-opt" data-val="21-100">21 - 100</div>
+            <div class="btn-opt" data-val="100+">100+</div>
+          </div>
         </div>
 
-        <label class="bundle-card" style="display:block;border-radius:12px;border:3px solid #86efac;background:#f0fdf4;padding:24px;cursor:pointer;transition:all 0.15s">
-          <div style="display:flex;align-items:flex-start;gap:12px">
-            <input type="checkbox" id="pw-bundle-check" data-slug="new-carrier-bundle" data-price="59900" data-govfee="30000" data-bundle="llc-formation,dot-registration,mc-authority,boc3-filing,mcs150-update,dot-drug-alcohol" style="margin-top:4px;width:20px;height:20px;accent-color:#16a34a">
-            <div style="flex:1">
-              <div style="display:flex;flex-wrap:wrap;align-items:center;justify-content:space-between;gap:8px">
-                <span style="font-size:18px;font-weight:800;color:#1a2744">New Carrier Starter Bundle</span>
-                <div style="text-align:right">
-                  <span style="font-size:20px;font-weight:800;color:#16a34a">$599</span>
-                  <span style="font-size:13px;color:#64748b;margin-left:4px">+ $300 FMCSA fee</span>
+        <!-- Q2: Vehicle type -->
+        <div class="q-block">
+          <p class="q-label">What type of vehicles?</p>
+          <div class="q-grid" id="q-vehicles">
+            <div class="btn-opt" data-val="straight">Straight Trucks</div>
+            <div class="btn-opt" data-val="tractor">Tractor-Trailers</div>
+            <div class="btn-opt" data-val="both">Both</div>
+            <div class="btn-opt" data-val="bus">Buses / Passengers</div>
+          </div>
+        </div>
+
+        <!-- Q3: Cargo -->
+        <div class="q-block">
+          <p class="q-label">What will you haul? <span style="font-weight:400;color:#94a3b8;font-size:13px">(select all that apply)</span></p>
+          <div class="q-grid" id="q-cargo">
+            <label class="chk-opt"><input type="checkbox" value="general"> General Freight</label>
+            <label class="chk-opt"><input type="checkbox" value="household"> Household Goods</label>
+            <label class="chk-opt"><input type="checkbox" value="hazmat"> Hazmat</label>
+            <label class="chk-opt"><input type="checkbox" value="passengers"> Passengers</label>
+            <label class="chk-opt"><input type="checkbox" value="livestock"> Livestock</label>
+            <label class="chk-opt"><input type="checkbox" value="refrigerated"> Refrigerated</label>
+            <label class="chk-opt"><input type="checkbox" value="flatbed"> Flatbed / Machinery</label>
+            <label class="chk-opt"><input type="checkbox" value="tanker"> Tanker / Liquids</label>
+            <label class="chk-opt"><input type="checkbox" value="other"> Other</label>
+          </div>
+        </div>
+
+        <!-- Q4: Interstate -->
+        <div class="q-block">
+          <p class="q-label">Will you cross state lines?</p>
+          <div class="q-grid" id="q-interstate">
+            <div class="btn-opt" data-val="interstate">Interstate</div>
+            <div class="btn-opt" data-val="intrastate">Intrastate Only</div>
+          </div>
+        </div>
+
+        <!-- Q5: International -->
+        <div class="q-block">
+          <p class="q-label">Do you cross international borders?</p>
+          <div class="q-grid" id="q-international">
+            <div class="btn-opt" data-val="no">No</div>
+            <div class="btn-opt" data-val="canada">Canada</div>
+            <div class="btn-opt" data-val="mexico">Mexico</div>
+            <div class="btn-opt" data-val="both">Both</div>
+          </div>
+        </div>
+
+        <!-- Q6: Base state -->
+        <div class="q-block">
+          <p class="q-label">Where is your base of operations?</p>
+          <select id="q-base-state" style="width:100%;max-width:320px;padding:12px 14px;border:2px solid #e2e8f0;border-radius:10px;font-size:14px;font-weight:500;color:#334155;background:#fff;cursor:pointer;appearance:auto">
+            <option value="">Select your state...</option>
+          </select>
+        </div>
+
+        <!-- Q7: Operating states (shown after base state) -->
+        <div class="q-block" id="q-op-states-block" style="display:none">
+          <p class="q-label">What states will you operate in? <span style="font-weight:400;color:#94a3b8;font-size:13px">(select all that apply)</span></p>
+          <div style="margin-bottom:10px">
+            <button type="button" id="select-all-states-btn" style="font-size:12px;color:#f97316;font-weight:600;background:none;border:none;cursor:pointer;padding:0;text-decoration:underline">Select all states</button>
+            <span style="color:#d4d4d4;margin:0 8px">|</span>
+            <button type="button" id="clear-states-btn" style="font-size:12px;color:#94a3b8;font-weight:600;background:none;border:none;cursor:pointer;padding:0;text-decoration:underline">Clear</button>
+          </div>
+          <div class="state-grid" id="q-op-states"></div>
+        </div>
+
+        <!-- Q8: Carrier type -->
+        <div class="q-block">
+          <p class="q-label">For-hire or private carrier?</p>
+          <div class="q-grid" id="q-carrier-type">
+            <div class="btn-opt" data-val="for-hire" style="flex:1">
+              <div style="text-align:center">
+                <div style="font-weight:700">For-Hire</div>
+                <div style="font-size:11px;font-weight:400;color:#94a3b8;margin-top:2px">Hauling others' goods for pay</div>
+              </div>
+            </div>
+            <div class="btn-opt" data-val="private" style="flex:1">
+              <div style="text-align:center">
+                <div style="font-weight:700">Private</div>
+                <div style="font-size:11px;font-weight:400;color:#94a3b8;margin-top:2px">Transporting your own goods</div>
+              </div>
+            </div>
+            <div class="btn-opt" data-val="exempt" style="flex:1">
+              <div style="text-align:center">
+                <div style="font-weight:700">Exempt</div>
+                <div style="font-size:11px;font-weight:400;color:#94a3b8;margin-top:2px">Farm, government, etc.</div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div class="wiz-nav">
+          <div></div>
+          <button type="button" class="wiz-btn primary" id="step0-next" disabled>
+            Next: Entity Setup
+            <svg style="width:16px;height:16px" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2.5"><path stroke-linecap="round" stroke-linejoin="round" d="M13.5 4.5L21 12m0 0l-7.5 7.5M21 12H3"/></svg>
+          </button>
+        </div>
+      </div>
+
+      <!-- ===================== STEP 1: Entity Strategy ===================== -->
+      <div class="wiz-step" id="step-1">
+        <h2 style="font-size:22px;font-weight:800;color:#1a2744;margin:0 0 8px">Business Entity Setup</h2>
+        <p style="font-size:14px;color:#64748b;margin:0 0 28px">Your trucking business needs a legal entity before we can register with FMCSA.</p>
+
+        <div class="q-block">
+          <p class="q-label">Do you have an existing business entity?</p>
+          <div class="q-grid" id="q-has-entity">
+            <div class="btn-opt" data-val="yes" style="flex:1">Yes, I have one</div>
+            <div class="btn-opt" data-val="no" style="flex:1">No, I need to form one</div>
+          </div>
+        </div>
+
+        <!-- Existing entity input -->
+        <div id="entity-existing" style="display:none">
+          <div class="q-block">
+            <p class="q-label">What is your business name?</p>
+            <input type="text" id="entity-existing-name" placeholder="e.g. Smith Trucking LLC" style="width:100%;padding:12px 14px;border:2px solid #e2e8f0;border-radius:10px;font-size:14px;color:#334155">
+            <div id="entity-existing-result" class="name-result"></div>
+          </div>
+          <div class="q-block">
+            <p class="q-label">State of incorporation</p>
+            <select id="entity-existing-state" style="width:100%;max-width:320px;padding:12px 14px;border:2px solid #e2e8f0;border-radius:10px;font-size:14px;color:#334155;background:#fff">
+              <option value="">Select state...</option>
+            </select>
+          </div>
+        </div>
+
+        <!-- New entity options -->
+        <div id="entity-new" style="display:none">
+          <div class="q-block">
+            <p class="q-label">How do you want to set up?</p>
+            <div class="entity-opt" data-val="home" id="entity-opt-home">
+              <div style="display:flex;align-items:center;gap:12px">
+                <div style="width:40px;height:40px;border-radius:10px;background:#f0fdf4;display:flex;align-items:center;justify-content:center;flex-shrink:0">
+                  <svg style="width:20px;height:20px;color:#16a34a" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M2.25 12l8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25"/></svg>
+                </div>
+                <div style="flex:1">
+                  <div style="font-size:15px;font-weight:700;color:#1e293b">Keep it simple</div>
+                  <div style="font-size:13px;color:#64748b;margin-top:2px">Form in your home state (<span id="home-state-label">your state</span>)</div>
                 </div>
               </div>
-              <p style="font-size:13px;color:#475569;margin:8px 0 14px;line-height:1.6">Everything you need to start hauling freight legally. We form your LLC, register your USDOT, file for MC authority, and set up all required compliance programs.</p>
-              <div style="display:grid;grid-template-columns:1fr 1fr;gap:6px 16px;font-size:12px;color:#334155">
-                <span style="display:flex;align-items:center;gap:6px"><svg style="width:14px;height:14px;color:#16a34a;flex-shrink:0" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2.5"><path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12.75l6 6 9-13.5"/></svg> LLC Formation</span>
-                <span style="display:flex;align-items:center;gap:6px"><svg style="width:14px;height:14px;color:#16a34a;flex-shrink:0" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2.5"><path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12.75l6 6 9-13.5"/></svg> USDOT Registration</span>
-                <span style="display:flex;align-items:center;gap:6px"><svg style="width:14px;height:14px;color:#16a34a;flex-shrink:0" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2.5"><path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12.75l6 6 9-13.5"/></svg> MC Operating Authority</span>
-                <span style="display:flex;align-items:center;gap:6px"><svg style="width:14px;height:14px;color:#16a34a;flex-shrink:0" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2.5"><path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12.75l6 6 9-13.5"/></svg> BOC-3 Filing</span>
-                <span style="display:flex;align-items:center;gap:6px"><svg style="width:14px;height:14px;color:#16a34a;flex-shrink:0" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2.5"><path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12.75l6 6 9-13.5"/></svg> MCS-150 Filing</span>
-                <span style="display:flex;align-items:center;gap:6px"><svg style="width:14px;height:14px;color:#16a34a;flex-shrink:0" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2.5"><path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12.75l6 6 9-13.5"/></svg> Drug & Alcohol Program</span>
-              </div>
-              <div style="margin-top:14px;padding:10px 14px;background:rgba(22,163,74,0.08);border-radius:8px;display:flex;align-items:center;gap:8px">
-                <svg style="width:16px;height:16px;color:#16a34a;flex-shrink:0" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M9.813 15.904L9 18.75l-.813-2.846a4.5 4.5 0 00-3.09-3.09L2.25 12l2.846-.813a4.5 4.5 0 003.09-3.09L9 5.25l.813 2.846a4.5 4.5 0 003.09 3.09L15.75 12l-2.846.813a4.5 4.5 0 00-3.09 3.09zM18.259 8.715L18 9.75l-.259-1.035a3.375 3.375 0 00-2.455-2.456L14.25 6l1.036-.259a3.375 3.375 0 002.455-2.456L18 2.25l.259 1.035a3.375 3.375 0 002.455 2.456L21.75 6l-1.036.259a3.375 3.375 0 00-2.455 2.456zM16.894 20.567L16.5 21.75l-.394-1.183a2.25 2.25 0 00-1.423-1.423L13.5 18.75l1.183-.394a2.25 2.25 0 001.423-1.423l.394-1.183.394 1.183a2.25 2.25 0 001.423 1.423l1.183.394-1.183.394a2.25 2.25 0 00-1.423 1.423z"/></svg>
-                <span style="font-size:12px;font-weight:700;color:#15803d">Save $405 vs. buying individually ($1,004 value)</span>
+            </div>
+            <div class="entity-opt" data-val="wyoming" id="entity-opt-wy">
+              <div style="display:flex;align-items:center;gap:12px">
+                <div style="width:40px;height:40px;border-radius:10px;background:#eff6ff;display:flex;align-items:center;justify-content:center;flex-shrink:0">
+                  <svg style="width:20px;height:20px;color:#2563eb" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75L11.25 15 15 9.75m-3-7.036A11.959 11.959 0 013.598 6 11.99 11.99 0 003 9.749c0 5.592 3.824 10.29 9 11.623 5.176-1.332 9-6.03 9-11.622 0-1.31-.21-2.571-.598-3.751h-.152c-3.196 0-6.1-1.248-8.25-3.285z"/></svg>
+                </div>
+                <div style="flex:1">
+                  <div style="font-size:15px;font-weight:700;color:#1e293b">Optimize for liability protection &amp; taxes
+                    <span style="font-size:11px;font-weight:700;color:#2563eb;background:#eff6ff;padding:2px 8px;border-radius:999px;margin-left:6px">RECOMMENDED</span>
+                  </div>
+                  <div style="font-size:13px;color:#64748b;margin-top:2px">Form in Wyoming — no state income tax, $50/yr annual report, strongest asset protection in the US. We handle foreign qualification in your operating state.</div>
+                </div>
               </div>
             </div>
           </div>
-        </label>
+
+          <div class="q-block">
+            <p class="q-label">Entity type</p>
+            <div class="q-grid" id="q-entity-type">
+              <div class="btn-opt selected" data-val="llc" style="flex:1">
+                <div style="text-align:center">
+                  <div style="font-weight:700">LLC</div>
+                  <div style="font-size:11px;font-weight:400;color:#94a3b8;margin-top:2px">Recommended for most carriers</div>
+                </div>
+              </div>
+              <div class="btn-opt" data-val="corp" style="flex:1">
+                <div style="text-align:center">
+                  <div style="font-weight:700">Corporation</div>
+                  <div style="font-size:11px;font-weight:400;color:#94a3b8;margin-top:2px">S-Corp or C-Corp election</div>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <div class="q-block">
+            <p class="q-label">Business name</p>
+            <input type="text" id="entity-new-name" placeholder="e.g. Smith Trucking LLC" style="width:100%;padding:12px 14px;border:2px solid #e2e8f0;border-radius:10px;font-size:14px;color:#334155">
+            <p style="font-size:11px;color:#94a3b8;margin:6px 0 0">We'll check availability with the Secretary of State and FMCSA.</p>
+            <div id="entity-new-result" class="name-result"></div>
+          </div>
+        </div>
+
+        <div class="wiz-nav">
+          <button type="button" class="wiz-btn secondary" id="step1-back">
+            <svg style="width:16px;height:16px" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2.5"><path stroke-linecap="round" stroke-linejoin="round" d="M10.5 19.5L3 12m0 0l7.5-7.5M3 12h18"/></svg>
+            Back
+          </button>
+          <button type="button" class="wiz-btn primary" id="step1-next" disabled>
+            Next: Review Services
+            <svg style="width:16px;height:16px" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2.5"><path stroke-linecap="round" stroke-linejoin="round" d="M13.5 4.5L21 12m0 0l-7.5 7.5M21 12H3"/></svg>
+          </button>
+        </div>
       </div>
 
-      <!-- ============ OR DIVIDER ============ -->
-      <div style="display:flex;align-items:center;gap:16px;margin:0 0 24px">
-        <div style="flex:1;height:1px;background:#e2e8f0"></div>
-        <span style="font-size:12px;font-weight:600;color:#94a3b8;text-transform:uppercase;letter-spacing:0.1em">Or pick individual services</span>
-        <div style="flex:1;height:1px;background:#e2e8f0"></div>
+      <!-- ===================== STEP 2: Service Selection ===================== -->
+      <div class="wiz-step" id="step-2">
+        <div style="display:flex;align-items:center;gap:8px;margin-bottom:4px">
+          <h2 style="font-size:22px;font-weight:800;color:#1a2744;margin:0">Your Compliance Package</h2>
+        </div>
+        <p style="font-size:14px;color:#64748b;margin:0 0 8px">Based on your fleet profile, here's what you need:</p>
+
+        <!-- Bundle offer (shown if 4+ services) -->
+        <div id="bundle-offer" style="display:none;margin-bottom:24px">
+          <div style="background:linear-gradient(135deg,#f0fdf4 0%,#ecfdf5 100%);border:2px solid #86efac;border-radius:12px;padding:20px;cursor:pointer" id="bundle-card">
+            <div style="display:flex;align-items:center;gap:8px;margin-bottom:8px">
+              <span style="font-size:10px;font-weight:700;color:#fff;background:#16a34a;border-radius:999px;padding:2px 10px">BEST VALUE</span>
+              <span style="font-size:12px;font-weight:700;color:#16a34a">New Carrier Starter Bundle</span>
+            </div>
+            <div style="display:flex;align-items:center;justify-content:space-between;flex-wrap:wrap;gap:8px">
+              <div>
+                <span style="font-size:24px;font-weight:800;color:#16a34a">$599</span>
+                <span style="font-size:13px;color:#64748b;margin-left:4px">+ $300 FMCSA fee</span>
+              </div>
+              <div style="font-size:12px;font-weight:700;color:#15803d;background:rgba(22,163,74,0.1);padding:6px 12px;border-radius:8px">
+                <span id="bundle-savings">Save $405</span> vs. individual pricing
+              </div>
+            </div>
+            <p style="font-size:12px;color:#475569;margin:10px 0 0">Includes: LLC Formation, USDOT, MC Authority, BOC-3, MCS-150, Drug &amp; Alcohol Program</p>
+            <div style="margin-top:12px">
+              <label style="display:flex;align-items:center;gap:8px;cursor:pointer">
+                <input type="checkbox" id="use-bundle" style="width:18px;height:18px;accent-color:#16a34a">
+                <span style="font-size:14px;font-weight:700;color:#15803d">Use the Starter Bundle and save</span>
+              </label>
+            </div>
+          </div>
+        </div>
+
+        <div id="svc-list-header" style="display:flex;align-items:center;gap:16px;margin:0 0 16px">
+          <div style="flex:1;height:1px;background:#e2e8f0"></div>
+          <span style="font-size:12px;font-weight:600;color:#94a3b8;text-transform:uppercase;letter-spacing:0.1em" id="svc-list-label">Required &amp; Optional Services</span>
+          <div style="flex:1;height:1px;background:#e2e8f0"></div>
+        </div>
+
+        <div id="svc-list"></div>
+
+        <!-- Hazmat note -->
+        <div id="hazmat-note" style="display:none;margin-top:16px;padding:14px 16px;background:#fffbeb;border:1px solid #fde68a;border-radius:10px">
+          <div style="display:flex;align-items:flex-start;gap:10px">
+            <svg style="width:18px;height:18px;color:#d97706;flex-shrink:0;margin-top:1px" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126zM12 15.75h.007v.008H12v-.008z"/></svg>
+            <div>
+              <p style="font-size:13px;font-weight:700;color:#92400e;margin:0 0 4px">Hazmat Notice</p>
+              <p style="font-size:12px;color:#78350f;margin:0;line-height:1.5">Hazmat carriers must register with the Hazardous Materials Safety Permit (HMSP) program, and all drivers must obtain a TWIC card. We'll guide you through these requirements during intake.</p>
+            </div>
+          </div>
+        </div>
+
+        <!-- Total -->
+        <div style="margin-top:24px;padding:20px;background:#fff;border:2px solid #e2e8f0;border-radius:12px" id="svc-total-box">
+          <div id="svc-total-rows"></div>
+        </div>
+
+        <div class="wiz-nav">
+          <button type="button" class="wiz-btn secondary" id="step2-back">
+            <svg style="width:16px;height:16px" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2.5"><path stroke-linecap="round" stroke-linejoin="round" d="M10.5 19.5L3 12m0 0l7.5-7.5M3 12h18"/></svg>
+            Back
+          </button>
+          <button type="button" class="wiz-btn primary" id="step2-next">
+            Next: Checkout
+            <svg style="width:16px;height:16px" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2.5"><path stroke-linecap="round" stroke-linejoin="round" d="M13.5 4.5L21 12m0 0l-7.5 7.5M21 12H3"/></svg>
+          </button>
+        </div>
       </div>
 
-      <!-- ============ INDIVIDUAL SERVICES ============ -->
-      <div id="pw-svc-list" class="space-y-3">
+      <!-- ===================== STEP 3: Checkout ===================== -->
+      <div class="wiz-step" id="step-3">
+        <h2 style="font-size:22px;font-weight:800;color:#1a2744;margin:0 0 8px">Complete Your Order</h2>
+        <p style="font-size:14px;color:#64748b;margin:0 0 24px">Review your package and enter payment details.</p>
 
-        <h3 style="font-size:11px;font-weight:700;color:#ea580c;text-transform:uppercase;letter-spacing:0.05em;margin:0 0 8px">Business Formation</h3>
+        <!-- Order summary -->
+        <div style="background:#f8fafc;border:1px solid #e2e8f0;border-radius:12px;padding:20px;margin-bottom:24px">
+          <h3 style="font-size:14px;font-weight:700;color:#1e293b;margin:0 0 12px">Order Summary</h3>
+          <div id="checkout-summary"></div>
+        </div>
 
-        <label class="svc-card block rounded-xl border-2 border-gray-200 bg-white p-4 cursor-pointer hover:border-orange-300">
-          <div class="flex items-start gap-3">
-            <input type="checkbox" data-slug="llc-formation" data-price="19900" class="mt-1 accent-orange-500">
-            <div class="flex-1">
-              <div class="flex items-center justify-between">
-                <span class="font-semibold text-gray-900">LLC Formation</span>
-                <span class="text-sm font-bold text-orange-600">$199</span>
-              </div>
-              <p class="text-xs text-gray-500 mt-1">Form your trucking LLC in any state. Includes articles of organization, operating agreement template, and EIN guidance.</p>
-            </div>
-          </div>
-        </label>
-
-        <label class="svc-card block rounded-xl border-2 border-gray-200 bg-white p-4 cursor-pointer hover:border-orange-300">
-          <div class="flex items-start gap-3">
-            <input type="checkbox" data-slug="ein-application" data-price="7900" class="mt-1 accent-orange-500">
-            <div class="flex-1">
-              <div class="flex items-center justify-between">
-                <span class="font-semibold text-gray-900">EIN Application</span>
-                <span class="text-sm font-bold text-orange-600">$79</span>
-              </div>
-              <p class="text-xs text-gray-500 mt-1">Obtain your Employer Identification Number from the IRS. Required for business banking, hiring employees, and tax filings.</p>
-            </div>
-          </div>
-        </label>
-
-        <h3 style="font-size:11px;font-weight:700;color:#ea580c;text-transform:uppercase;letter-spacing:0.05em;margin:24px 0 8px">Federal Registrations</h3>
-
-        <label class="svc-card block rounded-xl border-2 border-gray-200 bg-white p-4 cursor-pointer hover:border-orange-300">
-          <div class="flex items-start gap-3">
-            <input type="checkbox" data-slug="dot-registration" data-price="14900" class="mt-1 accent-orange-500">
-            <div class="flex-1">
-              <div class="flex items-center justify-between">
-                <span class="font-semibold text-gray-900">USDOT Registration</span>
-                <span class="text-sm font-bold text-orange-600">$149</span>
-              </div>
-              <p class="text-xs text-gray-500 mt-1">Register for a new USDOT number with FMCSA. Required for all interstate commercial motor carriers.</p>
-            </div>
-          </div>
-        </label>
-
-        <label class="svc-card block rounded-xl border-2 border-gray-200 bg-white p-4 cursor-pointer hover:border-orange-300">
-          <div class="flex items-start gap-3">
-            <input type="checkbox" data-slug="mc-authority" data-price="34900" data-govfee="30000" data-nodiscount="1" class="mt-1 accent-orange-500">
-            <div class="flex-1">
-              <div class="flex items-center justify-between">
-                <span class="font-semibold text-gray-900">MC Operating Authority</span>
-                <span class="text-sm font-bold text-orange-600">$349 <span style="font-size:11px;font-weight:400;color:#94a3b8">+ $300 FMCSA fee</span></span>
-              </div>
-              <p class="text-xs text-gray-500 mt-1">Apply for common or contract carrier authority. Required for for-hire carriers transporting regulated commodities.</p>
-            </div>
-          </div>
-        </label>
-
-        <label class="svc-card block rounded-xl border-2 border-gray-200 bg-white p-4 cursor-pointer hover:border-orange-300">
-          <div class="flex items-start gap-3">
-            <input type="checkbox" data-slug="boc3-filing" data-price="8900" data-nodiscount="1" class="mt-1 accent-orange-500">
-            <div class="flex-1">
-              <div class="flex items-center justify-between">
-                <span class="font-semibold text-gray-900">BOC-3 Process Agent Filing</span>
-                <span class="text-sm font-bold text-orange-600">$89</span>
-              </div>
-              <p class="text-xs text-gray-500 mt-1">Designates a process agent in all 48 states + DC. Required for all for-hire carriers, brokers, and freight forwarders.</p>
-            </div>
-          </div>
-        </label>
-
-        <label class="svc-card block rounded-xl border-2 border-gray-200 bg-white p-4 cursor-pointer hover:border-orange-300">
-          <div class="flex items-start gap-3">
-            <input type="checkbox" data-slug="mcs150-update" data-price="6900" class="mt-1 accent-orange-500">
-            <div class="flex-1">
-              <div class="flex items-center justify-between">
-                <span class="font-semibold text-gray-900">MCS-150 Filing</span>
-                <span class="text-sm font-bold text-orange-600">$69</span>
-              </div>
-              <p class="text-xs text-gray-500 mt-1">Initial MCS-150 motor carrier identification report. Filed with your USDOT application.</p>
-            </div>
-          </div>
-        </label>
-
-        <h3 style="font-size:11px;font-weight:700;color:#ea580c;text-transform:uppercase;letter-spacing:0.05em;margin:24px 0 8px">Safety & Compliance</h3>
-
-        <label class="svc-card block rounded-xl border-2 border-gray-200 bg-white p-4 cursor-pointer hover:border-orange-300">
-          <div class="flex items-start gap-3">
-            <input type="checkbox" data-slug="dot-drug-alcohol" data-price="14900" data-nodiscount="1" class="mt-1 accent-orange-500">
-            <div class="flex-1">
-              <div class="flex items-center justify-between">
-                <span class="font-semibold text-gray-900">Drug & Alcohol Program Setup</span>
-                <span class="text-sm font-bold text-orange-600">$149/yr</span>
-              </div>
-              <p class="text-xs text-gray-500 mt-1">Consortium enrollment, written policy, DER designation, random testing pool. Required for all carriers with CDL drivers.</p>
-            </div>
-          </div>
-        </label>
-
-        <label class="svc-card block rounded-xl border-2 border-gray-200 bg-white p-4 cursor-pointer hover:border-orange-300">
-          <div class="flex items-start gap-3">
-            <input type="checkbox" data-slug="ucr-registration" data-price="6900" class="mt-1 accent-orange-500">
-            <div class="flex-1">
-              <div class="flex items-center justify-between">
-                <span class="font-semibold text-gray-900">UCR Registration</span>
-                <span class="text-sm font-bold text-orange-600">$69 <span style="font-size:11px;font-weight:400;color:#94a3b8">+ gov fee from $46</span></span>
-              </div>
-              <p class="text-xs text-gray-500 mt-1">Annual Unified Carrier Registration. Required for all interstate for-hire carriers. Gov fee based on fleet size.</p>
-            </div>
-          </div>
-        </label>
-
-      </div>
-
-      <!-- ============ TOTAL + CHECKOUT ============ -->
-      <div id="pw-total-section" class="mt-6 bg-white border border-gray-200 rounded-xl p-6 shadow-sm" hidden>
-        <div id="pw-total-rows"></div>
-        <div class="mt-4 pt-4 border-t border-gray-200">
-          <form id="pw-batch-form" class="space-y-4">
-            <div class="grid sm:grid-cols-2 gap-3">
-              <div>
-                <label class="block text-xs font-medium text-gray-600 mb-1">Your first and last name</label>
-                <input type="text" id="pw-name" required placeholder="e.g. John Smith" class="w-full px-3 py-2 text-sm border border-gray-300 rounded-lg outline-none">
-              </div>
-              <div>
-                <label class="block text-xs font-medium text-gray-600 mb-1">Email</label>
-                <input type="email" id="pw-email" required placeholder="john@company.com" class="w-full px-3 py-2 text-sm border border-gray-300 rounded-lg outline-none">
-              </div>
-              <div>
-                <label class="block text-xs font-medium text-gray-600 mb-1">Phone</label>
-                <input type="tel" id="pw-phone" placeholder="(555) 123-4567" class="w-full px-3 py-2 text-sm border border-gray-300 rounded-lg outline-none">
-              </div>
-              <div>
-                <label class="block text-xs font-medium text-gray-600 mb-1">USDOT # <span style="font-weight:400;color:#94a3b8">(if you already have one)</span></label>
-                <input type="text" id="pw-dot" placeholder="Optional" class="w-full px-3 py-2 text-sm border border-gray-300 rounded-lg outline-none">
-              </div>
+        <form id="pw-batch-form" style="display:grid;gap:16px">
+          <div style="display:grid;grid-template-columns:1fr 1fr;gap:12px">
+            <div>
+              <label style="display:block;font-size:12px;font-weight:600;color:#475569;margin-bottom:4px">Your first and last name</label>
+              <input type="text" id="pw-name" required placeholder="e.g. John Smith" style="width:100%;padding:12px 14px;border:2px solid #e2e8f0;border-radius:10px;font-size:14px;color:#334155">
             </div>
             <div>
-              <label class="block text-xs font-medium text-gray-600 mb-1">Discount code</label>
-              <input type="text" id="pw-promo" placeholder="Optional" class="w-full px-3 py-2 text-sm border border-gray-300 rounded-lg outline-none uppercase" style="max-width:240px">
-            </div>
-            <div id="pw-payment-section">
-              <h4 class="text-sm font-semibold text-gray-900 mb-2">Payment Method</h4>
-              <div style="display:grid;grid-template-columns:1fr 1fr;gap:8px">
-                <label class="flex items-center gap-2 p-3 rounded-lg border border-gray-200 cursor-pointer hover:border-orange-300 has-[:checked]:border-orange-500 has-[:checked]:bg-orange-50"><input type="radio" name="pw_pay" value="card" checked><span class="text-sm">Card</span></label>
-                <label class="flex items-center gap-2 p-3 rounded-lg border border-gray-200 cursor-pointer hover:border-orange-300 has-[:checked]:border-orange-500 has-[:checked]:bg-orange-50"><input type="radio" name="pw_pay" value="paypal"><span class="text-sm">PayPal</span></label>
-                <label class="flex items-center gap-2 p-3 rounded-lg border border-gray-200 cursor-pointer hover:border-orange-300 has-[:checked]:border-orange-500 has-[:checked]:bg-orange-50"><input type="radio" name="pw_pay" value="ach"><span class="text-sm">ACH</span></label>
-                <label class="flex items-center gap-2 p-3 rounded-lg border border-gray-200 cursor-pointer hover:border-orange-300 has-[:checked]:border-orange-500 has-[:checked]:bg-orange-50"><input type="radio" name="pw_pay" value="klarna"><span class="text-sm">Klarna <span style="font-size:10px;color:#e74c99">4 payments</span></span></label>
-              </div>
-            </div>
-            <label class="flex items-start gap-2 p-3 rounded-lg border border-gray-200 text-xs text-gray-600"><input type="checkbox" id="pw-engage" required class="mt-0.5"><span>I authorize Performance West to prepare and file on my behalf. <a href="/terms" target="_blank" class="text-orange-600 underline">Terms</a></span></label>
-            <button type="submit" id="pw-submit" style="width:100%;padding:14px;border-radius:8px;background:#f97316;color:#fff;font-weight:700;font-size:16px;border:none;cursor:pointer;box-shadow:0 4px 14px rgba(249,115,22,0.4)">Continue to Secure Payment &rarr;</button>
-            <p id="pw-err" class="text-sm text-red-700 mt-1" hidden></p>
-
-            <!-- Security badges -->
-            <div style="display:flex;align-items:center;justify-content:center;gap:16px;margin-top:14px;padding:10px 0;border-top:1px solid #f1f5f9">
-              <svg style="height:20px;color:#6366f1" viewBox="0 0 60 25" fill="currentColor"><text x="0" y="18" font-size="16" font-weight="700" font-family="Arial">stripe</text></svg>
-              <span style="font-size:11px;color:#94a3b8">|</span>
-              <span style="font-size:12px;font-weight:700;color:#003087">Pay<span style="color:#009cde">Pal</span></span>
-              <span style="font-size:11px;color:#94a3b8">|</span>
-              <span style="display:flex;align-items:center;gap:4px;font-size:11px;color:#64748b"><svg style="width:14px;height:14px" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M16.5 10.5V6.75a4.5 4.5 0 10-9 0v3.75m-.75 11.25h10.5a2.25 2.25 0 002.25-2.25v-6.75a2.25 2.25 0 00-2.25-2.25H6.75a2.25 2.25 0 00-2.25 2.25v6.75a2.25 2.25 0 002.25 2.25z"/></svg>256-bit SSL</span>
-              <span style="font-size:11px;color:#94a3b8">|</span>
-              <span style="display:flex;align-items:center;gap:4px;font-size:11px;color:#64748b"><svg style="width:14px;height:14px" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75L11.25 15 15 9.75m-3-7.036A11.959 11.959 0 013.598 6 11.99 11.99 0 003 9.749c0 5.592 3.824 10.29 9 11.623 5.176-1.332 9-6.03 9-11.622 0-1.31-.21-2.571-.598-3.751h-.152c-3.196 0-6.1-1.248-8.25-3.285z"/></svg>PCI Compliant</span>
-            </div>
-          </form>
-        </div>
-      </div>
-
-      <!-- What's included breakdown -->
-      <div style="max-width:36rem;margin:32px auto 0">
-        <div style="background:#fff;border:1px solid #e2e8f0;border-radius:12px;padding:24px">
-          <h3 style="font-size:16px;font-weight:700;color:#1a2744;margin:0 0 16px;text-align:center">What Happens After You Order</h3>
-          <div style="display:grid;gap:16px">
-            <div style="display:flex;gap:12px;align-items:flex-start">
-              <div style="width:28px;height:28px;border-radius:50%;background:#f0fdf4;display:flex;align-items:center;justify-content:center;flex-shrink:0;font-size:13px;font-weight:700;color:#16a34a">1</div>
-              <div>
-                <p style="font-size:13px;font-weight:600;color:#1e293b;margin:0">We collect your information</p>
-                <p style="font-size:12px;color:#64748b;margin:4px 0 0">After payment, you'll complete a short intake form with your business details, driver info, and vehicle information.</p>
-              </div>
-            </div>
-            <div style="display:flex;gap:12px;align-items:flex-start">
-              <div style="width:28px;height:28px;border-radius:50%;background:#f0fdf4;display:flex;align-items:center;justify-content:center;flex-shrink:0;font-size:13px;font-weight:700;color:#16a34a">2</div>
-              <div>
-                <p style="font-size:13px;font-weight:600;color:#1e293b;margin:0">We handle the filings</p>
-                <p style="font-size:12px;color:#64748b;margin:4px 0 0">Our compliance team prepares and submits all registrations to the appropriate agencies (SOS, FMCSA, etc.).</p>
-              </div>
-            </div>
-            <div style="display:flex;gap:12px;align-items:flex-start">
-              <div style="width:28px;height:28px;border-radius:50%;background:#f0fdf4;display:flex;align-items:center;justify-content:center;flex-shrink:0;font-size:13px;font-weight:700;color:#16a34a">3</div>
-              <div>
-                <p style="font-size:13px;font-weight:600;color:#1e293b;margin:0">You're ready to operate</p>
-                <p style="font-size:12px;color:#64748b;margin:4px 0 0">You'll receive your USDOT number, MC authority, BOC-3 confirmation, and all compliance documents. Get insurance and start hauling.</p>
-              </div>
+              <label style="display:block;font-size:12px;font-weight:600;color:#475569;margin-bottom:4px">Email</label>
+              <input type="email" id="pw-email" required placeholder="john@company.com" style="width:100%;padding:12px 14px;border:2px solid #e2e8f0;border-radius:10px;font-size:14px;color:#334155">
             </div>
           </div>
-        </div>
-      </div>
-
-      <!-- Closing reassurance -->
-      <div style="max-width:36rem;margin:24px auto 0;text-align:center">
-        <div style="background:#f8fafc;border:1px solid #e2e8f0;border-radius:12px;padding:20px 24px">
-          <h3 style="font-size:15px;font-weight:700;color:#1a2744;margin:0 0 10px">About Performance West</h3>
-          <p style="font-size:13px;color:#475569;line-height:1.7;margin:0 0 12px">Performance West Inc. is a professional compliance consulting firm based in Cheyenne, Wyoming. We specialize in DOT/FMCSA regulatory filings for motor carriers, brokers, and freight forwarders nationwide. Our team handles the paperwork so you can stay on the road.</p>
-          <div style="display:flex;flex-wrap:wrap;justify-content:center;gap:16px;font-size:12px;color:#64748b;margin-bottom:12px">
-            <span>Wyoming-registered corporation</span>
-            <span>&middot;</span>
-            <span>Serving all 50 states</span>
-            <span>&middot;</span>
-            <span>Toll free: (888) 411-0383</span>
+          <div style="display:grid;grid-template-columns:1fr 1fr;gap:12px">
+            <div>
+              <label style="display:block;font-size:12px;font-weight:600;color:#475569;margin-bottom:4px">Phone</label>
+              <input type="tel" id="pw-phone" placeholder="(555) 123-4567" style="width:100%;padding:12px 14px;border:2px solid #e2e8f0;border-radius:10px;font-size:14px;color:#334155">
+            </div>
+            <div>
+              <label style="display:block;font-size:12px;font-weight:600;color:#475569;margin-bottom:4px">USDOT # <span style="font-weight:400;color:#94a3b8">(if you already have one)</span></label>
+              <input type="text" id="pw-dot" placeholder="Optional" style="width:100%;padding:12px 14px;border:2px solid #e2e8f0;border-radius:10px;font-size:14px;color:#334155">
+            </div>
           </div>
-          <p style="font-size:12px;color:#94a3b8;margin:0">Your payment information is processed securely by Stripe. We never store your card number. All filings are prepared by our compliance team and submitted directly to the appropriate federal or state agency on your behalf.</p>
+          <div>
+            <label style="display:block;font-size:12px;font-weight:600;color:#475569;margin-bottom:4px">Discount code</label>
+            <input type="text" id="pw-promo" placeholder="Optional" style="width:100%;max-width:240px;padding:12px 14px;border:2px solid #e2e8f0;border-radius:10px;font-size:14px;color:#334155;text-transform:uppercase">
+          </div>
+
+          <div>
+            <h4 style="font-size:14px;font-weight:700;color:#1e293b;margin:0 0 10px">Payment Method</h4>
+            <div style="display:grid;grid-template-columns:1fr 1fr;gap:8px">
+              <label style="display:flex;align-items:center;gap:8px;padding:14px;border:2px solid #e2e8f0;border-radius:10px;cursor:pointer;transition:all 0.15s">
+                <input type="radio" name="pw_pay" value="card" checked style="accent-color:#f97316">
+                <span style="font-size:14px;font-weight:500">Card</span>
+              </label>
+              <label style="display:flex;align-items:center;gap:8px;padding:14px;border:2px solid #e2e8f0;border-radius:10px;cursor:pointer;transition:all 0.15s">
+                <input type="radio" name="pw_pay" value="paypal" style="accent-color:#f97316">
+                <span style="font-size:14px;font-weight:500">PayPal</span>
+              </label>
+              <label style="display:flex;align-items:center;gap:8px;padding:14px;border:2px solid #e2e8f0;border-radius:10px;cursor:pointer;transition:all 0.15s">
+                <input type="radio" name="pw_pay" value="ach" style="accent-color:#f97316">
+                <span style="font-size:14px;font-weight:500">ACH</span>
+              </label>
+              <label style="display:flex;align-items:center;gap:8px;padding:14px;border:2px solid #e2e8f0;border-radius:10px;cursor:pointer;transition:all 0.15s">
+                <input type="radio" name="pw_pay" value="klarna" style="accent-color:#f97316">
+                <span style="font-size:14px;font-weight:500">Klarna <span style="font-size:10px;color:#e74c99;font-weight:700">4 payments</span></span>
+              </label>
+            </div>
+          </div>
+
+          <label style="display:flex;align-items:flex-start;gap:8px;padding:14px;border:2px solid #e2e8f0;border-radius:10px;font-size:13px;color:#475569;cursor:pointer">
+            <input type="checkbox" id="pw-engage" required style="margin-top:2px;width:18px;height:18px;accent-color:#f97316;flex-shrink:0">
+            <span>I authorize Performance West to prepare and file on my behalf. <a href="/terms" target="_blank" style="color:#f97316;text-decoration:underline">Terms</a></span>
+          </label>
+
+          <button type="submit" id="pw-submit" style="width:100%;padding:16px;border-radius:10px;background:#f97316;color:#fff;font-weight:700;font-size:16px;border:none;cursor:pointer;box-shadow:0 4px 14px rgba(249,115,22,0.4)">Continue to Secure Payment &rarr;</button>
+          <p id="pw-err" style="font-size:14px;color:#b91c1c;margin:0;display:none"></p>
+
+          <!-- Security badges -->
+          <div style="display:flex;align-items:center;justify-content:center;gap:16px;margin-top:8px;padding:10px 0;border-top:1px solid #f1f5f9">
+            <svg style="height:20px;color:#6366f1" viewBox="0 0 60 25" fill="currentColor"><text x="0" y="18" font-size="16" font-weight="700" font-family="Arial">stripe</text></svg>
+            <span style="font-size:11px;color:#94a3b8">|</span>
+            <span style="font-size:12px;font-weight:700;color:#003087">Pay<span style="color:#009cde">Pal</span></span>
+            <span style="font-size:11px;color:#94a3b8">|</span>
+            <span style="display:flex;align-items:center;gap:4px;font-size:11px;color:#64748b"><svg style="width:14px;height:14px" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M16.5 10.5V6.75a4.5 4.5 0 10-9 0v3.75m-.75 11.25h10.5a2.25 2.25 0 002.25-2.25v-6.75a2.25 2.25 0 00-2.25-2.25H6.75a2.25 2.25 0 00-2.25 2.25v6.75a2.25 2.25 0 002.25 2.25z"/></svg>256-bit SSL</span>
+            <span style="font-size:11px;color:#94a3b8">|</span>
+            <span style="display:flex;align-items:center;gap:4px;font-size:11px;color:#64748b"><svg style="width:14px;height:14px" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75L11.25 15 15 9.75m-3-7.036A11.959 11.959 0 013.598 6 11.99 11.99 0 003 9.749c0 5.592 3.824 10.29 9 11.623 5.176-1.332 9-6.03 9-11.622 0-1.31-.21-2.571-.598-3.751h-.152c-3.196 0-6.1-1.248-8.25-3.285z"/></svg>PCI Compliant</span>
+          </div>
+        </form>
+
+        <div class="wiz-nav" style="margin-top:16px">
+          <button type="button" class="wiz-btn secondary" id="step3-back">
+            <svg style="width:16px;height:16px" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2.5"><path stroke-linecap="round" stroke-linejoin="round" d="M10.5 19.5L3 12m0 0l7.5-7.5M3 12h18"/></svg>
+            Back
+          </button>
+          <div></div>
         </div>
       </div>
 
       <!-- Help -->
-      <div class="mt-6 text-center">
-        <p class="text-sm text-gray-500">Questions? <a href="mailto:info@performancewest.net" class="text-orange-600 underline">info@performancewest.net</a> or call <strong>(888) 411-0383</strong></p>
+      <div style="margin-top:32px;text-align:center">
+        <p style="font-size:14px;color:#64748b">Questions? <a href="mailto:info@performancewest.net" style="color:#f97316;text-decoration:underline">info@performancewest.net</a> or call <strong>(888) 411-0383</strong></p>
       </div>
 
     </div>
@@ -340,180 +577,640 @@ Sign out
 <script>
 var API = window.__PW_API || "https://api.performancewest.net";
 var params = new URLSearchParams(window.location.search);
-var emailFromUrl = params.get("email") || "";
-var promoFromUrl = params.get("code") || params.get("promo") || "";
 
 function usd(cents) { return "$" + (cents / 100).toLocaleString("en-US", {minimumFractionDigits: 2}); }
 
-// Pre-fill from URL params
-if (emailFromUrl) { var e = document.getElementById("pw-email"); if (e) e.value = emailFromUrl; }
-if (promoFromUrl) { var p = document.getElementById("pw-promo"); if (p) { p.value = promoFromUrl.toUpperCase(); p.readOnly = true; p.style.background = "#fff7ed"; p.style.borderColor = "#f97316"; } }
+// ───── US States ─────
+var US_STATES = [
+  {code:"AL",name:"Alabama"},{code:"AK",name:"Alaska"},{code:"AZ",name:"Arizona"},{code:"AR",name:"Arkansas"},
+  {code:"CA",name:"California"},{code:"CO",name:"Colorado"},{code:"CT",name:"Connecticut"},{code:"DE",name:"Delaware"},
+  {code:"DC",name:"District of Columbia"},{code:"FL",name:"Florida"},{code:"GA",name:"Georgia"},{code:"HI",name:"Hawaii"},
+  {code:"ID",name:"Idaho"},{code:"IL",name:"Illinois"},{code:"IN",name:"Indiana"},{code:"IA",name:"Iowa"},
+  {code:"KS",name:"Kansas"},{code:"KY",name:"Kentucky"},{code:"LA",name:"Louisiana"},{code:"ME",name:"Maine"},
+  {code:"MD",name:"Maryland"},{code:"MA",name:"Massachusetts"},{code:"MI",name:"Michigan"},{code:"MN",name:"Minnesota"},
+  {code:"MS",name:"Mississippi"},{code:"MO",name:"Missouri"},{code:"MT",name:"Montana"},{code:"NE",name:"Nebraska"},
+  {code:"NV",name:"Nevada"},{code:"NH",name:"New Hampshire"},{code:"NJ",name:"New Jersey"},{code:"NM",name:"New Mexico"},
+  {code:"NY",name:"New York"},{code:"NC",name:"North Carolina"},{code:"ND",name:"North Dakota"},{code:"OH",name:"Ohio"},
+  {code:"OK",name:"Oklahoma"},{code:"OR",name:"Oregon"},{code:"PA",name:"Pennsylvania"},{code:"RI",name:"Rhode Island"},
+  {code:"SC",name:"South Carolina"},{code:"SD",name:"South Dakota"},{code:"TN",name:"Tennessee"},{code:"TX",name:"Texas"},
+  {code:"UT",name:"Utah"},{code:"VT",name:"Vermont"},{code:"VA",name:"Virginia"},{code:"WA",name:"Washington"},
+  {code:"WV",name:"West Virginia"},{code:"WI",name:"Wisconsin"},{code:"WY",name:"Wyoming"}
+];
 
-// Non-discountable slugs
-var nonDiscountable = {"dot-drug-alcohol": true, "boc3-filing": true, "mc-authority": true};
-
-// Bundle logic
-var bundleCb = document.getElementById("pw-bundle-check");
-var bundleComponents = (bundleCb.dataset.bundle || "").split(",");
-
-function getAllCheckboxes() { return document.querySelectorAll("input[data-slug]"); }
-function getIndividualCheckboxes() { return document.querySelectorAll("#pw-svc-list input[data-slug]"); }
-
-// When bundle is checked, uncheck all individual services that are in the bundle
-bundleCb.addEventListener("change", function() {
-  if (!bundleCb.checked) return;
-  bundleComponents.forEach(function(slug) {
-    var cb = document.querySelector('#pw-svc-list input[data-slug="' + slug + '"]');
-    if (cb && cb.checked) cb.checked = false;
+// Populate state dropdowns
+function populateStateDropdown(sel) {
+  US_STATES.forEach(function(s) {
+    var opt = document.createElement("option");
+    opt.value = s.code; opt.textContent = s.name;
+    sel.appendChild(opt);
   });
-  updateTotal();
+}
+populateStateDropdown(document.getElementById("q-base-state"));
+populateStateDropdown(document.getElementById("entity-existing-state"));
+
+// Populate operating states grid
+var opStatesGrid = document.getElementById("q-op-states");
+US_STATES.forEach(function(s) {
+  var chip = document.createElement("div");
+  chip.className = "state-chip";
+  chip.dataset.state = s.code;
+  chip.textContent = s.code;
+  chip.title = s.name;
+  chip.addEventListener("click", function() {
+    if (chip.classList.contains("base")) return;
+    chip.classList.toggle("selected");
+    validateStep0();
+  });
+  opStatesGrid.appendChild(chip);
 });
 
-// When an individual service in the bundle is checked, uncheck the bundle
-document.getElementById("pw-svc-list").addEventListener("change", function(e) {
-  if (!e.target.matches || !e.target.matches("input[data-slug]")) return;
-  if (e.target.checked && bundleCb.checked && bundleComponents.indexOf(e.target.dataset.slug) >= 0) {
-    bundleCb.checked = false;
+// ───── Wizard State ─────
+var wiz = {
+  units: null,
+  vehicles: null,
+  cargo: [],
+  interstate: null,
+  international: null,
+  baseState: null,
+  operatingStates: [],
+  carrierType: null,
+  hasEntity: null,
+  entityStrategy: null, // "home" or "wyoming"
+  entityType: "llc",
+  entityName: "",
+  entityState: null,
+  nameAvailable: null,
+  selectedServices: [], // computed
+  useBundle: false
+};
+
+// ───── Button selectors (single-select) ─────
+function setupBtnGroup(containerId, wizKey) {
+  var container = document.getElementById(containerId);
+  container.addEventListener("click", function(e) {
+    var btn = e.target.closest(".btn-opt");
+    if (!btn) return;
+    container.querySelectorAll(".btn-opt").forEach(function(b) { b.classList.remove("selected"); });
+    btn.classList.add("selected");
+    wiz[wizKey] = btn.dataset.val;
+    validateStep0();
+
+    // Special handling for base state change
+    if (wizKey === "interstate" || wizKey === "baseState") {
+      updateOperatingStates();
+    }
+  });
+}
+
+setupBtnGroup("q-units", "units");
+setupBtnGroup("q-vehicles", "vehicles");
+setupBtnGroup("q-interstate", "interstate");
+setupBtnGroup("q-international", "international");
+setupBtnGroup("q-carrier-type", "carrierType");
+
+// Cargo checkboxes
+document.getElementById("q-cargo").addEventListener("change", function(e) {
+  if (!e.target.matches("input[type=checkbox]")) return;
+  var label = e.target.closest(".chk-opt");
+  if (e.target.checked) { label.classList.add("selected"); } else { label.classList.remove("selected"); }
+  wiz.cargo = [];
+  document.querySelectorAll("#q-cargo input:checked").forEach(function(cb) { wiz.cargo.push(cb.value); });
+  validateStep0();
+});
+
+// Base state dropdown
+document.getElementById("q-base-state").addEventListener("change", function() {
+  wiz.baseState = this.value || null;
+  updateOperatingStates();
+  validateStep0();
+});
+
+function updateOperatingStates() {
+  var block = document.getElementById("q-op-states-block");
+  if (!wiz.baseState) { block.style.display = "none"; return; }
+  block.style.display = "block";
+
+  // Reset all chips, then pre-check base state
+  opStatesGrid.querySelectorAll(".state-chip").forEach(function(c) {
+    c.classList.remove("selected", "base");
+  });
+  var baseChip = opStatesGrid.querySelector('[data-state="' + wiz.baseState + '"]');
+  if (baseChip) { baseChip.classList.add("selected", "base"); }
+  collectOperatingStates();
+}
+
+function collectOperatingStates() {
+  wiz.operatingStates = [];
+  opStatesGrid.querySelectorAll(".state-chip.selected").forEach(function(c) {
+    wiz.operatingStates.push(c.dataset.state);
+  });
+}
+
+// Select all / clear states
+document.getElementById("select-all-states-btn").addEventListener("click", function() {
+  opStatesGrid.querySelectorAll(".state-chip").forEach(function(c) { c.classList.add("selected"); });
+  collectOperatingStates();
+});
+document.getElementById("clear-states-btn").addEventListener("click", function() {
+  opStatesGrid.querySelectorAll(".state-chip").forEach(function(c) {
+    if (!c.classList.contains("base")) c.classList.remove("selected");
+  });
+  collectOperatingStates();
+});
+
+// ───── Step 0 validation ─────
+function validateStep0() {
+  var ok = wiz.units && wiz.vehicles && wiz.cargo.length > 0 && wiz.interstate && wiz.international && wiz.baseState && wiz.carrierType;
+  document.getElementById("step0-next").disabled = !ok;
+}
+
+// ───── Step 1: Entity ─────
+setupBtnGroup("q-entity-type", "entityType");
+
+// Has entity toggle
+document.getElementById("q-has-entity").addEventListener("click", function(e) {
+  var btn = e.target.closest(".btn-opt");
+  if (!btn) return;
+  document.querySelectorAll("#q-has-entity .btn-opt").forEach(function(b) { b.classList.remove("selected"); });
+  btn.classList.add("selected");
+  wiz.hasEntity = btn.dataset.val;
+
+  document.getElementById("entity-existing").style.display = wiz.hasEntity === "yes" ? "block" : "none";
+  document.getElementById("entity-new").style.display = wiz.hasEntity === "no" ? "block" : "none";
+
+  if (wiz.hasEntity === "no") {
+    document.getElementById("home-state-label").textContent = getStateName(wiz.baseState);
+    // If base state is WY, auto-select home
+    if (wiz.baseState === "WY") {
+      selectEntityStrategy("home");
+    }
   }
-  updateTotal();
+  validateStep1();
 });
 
-// Also update when bundle checkbox changes
-bundleCb.addEventListener("change", updateTotal);
+// Entity strategy
+document.getElementById("entity-opt-home").addEventListener("click", function() { selectEntityStrategy("home"); });
+document.getElementById("entity-opt-wy").addEventListener("click", function() { selectEntityStrategy("wyoming"); });
 
-// Discount code logic
+function selectEntityStrategy(val) {
+  wiz.entityStrategy = val;
+  document.querySelectorAll("#entity-new .entity-opt").forEach(function(o) { o.classList.remove("selected"); });
+  document.getElementById("entity-opt-" + (val === "wyoming" ? "wy" : "home")).classList.add("selected");
+  wiz.entityState = val === "wyoming" ? "WY" : wiz.baseState;
+  validateStep1();
+}
+
+// Entity type buttons
+document.getElementById("q-entity-type").addEventListener("click", function(e) {
+  var btn = e.target.closest(".btn-opt");
+  if (!btn) return;
+  document.querySelectorAll("#q-entity-type .btn-opt").forEach(function(b) { b.classList.remove("selected"); });
+  btn.classList.add("selected");
+  wiz.entityType = btn.dataset.val;
+  validateStep1();
+});
+
+// Name check (debounced)
+var nameCheckTimer = null;
+function setupNameCheck(inputId, resultId, stateGetter) {
+  var input = document.getElementById(inputId);
+  var result = document.getElementById(resultId);
+  input.addEventListener("input", function() {
+    clearTimeout(nameCheckTimer);
+    wiz.entityName = input.value.trim();
+    wiz.nameAvailable = null;
+    result.className = "name-result";
+    result.style.display = "none";
+    validateStep1();
+    if (wiz.entityName.length < 3) return;
+    result.className = "name-result checking";
+    result.textContent = "Checking availability...";
+    result.style.display = "block";
+    nameCheckTimer = setTimeout(function() {
+      var st = stateGetter();
+      fetch(API + "/api/v1/dot/name-check", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ name: wiz.entityName, state: st })
+      })
+      .then(function(r) { return r.json(); })
+      .then(function(d) {
+        if (d.available) {
+          result.className = "name-result available";
+          result.innerHTML = '<svg style="width:16px;height:16px;vertical-align:middle;margin-right:4px;display:inline" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2.5"><path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12.75l6 6 9-13.5"/></svg>' + d.message;
+          wiz.nameAvailable = true;
+        } else {
+          result.className = "name-result taken";
+          result.innerHTML = '<svg style="width:16px;height:16px;vertical-align:middle;margin-right:4px;display:inline" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2.5"><path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12"/></svg>' + d.message;
+          wiz.nameAvailable = false;
+        }
+        validateStep1();
+      })
+      .catch(function() {
+        result.className = "name-result";
+        result.style.display = "none";
+        wiz.nameAvailable = null;
+        validateStep1();
+      });
+    }, 800);
+  });
+}
+
+setupNameCheck("entity-new-name", "entity-new-result", function() { return wiz.entityState || wiz.baseState; });
+setupNameCheck("entity-existing-name", "entity-existing-result", function() {
+  return document.getElementById("entity-existing-state").value || wiz.baseState;
+});
+
+document.getElementById("entity-existing-state").addEventListener("change", function() {
+  wiz.entityState = this.value;
+  // Re-run name check if name already entered
+  var nameInput = document.getElementById("entity-existing-name");
+  if (nameInput.value.trim().length >= 3) {
+    nameInput.dispatchEvent(new Event("input"));
+  }
+  validateStep1();
+});
+
+function validateStep1() {
+  var ok = false;
+  if (wiz.hasEntity === "yes") {
+    var name = document.getElementById("entity-existing-name").value.trim();
+    var state = document.getElementById("entity-existing-state").value;
+    ok = name.length >= 2 && state;
+    wiz.entityName = name;
+    wiz.entityState = state;
+  } else if (wiz.hasEntity === "no") {
+    ok = wiz.entityStrategy && wiz.entityName.length >= 2 && wiz.entityType;
+  }
+  document.getElementById("step1-next").disabled = !ok;
+}
+
+function getStateName(code) {
+  var s = US_STATES.find(function(st) { return st.code === code; });
+  return s ? s.name : code;
+}
+
+// ───── Step 2: Service computation ─────
+var SERVICE_CATALOG = {
+  "dot-registration":   { name: "USDOT Registration",         price: 14900, govfee: 0,     slug: "dot-registration",   nodiscount: false },
+  "mc-authority":       { name: "MC Operating Authority",      price: 34900, govfee: 30000, slug: "mc-authority",       nodiscount: true },
+  "boc3-filing":        { name: "BOC-3 Process Agent Filing",  price: 8900,  govfee: 0,     slug: "boc3-filing",        nodiscount: true },
+  "mcs150-update":      { name: "MCS-150 Filing",              price: 6900,  govfee: 0,     slug: "mcs150-update",      nodiscount: false },
+  "llc-formation":      { name: "LLC Formation",               price: 19900, govfee: 0,     slug: "llc-formation",      nodiscount: false },
+  "corp-formation":     { name: "Corporation Formation",       price: 24900, govfee: 0,     slug: "corp-formation",     nodiscount: false },
+  "foreign-qual":       { name: "Foreign Qualification",       price: 14900, govfee: 0,     slug: "foreign-qual",       nodiscount: false },
+  "dot-drug-alcohol":   { name: "Drug & Alcohol Program",      price: 14900, govfee: 0,     slug: "dot-drug-alcohol",   nodiscount: true },
+  "ucr-registration":   { name: "UCR Registration",            price: 6900,  govfee: 0,     slug: "ucr-registration",   nodiscount: false },
+  "registered-agent":   { name: "Registered Agent (per state)",price: 9900,  govfee: 0,     slug: "registered-agent",   nodiscount: false }
+};
+
+function computeServices() {
+  var svcs = [];
+  var isInterstate = wiz.interstate === "interstate";
+  var isForHire = wiz.carrierType === "for-hire";
+  var needsEntity = wiz.hasEntity === "no";
+  var isWyoming = wiz.entityStrategy === "wyoming";
+  var baseNotWy = wiz.baseState && wiz.baseState !== "WY";
+  var hasCDL = true; // assume CDL for trucks
+  var hasHazmat = wiz.cargo.indexOf("hazmat") >= 0;
+
+  // Always: USDOT
+  svcs.push({ key: "dot-registration", required: true });
+
+  // For-hire + interstate: MC Authority
+  if (isForHire && isInterstate) {
+    svcs.push({ key: "mc-authority", required: true });
+  }
+
+  // Always: BOC-3
+  svcs.push({ key: "boc3-filing", required: true });
+
+  // Always: MCS-150
+  svcs.push({ key: "mcs150-update", required: true });
+
+  // Entity formation
+  if (needsEntity) {
+    if (wiz.entityType === "corp") {
+      svcs.push({ key: "corp-formation", required: true });
+    } else {
+      svcs.push({ key: "llc-formation", required: true });
+    }
+  }
+
+  // Foreign qualification
+  if (needsEntity && isWyoming && baseNotWy) {
+    svcs.push({ key: "foreign-qual", required: true });
+  }
+
+  // Drug & Alcohol (CDL drivers)
+  if (hasCDL) {
+    svcs.push({ key: "dot-drug-alcohol", required: true });
+  }
+
+  // UCR (interstate)
+  if (isInterstate) {
+    svcs.push({ key: "ucr-registration", required: false });
+  }
+
+  // Registered Agent — if Wyoming + operating elsewhere, need RA in 2 states
+  if (needsEntity && isWyoming && baseNotWy) {
+    svcs.push({ key: "registered-agent", required: false, qty: 2, label: "Registered Agent (WY + " + wiz.baseState + ")" });
+  } else if (needsEntity) {
+    svcs.push({ key: "registered-agent", required: false, qty: 1, label: "Registered Agent (" + (wiz.entityState || wiz.baseState) + ")" });
+  }
+
+  return svcs;
+}
+
+function renderStep2() {
+  var svcs = computeServices();
+  var listEl = document.getElementById("svc-list");
+  var html = "";
+
+  // Count required services (for bundle eligibility)
+  var requiredCount = svcs.filter(function(s) { return s.required; }).length;
+  var showBundle = requiredCount >= 4 && wiz.hasEntity === "no" && wiz.carrierType === "for-hire" && wiz.interstate === "interstate";
+
+  // Bundle
+  var bundleEl = document.getElementById("bundle-offer");
+  if (showBundle) {
+    bundleEl.style.display = "block";
+    // Calculate individual total for savings display
+    var indivTotal = 0;
+    svcs.forEach(function(s) {
+      if (s.required) indivTotal += SERVICE_CATALOG[s.key].price;
+    });
+    var savings = indivTotal - 59900;
+    if (savings > 0) {
+      document.getElementById("bundle-savings").textContent = "Save " + usd(savings);
+    }
+  } else {
+    bundleEl.style.display = "none";
+    wiz.useBundle = false;
+    var bundleCb = document.getElementById("use-bundle");
+    if (bundleCb) bundleCb.checked = false;
+  }
+
+  svcs.forEach(function(s) {
+    var cat = SERVICE_CATALOG[s.key];
+    var qty = s.qty || 1;
+    var price = cat.price * qty;
+    var govfee = cat.govfee * qty;
+    var label = s.label || cat.name;
+
+    var isRequired = s.required;
+    var cls = isRequired ? "svc-row included" : "svc-row optional";
+
+    html += '<div class="' + cls + '" data-svc-key="' + s.key + '" data-price="' + price + '" data-govfee="' + govfee + '" data-required="' + (isRequired ? "1" : "0") + '" data-nodiscount="' + (cat.nodiscount ? "1" : "0") + '" data-slug="' + cat.slug + '" data-qty="' + qty + '">';
+    html += '<div style="display:flex;align-items:center;gap:10px;flex:1">';
+    if (isRequired) {
+      html += '<svg style="width:18px;height:18px;color:#16a34a;flex-shrink:0" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2.5"><path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12.75l6 6 9-13.5"/></svg>';
+    } else {
+      html += '<input type="checkbox" class="opt-svc-cb" data-key="' + s.key + '" style="width:18px;height:18px;accent-color:#f97316;flex-shrink:0">';
+    }
+    html += '<div>';
+    html += '<div style="font-size:14px;font-weight:600;color:#1e293b">' + label + '</div>';
+    if (isRequired) {
+      html += '<div style="font-size:11px;color:#16a34a;font-weight:600">Required</div>';
+    } else {
+      html += '<div style="font-size:11px;color:#94a3b8">Optional</div>';
+    }
+    html += '</div></div>';
+    html += '<div style="text-align:right">';
+    html += '<div style="font-size:14px;font-weight:700;color:' + (isRequired ? '#16a34a' : '#ea580c') + '">' + usd(price) + '</div>';
+    if (govfee > 0) {
+      html += '<div style="font-size:11px;color:#94a3b8">+ ' + usd(govfee) + ' gov fee</div>';
+    }
+    if (cat.nodiscount) {
+      html += '<div style="font-size:10px;color:#d4d4d4">non-discountable</div>';
+    }
+    html += '</div></div>';
+  });
+
+  listEl.innerHTML = html;
+
+  // Toggle optional services
+  listEl.querySelectorAll(".svc-row.optional").forEach(function(row) {
+    row.addEventListener("click", function(e) {
+      if (e.target.tagName === "INPUT") return;
+      var cb = row.querySelector(".opt-svc-cb");
+      if (cb) { cb.checked = !cb.checked; row.classList.toggle("selected", cb.checked); }
+      updateStep2Total();
+    });
+    var cb = row.querySelector(".opt-svc-cb");
+    if (cb) {
+      cb.addEventListener("change", function() {
+        row.classList.toggle("selected", cb.checked);
+        updateStep2Total();
+      });
+    }
+  });
+
+  // Hazmat note
+  document.getElementById("hazmat-note").style.display = wiz.cargo.indexOf("hazmat") >= 0 ? "block" : "none";
+
+  updateStep2Total();
+}
+
+// Bundle checkbox
+document.getElementById("use-bundle").addEventListener("change", function() {
+  wiz.useBundle = this.checked;
+  updateStep2Total();
+});
+
+function getSelectedServices() {
+  var svcs = [];
+  if (wiz.useBundle) {
+    svcs.push({ slug: "new-carrier-bundle", price: 59900, govfee: 30000, name: "New Carrier Starter Bundle", nodiscount: true });
+    // Add non-bundle optional services
+    document.querySelectorAll("#svc-list .svc-row.optional").forEach(function(row) {
+      var cb = row.querySelector(".opt-svc-cb");
+      if (cb && cb.checked) {
+        var bundleIncludes = ["llc-formation","dot-registration","mc-authority","boc3-filing","mcs150-update","dot-drug-alcohol"];
+        if (bundleIncludes.indexOf(row.dataset.slug) < 0) {
+          svcs.push({
+            slug: row.dataset.slug,
+            price: parseInt(row.dataset.price),
+            govfee: parseInt(row.dataset.govfee) || 0,
+            name: row.querySelector("[style*='font-weight:600']").textContent,
+            nodiscount: row.dataset.nodiscount === "1"
+          });
+        }
+      }
+    });
+  } else {
+    // All required services
+    document.querySelectorAll("#svc-list .svc-row[data-required='1']").forEach(function(row) {
+      svcs.push({
+        slug: row.dataset.slug,
+        price: parseInt(row.dataset.price),
+        govfee: parseInt(row.dataset.govfee) || 0,
+        name: row.querySelector("[style*='font-weight:600']").textContent,
+        nodiscount: row.dataset.nodiscount === "1"
+      });
+    });
+    // Selected optional services
+    document.querySelectorAll("#svc-list .svc-row.optional").forEach(function(row) {
+      var cb = row.querySelector(".opt-svc-cb");
+      if (cb && cb.checked) {
+        svcs.push({
+          slug: row.dataset.slug,
+          price: parseInt(row.dataset.price),
+          govfee: parseInt(row.dataset.govfee) || 0,
+          name: row.querySelector("[style*='font-weight:600']").textContent,
+          nodiscount: row.dataset.nodiscount === "1"
+        });
+      }
+    });
+  }
+  return svcs;
+}
+
+function updateStep2Total() {
+  var svcs = getSelectedServices();
+  var total = 0;
+  var govTotal = 0;
+  var html = "";
+
+  svcs.forEach(function(s) {
+    total += s.price;
+    govTotal += s.govfee;
+    html += '<div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:6px">';
+    html += '<span style="font-size:13px;color:#334155">' + s.name + '</span>';
+    html += '<span style="font-size:13px;font-weight:600;color:#1e293b">' + usd(s.price) + '</span>';
+    html += '</div>';
+    if (s.govfee > 0) {
+      html += '<div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:6px;padding-left:12px">';
+      html += '<span style="font-size:12px;color:#94a3b8">Government fee (FMCSA)</span>';
+      html += '<span style="font-size:12px;color:#94a3b8">' + usd(s.govfee) + '</span>';
+      html += '</div>';
+    }
+  });
+
+  var grand = total + govTotal;
+  html += '<div style="border-top:2px solid #e2e8f0;margin-top:8px;padding-top:10px;display:flex;justify-content:space-between;align-items:center">';
+  html += '<span style="font-size:16px;font-weight:800;color:#1a2744">Total</span>';
+  html += '<span style="font-size:20px;font-weight:800;color:#1a2744">' + usd(grand) + '</span>';
+  html += '</div>';
+
+  if (wiz.useBundle) {
+    html += '<div style="font-size:12px;color:#15803d;text-align:right;margin-top:4px;font-weight:600">Bundle savings applied!</div>';
+  }
+
+  document.getElementById("svc-total-rows").innerHTML = html;
+}
+
+// ───── Step 3: Checkout ─────
+function renderStep3() {
+  var svcs = getSelectedServices();
+  var html = "";
+  var total = 0;
+  var govTotal = 0;
+
+  svcs.forEach(function(s) {
+    total += s.price;
+    govTotal += s.govfee;
+    html += '<div style="display:flex;justify-content:space-between;font-size:13px;margin-bottom:4px">';
+    html += '<span style="color:#475569">' + s.name + '</span>';
+    html += '<span style="font-weight:600;color:#1e293b">' + usd(s.price) + '</span>';
+    html += '</div>';
+    if (s.govfee > 0) {
+      html += '<div style="display:flex;justify-content:space-between;font-size:12px;margin-bottom:4px;padding-left:12px">';
+      html += '<span style="color:#94a3b8">Gov fee</span><span style="color:#94a3b8">' + usd(s.govfee) + '</span>';
+      html += '</div>';
+    }
+  });
+
+  html += '<div style="border-top:1px solid #e2e8f0;margin-top:8px;padding-top:8px;display:flex;justify-content:space-between">';
+  html += '<span style="font-weight:700;color:#1a2744">Total</span>';
+  html += '<span style="font-size:18px;font-weight:800;color:#1a2744">' + usd(total + govTotal) + '</span>';
+  html += '</div>';
+
+  document.getElementById("checkout-summary").innerHTML = html;
+}
+
+// ───── Progress bar ─────
+function updateProgress(step) {
+  for (var i = 0; i <= 3; i++) {
+    var dot = document.querySelector('.prog-dot[data-step="' + i + '"]');
+    var label = document.querySelector('.prog-label[data-step="' + i + '"]');
+    dot.classList.remove("active", "done");
+    label.classList.remove("active", "done");
+    if (i < step) { dot.classList.add("done"); dot.innerHTML = '<svg style="width:14px;height:14px" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="3"><path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12.75l6 6 9-13.5"/></svg>'; label.classList.add("done"); }
+    else if (i === step) { dot.classList.add("active"); dot.textContent = (i + 1); label.classList.add("active"); }
+    else { dot.textContent = (i + 1); }
+  }
+  for (var j = 0; j <= 2; j++) {
+    var line = document.querySelector('.prog-line[data-line="' + j + '"]');
+    line.classList.toggle("done", j < step);
+  }
+}
+
+// ───── Navigation ─────
+var currentStep = 0;
+function goToStep(step) {
+  document.querySelectorAll(".wiz-step").forEach(function(el) { el.classList.remove("active"); });
+  document.getElementById("step-" + step).classList.add("active");
+  currentStep = step;
+  updateProgress(step);
+  window.scrollTo({ top: 200, behavior: "smooth" });
+
+  if (step === 2) renderStep2();
+  if (step === 3) renderStep3();
+}
+
+document.getElementById("step0-next").addEventListener("click", function() {
+  collectOperatingStates();
+  goToStep(1);
+});
+document.getElementById("step1-back").addEventListener("click", function() { goToStep(0); });
+document.getElementById("step1-next").addEventListener("click", function() { goToStep(2); });
+document.getElementById("step2-back").addEventListener("click", function() { goToStep(1); });
+document.getElementById("step2-next").addEventListener("click", function() { goToStep(3); });
+document.getElementById("step3-back").addEventListener("click", function() { goToStep(2); });
+
+// ───── Pre-fill from URL params ─────
+var emailFromUrl = params.get("email") || "";
+var promoFromUrl = params.get("code") || params.get("promo") || "";
+if (emailFromUrl) { document.getElementById("pw-email").value = emailFromUrl; }
+if (promoFromUrl) { var p = document.getElementById("pw-promo"); p.value = promoFromUrl.toUpperCase(); p.readOnly = true; p.style.background = "#fff7ed"; p.style.borderColor = "#f97316"; }
+
+// ───── Discount code logic ─────
 var activeDiscount = null;
 function fetchDiscount() {
   var code = (document.getElementById("pw-promo").value || "").trim().toUpperCase();
-  if (!code) { activeDiscount = null; updateTotal(); return; }
-  fetch(API + "/api/v1/discount/" + encodeURIComponent(code)).then(function(r) { return r.json(); }).then(function(d) {
-    if (d.valid) { activeDiscount = d; } else { activeDiscount = null; }
-    updateTotal();
-  }).catch(function() { activeDiscount = null; updateTotal(); });
+  if (!code) { activeDiscount = null; renderStep3(); return; }
+  fetch(API + "/api/v1/discount/" + encodeURIComponent(code))
+    .then(function(r) { return r.json(); })
+    .then(function(d) { activeDiscount = d.valid ? d : null; renderStep3(); })
+    .catch(function() { activeDiscount = null; renderStep3(); });
 }
 var promoField = document.getElementById("pw-promo");
-if (promoField.value.trim()) { setTimeout(fetchDiscount, 300); }
+if (promoField.value.trim()) setTimeout(fetchDiscount, 300);
 promoField.addEventListener("blur", fetchDiscount);
-promoField.addEventListener("input", function() { clearTimeout(promoField._debounce); promoField._debounce = setTimeout(fetchDiscount, 600); });
-
-// Total calculation
-var totalSection = document.getElementById("pw-total-section");
-var totalRows = document.getElementById("pw-total-rows");
-
-function updateTotal() {
-  var selected = [];
-  var svcTotal = 0;
-  var govTotal = 0;
-  var discountable = 0;
-
-  getAllCheckboxes().forEach(function(cb) {
-    if (!cb.checked) return;
-    var price = parseInt(cb.dataset.price) || 0;
-    var gov = parseInt(cb.dataset.govfee) || 0;
-    svcTotal += price;
-    govTotal += gov;
-    // Bundle itself is discountable (minus the non-discountable component values inside)
-    if (cb.dataset.slug === "new-carrier-bundle") {
-      // Only the discountable portion of the bundle
-      // Bundle = $599. Non-discountable components: BOC-3 ($89), D&A ($149), MC ($349) = $587
-      // Discountable portion: $599 - $587 = $12? No — the bundle is $599 flat.
-      // For discount purposes, we treat the bundle as having non-discountable components at their face value
-      // and the remainder is discountable.
-      // Actually, let's keep it simple: the bundle price is discountable except for the non-discountable items' share.
-      // Non-discountable share in bundle: BOC-3 ($89) + D&A ($149) + MC ($349) = $587 but bundle is only $599
-      // So effectively nearly all of it is non-discountable. Let's mark the bundle itself as non-discountable.
-      // This is simplest and fairest since the bundle already has a huge discount built in.
-    } else if (!nonDiscountable[cb.dataset.slug] && !cb.dataset.nodiscount) {
-      discountable += price;
-    }
-    selected.push(cb.dataset.slug);
-  });
-
-  if (selected.length === 0) { totalSection.hidden = true; return; }
-  totalSection.hidden = false;
-
-  var discountAmt = 0;
-  if (activeDiscount && activeDiscount.discount_type === "percent") {
-    discountAmt = Math.round(discountable * activeDiscount.discount_value / 100);
-  } else if (activeDiscount && activeDiscount.discount_type === "flat") {
-    discountAmt = Math.min(activeDiscount.discount_value * 100, discountable);
-  }
-
-  // Build itemized list
-  var html = '';
-  getAllCheckboxes().forEach(function(cb) {
-    if (!cb.checked) return;
-    var price = parseInt(cb.dataset.price) || 0;
-    var gov = parseInt(cb.dataset.govfee) || 0;
-    var slug = cb.dataset.slug;
-    var label = cb.closest("label");
-    var nameEl = label ? label.querySelector(".font-semibold.text-gray-900, [style*='font-weight:800']") : null;
-    var name = nameEl ? nameEl.textContent : slug;
-    var canDiscount = !nonDiscountable[slug] && !cb.dataset.nodiscount && slug !== "new-carrier-bundle" && activeDiscount;
-    var itemDiscount = 0;
-    if (canDiscount && activeDiscount.discount_type === "percent") {
-      itemDiscount = Math.round(price * activeDiscount.discount_value / 100);
-    }
-    html += '<div class="flex justify-between text-sm mb-1"><span>' + name + '</span>';
-    if (itemDiscount > 0) {
-      html += '<span>' + usd(price) + ' <span style="color:#059669;font-size:12px;font-weight:600">-' + usd(itemDiscount) + '</span></span>';
-    } else {
-      html += '<span>' + usd(price) + '</span>';
-    }
-    html += '</div>';
-    if (gov > 0) html += '<div class="flex justify-between text-xs text-gray-400 mb-1 pl-2"><span>Gov fee (FMCSA)</span><span>' + usd(gov) + '</span></div>';
-  });
-
-  if (govTotal > 0) html += '<div class="flex justify-between text-sm text-gray-500 mb-1 border-t border-gray-100 pt-1 mt-1"><span>Government fees</span><span>' + usd(govTotal) + '</span></div>';
-  if (discountAmt > 0) {
-    html += '<div class="flex justify-between text-sm text-green-600 font-semibold mb-1"><span>' + activeDiscount.code + ' (' + activeDiscount.discount_value + '% off)</span><span>-' + usd(discountAmt) + '</span></div>';
-  }
-  var finalTotal = svcTotal + govTotal - discountAmt;
-  html += '<div class="flex justify-between font-bold text-lg border-t border-gray-300 pt-2 mt-2"><span>Total</span><span>' + usd(finalTotal) + '</span></div>';
-  if (discountAmt > 0) { html += '<div class="text-xs text-green-600 text-right mt-1">You save ' + usd(discountAmt) + '!</div>'; }
-  totalRows.innerHTML = html;
-}
-
-// Listen for all checkbox changes
-document.addEventListener("change", function(e) { if (e.target.matches && e.target.matches("input[data-slug]")) updateTotal(); });
-
-// Pre-select from URL
-var preSelect = (params.get("services") || "").split(",").filter(Boolean);
-preSelect.forEach(function(slug) {
-  var cb = document.querySelector('input[data-slug="' + slug + '"]');
-  if (cb) {
-    cb.checked = true;
-    // If it's a bundle component and bundle is checked, uncheck bundle
-    if (bundleCb.checked && bundleComponents.indexOf(slug) >= 0) {
-      bundleCb.checked = false;
-    }
-  }
+promoField.addEventListener("input", function() {
+  clearTimeout(promoField._debounce);
+  promoField._debounce = setTimeout(fetchDiscount, 600);
 });
-if (params.get("bundle") === "1") {
-  bundleCb.checked = true;
-  bundleComponents.forEach(function(slug) {
-    var cb = document.querySelector('#pw-svc-list input[data-slug="' + slug + '"]');
-    if (cb) cb.checked = false;
-  });
-}
-if (preSelect.length || params.get("bundle") === "1") updateTotal();
 
-// Submit
+// ───── Submit ─────
 document.getElementById("pw-batch-form").addEventListener("submit", function(e) {
   e.preventDefault();
-  var selected = [];
-  getAllCheckboxes().forEach(function(cb) { if (cb.checked) selected.push(cb.dataset.slug); });
-  if (selected.length === 0) { alert("Please select at least one service."); return; }
   if (!document.getElementById("pw-engage").checked) { alert("Please accept the authorization terms."); return; }
 
+  var svcs = getSelectedServices();
+  var slugs = svcs.map(function(s) { return s.slug; });
+  if (slugs.length === 0) { alert("No services selected."); return; }
+
   var btn = document.getElementById("pw-submit");
   btn.disabled = true; btn.textContent = "Creating order...";
-  var errEl = document.getElementById("pw-err"); errEl.hidden = true;
+  var errEl = document.getElementById("pw-err");
+  errEl.style.display = "none";
 
   var dotVal = (document.getElementById("pw-dot").value || "").trim();
 
   var body = {
-    services: selected,
+    services: slugs,
     customer_name: document.getElementById("pw-name").value.trim(),
     customer_email: document.getElementById("pw-email").value.trim(),
     customer_phone: document.getElementById("pw-phone").value.trim() || undefined,
@@ -521,7 +1218,24 @@ document.getElementById("pw-batch-form").addEventListener("submit", function(e)
     intake_data: {
       dot_number: dotVal || undefined,
       source: "trucking-new-carrier",
-      is_new_carrier: true
+      is_new_carrier: true,
+      fleet_profile: {
+        power_units: wiz.units,
+        vehicle_type: wiz.vehicles,
+        cargo_types: wiz.cargo,
+        interstate: wiz.interstate,
+        international: wiz.international,
+        base_state: wiz.baseState,
+        operating_states: wiz.operatingStates,
+        carrier_type: wiz.carrierType
+      },
+      entity: {
+        has_existing: wiz.hasEntity === "yes",
+        strategy: wiz.entityStrategy,
+        entity_type: wiz.entityType,
+        entity_name: wiz.entityName,
+        formation_state: wiz.entityState
+      }
     },
     engagement_accepted: true
   };
@@ -538,8 +1252,10 @@ document.getElementById("pw-batch-form").addEventListener("submit", function(e)
       else throw new Error("No checkout URL returned");
     })
     .catch(function(err) {
-      errEl.textContent = err.message; errEl.hidden = false;
-      btn.disabled = false; btn.textContent = "Continue to Secure Payment \u2192";
+      errEl.textContent = err.message;
+      errEl.style.display = "block";
+      btn.disabled = false;
+      btn.textContent = "Continue to Secure Payment \u2192";
     });
 });
 </script>