bhl-forms 0.6.15 → 0.7.1

package/dist/forms/generalLegalPopUnderSingle.es.js

@@ -6,14 +6,97 @@ function LegalRedirectUrl() {
   return 'https://listings.ziplawyer.com/api/v1/redirect?zone_id=4&vertical=Legal&category=${properties.Type_Of_Legal_Problem}&Degree_Of_Interest=${properties.Degree_Of_Interest}&zip_code=${properties.Zip}&sub_id=${properties.vid}'
 }
 
-var TCPA_LANGUAGE = "By checking this box, I a) agree to the Terms of Use, and b) consent to be contacted by lawyers, lawyer networks, and partners of this website using live, autodialed, pre-recorded, or artificial voice calls, as well as text messages. Your consent is not required as a condition of purchasing any goods or services. To submit this request without this consent, call 878-213-4937.";
-
-const DEFAULT_COMMENTS_PLACEHOLDER_DYNAMIC = '$getKey($meta, "commentsPlaceholders." + $get(Type_Of_Legal_Problem).value, $meta.defaultCommentsPlaceholder)';
-const DEFAULT_COMMENTS_LABEL = 'Please briefly describe your legal issue in a few words:';
-const DEFAULT_FINAL_HEADLINE = 'Submit Your Case';
-const DEFAULT_FINAL_HEADLINE_DYNAMIC = '$getKey($meta, "finalHeadlines." + $get(Type_Of_Legal_Problem).value, $meta.defaultFinalHeadline)';
-const DEFAULT_FINAL_SUBHEADLINE = 'You may benefit from speaking with a legal professional. Please verify your contact information.';
-const DEFAULT_FINAL_SUBHEADLINE_DYNAMIC = '$getKey($meta, "finalSubHeadlines." + $get(Type_Of_Legal_Problem).value, $meta.defaultFinalSubHeadline)';
+const DEFAULT_COMMENTS_PLACEHOLDER_DYNAMIC_LEGAL = '$getKey($meta, "commentsPlaceholders." + $get(Type_Of_Legal_Problem).value, $meta.defaultCommentsPlaceholder)';
+const DEFAULT_COMMENTS_LABEL_LEGAL = 'Please briefly describe your legal issue in a few words:';
+const DEFAULT_FINAL_HEADLINE_LEGAL = 'Submit Your Case';
+const DEFAULT_FINAL_HEADLINE_DYNAMIC_LEGAL = '$getKey($meta, "finalHeadlines." + $get(Type_Of_Legal_Problem).value, $meta.defaultFinalHeadline)';
+const DEFAULT_FINAL_SUBHEADLINE_LEGAL = 'You may benefit from speaking with a legal professional. Please verify your contact information.';
+const DEFAULT_FINAL_SUBHEADLINE_DYNAMIC_LEGAL = '$getKey($meta, "finalSubHeadlines." + $get(Type_Of_Legal_Problem).value, $meta.defaultFinalSubHeadline)';
+const TCPA_LANGUAGE_LEGAL = "By checking this box, I a) agree to the Terms of Use, and b) consent to be contacted by lawyers, lawyer networks, and partners of this website using live, autodialed, pre-recorded, or artificial voice calls, as well as text messages. Your consent is not required as a condition of purchasing any goods or services. To submit this request without this consent, call 878-213-4937.";
+const defaultLegalImprovementCrossSells = {
+  'Auto and Car Accidents': 'Injured in a Car Accident',
+  'Personal Injury': 'Personal or Workplace Injury',
+  'DUI and DWI': 'Involved in a DUI/DWI',
+  'Wills and Trusts': 'Need a Will or Trust',
+  'Power of Attorney': 'Update Power of Attorney',
+  'Social Security Disability and Insurance': 'Interest in Disability Benefits',
+};
+const CROSS_SELL_OPTION_MAP_LEGAL = {
+  // Values can be a list or a map of value -> display value
+  'Auto and Car Accidents': {
+    'Social Security Disability and Insurance': 'Interest in Disability Benefits',
+    'Wills and Trusts': 'Need a Will or Trust',
+    'Workers Compensation': 'Workplace Injury',
+    'Power of Attorney': 'Update Power of Attorney',
+    'Divorce and Separation': 'Need a Divorce or Separation',
+    'Child Custody': 'Need help with Child Custody',
+  },
+  "Personal Injury": {
+    'DUI and DWI': 'Involved in a DUI/DWI',
+    'Wills and Trusts': 'Need a Will or Trust',
+    'Power of Attorney': 'Update Power of Attorney',
+    'Divorce and Separation': 'Need a Divorce or Separation',
+    'Child Custody': 'Need help with Child Custody',
+    // TODO add one more?
+  },
+  "Workers Compensation": {
+    'DUI and DWI': 'Involved in a DUI/DWI',
+    'Wills and Trusts': 'Need a Will or Trust',
+    'Power of Attorney': 'Update Power of Attorney',
+    'Divorce and Separation': 'Need a Divorce or Separation',
+    'Child Custody': 'Need help with Child Custody',
+    // TODO add one more?
+  },
+  "DUI and DWI": {
+    'Personal Injury': 'Personal or Workplace Injury',
+    'Wills and Trusts': 'Need a Will or Trust',
+    'Social Security Disability and Insurance': 'Interest in Disability Benefits',
+    'Power of Attorney': 'Update Power of Attorney',
+    'Divorce and Separation': 'Need a Divorce or Separation',
+    'Child Custody': 'Need help with Child Custody',
+  },
+  "Wills and Trusts": {
+    'Auto and Car Accidents': 'Injured in a Car Accident',
+    'Personal Injury': 'Personal or Workplace Injury',
+    'DUI and DWI': 'Involved in a DUI/DWI',
+    'Social Security Disability and Insurance': 'Interest in Disability Benefits',
+    'Divorce and Separation': 'Need a Divorce or Separation',
+    'Child Custody': 'Need help with Child Custody',
+  },
+  "Probate and Estates": {
+    'Auto and Car Accidents': 'Injured in a Car Accident',
+    'Personal Injury': 'Personal or Workplace Injury',
+    'DUI and DWI': 'Involved in a DUI/DWI',
+    'Social Security Disability and Insurance': 'Interest in Disability Benefits',
+    'Divorce and Separation': 'Need a Divorce or Separation',
+    'Child Custody': 'Need help with Child Custody',
+  },
+  "Power of Attorney": {
+    'Auto and Car Accidents': 'Injured in a Car Accident',
+    'Personal Injury': 'Personal or Workplace Injury',
+    'DUI and DWI': 'Involved in a DUI/DWI',
+    'Social Security Disability and Insurance': 'Interest in Disability Benefits',
+    'Divorce and Separation': 'Need a Divorce or Separation',
+    'Child Custody': 'Need help with Child Custody',
+  },
+  "Long Term Disability": {
+    'Auto and Car Accidents': 'Injured in a Car Accident',
+    'DUI and DWI': 'Involved in a DUI/DWI',
+    'Wills and Trusts': 'Need a Will or Trust',
+    'Power of Attorney': 'Update Power of Attorney',
+    'Divorce and Separation': 'Need a Divorce or Separation',
+    'Child Custody': 'Need help with Child Custody',
+  },
+  "Social Security Disability and Insurance": {
+    'Auto and Car Accidents': 'Injured in a Car Accident',
+    'DUI and DWI': 'Involved in a DUI/DWI',
+    'Wills and Trusts': 'Need a Will or Trust',
+    'Power of Attorney': 'Update Power of Attorney',
+    'Divorce and Separation': 'Need a Divorce or Separation',
+    'Child Custody': 'Need help with Child Custody',
+  },
+  '*': defaultLegalImprovementCrossSells,
+};
 
 // ------ Common Base Settings
 
