bhl-forms 0.6.6 → 0.6.8

package/dist/forms/civilLawsuit.es.js

@@ -65,21 +65,17 @@ const radio = (updates) => {
   }, updates)
 };
 
-const col2Radio = (updates) => {
-  updates.legendClass = 'required';
-  updates.fieldsetClass = '$reset';
-  updates.optionsClass = 't-pl-2 t-pt-3 t-grid t-grid-cols-1 md:t-grid-cols-2';
+const col2RadioCenter = (updates) => {
+  updates.legendClass = 'required t-w-[100%] t-text-center';
+  if (typeof updates.fieldsetClass === 'undefined') {
+    updates.fieldsetClass = '$reset t-flex t-justify-center';
+  }
+  updates.optionsClass = 't-pl-4 t-pt-3 t-grid t-grid-cols-1 md:t-grid-cols-2';
   updates.innerClass = 't-items-start';
   updates.wrapperClass = '$reset t-flex t-cursor-pointer t-mb-3';
-  return radio(updates)
-};
-
-const sbsRadio = (updates) => {
-  updates.legendClass = 'legend-left required';
-  updates.fieldsetClass = '$reset side-by-side';
-  updates.optionsClass = 't-pl-1';
-  updates.innerClass = 't-flex t-items-center';
-  updates.wrapperClass = 't-mb-3';
+  updates.optionClass = 't-pl-4 md:t-pl-8 md:t-min-w-[200px]';
+  updates.messagesClass = 't-flex t-justify-center';
+  updates.helpClass = 't-mt-0 t-mb-4 !t-text-sm t-text-center';
   return radio(updates)
 };
 
@@ -106,6 +102,37 @@ const sbsYesNoRadio = (updates) => {
   return sbs2ItemRadio(updates)
 };
 
+const verticalButtonRadio = (updates) => {
+  updates.legendClass = 'legend-left';
+  updates.fieldsetClass = '$reset t-flex t-justify-center t-items-center';
+  if (typeof updates.optionsClass === 'undefined') {
+    updates.optionsClass = 't-flex t-flex-col sm:t-flex-row t-justify-center t-my-3';
+  }
+  updates.optionClass = 'radiobtn t-my-2 sm:t-my-0 t-mx-2 md:t-mx-5';
+  updates.wrapperClass = '$reset formkit-wrapper t-mb-0 t-flex t-items-center t-h-[100%]';
+  updates.labelClass = 't-font-semibold t-text-[#1e448f] t-w-[100%]';
+  updates.decoratorIcon = false;
+  updates.messagesClass = 't-flex t-justify-center';
+  return radio(updates)
+};
+
+const verticalYesNoRadio = (updates) => {
+  updates.options = ['Yes', 'No'];
+  updates.optionsClass = 't-flex t-justify-center t-my-3';
+  return verticalButtonRadio(updates)
+};
+
+const verticalRadio = (updates) => {
+  updates.legendClass = 'required';
+  updates.fieldsetClass = '$reset t-flex t-justify-center';
+  updates.optionsClass = 't-pl-2 t-pt-3';
+  updates.innerClass = 't-items-center';
+  updates.wrapperClass = '$reset t-flex t-cursor-pointer t-mb-3';
+  updates.optionClass = 't-pl-4 md:t-pl-12';
+  updates.messagesClass = 't-flex t-justify-center';
+  return radio(updates)
+};
+
 const select = (updates) => {
   if (updates.name && !updates.id) {
     updates.id = updates.name;
@@ -130,6 +157,15 @@ const sbsSelect = (updates) => {
   return select(updates)
 };
 
+const verticalSelect = (updates) => {
+  updates.labelClass = 'required';
+  updates.wrapperClass = 't-flex t-justify-center';
+  updates.messagesClass = 't-flex t-justify-center';
+  updates.inputClass = 't-min-w-[150px] t-bg-white';
+  updates.helpClass = 't-mt-2.5 t-text-center';
+  return select(updates)
+};
+
 const text = (updates) => {
   if (updates.name && !updates.id) {
     updates.id = updates.name;
@@ -186,6 +222,13 @@ const sbsDate = (updates) => {
   return date(updates)
 };
 
+const verticalDate = (updates) => {
+  updates.wrapperClass = 't-flex t-justify-center';
+  updates.inputClass = 't-text-center';
+  updates.messagesClass = 't-flex t-justify-center';
+  return date(updates)
+};
+
 const applicantAge = (scope) => sbsText({
   name: scope ? scope + ':' + 'Applicant_Age' : 'Applicant_Age',
   label: 'Age of Applicant?',
@@ -200,11 +243,15 @@ const applicantAge = (scope) => sbsText({
   }
 });
 
-const atFault = (scope) => sbsYesNoRadio({
+const atFault$1 = (scope) => sbsYesNoRadio({
   name: scope ? scope + ':' + 'At_Fault' : 'At_Fault',
   label: 'Were You at Fault?'
 });
 
+const atFaultCenter = (scope) => verticalYesNoRadio({
+  name: scope ? scope + ':' + 'At_Fault' : 'At_Fault',
+});
+
 const bankruptcyCrossSell = () => sbsCheckbox({
   label: "I'd also like a consult for bankruptcy or debt elimination (optional)",
   help: "Note: you will be contacted separately by a bankruptcy/debt expert",
@@ -230,8 +277,7 @@ const bloodContentAlcoholTest = (scope) => sbsSelect({
   ]
 });
 
-const businessServices = () => sbsSelect({
-  label: 'Legal Services Needed for Your Business:',
+const businessServicesCenter = () => col2RadioCenter({
   id: 'Business_Services',
   name: 'Business_Services',
   options: [
@@ -245,8 +291,7 @@ const businessServices = () => sbsSelect({
   ]
 });
 
-const businessType = () => sbs2ColRadio({
-  label: 'Is the Business Public or Private?',
+const businessTypeCenter = () => verticalButtonRadio({
   name: 'Business_Type',
   options: [
     "Public",
@@ -266,21 +311,17 @@ const causeOfInjury = (scope) => sbsSelect({
   ]
 });
 
-const civilDefense = (updates) => sbs2ItemRadio(merge({
-  name: 'Civil_Defense',
-  id: 'Civil_Defense',
-  if: '$get(Type_Of_Legal_Problem).value == "Civil Lawsuit"',
-  label: 'Do You Need Representation to File a Lawsuit or Defend One?',
+const civilLawsuitTOLPCenter = (updates) => verticalButtonRadio(merge({
+  name: 'Type_Of_Legal_Problem',
+  id: 'Type_Of_Legal_Problem',
   options: {
-    Yes: 'Defend a Lawsuit',
-    No: 'File a Lawsuit'
+    'Defend a Lawsuit': 'Defend Lawsuit',
+    'File a Lawsuit': 'File Lawsuit'
   }
 }, updates));
 
-const civilLawsuitTOLPDisplay = (updates) => col2Radio(merge({
+const civilLawsuitTOLPDisplayCenter = (updates) => col2RadioCenter(merge({
   name: 'Type_Of_Legal_Problem_Display',
-  if: '$get(Type_Of_Legal_Problem).value == "Civil Lawsuit" && $get(Civil_Defense).value == "No"',
-  label: 'Select The Type of Lawsuit You Would Like to File:',
   options: [
     'Automobile Accident',
     'Contract Disputes',
@@ -293,7 +334,7 @@ const civilLawsuitTOLPDisplay = (updates) => col2Radio(merge({
     'Property Damage',
     'Small Claims',
     'Real Estate',
-    'Other (describe on next page)'
+    'Not Sure or Other'
   ]
 }, updates));
 
@@ -330,7 +371,7 @@ const childRelationship = (scope) => sbsSelect({
   ]
 });
 
-const claimStatus = (scope) => sbsSelect({
+const claimStatus$1 = (scope) => sbsSelect({
   name: scope ? scope + ':' + 'Claim_Status' : 'Claim_Status',
   label: "Status of Claim:",
   options: [
@@ -341,6 +382,16 @@ const claimStatus = (scope) => sbsSelect({
   ]
 });
 
+const claimStatusCenter = (scope) => col2RadioCenter({
+  name: scope ? scope + ':' + 'Claim_Status' : 'Claim_Status',
+  options: [
+    "No action taken yet",
+    "Demand for compensation made",
+    "Lawsuit filed",
+    "Other"
+  ]
+});
+
 const comments = (updates, scope) => textArea(
   merge({
     name: scope ? scope + ':' + 'Comments' : 'Comments',
@@ -349,8 +400,7 @@ const comments = (updates, scope) => textArea(
   }, updates)
 );
 
-const consumerLawyerType = () => sbsSelect({
-  label: 'What best describes your issue?',
+const consumerLawyerTypeCenter = () => verticalSelect({
   name: 'Consumer_Lawyer_Type',
   options: [
     "Unsafe Environment",
@@ -367,7 +417,7 @@ const consumerLawyerType = () => sbsSelect({
   ]
 });
 
-const degreeOfInterest = (scope, help) => sbsSelect({
+const degreeOfInterest$1 = (scope, help) => sbsSelect({
   name: scope ? scope + ':' + 'Degree_Of_Interest' : 'Degree_Of_Interest',
   id: scope ? scope + ':' + 'Degree_Of_Interest' : 'Degree_Of_Interest',
   label: 'How Likely Are You to Pay if Your Issue Could be Resolved?',
@@ -380,7 +430,19 @@ const degreeOfInterest = (scope, help) => sbsSelect({
   ]
 });
 
-const degreeOfInterestHelp = (scope) => degreeOfInterest(scope, 'No payment necessary to speak with lawyers.');
+const degreeOfInterestCenter = (scope, help) => col2RadioCenter({
+  name: scope ? scope + ':' + 'Degree_Of_Interest' : 'Degree_Of_Interest',
+  id: scope ? scope + ':' + 'Degree_Of_Interest' : 'Degree_Of_Interest',
+  help: help,
+  options: [
+    'Definitely',
+    'Probably',
+    'Maybe',
+    "Absolutely Can't Afford"
+  ]
+});
+
+const degreeOfInterestHelp = (scope) => degreeOfInterest$1(scope, 'No payment necessary to speak with lawyers.');
 
 const disabilityConditionStopWork = (scope) => sbsYesNoRadio({
   name: scope ? scope + ':' + 'Disability_Condition_Stop_Work' : 'Disability_Condition_Stop_Work',
@@ -392,11 +454,15 @@ const disabilityWorkHistory = (scope) => sbsYesNoRadio({
   label: 'Have You Had a Full-Time Job Within the Past 5 Years?'
 });
 
-const doctorTreatment = (scope) => sbsYesNoRadio({
+const doctorTreatment$1 = (scope) => sbsYesNoRadio({
   name: scope ? scope + ':' + 'Doctor_Treatment' : 'Doctor_Treatment',
   label: 'Have You Recently Been Treated by a Doctor, Hospital or Clinic?',
 });
 
+const doctorTreatmentCenter = () => verticalYesNoRadio({
+  name: 'Doctor_Treatment',
+});
+
 const email = () => sbsText({
   $formkit: 'email',
   name: 'Email',
@@ -411,8 +477,7 @@ const email = () => sbsText({
   }
 });
 
-const employerType = () => sbsSelect({
-  label: 'The Employer Is a:',
+const employerTypeCenter = () => col2RadioCenter({
   name: 'Employer_Type',
   options: [
     "Sole proprietorship (mom and pop)",
@@ -425,9 +490,8 @@ const employerType = () => sbsSelect({
   ]
 });
 
-const employeeAtCompany = (scope) => sbsYesNoRadio({
+const employeeAtCompanyCenter = (scope) => verticalYesNoRadio({
   name: scope ? scope + ':' + 'Employee_At_Company' : 'Employee_At_Company',
-  label: 'Do you/they still work at the company?'
 });
 
 const estateLegalServicesNeeded = (scope) => sbsSelect({
@@ -454,21 +518,29 @@ const firstName = () => sbsText({
   }
 });
 
-const haveAttorney = (scope) => sbsYesNoRadio({
+const haveAttorney$1 = (scope) => sbsYesNoRadio({
   name: scope ? scope + ':' + 'Have_Attorney' : 'Have_Attorney',
   label: 'Already Working with An Attorney?'
 });
 
+const haveAttorneyCenter = () => verticalYesNoRadio({
+  name: 'Have_Attorney',
+});
+
 const haveChildren = (scope) => sbsYesNoRadio({
   name: scope ? scope + ':' + 'Have_Children' : 'Have_Children',
   label: 'Do You Have Children?'
 });
 
-const incidentDate = (scope) => sbsDate({
+const incidentDate$1 = (scope) => sbsDate({
   name: scope ? scope + ':' + 'Incident_Date' : 'Incident_Date',
   label: 'Date of Incident:',
 });
 
+const incidentDateCenter = (scope) => verticalDate({
+  name: scope ? scope + ':' + 'Incident_Date' : 'Incident_Date',
+});
+
 const lastName = () => sbsText({
   $formkit: 'text',
   label: 'Last Name:',
@@ -480,8 +552,7 @@ const lastName = () => sbsText({
   }
 });
 
-const lawsuitOtherParty = () => sbsSelect({
-  label: 'The Other Party is a:',
+const lawsuitOtherPartyCenter = () => col2RadioCenter({
   name: 'Lawsuit_Other_Party',
   options: [
     "Individual",
@@ -589,8 +660,7 @@ const maritalStatus = (scope) => sbsSelect({
   ]
 });
 
-const medicalMalpracticeInjuries = () => sbsSelect({
-  label: "Injuries from Medical Malpractice:",
+const medicalMalpracticeInjuriesCenter = () => verticalSelect({
   name: 'Medical_Malpractice_Injuries',
   options: [
     "No Injury",
@@ -603,9 +673,7 @@ const medicalMalpracticeInjuries = () => sbsSelect({
   ]
 });
 
-
-const numEmployeesOfBusiness = () => sbsSelect({
-  label: 'Total Employees of Business? (estimated)',
+const numEmployeesOfBusinessCenter = () => col2RadioCenter({
   name: 'Num_Employees_Of_Business',
   options: [
     "1-5",
@@ -641,7 +709,7 @@ const phone = () => sbsText({
   helpClass: "t-mt-2.5 md:t-text-right md:t-mt-[-2px]"
 });
 
-const primaryInjury = (scope) => sbs2ColRadio({
+const primaryInjury$1 = (scope) => sbs2ColRadio({
   name: scope ? scope + ':' + 'Primary_Injury' : 'Primary_Injury',
   label: 'Primary Injury:',
   options: [
@@ -652,7 +720,21 @@ const primaryInjury = (scope) => sbs2ColRadio({
     "Headaches",
     "Memory Loss",
     "Loss of Limb",
-    "Other (describe on next page)"
+    "Not Sure or Other"
+  ]
+});
+
+const primaryInjuryCenter = (scope) => col2RadioCenter({
+  name: scope ? scope + ':' + 'Primary_Injury' : 'Primary_Injury',
+  options: [
+    "Anxiety",
+    "Back or Neck Pain",
+    "Broken Bones",
+    "Cuts and Bruises",
+    "Headaches",
+    "Memory Loss",
+    "Loss of Limb",
+    "Not Sure or Other"
   ]
 });
 
@@ -661,13 +743,16 @@ const priorAlcoholOffenses = (scope) => sbsYesNoRadio({
   label: 'Any Prior Alcohol Related Offenses?'
 });
 
-const policeReportFiled = (scope) => sbsYesNoRadio({
+const policeReportFiled$1 = (scope) => sbsYesNoRadio({
   name: scope ? scope + ':' + 'Police_Report_Filed' : 'Police_Report_Filed',
   label: 'Was a Police Report Filed?'
 });
 
-const realEstateArea = () => sbsSelect({
-  label: "Area of Real Estate:",
+const policeReportFiledCenter = (scope) => verticalYesNoRadio({
+  name: scope ? scope + ':' + 'Police_Report_Filed' : 'Police_Report_Filed',
+});
+
+const realEstateAreaCenter = () => col2RadioCenter({
   name: 'Real_Estate_Area',
   options: [
     "Condos and Coops",
@@ -753,8 +838,7 @@ const valueOfAssets = (scope) => sbsSelect({
   ]
 });
 
-const wouldLikeLawyerTo = () => sbsRadio({
-  label: 'I Would Like a Lawyer to:',
+const wouldLikeLawyerToCenter = () => verticalRadio({
   name: 'Would_Like_Lawyer_To',
   options: [
     "Give me general advice to protect my interests",
@@ -766,9 +850,9 @@ const wouldLikeLawyerTo = () => sbsRadio({
   ]
 });
 
-const zipcode = () => sbsText({
-  label: 'Zip Code:',
+const zipcodeCenter = (updates = {}) => text({
   placeholder: '#####',
+  help: updates.help ?? "We try to match you with local legal help",
   name: 'Zip',
   maxlength: 5,
   inputmode: "numeric",
@@ -777,7 +861,11 @@ const zipcode = () => sbsText({
   validationMessages: {
     required: 'Zip Code is required',
     matches: 'Invalid Zip Code'
-  }
+  },
+  wrapperClass: 't-flex t-justify-center',
+  messagesClass: 't-flex t-justify-center',
+  inputClass: 't-text-center',
+  helpClass: 't-mt-2.5 !t-text-sm t-text-center'
 });
 
 
@@ -801,26 +889,12 @@ const AutoAndCarAccidentsQuestions = (condition, scope) => group(
   {
     if: (condition || '$get(Type_Of_Legal_Problem).value == "Auto and Car Accidents"'),
     children: [
-      haveAttorney(scope),
-      incidentDate(scope),
-      atFault(scope),
-      primaryInjury(scope),
-      doctorTreatment(scope),
-      policeReportFiled(scope)
-    ]
-  }
-);
-
-const BusinessLawyersQuestions = () => group(
-  'BusinessLawyersQuestions',
-  {
-    if: '$get(Type_Of_Legal_Problem).value == "Business Lawyers"',
-    children: [
-      haveAttorney(),
-      businessServices(),
-      businessType(),
-      numEmployeesOfBusiness(),
-      degreeOfInterestHelp()
+      haveAttorney$1(scope),
+      incidentDate$1(scope),
+      atFault$1(scope),
+      primaryInjury$1(scope),
+      doctorTreatment$1(scope),
+      policeReportFiled$1(scope)
     ]
   }
 );
@@ -830,63 +904,25 @@ const ChildCustodyQuestions = (condition, scope) => group(
   {
     if: (condition || '$get(Type_Of_Legal_Problem).value == "Child Custody"'),
     children: [
-      haveAttorney(scope),
+      haveAttorney$1(scope),
       childRelationship(scope),
       childHome(scope),
       childPrimaryCaregiver(scope),
-      degreeOfInterest(scope),
+      degreeOfInterest$1(scope),
       lawyerPaymentMethod(scope)
     ]
   }
 );
 
-const FileLawsuitQuestions = () => group(
-  'FileLawsuitQuestions',
-  {
-    if: '$get(Type_Of_Legal_Problem).value == "File a Lawsuit"',
-    children: [
-      haveAttorney(),
-      lawsuitOtherParty(),
-      degreeOfInterestHelp()
-    ]
-  }
-);
-
-const DefendLawsuitQuestions = () => group(
-  'DefendLawsuitQuestions',
-  {
-    if: '$get(Type_Of_Legal_Problem).value == "Defend a Lawsuit"',
-    children: [
-      haveAttorney(),
-      lawsuitOtherParty(),
-      degreeOfInterestHelp()
-    ]
-  }
-);
-
-const ConsumerLawyersQuestions = () => group(
-  'ConsumerLawyersQuestions',
-  {
-    if: '$get(Type_Of_Legal_Problem).value == "Consumer Lawyers"',
-    children: [
-      consumerLawyerType(),
-      incidentDate(),
-      haveAttorney(),
-      lawsuitOtherParty(),
-      degreeOfInterestHelp()
-    ]
-  }
-);
-
 const DivorceQuestions = (condition, scope) => group(
   'DivorceQuestions',
   {
     if: (condition || '$get(Type_Of_Legal_Problem).value == "Divorce and Separation"'),
     children: [
-      haveAttorney(scope),
+      haveAttorney$1(scope),
       maritalStatus(scope),
       haveChildren(scope),
-      degreeOfInterest(scope),
+      degreeOfInterest$1(scope),
       lawyerPaymentMethod(scope)
     ]
   }
@@ -897,8 +933,8 @@ const DUIAndDWIQuestions = (condition, scope) => group(
   {
     if: (condition || '$get(Type_Of_Legal_Problem).value == "DUI and DWI"'),
     children: [
-      haveAttorney(scope),
-      incidentDate(scope),
+      haveAttorney$1(scope),
+      incidentDate$1(scope),
       priorAlcoholOffenses(scope),
       typeOfAlcoholTest(scope),
       bloodContentAlcoholTest(scope),
@@ -908,46 +944,17 @@ const DUIAndDWIQuestions = (condition, scope) => group(
   }
 );
 
-const EmploymentAndWorkplaceQuestions = () => group(
-  'EmploymentAndWorkplaceQuestions',
-  {
-    if: '$get(Type_Of_Legal_Problem).value == "Employment and Workplace"',
-    children: [
-      haveAttorney(),
-      numEmployeesOfBusiness(),
-      employerType(),
-      employeeAtCompany(),
-      degreeOfInterestHelp()
-    ]
-  }
-);
-
-const MedicalMalpracticeQuestions = () => group(
-  'MedicalMalpracticeQuestions',
-  {
-    if: '$get(Type_Of_Legal_Problem).value == "Medical Malpractice"',
-    children: [
-      haveAttorney(),
-      incidentDate(),
-      claimStatus(),
-      doctorTreatment(),
-      medicalMalpracticeInjuries(),
-      degreeOfInterestHelp()
-    ]
-  }
-);
-
 const PersonalInjuryQuestions = (condition, scope) => group(
   'PersonalInjuryQuestions',
   {
     if: (condition || '$get(Type_Of_Legal_Problem).value == "Personal Injury"'),
     children: [
-      haveAttorney(scope),
-      incidentDate(scope),
-      claimStatus(scope),
-      atFault(scope),
-      primaryInjury(scope),
-      doctorTreatment(scope)
+      haveAttorney$1(scope),
+      incidentDate$1(scope),
+      claimStatus$1(scope),
+      atFault$1(scope),
+      primaryInjury$1(scope),
+      doctorTreatment$1(scope)
     ]
   }
 );
@@ -957,49 +964,23 @@ const PowerofAttorneyQuestions = (condition, scope) => group(
   {
     if: (condition || '$get(Type_Of_Legal_Problem).value == "Power of Attorney"'),
     children: [
-      haveAttorney(scope),
+      haveAttorney$1(scope),
       degreeOfInterestHelp(scope)
     ]
   }
 );
 
-const PropertyDamageQuestions = () => group(
-  'PropertyDamageQuestions',
-  {
-    if: '$get(Type_Of_Legal_Problem).value == "Property Damage"',
-    children: [
-      haveAttorney(),
-      realEstateArea(),
-      wouldLikeLawyerTo(),
-      degreeOfInterestHelp()
-    ]
-  }
-);
-
-const RealEstateQuestions = () => group(
-  'RealEstateQuestions',
-  {
-    if: '$get(Type_Of_Legal_Problem).value == "Real Estate"',
-    children: [
-      haveAttorney(),
-      realEstateArea(),
-      wouldLikeLawyerTo(),
-      degreeOfInterestHelp()
-    ]
-  }
-);
-
 const SocialSecurityDisabilityAndInsuranceQuestions = (condition, scope) => group(
   'SocialSecurityDisabilityAndInsuranceQuestions',
   {
     if: (condition || '$get(Type_Of_Legal_Problem).value == "Social Security Disability and Insurance"'),
     children: [
-      haveAttorney(scope),
+      haveAttorney$1(scope),
       applicantAge(scope),
       disabilityConditionStopWork(scope),
       disabilityWorkHistory(scope),
       socialSecurityDisabilityReceivingBenefits(scope),
-      doctorTreatment(scope)
+      doctorTreatment$1(scope)
     ]
   }
 );
@@ -1009,7 +990,7 @@ const WillsAndTrustsQuestions = (condition, scope) => group(
   {
     if: (condition || '$get(Type_Of_Legal_Problem).value == "Wills and Trusts"'),
     children: [
-      haveAttorney(scope),
+      haveAttorney$1(scope),
       valueOfAssets(scope),
       typeOfAssets(scope),
       roleInMatterProbate(scope),
@@ -1024,23 +1005,12 @@ const WorkersCompensationQuestions = (condition, scope) => group(
   {
     if: (condition || '$get(Type_Of_Legal_Problem).value == "Workers Compensation"'),
     children: [
-      haveAttorney(scope),
-      incidentDate(scope),
-      claimStatus(scope),
-      primaryInjury(scope),
+      haveAttorney$1(scope),
+      incidentDate$1(scope),
+      claimStatus$1(scope),
+      primaryInjury$1(scope),
       causeOfInjury(scope),
-      doctorTreatment(scope)
-    ]
-  }
-);
-
-const NotSureOrOtherQuestions = () => group(
-  'NotSureOrOtherQuestions',
-  {
-    if: '$get(Type_Of_Legal_Problem).value == "Not Sure or Other"',
-    children: [
-      haveAttorney(),
-      degreeOfInterestHelp()
+      doctorTreatment$1(scope)
     ]
   }
 );
@@ -1107,7 +1077,7 @@ function secureIcon(updates) {
   )
 }
 
-function questionsStepHeadline(updates) {
+function crossSellQuestionsStepHeadline(updates) {
   return {
     $el: 'h3',
     children: updates.headline || 'Tell Us About Your Situation',
@@ -1117,22 +1087,32 @@ function questionsStepHeadline(updates) {
   }
 }
 
-function crossSellQuestionsStepHeadline(updates) {
+function crossSellQuestionsStepSubHeadline(updates) {
+  return {
+    $el: 'h5',
+    children: updates.subheadline || 'Tell us about your situation:',
+    attrs: {
+      class: 't-flex t-justify-center t-text-dark t-text-center !t-text-lg t-font-semibold t-pb-4 t-pt-0 t-px-3'
+    }
+  }
+}
+
+function verticalStepHeadline(updates) {
   return {
     $el: 'h3',
     children: updates.headline || 'Tell Us About Your Situation',
     attrs: {
-      class: 't-flex t-justify-center t-text-center t-text-2xl t-font-bold t-text-blue-500 t-pb-5 t-pt-0 t-px-1'
+      class: 't-flex t-justify-center t-text-center t-text-2xl t-font-bold t-text-dark t-pb-5 t-pt-0 t-px-1' + ' ' + (updates.headlineClass || '')
     }
   }
 }
 
-function crossSellQuestionsStepSubHeadline(updates) {
+function verticalStepSubHeadline(updates) {
   return {
     $el: 'h5',
-    children: updates.subheadline || 'Tell us about your situation:',
+    children: updates.subheadline || '',
     attrs: {
-      class: 't-flex t-justify-center t-text-dark t-text-center !t-text-lg t-font-semibold t-pb-4 t-pt-0 t-px-3'
+      class: 't-flex t-justify-center t-text-center !t-text-lg t-font-normal t-text-dark t-pb-5 t-pt-0 t-px-1' + ' ' + (updates.subheadlineClass || '')
     }
   }
 }
@@ -1251,26 +1231,16 @@ function step(name, inputs, nextOnEnter = true, nextOnInput = false, stepKey = u
   )
 }
 
-function civilLawsuitTOLPAndZip(updates = {}) {
+// Single question step
+function sqstep(name, input, defaultHeadline, updates = {}) {
   return step(
-    'civilLawsuitTOLPAndZip',
+    name,
     [
-      {
-        $formkit: 'hidden',
-        name: "Type_Of_Legal_Problem",
-        id: "Type_Of_Legal_Problem",
-        value: "Civil Lawsuit"
-      },
-      civilDefense({
-        if: 'true'
-      }),
-      civilLawsuitTOLPDisplay({
-        if: '$get(Civil_Defense).value == "No"'
-      }),
-      zipcode()
+      verticalStepHeadline({ headline: updates.headline ?? defaultHeadline, headlineClass: updates.headlineClass }),
+      ...Array.isArray(input) ? input : [input],
     ],
     updates.nextOnEnter,
-    updates.nextOnInput,
+    typeof updates.nextOnInput === 'undefined' ? true : updates.nextOnInput,
     updates.stepKey,
     updates.nextStepMap
   )
@@ -1319,11 +1289,18 @@ function contactInfo(updates = {}) {
   )
 }
 
-function firstAndLastV2(updates = {}) {
+function firstAndLastV3(updates = {}) {
   return step(
     'firstAndLast',
     [
-      firstAndLastStepHeadline(updates),
+      firstAndLastStepHeadline({
+        headline: updates.headline ?? 'Who is looking for help?',
+        headlineClass: updates.headlineClass
+      }),
+      verticalStepSubHeadline({
+        subheadline: updates.subheadline ?? 'Note: we never share info without consent',
+        subheadlineClass: '!t-text-sm !t-text-gray-500'
+      }),
       firstName(),
       lastName()
     ],
@@ -1507,27 +1484,6 @@ function workersCompensationCrossSellQuestions(updates = {}) {
   )
 }
 
-function civilLawsuitTOLPQuestions(updates = {}) {
-  return step(
-    'TOLPQuestions',
-    [
-      questionsStepHeadline(updates),
-      AutoAndCarAccidentsQuestions(),
-      BusinessLawyersQuestions(),
-      DefendLawsuitQuestions(),
-      FileLawsuitQuestions(),
-      PersonalInjuryQuestions(),
-      EmploymentAndWorkplaceQuestions(),
-      ConsumerLawyersQuestions(),
-      MedicalMalpracticeQuestions(),
-      PropertyDamageQuestions(),
-      RealEstateQuestions(),
-      NotSureOrOtherQuestions()
-    ],
-    updates.nextOnEnter
-  )
-}
-
 function legalCrossSells(updates = {}) {
   return step(
     'legalCrossSells',
@@ -1542,6 +1498,199 @@ function legalCrossSells(updates = {}) {
   )
 }
 
+function zipcode(updates = {}) {
+  return sqstep(
+    'zipcode',
+    zipcodeCenter(updates),
+    'Please verify your Zip Code',
+    updates
+  )
+}
+
+function civilLawsuitTOLP(updates = {}) {
+  return step(
+    'civilLawsuitTOLP',
+    [
+      civilLawsuitTOLPCenter(),
+    ],
+    updates.nextOnEnter,
+    updates.nextOnInput,
+    updates.stepKey,
+    updates.nextStepMap
+  )
+}
+
+function civilLawsuitTOLPDisplay(updates = {}) {
+  return sqstep(
+    'civilLawsuitTOLPDisplay',
+    civilLawsuitTOLPDisplayCenter(),
+    'What type of lawsuit would you like to file?',
+    updates
+  )
+}
+
+function haveAttorney(updates = {}) {
+  return sqstep(
+    'haveAttorney',
+    haveAttorneyCenter(),
+    'Already working with an attorney?',
+    updates
+  )
+}
+
+function degreeOfInterest(updates = {}) {
+  return sqstep(
+    'degreeOfInterest',
+    degreeOfInterestCenter(),
+    'Could you pay if your issue could be resolved?',
+    updates
+  )
+}
+
+function incidentDate(updates = {}) {
+  return sqstep(
+    'incidentDate',
+    incidentDateCenter(),
+    'When did the incident occur?',
+    updates
+  )
+}
+
+function doctorTreatment(updates = {}) {
+  return sqstep(
+    'doctorTreatment',
+    doctorTreatmentCenter(),
+    'Have you seen a doctor about this?',
+    updates
+  )
+}
+
+function medicalMalpracticeInjuries(updates = {}) {
+  return sqstep(
+    'medicalMalpracticeInjuries',
+    medicalMalpracticeInjuriesCenter(),
+    'What injuries did you suffer?',
+    updates
+  )
+}
+
+function atFault(updates = {}) {
+  return sqstep(
+    'atFault',
+    atFaultCenter(),
+    'Were you at fault?',
+    updates
+  )
+}
+
+function primaryInjury(updates = {}) {
+  return sqstep(
+    'primaryInjury',
+    primaryInjuryCenter(),
+    'What was the primary injury?',
+    updates
+  )
+}
+
+function policeReportFiled(updates = {}) {
+  return sqstep(
+    'policeReportFiled',
+    policeReportFiledCenter(),
+    'Was a police report filed?',
+    updates
+  )
+}
+
+function businessServices(updates = {}) {
+  return sqstep(
+    'businessServices',
+    businessServicesCenter(),
+    'What legal services do you need?',
+    updates
+  )
+}
+
+function businessType(updates = {}) {
+  return sqstep(
+    'businessType',
+    businessTypeCenter(),
+    'Is the business public or private?',
+    updates
+  )
+}
+
+function employerType(updates = {}) {
+  return sqstep(
+    'employerType',
+    employerTypeCenter(),
+    'What type of employer is it?',
+    updates
+  )
+}
+
+function employeeAtCompany(updates = {}) {
+  return sqstep(
+    'employeeAtCompany',
+    employeeAtCompanyCenter(),
+    'Do you/they still work at the company?',
+    updates
+  )
+}
+
+function numEmployeesOfBusiness(updates = {}) {
+  return sqstep(
+    'numEmployeesOfBusiness',
+    numEmployeesOfBusinessCenter(),
+    'How many employees does the business have?',
+    updates
+  )
+}
+
+function lawsuitOtherParty(updates = {}) {
+  return sqstep(
+    'lawsuitOtherParty',
+    lawsuitOtherPartyCenter(),
+    'What describes the other party in the lawsuit?',
+    updates
+  )
+}
+
+function consumerLawyerType(updates = {}) {
+  return sqstep(
+    'consumerLawyerType',
+    consumerLawyerTypeCenter(),
+    'What best describes your issue?',
+    updates
+  )
+}
+
+function claimStatus(updates = {}) {
+  return sqstep(
+    'claimStatus',
+    claimStatusCenter(),
+    'What is the status of the claim?',
+    updates
+  )
+}
+
+function realEstateArea(updates = {}) {
+  return sqstep(
+    'realEstateArea',
+    realEstateAreaCenter(),
+    'What area of real estate?',
+    updates
+  )
+}
+
+function wouldLikeLawyerTo(updates = {}) {
+  return sqstep(
+    'wouldLikeLawyerTo',
+    wouldLikeLawyerToCenter(),
+    'I would like the lawyer to:',
+    updates
+  )
+}
+
 // ------ Common
 
 const formNavigation = () => ({
@@ -1730,6 +1879,62 @@ function formAnchor(updates) {
   )
 }
 
+const progressBarDefaults = {
+  $el: 'div',
+  attrs: {
+    class: 't-mt-7 t-mb-5 t-w-full t-flex t-flex-col t-justify-center t-items-center',
+    style: {
+      if: '$fns.eq($activeStep, $firstStep()) || $fns.eq($activeStep, $lastStep())',
+      then: 'display: none'
+    },
+  },
+  children: [
+    {
+      $el: 'div',
+      attrs: {
+        class: 't-flex t-justify-center'
+      },
+      children: [
+        {
+          $el: 'span',
+          attrs: {
+            id: 'progress-bar-text',
+            class: 't-text-sm t-mb-1'
+          },
+          children: [
+            "0% Complete"
+          ]
+        },
+      ]
+    },
+    {
+      $el: 'div',
+      attrs: {
+        class: 't-bg-gray-100 t-w-9/12 t-rounded'
+      },
+      children: [
+        {
+          $el: 'div',
+          attrs: {
+            id: 'progress-bar',
+            class: 't-flex t-flex-col t-justify-center t-text-center t-whitespace-nowrap t-w-[10%] t-h-1.5 t-rounded t-text-white t-bg-[#007bff]',
+            style: {
+              transition: 'width 0.5s ease'
+            },
+          },
+        }
+      ]
+    }
+  ]
+};
+
+function progressBar(updates) {
+  return merge(
+    progressBarDefaults,
+    updates
+  )
+}
+
 function headlineDefaults(updates = {}) {
   return {
     $el: 'h1',
@@ -1822,6 +2027,32 @@ const legalAllValueOverrideMap = {
       'Type_Of_Legal_Problem': 'File a Lawsuit'
     }
   },
+  'Business_Services_Display': {
+    "Business Formation": {
+      'Business_Services': 'Business Formation'
+    },
+    "Contracts": {
+      'Business_Services': 'Contracts'
+    },
+    "Insurance and Liability": {
+      'Business_Services': 'Insurance and Liability'
+    },
+    "Mergers and Acquisition": {
+      'Business_Services': 'Mergers and Acquisition'
+    },
+    "Regulatory Compliance": {
+      'Business_Services': 'Regulatory Compliance'
+    },
+    "Employee Dispute": {
+      'Business_Services': 'Employee Dispute'
+    },
+    "Advice and Consulting": {
+      'Business_Services': 'Other',
+    },
+    "Other": {
+      'Business_Services': 'Other'
+    }
+  },
   'Type_Of_Legal_Problem_Display': {
     // Accidents and PI
     'Auto Accident': {
@@ -2112,23 +2343,432 @@ const TOLPFinalSubHeadlines = {
   // 'Non-Workplace Discrimination': '',
 };
 
+const nextStepsLegalDefault = [
+  'haveAttorney',
+  'degreeOfInterest',
+  'commentsWithBankruptcy',
+  'zipcode',
+  'legalCrossSells',
+  'firstAndLast',
+  'contactInfo',
+];
+
+const nextStepsLegalDefaultLPM = [
+  'haveAttorney',
+  'degreeOfInterest',
+  'lawyerPaymentMethod',
+  'commentsWithBankruptcy',
+  'zipcode',
+  'legalCrossSells',
+  'firstAndLast',
+  'contactInfo',
+];
+
+const nextStepsLegalNoDOI = [
+  'haveAttorney',
+  'commentsWithBankruptcy',
+  'zipcode',
+  'legalCrossSells',
+  'firstAndLast',
+  'contactInfo',
+];
+
+const nextStepsLegalNoHA = [
+  'degreeOfInterest',
+  'commentsWithBankruptcy',
+  'zipcode',
+  'legalCrossSells',
+  'firstAndLast',
+  'contactInfo',
+];
 
-const nextStepsMapLegalLegacy = {
+const nextStepsMapGeneralLegal = {
+  'Type_Of_Legal_Problem': {
+    'Adoption': [
+      'maritalStatus',
+      'haveChildren',
+      ...nextStepsLegalDefaultLPM
+    ],
+    'Asbestos and Mesothelioma': [
+      'incidentDate',
+      'doctorTreatment',
+      ...nextStepsLegalDefault
+    ],
+    'Auto and Car Accidents': [
+      'incidentDate',
+      'atFault',
+      'primaryInjury',
+      'doctorTreatment',
+      'policeReportFiled',
+      ...nextStepsLegalNoDOI
+    ],
+    'Bankruptcy': [
+      'totalMonthlyIncome',
+      'totalDebt',
+      'ownRealEstate',
+      'valueOfAssets',
+      ...nextStepsLegalDefault
+    ],
+    'Business Lawyers': [
+      'businessServices',
+      'businessType',
+      'numEmployeesOfBusiness',
+      ...nextStepsLegalDefault
+    ],
+    'Child Custody': [
+      'childRelationship',
+      'childHome',
+      'childPrimaryCaregiver',
+      ...nextStepsLegalDefaultLPM
+    ],
+    'Child Support': [
+      'childRelationship',
+      'childHome',
+      'childPrimaryCaregiver',
+      ...nextStepsLegalDefaultLPM
+    ],
+    'Civil Rights and Discrimination': [
+      'civilRightsType',
+      ...nextStepsLegalDefault
+    ],
+    'Civil Lawsuit': [
+      'civilDefense',
+      'lawsuitOtherParty',
+      ...nextStepsLegalDefault
+    ],
+    'File a Lawsuit': [
+      'civilLawsuitTOLPDisplay',
+      'lawsuitOtherParty',
+      ...nextStepsLegalDefault
+    ],
+    'Defend a Lawsuit': [
+      'lawsuitOtherParty',
+      ...nextStepsLegalDefault
+    ],
+    'Consumer Lawyers': [
+      'consumerLawyerType',
+      'incidentDate',
+      'lawsuitOtherParty',
+      ...nextStepsLegalDefault
+    ],
+    'Criminal and Felony': [
+      'criminalTOLPDisplay',
+      'crimeCommittedDate',
+      'roleInMatterCriminal',
+      'pendingCharges',
+      ...nextStepsLegalDefaultLPM
+    ],
+    'Debt and Collections': [
+      'totalMonthlyIncome',
+      'totalDebt',
+      'ownRealEstate',
+      'valueOfAssets',
+      ...nextStepsLegalDefault
+    ],
+    'Divorce and Separation': [
+      'maritalStatus',
+      'haveChildren',
+      ...nextStepsLegalDefaultLPM
+    ],
+    'DUI and DWI': [
+      'incidentDate',
+      'priorAlcoholOffenses',
+      'typeOfAlcoholTest',
+      'bloodContentAlcoholTest',
+      'pendingCharges',
+      ...nextStepsLegalDefault
+    ],
+    'Employment and Workplace': [
+      'employmentAndWorkplaceTOLPDisplay',
+      'numEmployeesOfBusiness',
+      'employerType',
+      'employeeAtCompany',
+      ...nextStepsLegalDefault
+    ],
+    'Expungement': [
+      'incidentDate',
+      'criminalChargeType',
+      ...nextStepsLegalDefaultLPM
+    ],
+    'Family Issues': [
+      'maritalStatus',
+      'haveChildren',
+      ...nextStepsLegalDefaultLPM
+    ],
+    'Foreclosure': [
+      'ownRealEstate',
+      'typeOfProperty',
+      'amountPaymentsPastDue',
+      'loanAmount',
+      'defaultNotice',
+      ...nextStepsLegalDefault
+    ],
+    'Guardianship': [
+      'maritalStatus',
+      'haveChildren',
+      ...nextStepsLegalDefaultLPM
+    ],
+    'Immigration and Visas': [
+      'countryOfCitizenship',
+      'immigrationLocation',
+      'immigrationEntry',
+      'immigrationType',
+      'immigrationStatus',
+      'immigrationDetails',
+      ...nextStepsLegalDefault
+    ],
+    'Landlord and Tenant': [
+      'landlordTenantIssue',
+      'landlordTenantParty',
+      ...nextStepsLegalDefault
+    ],
+    'Lemon Law': [
+      'incidentDate',
+      'lawsuitOtherParty',
+      ...nextStepsLegalDefault
+    ],
+    'Long Term Disability': [
+      'applicantOccupation',
+      'applicantAge',
+      'applicantLTDisabilityPolicy',
+      'applicantDisabilityHowObtain',
+      'applicantPreviouslyAppliedLtdBenefits',
+      'applicantReceivedDisabilityBenefits',
+      'applicantMonthlySalary',
+      ...nextStepsLegalNoDOI
+    ],
+    'Medical Malpractice': [
+      'incidentDate',
+      'claimStatus',
+      'doctorTreatment',
+      'medicalMalpracticeInjuries',
+      ...nextStepsLegalDefault
+    ],
+    'Patents and Intellectual Property': [
+      'patentAssistanceType',
+      'patentFor',
+      ...nextStepsLegalDefault
+    ],
+    'Personal Injury': [
+      'incidentDate',
+      'claimStatus',
+      'atFault',
+      'primaryInjury',
+      'doctorTreatment',
+      ...nextStepsLegalNoDOI
+    ],
+    'Probate and Estates': [
+      'valueOfAssets',
+      'typeOfAssets',
+      'roleInMatterProbate',
+      'estateLegalServicesNeeded',
+      ...nextStepsLegalDefault
+    ],
+    'Property Damage': [
+      'realEstateArea',
+      'wouldLikeLawyerTo',
+      ...nextStepsLegalDefault
+    ],
+    'Real Estate': [
+      'realEstateTOLPDisplay',
+      'realEstateArea',
+      'wouldLikeLawyerTo',
+      ...nextStepsLegalDefault
+    ],
+    'Social Security Disability and Insurance': [
+      'applicantAge',
+      'disabilityConditionStopWork',
+      'disabilityWorkHistory',
+      'socialSecurityDisabilityReceivingBenefits',
+      'doctorTreatment',
+      ...nextStepsLegalNoDOI
+    ],
+    'Tax and IRS': [
+      'totalDebt',
+      'taxProblemDetails',
+      'taxLevel',
+      'taxIssueType',
+      ...nextStepsLegalDefault
+    ],
+    'Traffic and Tickets': [
+      'driversLicenseType',
+      'trafficViolations',
+      'haveCourtDate',
+      ...nextStepsLegalDefault
+    ],
+    'Unemployment': [
+      'numEmployeesOfBusiness',
+      'employerType',
+      ...nextStepsLegalNoHA
+    ],
+    'Victim of a Crime': [
+      'crimeCommittedDate',
+      'roleInMatterCriminal',
+      'pendingCharges',
+      ...nextStepsLegalDefaultLPM
+    ],
+    'Wills and Trusts': [
+      'valueOfAssets',
+      'typeOfAssets',
+      'roleInMatterProbate',
+      'estateLegalServicesNeeded',
+      ...nextStepsLegalDefault
+    ],
+    'Workers Compensation': [
+      'incidentDate',
+      'claimStatus',
+      'primaryInjury',
+      'causeOfInjury',
+      'doctorTreatment',
+      ...nextStepsLegalNoDOI
+    ],
+    'Workplace Harassment': [
+      'numEmployeesOfBusiness',
+      'employerType',
+      'employeeAtCompany',
+      ...nextStepsLegalDefault
+    ],
+    'Workplace Discrimination': [
+      'numEmployeesOfBusiness',
+      'employerType',
+      'employeeAtCompany',
+      ...nextStepsLegalDefault
+    ],
+    'Wrongful Death': [
+      'incidentDate',
+      'relationshipToVictim',
+      'criminalChargesFiled',
+      'causeOfDeath',
+      ...nextStepsLegalNoDOI
+    ],
+    'Wrongful Termination': [
+      'numEmployeesOfBusiness',
+      'employerType',
+      ...nextStepsLegalDefault
+    ],
+  },
+  '*': nextStepsLegalDefault
+};
+
+// function filterMapByKey(obj, keyList) {
+//   return Object.fromEntries(
+//     Object.entries(obj).filter(([key]) => keyList.includes(key))
+//   );
+// }
+
+// export function filteredNextStepsMapLegal(keyList) {
+//   const res = { Type_Of_Legal_Problem: filterMapByKey(nextStepsMapGeneralLegal["Type_Of_Legal_Problem"], keyList) }
+//   res["*"] = nextStepsMapGeneralLegal["*"]
+//   return res
+// }
+
+const TOLPNextSteps = nextStepsMapGeneralLegal["Type_Of_Legal_Problem"];
+
+({
+  'Civil_Defense': {
+    'Yes': TOLPNextSteps["Defend a Lawsuit"],
+    'No': TOLPNextSteps["File a Lawsuit"],
+  },
   '*': [
-    'TOLPQuestions',
-    'commentsWithBankruptcy',
-    'legalCrossSells',
-    'firstAndLast',
-    'contactInfo',
+    'lawsuitOtherParty',
+    ...nextStepsLegalDefault
+  ]
+});
+
+const nextStepsMapCivilTolp = {
+  'Type_Of_Legal_Problem': {
+    'Defend a Lawsuit': TOLPNextSteps["Defend a Lawsuit"],
+    'File a Lawsuit': TOLPNextSteps["File a Lawsuit"],
+  },
+  '*': [
+    'lawsuitOtherParty',
+    ...nextStepsLegalDefault
+  ]
+};
+
+const nextStepsMapCivilTOLPDisplay = {
+  'Type_Of_Legal_Problem_Display': {
+    'Automobile Accident': TOLPNextSteps["Auto and Car Accidents"],
+    'Contract Disputes': TOLPNextSteps["Business Lawyers"],
+    'Dog Bite': TOLPNextSteps["Personal Injury"],
+    'Employment and Workplace': TOLPNextSteps["Employment and Workplace"],
+    'Fraud': TOLPNextSteps["Consumer Lawyers"],
+    'Medical Malpractice': TOLPNextSteps["Medical Malpractice"],
+    'Personal Injury': TOLPNextSteps["Personal Injury"],
+    'Property Damage': TOLPNextSteps["Property Damage"],
+    'Real Estate': TOLPNextSteps["Real Estate"],
+    'Not Sure or Other': nextStepsMapGeneralLegal["*"],
+  },
+  '*': [
+    'lawsuitOtherParty',
+    ...nextStepsLegalDefault
   ]
 };
 
+({
+  'Type_Of_Legal_Problem_Display': {
+    'Wrongful Termination': TOLPNextSteps["Wrongful Termination"],
+    'Workers Compensation': TOLPNextSteps["Workers Compensation"],
+    'Personal Injury': TOLPNextSteps["Personal Injury"],
+    'Unemployment': TOLPNextSteps["Unemployment"],
+  },
+  '*': [
+    'numEmployeesOfBusiness',
+    'employerType',
+    'employeeAtCompany',
+    ...nextStepsLegalDefault
+  ]
+});
+
+({
+  'Type_Of_Legal_Problem_Display': {
+    'Foreclosure': TOLPNextSteps["Foreclosure"],
+    'Landlord and Tenant': TOLPNextSteps["Landlord and Tenant"],
+    'Wills, Trusts, and Estates': TOLPNextSteps["Wills and Trusts"],
+    'Property Damage': TOLPNextSteps['Property Damage'],
+  },
+  '*': [
+    'realEstateArea',
+    'wouldLikeLawyerTo',
+    ...nextStepsLegalDefault
+  ]
+});
+
 const meta = defaultMetaProps();
 
 meta.data.dynamicSchema = [
-  civilLawsuitTOLPQuestions(),
-  commentsWithBankruptcy(),
-  legalCrossSells(),
+  atFault(),
+  businessServices(),
+  businessType(),
+  civilLawsuitTOLPDisplay({
+    nextStepMap: nextStepsMapCivilTOLPDisplay
+  }),
+  claimStatus(),
+  consumerLawyerType(),
+  degreeOfInterest(),
+  doctorTreatment(),
+  employerType(),
+  employeeAtCompany(),
+  haveAttorney(),
+  incidentDate({
+    nextOnInput: false
+  }),
+  lawsuitOtherParty(),
+  medicalMalpracticeInjuries(),
+  numEmployeesOfBusiness(),
+  policeReportFiled(),
+  primaryInjury(),
+  realEstateArea(),
+  wouldLikeLawyerTo(),
+  zipcode(),
+  commentsWithBankruptcy({
+    label: null,
+    headline: 'Please briefly describe your situation:',
+    headlineClass: '!t-text-dark',
+  }),
+  legalCrossSells({
+    headlineClass: '!t-text-dark'
+  }),
   autoAndCarAccidentCrossSellQuestions(),
   personalInjuryCrossSellQuestions(),
   workersCompensationCrossSellQuestions(),
@@ -2138,7 +2778,9 @@ meta.data.dynamicSchema = [
   willsAndTrustsCrossSellQuestions(),
   divorceAndSeparationCrossSellQuestions(),
   childCustodyCrossSellQuestions(),
-  firstAndLastV2()
+  firstAndLastV3({
+    headlineClass: '!t-text-dark'
+  }),
 ];
 
 const schema = [
@@ -2152,6 +2794,7 @@ const schema = [
       valueOverrideMap: legalAllValueOverrideMap
     }),
     children: [
+      progressBar(),
       headline({
         children: '$urlParam("hl", "Schedule a Lawsuit Consultation")',
         if: '$activeStep === $firstStep()'
@@ -2164,8 +2807,9 @@ const schema = [
           class: 'form-body'
         },
         children: [
-          civilLawsuitTOLPAndZip({
-            nextStepMap: nextStepsMapLegalLegacy
+          civilLawsuitTOLP({
+            nextOnInput: false,
+            nextStepMap: nextStepsMapCivilTolp
           }),
           dynamicSchemaNode,
           contactInfo(),