@@ -214,6 +297,7 @@ const verticalText = (updates) => {
   updates.wrapperClass = 't-flex t-justify-center';
   updates.messagesClass = 't-flex t-justify-center';
   updates.inputClass = 't-text-center';
+  updates.helpClass = 't-mt-2.5 !t-text-sm t-text-center';
   return text(updates)
 };
 
@@ -261,54 +345,131 @@ const verticalDate = (updates) => {
   return date(updates)
 };
 
-const amountPaymentsPastDueCenter = () => verticalSelect({
-  name: 'Amount_Payments_Past_Due',
-  options: [
-    "$0 - $499",
-    "$500 - $999",
-    "$1,000 - $2,499",
-    "$2,500 - $4,999",
-    "$5,000 - $9,999",
-    "$10,000 - $24,999",
-    "$25,000 - $49,999",
-    "$50,000 - $99,999",
-    "More than $100,000"
-  ]
+const email = (scope) => sbsText({
+  $formkit: 'email',
+  name: scope ? scope + ':' + 'Email' : 'Email',
+  label: 'Email Address:',
+  placeholder: 'email@domain.com',
+  autocomplete: 'email',
+  'data-tf-sensitive': 'false',
+  validation: 'required|email',
+  validationMessages: {
+    required: 'Email is required',
+    email: 'Invalid Email'
+  }
 });
 
-const applicantOccupationCenter = (scope) => verticalText({
-  name: scope ? scope + ':' + 'Applicant_Occupation' : 'Applicant_Occupation',
-  placeholder: "Occupation"
+const firstName = (scope) => sbsText({
+  label: 'First Name:',
+  placeholder: 'First',
+  name: scope ? scope + ':' + 'First_Name' : 'First_Name',
+  autocomplete: "given-name",
+  validationMessages: {
+    required: 'First Name is required'
+  }
 });
 
-const applicantAge$1 = (scope) => sbsText({
-  name: scope ? scope + ':' + 'Applicant_Age' : 'Applicant_Age',
-  label: 'Age of Applicant?',
-  placeholder: 'Age between 18 and 65',
-  maxlength: 2,
-  inputmode: "numeric",
-  validation: "required|min:18,max:65",
+const lastName = (scope) => sbsText({
+  label: 'Last Name:',
+  placeholder: 'Last',
+  name: scope ? scope + ':' + 'Last_Name' : 'Last_Name',
+  autocomplete: "family-name",
   validationMessages: {
-    required: 'Applicant Age is required',
-    min: 'Invalid Age - must be between 18 and 65',
-    max: 'Invalid Age - must be between 18 and 65',
+    required: 'Last Name is required'
   }
 });
 
-const applicantAgeCenter = (scope) => verticalText({
-  name: scope ? scope + ':' + 'Applicant_Age' : 'Applicant_Age',
-  value: "50",
-  placeholder: 'Age between 18 and 65',
-  maxlength: 2,
-  inputmode: "numeric",
-  validation: "required|min:18,max:65",
+const phone = (scope) => sbsText({
+  $formkit: 'tel',
+  name: scope ? scope + ':' + 'Primary_Phone' : 'Primary_Phone',
+  label: 'Phone Number:',
+  placeholder: '###-###-####',
+  maxlength: 12,
+  help: '10-digit phone number, hyphens optional',
+  autocomplete: 'tel-national',
+  'data-tf-sensitive': 'false',
+  validation: 'required|matches:/^[0-9]{3}-?[0-9]{3}-?[0-9]{4}$/|valid_phone',
   validationMessages: {
-    required: 'Applicant Age is required',
-    min: 'Invalid Age - must be between 18 and 65',
-    max: 'Invalid Age - must be between 18 and 65',
+    required: 'Field is required',
+    matches: 'Invalid Phone Format, use ###-###-####',
+    valid_phone: 'Invalid Phone Number'
   },
+  helpClass: "t-mt-2.5 md:t-text-right md:t-mt-[-2px]"
 });
 
+
+const zipcode$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalText : sbsText;
+  const label = vertical ? (updates.label) : 'Zip Code:';
+  const help = vertical ? (updates.help ?? "We try to match you with local help") : null;  
+  return func({
+    label,
+    help,
+    placeholder: '#####',
+    name: scope ? scope + ':' + 'Zip' : 'Zip',
+    maxlength: 5,
+    inputmode: "numeric",
+    autocomplete: 'postal-code',
+    validation: 'required|matches:/^[0-9]{5}$/',
+    validationMessages: {
+      required: 'Zip Code is required',
+      matches: 'Invalid Zip Code'
+    },
+    ...updates
+  })
+};
+
+const amountPaymentsPastDue$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalSelect : sbsSelect;
+  const label = vertical ? (updates.label) : 'Total Amount of Payments that are Past Due:';
+  return func(merge({
+    label,
+    name: scope ? scope + ':' + 'Amount_Payments_Past_Due' : 'Amount_Payments_Past_Due',
+    options: [
+      "$0 - $499",
+      "$500 - $999",
+      "$1,000 - $2,499",
+      "$2,500 - $4,999",
+      "$5,000 - $9,999",
+      "$10,000 - $24,999",
+      "$25,000 - $49,999",
+      "$50,000 - $99,999",
+      "More than $100,000"
+    ]
+  }, updates))
+};
+
+const applicantOccupation$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalText : sbsText;
+  const label = vertical ? (updates.label) : "What is the Applicant's Occupation?";
+  return func(merge({
+    label,
+    placeholder: "Occupation",
+    name: scope ? scope + ':' + 'Applicant_Occupation' : 'Applicant_Occupation',
+  }, updates))
+};
+
+const applicantAge$1 = (scope, vertical, updates = {}) => {
+  const func = vertical ? verticalText : sbsText;
+  const label = vertical ? (updates.label) : 'Age of Applicant?';
+  const value = vertical ? (updates.value ?? "50") : null;
+  return func(merge({
+    label,
+    placeholder: 'Age between 18 and 65',
+    name: scope ? scope + ':' + 'Applicant_Age' : 'Applicant_Age',
+    value,
+    maxlength: 2,
+    inputmode: "numeric",
+    validation: "required|min:18,max:65",
+    validationMessages: {
+      required: 'Applicant Age is required',
+      min: 'Invalid Age - must be between 18 and 65',
+      max: 'Invalid Age - must be between 18 and 65',
+    },
+    ...updates
+  }))
+};
+
 const applicantDisabilityHowObtainCenter = (scope) => verticalButtonRadio({
   name: scope ? scope + ':' + 'Applicant_Disability_How_Obtain' : 'Applicant_Disability_How_Obtain',
   options: [
@@ -887,20 +1048,6 @@ const driversLicenseTypeCenter = () => verticalButtonRadio({
   ]
 });
 
-const email = (scope) => sbsText({
-  $formkit: 'email',
-  name: scope ? scope + ':' + 'Email' : 'Email',
-  label: 'Email Address:',
-  placeholder: 'email@domain.com',
-  autocomplete: 'email',
-  'data-tf-sensitive': 'false',
-  validation: 'required|email',
-  validationMessages: {
-    required: 'Email is required',
-    email: 'Invalid Email'
-  }
-});
-
 const employerTypeCenter = () => col2RadioCenter({
   name: 'Employer_Type',
   options: [
@@ -957,16 +1104,6 @@ const estateLegalServicesNeededCenter = (scope) => col2RadioCenter({
   ]
 });
 
-const firstName = (scope) => sbsText({
-  $formkit: 'text',
-  label: 'First Name:',
-  placeholder: 'First',
-  name: scope ? scope + ':' + 'First_Name' : 'First_Name',
-  autocomplete: "given-name",
-  validationMessages: {
-    required: 'First Name is required'
-  }
-});
 
 const TOLPOptions = [
   'Adoption',
@@ -1120,17 +1257,6 @@ const incidentDateCenter = (scope) => verticalDate({
   name: scope ? scope + ':' + 'Incident_Date' : 'Incident_Date',
 });
 
-const lastName = (scope) => sbsText({
-  $formkit: 'text',
-  label: 'Last Name:',
-  placeholder: 'Last',
-  name: scope ? scope + ':' + 'Last_Name' : 'Last_Name',
-  autocomplete: "family-name",
-  validationMessages: {
-    required: 'Last Name is required'
-  }
-});
-
 const landlordTenantPartyCenter = () => verticalButtonRadio({
   name: 'Landlord_Tenant_Party',
   options: [
@@ -1197,69 +1323,7 @@ const legalCrossSells$1 = () => col2Checkbox({
   help: 'Just hit "Next" if none apply',
   helpClass: 't-text-center !t-text-sm',
   validation: null,
-  options: {
-    if: '$getVal($get(form), "Type_Of_Legal_Problem") === "Auto and Car Accidents"',
-    then: {
-      'Social Security Disability and Insurance': 'Interest in Disability Benefits',
-      'Wills and Trusts': 'Need a Will or Trust',
-      'Workers Compensation': 'Workplace Injury',
-      'Power of Attorney': 'Update Power of Attorney',
-      'Divorce and Separation': 'Need a Divorce or Separation',
-      'Child Custody': 'Need help with Child Custody',
-    },
-    else: {
-      if: '$getVal($get(form), "Type_Of_Legal_Problem") === "Personal Injury" || $getVal($get(form), "Type_Of_Legal_Problem") === "Workers Compensation"',
-      then: {
-        'DUI and DWI': 'Involved in a DUI/DWI',
-        'Wills and Trusts': 'Need a Will or Trust',
-        'Power of Attorney': 'Update Power of Attorney',
-        'Divorce and Separation': 'Need a Divorce or Separation',
-        'Child Custody': 'Need help with Child Custody',
-        // TODO add one more?
-      },
-      else: {
-        if: '$getVal($get(form), "Type_Of_Legal_Problem") === "DUI and DWI"',
-        then: {
-          'Personal Injury': 'Personal or Workplace Injury',
-          'Wills and Trusts': 'Need a Will or Trust',
-          'Social Security Disability and Insurance': 'Interest in Disability Benefits',
-          'Power of Attorney': 'Update Power of Attorney',
-          'Divorce and Separation': 'Need a Divorce or Separation',
-          'Child Custody': 'Need help with Child Custody',
-        },
-        else: {
-          if: '$getVal($get(form), "Type_Of_Legal_Problem") === "Wills and Trusts" || $getVal($get(form), "Type_Of_Legal_Problem") === "Probate and Estates" || $getVal($get(form), "Type_Of_Legal_Problem") === "Power of Attorney"',
-          then: {
-            'Auto and Car Accidents': 'Injured in a Car Accident',
-            'Personal Injury': 'Personal or Workplace Injury',
-            'DUI and DWI': 'Involved in a DUI/DWI',
-            'Social Security Disability and Insurance': 'Interest in Disability Benefits',
-            'Divorce and Separation': 'Need a Divorce or Separation',
-            'Child Custody': 'Need help with Child Custody',
-          },
-          else: {
-            if: '$getVal($get(form), "Type_Of_Legal_Problem") === "Long Term Disability" || $getVal($get(form), "Type_Of_Legal_Problem") === "Social Security Disability and Insurance"',
-            then: {
-              'Auto and Car Accidents': 'Injured in a Car Accident',
-              'DUI and DWI': 'Involved in a DUI/DWI',
-              'Wills and Trusts': 'Need a Will or Trust',
-              'Power of Attorney': 'Update Power of Attorney',
-              'Divorce and Separation': 'Need a Divorce or Separation',
-              'Child Custody': 'Need help with Child Custody',
-            },
-            else: {
-              'Auto and Car Accidents': 'Injured in a Car Accident',
-              'Personal Injury': 'Personal or Workplace Injury',
-              'DUI and DWI': 'Involved in a DUI/DWI',
-              'Wills and Trusts': 'Need a Will or Trust',
-              'Power of Attorney': 'Update Power of Attorney',
-              'Social Security Disability and Insurance': 'Interest in Disability Benefits',
-            }
-          }
-        }
-      }
-    }
-  }
+  options: '$getCrossSellOptions($get(form), $getVal($get(form), "Type_Of_Legal_Problem"))',
 });
 
 const loanAmountCenter = () => verticalSelect({
@@ -1365,24 +1429,6 @@ const pendingChargesCenter = (scope) => verticalYesNoRadio({
   name: scope ? scope + ':' + 'Pending_Charges' : 'Pending_Charges',
 });
 
-const phone = (scope) => sbsText({
-  $formkit: 'tel',
-  name: scope ? scope + ':' + 'Primary_Phone' : 'Primary_Phone',
-  label: 'Phone Number:',
-  placeholder: '###-###-####',
-  maxlength: 12,
-  help: '10-digit phone number, hyphens optional',
-  autocomplete: 'tel-national',
-  'data-tf-sensitive': 'false',
-  validation: 'required|matches:/^[0-9]{3}-?[0-9]{3}-?[0-9]{4}$/|valid_phone',
-  validationMessages: {
-    required: 'Field is required',
-    matches: 'Invalid Phone Format, use ###-###-####',
-    valid_phone: 'Invalid Phone Number'
-  },
-  helpClass: "t-mt-2.5 md:t-text-right md:t-mt-[-2px]"
-});
-
 const primaryInjury$1 = (scope) => sbs2ColRadio({
   name: scope ? scope + ':' + 'Primary_Injury' : 'Primary_Injury',
   label: 'Primary Injury:',
@@ -1748,25 +1794,6 @@ const wouldLikeLawyerToCenter = () => verticalRadio({
   ]
 });
 
-const zipcodeCenter = (updates = {}, scope) => text({
-  placeholder: '#####',
-  help: updates.help ?? "We try to match you with local legal help",
-  name: scope ? scope + ':' + 'Zip' : 'Zip',
-  maxlength: 5,
-  inputmode: "numeric",
-  autocomplete: 'postal-code',
-  validation: 'required|matches:/^[0-9]{5}$/',
-  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'
-});
-
-
 // ------ Question Groups
 
 // NOTE: name must be unique within a form!
@@ -2030,13 +2057,20 @@ function verticalStepSubHeadline(updates) {
 function commentsStepHeadline(updates) {
   return {
     $el: 'h3',
-    children: updates.headline || 'Additional Case Details',
+    children: updates.headline || 'Additional Details',
     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' + ' ' + (updates.headlineClass || '')
     }
   }
 }
 
+function commentsStepHeadlineLegal(updates) {
+  return commentsStepHeadline({
+    headline: updates.headline || 'Additional Case Details',
+    headlineClass: updates.headlineClass
+  })
+}
+
 function firstAndLastStepHeadline(updates) {
   return {
     $el: 'h3',
@@ -2060,7 +2094,7 @@ function legalCrossSellsStepHeadline(updates) {
 function contactStepHeadline(updates) {
   return {
     $el: 'h3',
-    children: updates.headline || DEFAULT_FINAL_HEADLINE_DYNAMIC,
+    children: updates.headline || DEFAULT_FINAL_HEADLINE_DYNAMIC_LEGAL,
     attrs: {
       class: 't-flex t-justify-center t-text-center t-text-2xl t-font-bold t-text-blue-500 t-pb-3 t-pt-0 t-px-1' + ' ' + (updates.headlineClass || '')
     }
@@ -2070,7 +2104,7 @@ function contactStepHeadline(updates) {
 function contactStepSubHeadline(updates) {
   return {
     $el: 'h5',
-    children: updates.subheadline || DEFAULT_FINAL_SUBHEADLINE_DYNAMIC,
+    children: updates.subheadline || DEFAULT_FINAL_SUBHEADLINE_DYNAMIC_LEGAL,
     attrs: {
       class: 't-flex t-justify-center t-text-center !t-text-lg t-font-semibold t-pb-7 t-pt-0 t-px-3' + ' ' + (updates.subheadlineClass || '')
     }
@@ -2110,10 +2144,16 @@ const stepDefaults = (step, stepKey) => ({
   }
 });
 
-function step(name, inputs, nextOnEnter = true, nextOnInput = false, stepKey = undefined, nextStepMap = undefined, autoFocus = undefined) {
-  if (typeof nextOnEnter === 'undefined') {
-    nextOnEnter = true;
-  }
+function step(name, inputs, updates = {}) {
+  const {
+    nextOnEnter = true,
+    nextOnInput = false,
+    stepKey = undefined,
+    nextStepMap = undefined,
+    triggerRedirectMap = undefined,
+    autoFocus = undefined,
+  } = updates;
+
   if (inputs && inputs.length && (nextOnEnter || nextOnInput)) {
     const lastInput = findLastInput(inputs[inputs.length - 1]);
     if (lastInput && nextOnEnter === true) {
@@ -2133,6 +2173,7 @@ function step(name, inputs, nextOnEnter = true, nextOnInput = false, stepKey = u
           id: name,
           name: name,
           nextStepMap: nextStepMap,
+          triggerRedirectMap: triggerRedirectMap,
           autoFocus: autoFocus,
           children: inputs
         }
@@ -2143,44 +2184,17 @@ function step(name, inputs, nextOnEnter = true, nextOnInput = false, stepKey = u
 
 // Single question step
 function sqstep(name, input, defaultHeadline, updates = {}) {
+  if (typeof updates.nextOnInput === 'undefined') {
+    updates.nextOnInput = true;
+  }
+  
   return step(
     name,
     [
       verticalStepHeadline({ headline: updates.headline ?? defaultHeadline, headlineClass: updates.headlineClass }),
       ...Array.isArray(input) ? input : [input],
     ],
-    updates.nextOnEnter,
-    typeof updates.nextOnInput === 'undefined' ? true : updates.nextOnInput,
-    updates.stepKey,
-    updates.nextStepMap
-  )
-}
-
-function commentsWithBankruptcy(updates = {}) {
-  return step(
-    'commentsWithBankruptcy',
-    [
-      commentsStepHeadline(updates),
-      comments({
-        label: typeof updates.label === 'undefined' ? DEFAULT_COMMENTS_LABEL : updates.label,
-        placeholder: updates.placeholder || DEFAULT_COMMENTS_PLACEHOLDER_DYNAMIC,
-        inputClass: typeof updates.inputClass === 'undefined' ? '!t-h-32' : updates.inputClass,
-      }, updates.scope),
-      // TODO: needs scope support
-      bankruptcyCrossSell(),
-      {
-        $el: 'div',
-        if: '$get(CrossSell_Bankruptcy).value == true',
-        children: [
-          comments({
-            label: 'Bankruptcy or debt details:',
-            placeholder: 'Please describe your bankrtupcy or debt situation in a few words...',
-            inputClass: '!t-h-16'
-          }, 'CrossSell:Bankruptcy')
-        ],
-      }
-    ],
-    false // nextOnEnter
+    updates
   )
 }
 
@@ -2196,7 +2210,7 @@ function contactInfo(updates = {}) {
       TCPAConsent(updates.scope),
       secureIcon()
     ],
-    false, // nextOnEnter
+    { nextOnEnter: false }
   )
 }
 
@@ -2215,10 +2229,46 @@ function firstAndLastV3(updates = {}, scope) {
       firstName(scope),
       lastName(scope)
     ],
-    updates.nextOnEnter
+    updates
   )
 }
 
+function zipcode(updates = {}) {
+  return sqstep(
+    'zipcode',
+    zipcode$1(updates.scope, true, updates),
+    'Please verify your Zip Code',
+    updates
+  )
+}
+
+function commentsWithBankruptcy(updates = {}) {
+  return step(
+    'commentsWithBankruptcy',
+    [
+      commentsStepHeadlineLegal(updates),
+      comments({
+        label: typeof updates.label === 'undefined' ? DEFAULT_COMMENTS_LABEL_LEGAL : updates.label,
+        placeholder: updates.placeholder || DEFAULT_COMMENTS_PLACEHOLDER_DYNAMIC_LEGAL,
+        inputClass: typeof updates.inputClass === 'undefined' ? '!t-h-32' : updates.inputClass,
+      }, updates.scope),
+      // TODO: needs scope support
+      bankruptcyCrossSell(),
+      {
+        $el: 'div',
+        if: '$get(CrossSell_Bankruptcy).value == true',
+        children: [
+          comments({
+            label: 'Bankruptcy or debt details:',
+            placeholder: 'Please describe your bankrtupcy or debt situation in a few words...',
+            inputClass: '!t-h-16'
+          }, 'CrossSell:Bankruptcy')
+        ],
+      }
+    ],
+    { nextOnEnter: false }
+  )
+}
 
 function autoAndCarAccidentCrossSellQuestions(updates = {}) {
   return step(
@@ -2236,7 +2286,7 @@ function autoAndCarAccidentCrossSellQuestions(updates = {}) {
         'CrossSell:Auto_and_Car_Accidents'
       )
     ],
-    updates.nextOnEnter
+    updates
   )
 }
 
@@ -2255,7 +2305,7 @@ function childCustodyCrossSellQuestions(updates = {}) {
         'CrossSell:Child_Custody'
       )
     ],
-    updates.nextOnEnter
+    updates
   )
 }
 
@@ -2274,7 +2324,7 @@ function divorceAndSeparationCrossSellQuestions(updates = {}) {
         'CrossSell:Divorce_and_Separation'
       )
     ],
-    updates.nextOnEnter
+    updates
   )
 }
 
@@ -2293,7 +2343,7 @@ function duiAndDWICrossSellQuestions(updates = {}) {
         'CrossSell:DUI_and_DWI'
       )
     ],
-    updates.nextOnEnter
+    updates
   )
 }
 
@@ -2313,7 +2363,7 @@ function ssdiCrossSellQuestions(updates = {}) {
         'CrossSell:Social_Security_Disability_and_Insurance'
       )
     ],
-    updates.nextOnEnter
+    updates
   )
 }
 
@@ -2333,7 +2383,7 @@ function personalInjuryCrossSellQuestions(updates = {}) {
         'CrossSell:Personal_Injury'
       )
     ],
-    updates.nextOnEnter
+    updates
   )
 }
 
@@ -2352,7 +2402,7 @@ function powerOfAttorneyCrossSellQuestions(updates = {}) {
         'CrossSell:Power_of_Attorney'
       )
     ],
-    updates.nextOnEnter
+    updates
   )
 }
 
@@ -2371,7 +2421,7 @@ function willsAndTrustsCrossSellQuestions(updates = {}) {
         'CrossSell:Wills_and_Trusts'
       )
     ],
-    updates.nextOnEnter
+    updates
   )
 }
 
@@ -2391,21 +2441,20 @@ function workersCompensationCrossSellQuestions(updates = {}) {
         'CrossSell:Workers_Compensation'
       )
     ],
-    updates.nextOnEnter
+    updates
   )
 }
 
 function legalCrossSells(updates = {}) {
+  updates.nextOnInput = false;
+  updates.stepKey = '$get(Type_Of_Legal_Problem).value';
   return step(
     'legalCrossSells',
     [
       legalCrossSellsStepHeadline(updates),
       legalCrossSells$1(),
     ],
-    updates.nextOnEnter,
-    false,
-    // Note: we should probably scope this stepKey to this step name
-    '$get(Type_Of_Legal_Problem).value'
+    updates
   )
 }
 
@@ -2415,18 +2464,6 @@ function generalTOLP(updates = {}) {
     [
       generalTOLPCenter(updates.input),
     ],
-    updates.nextOnEnter,
-    updates.nextOnInput,
-    updates.stepKey,
-    updates.nextStepMap
-  )
-}
-
-function zipcode(updates = {}) {
-  return sqstep(
-    'zipcode',
-    zipcodeCenter(updates, updates.scope),
-    'Please verify your Zip Code',
     updates
   )
 }
@@ -2794,7 +2831,7 @@ function haveCourtDate(updates = {}) {
 function applicantOccupation(updates = {}) {
   return sqstep(
     'applicantOccupation',
-    applicantOccupationCenter(),
+    applicantOccupation$1(updates.scope, true, updates),
     'What is the applicant\'s occupation?',
     updates
   )
@@ -2803,7 +2840,7 @@ function applicantOccupation(updates = {}) {
 function applicantAge(updates = {}) {
   return sqstep(
     'applicantAge',
-    applicantAgeCenter(),
+    applicantAge$1(updates.scope, true, updates),
     'What is the applicant\'s age?',
     updates
   )
@@ -2941,7 +2978,7 @@ function typeOfProperty(updates = {}) {
 function amountPaymentsPastDue(updates = {}) {
   return sqstep(
     'amountPaymentsPastDue',
-    amountPaymentsPastDueCenter(),
+    amountPaymentsPastDue$1(updates.scope, true),
     'Total amount of payments past due:',
     updates
   )
@@ -3302,9 +3339,7 @@ function formProps(updates) {
   return props
 }
 
-const metaDefaults = {
-  tcpaLanguage: TCPA_LANGUAGE
-};
+const metaDefaults = {};
 
 function metaProps(updates) {
   const data = merge(
@@ -3317,7 +3352,7 @@ function metaProps(updates) {
   }
 }
 
-function defaultMetaProps(tolps = null) {
+function defaultMetaPropsLegal(tolps = null) {
   let commentsPlaceholders = TOLPCommentsPlaceholders;
   let finalHeadlines = TOLPFinalHeadlines;
   let finalSubHeadlines = TOLPFinalSubHeadlines;
@@ -3327,12 +3362,13 @@ function defaultMetaProps(tolps = null) {
     finalSubHeadlines = filterMapByKey(TOLPFinalSubHeadlines, tolps);
   }
   return metaProps({
-    defaultCommentsPlaceholder: DEFAULT_COMMENTS_PLACEHOLDER_DYNAMIC,
+    tcpaLanguage: TCPA_LANGUAGE_LEGAL,
+    defaultCommentsPlaceholder: DEFAULT_COMMENTS_PLACEHOLDER_DYNAMIC_LEGAL,
     commentsPlaceholders: commentsPlaceholders,
-    defaultFinalHeadline: DEFAULT_FINAL_HEADLINE,
+    defaultFinalHeadline: DEFAULT_FINAL_HEADLINE_LEGAL,
     finalHeadlines: finalHeadlines,
-    defaultFinalSubHeadline: DEFAULT_FINAL_SUBHEADLINE,
-    finalSubHeadlines: finalSubHeadlines,
+    defaultFinalSubHeadline: DEFAULT_FINAL_SUBHEADLINE_LEGAL,
+    finalSubHeadlines: finalSubHeadlines
   })
 }
 
@@ -3901,388 +3937,434 @@ const nextStepsLegalNoHA = [
 ];
 
 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
+  values: {
+    '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
+  }
 };
 
-const TOLPNextSteps = nextStepsMapGeneralLegal["Type_Of_Legal_Problem"];
+const TOLPNextSteps = nextStepsMapGeneralLegal["values"]["Type_Of_Legal_Problem"];
 
 ({
-  'Type_Of_Legal_Problem': {
-    'Child Custody': TOLPNextSteps["Child Custody"],
-    'Child Support': TOLPNextSteps["Child Support"],
-    'Not Sure or Other': nextStepsMapGeneralLegal["*"],
-  },
-  '*': TOLPNextSteps["Family Issues"]
+  values: {
+    'Type_Of_Legal_Problem': {
+      'Child Custody': TOLPNextSteps["Child Custody"],
+      'Child Support': TOLPNextSteps["Child Support"],
+      'Not Sure or Other': nextStepsMapGeneralLegal["values"]["*"],
+    },
+    '*': TOLPNextSteps["Family Issues"]
+  }
 });
 
 ({
-  'Type_Of_Legal_Problem_Display': {
-    'Alimony or Child Support': TOLPNextSteps["Child Support"],
-    'Child Custody': TOLPNextSteps["Child Custody"],
-    'Not Sure or Other': nextStepsMapGeneralLegal["*"],
-  },
-  '*': TOLPNextSteps["Divorce and Separation"]
+  values: {
+    'Type_Of_Legal_Problem_Display': {
+      'Alimony or Child Support': TOLPNextSteps["Child Support"],
+      'Child Custody': TOLPNextSteps["Child Custody"],
+      'Not Sure or Other': nextStepsMapGeneralLegal["values"]["*"],
+    },
+    '*': TOLPNextSteps["Divorce and Separation"]
+  }
 });
 
 ({
-  'Civil_Defense': {
-    'Yes': TOLPNextSteps["Defend a Lawsuit"],
-    'No': TOLPNextSteps["File a Lawsuit"],
-  },
-  '*': [
-    'lawsuitOtherParty',
-    ...nextStepsLegalDefault
-  ]
+  values: {
+    'Civil_Defense': {
+      'Yes': TOLPNextSteps["Defend a Lawsuit"],
+      'No': TOLPNextSteps["File a Lawsuit"],
+    },
+    '*': [
+      'lawsuitOtherParty',
+      ...nextStepsLegalDefault
+    ]
+  }
 });
 
 ({
-  'Type_Of_Legal_Problem': {
-    'Defend a Lawsuit': TOLPNextSteps["Defend a Lawsuit"],
-    'File a Lawsuit': TOLPNextSteps["File a Lawsuit"],
-  },
-  '*': [
-    'lawsuitOtherParty',
-    ...nextStepsLegalDefault
-  ]
+  values: {
+    '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
-  ]
+  values: {
+    '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["values"]["*"],
+    },
+    '*': [
+      'lawsuitOtherParty',
+      ...nextStepsLegalDefault
+    ]
+  }
 };
 
 const nextStepsMapCriminalTOLPDisplay = {
-  'Type_Of_Legal_Problem_Display': {
-    'Victim of a Crime': TOLPNextSteps["Victim of a Crime"],
-    'DUI and DWI': TOLPNextSteps["DUI and DWI"],
-    'Expungement': TOLPNextSteps["Expungement"],
-    'Not Sure or Other': nextStepsMapGeneralLegal["*"],
-  },
-  '*': [
-    'crimeCommittedDate',
-    'roleInMatterCriminal',
-    'pendingCharges',
-    ...nextStepsLegalDefaultLPM
-  ]
+  values: {
+    'Type_Of_Legal_Problem_Display': {
+      'Victim of a Crime': TOLPNextSteps["Victim of a Crime"],
+      'DUI and DWI': TOLPNextSteps["DUI and DWI"],
+      'Expungement': TOLPNextSteps["Expungement"],
+      'Not Sure or Other': nextStepsMapGeneralLegal["values"]["*"],
+    },
+    '*': [
+      'crimeCommittedDate',
+      'roleInMatterCriminal',
+      'pendingCharges',
+      ...nextStepsLegalDefaultLPM
+    ]
+  }
 };
 
 const nextStepsMapEmploymentAndWorkplaceTOLPDisplay = {
-  '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
-  ]
+  values: {
+    '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': {
-    'Patents': TOLPNextSteps["Patents and Intellectual Property"],
-    'Business Lawyers': TOLPNextSteps["Business Lawyers"],
-    'Business Consulting': TOLPNextSteps["Business Lawyers"],
-  },
-  '*': nextStepsMapGeneralLegal["*"],
+  values: {
+    'Type_Of_Legal_Problem_Display': {
+      'Patents': TOLPNextSteps["Patents and Intellectual Property"],
+      'Business Lawyers': TOLPNextSteps["Business Lawyers"],
+      'Business Consulting': TOLPNextSteps["Business Lawyers"],
+    },
+    '*': nextStepsMapGeneralLegal["values"]["*"],
+  }
 });
 
 const nextStepsMapRealEstateTOLPDisplay = {
-  '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'],
+  values: {
+    '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 nextStepsMapLegalCrossSells = {
+  values: {
+    'Legal_CrossSells': {
+      'Auto and Car Accidents': ['autoAndCarAccidentCrossSellQuestions'],
+      'Personal Injury': ['personalInjuryCrossSellQuestions'],
+      'Workers Compensation': ['workersCompensationCrossSellQuestions'],
+      'DUI and DWI': ['duiAndDWICrossSellQuestions'],
+      'Long Term Disability': ['longTermDisabilityCrossSellQuestions'],
+      'Social Security Disability and Insurance': ['ssdiCrossSellQuestions'],
+      'Bankruptcy': ['bankruptcyCrossSellQuestions'],
+      'Power of Attorney': ['powerOfAttorneyCrossSellQuestions'],
+      'Wills and Trusts': ['willsAndTrustsCrossSellQuestions'],
+      'Divorce and Separation': ['divorceAndSeparationCrossSellQuestions'],
+      'Child Custody': ['childCustodyCrossSellQuestions'],
+    },
+    '*': ['firstAndLast', 'contactInfo'],
   },
-  '*': [
-    'realEstateArea',
-    'wouldLikeLawyerTo',
-    ...nextStepsLegalDefault
-  ]
+  
+  // NOTE: this assumes a certain placement of the cross sell question
+  // in the form flow.
+  appendSteps: ['firstAndLast', 'contactInfo'],
+  matchesAllowed: 1,
 };
 
-const meta = defaultMetaProps();
+const legalCrossSellOptionMap = CROSS_SELL_OPTION_MAP_LEGAL;
+
+const meta = defaultMetaPropsLegal();
 
 meta.data.dynamicSchema = [
   amountPaymentsPastDue(),
@@ -4304,10 +4386,6 @@ meta.data.dynamicSchema = [
   childHome(),
   childPrimaryCaregiver(),
   childRelationship(),
-  // We removed Civil Lawsuit from TOLP dropdown for now
-  // steps.civilDefense({
-  //   nextStepMap: forms.nextStepsMapCivilDefense,
-  // }),
   civilLawsuitTOLPDisplay({
     nextStepMap: nextStepsMapCivilTOLPDisplay
   }),
@@ -4391,7 +4469,8 @@ meta.data.dynamicSchema = [
     headlineClass: '!t-text-dark',
   }),
   legalCrossSells({
-    headlineClass: '!t-text-dark'
+    headlineClass: '!t-text-dark',
+    nextStepMap: nextStepsMapLegalCrossSells,
   }),
   autoAndCarAccidentCrossSellQuestions(),
   personalInjuryCrossSellQuestions(),
@@ -4416,6 +4495,7 @@ const schema = [
       formId: 'generalLegalSingle',
       redirectMap: legalRedirectMap(),
       valueOverrideMap: legalAllValueOverrideMap,
+      crossSellOptionMap: legalCrossSellOptionMap
     }),
     children: [
       progressBar(),