diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 23d5e6806..2cb18429c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -22,7 +22,8 @@ resources:
         - container: awscli
           image: packagerepository.sagaws.net:8082/safelite/awscli2-build:3.9
         - container: prettier-node
-          image: packagerepository.sagaws.net:8082/safelite/prettier-node-build:18
+          image: ghcr.io/safelite/prettier-node-build:23
+          endpoint: GitHub Docker
     repositories:
         - repository: AzureDevOps
           type: github
@@ -37,15 +38,15 @@ variables:
 stages:
     # PR's
     - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-        #   - stage: TestFormat
-        #     displayName: Test Code Format
-        #     jobs:
-        #         - job: checkFormatting
-        #           displayName: Check formatting
-        #           container: prettier-node
-        #           steps:
-        #               - bash: prettier --check "$(Build.SourcesDirectory)/src/**/*.(js|vue)"
-        #                 displayName: Run Prettier check
+          - stage: TestFormat
+            displayName: Test Code Format
+            jobs:
+                - job: checkFormatting
+                  displayName: Check formatting
+                  container: prettier-node
+                  steps:
+                      - bash: prettier --check "$(Build.SourcesDirectory)/src/**/*.(js|vue)"
+                        displayName: Run Prettier check
 
           - stage: TestPr
             displayName: Run Unit Tests For PullRequest
diff --git a/src/constants/experiments.js b/src/constants/experiments.js
index 8209cae9c..09dfc4140 100644
--- a/src/constants/experiments.js
+++ b/src/constants/experiments.js
@@ -18,6 +18,8 @@ const experimentSettings = {
     INSURANCE_TAB_TO_DISPLAY_THRESHOLD_INTERNAL: "NextGen_InternalInsuranceTabDisplayThreshold",
     INSURANCE_TAB_TO_DISPLAY_THRESHOLD_EXTERNAL: "NextGen_ExternalInsuranceTabDisplayThreshold",
     DISPLAY_MSR: "DisplayMSR",
+    DISPLAY_WAITLIST: "DisplayWaitlist2.0",
+    WAITLIST_THRESHOLD_DAYS: "Waitlist_Threshold_Days",
     PRICING_BY_DAY: "DisplayPricingByDay",
     FOSTER_LOVE: "DisplayFosterLove",
 };
diff --git a/src/constants/part-number-strings.js b/src/constants/part-number-strings.js
index c32864a87..d21ab83ac 100644
--- a/src/constants/part-number-strings.js
+++ b/src/constants/part-number-strings.js
@@ -2,6 +2,7 @@ const partNumberStrings = {
     // Recalibration
     MOBILE_STATIC_RECAL_FEE: "RECAL MOBILE",
     MOBILE_DUAL_RECAL_FEE: "RECAL MOBILEDUAL",
+    DONATION: "DONATION",
 };
 
 export { partNumberStrings };
diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 187d0c3e6..42dc27e4f 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -79,6 +79,7 @@ const storeActions = {
     SAVE_EMAIL: "saveEmail",
     SAVE_PHONE_NUMBER: "savePhoneNumber",
     SAVE_IS_SMS_OPT_IN: "saveIsSmsOptIn",
+    SAVE_WAITLIST_REQUESTED: "saveWaitListRequested",
     SAVE_REGISTRATION_LICENSE_PLATE_LOOKUP: "saveRegistrationLicensePlateLookup",
     SAVE_VIN: "saveVin",
     SAVE_REGISTRATION_ADDRESS_LOOKUP: "saveRegistrationAddressLookup",
diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index 49ad6f507..dceeac63e 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -42,6 +42,7 @@ const storeMutations = {
     UPDATE_CUSTOMER_PHONE_NUMBER: "updateCustomerPhoneNumber",
     UPDATE_CUSTOMER_IS_SMS_OPT_IN: "updateCustomerIsSmsOptin",
     UPDATE_CUSTOMER_DETAILS: "updateCustomerDetails",
+    UPDATE_CUSTOMER_WAITLIST_REQUESTED: "updateCustomerWaitListRequested",
 
     // ORDER MUTATIONS
     UPDATE_REFERRAL_NUMBER: "updateReferralNumber",
diff --git a/src/digital-components/text-block/text-block.vue b/src/digital-components/text-block/text-block.vue
index f939fc028..b84f12283 100644
--- a/src/digital-components/text-block/text-block.vue
+++ b/src/digital-components/text-block/text-block.vue
@@ -1,5 +1,8 @@
 <template>
-    <div class="text-block w-100" :class="[justifyText, typeStyle, fontWeight, marginTopClass]">
+    <div
+        class="text-block w-100"
+        :class="[justifyText, typeStyle, fontWeight, marginTopClass]"
+        :style="{ 'font-weight': fontWeight }">
         <span v-for="copy in splitCopyOnCMSPlaceHolder(this.textBlockCopy)" :key="copy">
             <span v-if="doesCopyContainRouterLink(copy)">
                 <textLink
diff --git a/src/experiment-components/donation-block.vue b/src/experiment-components/donation-block.vue
index 10ebec7a5..1daeedc41 100644
--- a/src/experiment-components/donation-block.vue
+++ b/src/experiment-components/donation-block.vue
@@ -130,10 +130,6 @@ export default {
     },
     methods: {
         handleDonationAction(submitEvent) {
-            console.log(
-                "running handleDonationAction(), submitEvent.target.elements.amount.value: ",
-                submitEvent.target.elements.amount.value
-            );
             this.selectedValue = submitEvent.target.elements.amount.value;
         },
     },
diff --git a/src/experiment-components/service-package-radio.vue b/src/experiment-components/service-package-radio.vue
index c52a80121..6d598adaf 100644
--- a/src/experiment-components/service-package-radio.vue
+++ b/src/experiment-components/service-package-radio.vue
@@ -1,10 +1,9 @@
 <template>
     <baseInputButton v-bind="$props" @buttonClicked="handleAnswerChange" v-model="selectedValue">
         <div
-            class="package-label"
+            class="package-label pricing-by-day-pkg-lbl"
             :class="[
                 this.buttonLabelSubCopy ? 'has-subheader' : '',
-                this.isInsuranceSelected ? 'pricing-by-day-pkg-lbl-ins' : 'pricing-by-day-pkg-lbl',
                 !this.additionalButtonData.servicePackageDiscount ? 'adjust-top' : '',
             ]"
             for="testradio">
@@ -21,9 +20,7 @@
                     </div>
                     <span class="col md-6 service-package-discount-pricing-by-day">
                         <div>
-                            <span v-if="!isInsuranceSelected" class="caption pricing-by-day">
-                                as low as
-                            </span>
+                            <span class="caption pricing-by-day">as low as</span>
                             <div
                                 class="strikethrough-discount-price"
                                 v-if="shouldDisplayStrikeThroughPrice"
@@ -36,9 +33,7 @@
                     <p class="m-0">
                         <span v-html="this.buttonLabel"></span>
                         <span class="pricing-info-pricing-by-day">
-                            <span v-if="!isInsuranceSelected" class="caption pricing-by-day">
-                                as low as
-                            </span>
+                            <span class="caption pricing-by-day">as low as</span>
                             <span
                                 class="strikethrough-price"
                                 v-if="shouldDisplayStrikeThroughPrice"
@@ -208,7 +203,7 @@ export default {
                 }
                 @include media-breakpoint-up(lg) {
                     &:before {
-                        top: .5rem;
+                        top: 0.5rem;
                     }
                     &:after {
                         top: 1.4375rem;
@@ -223,7 +218,7 @@ export default {
 
             + .package-label.pricing-by-day-pkg-lbl-ins {
                 &:before {
-                    top: .3125rem;
+                    top: 0.3125rem;
                 }
                 &:after {
                     top: 1.25rem;
@@ -234,7 +229,7 @@ export default {
                 &:before {
                     top: 0.9375rem;
                     @include media-breakpoint-up(lg) {
-                        top: .3125rem;
+                        top: 0.3125rem;
                     }
                 }
                 &:after {
diff --git a/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue b/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue
index 3628a372c..ebaa5a8be 100644
--- a/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue
+++ b/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue
@@ -181,7 +181,7 @@ export default {
             transition: background 0s 0s ease-in-out;
         }
     }
-    
+
     .modal.modal-component .modal-dialog .modal-content {
         .modal-header {
             padding-top: 0;
diff --git a/src/layouts/confirmation/confirmation.spec.js b/src/layouts/confirmation/confirmation.spec.js
index 45347491a..37ad71949 100644
--- a/src/layouts/confirmation/confirmation.spec.js
+++ b/src/layouts/confirmation/confirmation.spec.js
@@ -14,6 +14,19 @@ import { experimentSettings } from "@/constants/experiments";
 
 const mockExperimentSettings = experimentSettings;
 
+jest.mock("@/mixins/experiment-mixin.js", () => ({
+    methods: {
+        getSettingValue(settingName) {
+            if (settingName === mockExperimentSettings.RECAL_PRICE_REMOVE) {
+                return true;
+            }
+        },
+        hasSettingEqualTo(settingName, settingValue) {
+            return true;
+        },
+    },
+}));
+
 // Mock our module for promises.
 jest.mock("@/helpers/layout-helper.js", () => ({
     settleAllPromises: jest.fn(),
@@ -572,13 +585,6 @@ function setupMocks({ customMountOptions }) {
                 getCmsContent: jest.fn().mockImplementation(() => {
                     return wordingText;
                 }),
-                getSettingValue: jest.fn((settingName) => {
-                    if (settingName === experimentSettings.RECAL_PRICE_REMOVE) {
-                        return "true";
-                    }
-
-                    return "false";
-                }),
             },
         },
     ];
diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index c87da58dd..ac6ce2ed5 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -64,7 +64,7 @@
                                 :isItac="isItac"
                                 :isNoComp="isNoComp" />
 
-                            <div class="mt-3" v-if="displayFosterLove">
+                            <div class="mt-3" v-if="DisplayFosterLove">
                                 <donationBlock
                                     cmsWidgetName="DonationWidget"
                                     v-model="donationAmount"
@@ -73,10 +73,6 @@
                                     :showDonationError="showDonationError" />
                             </div>
 
-                            <!-- <button type="button" @click="addDonation(3)">
-                                Add Donation of $3
-                            </button> -->
-
                             <hr class="mb-5" />
 
                             <div class="emailtext" v-html="ConfirmationEmailText"></div>
@@ -122,6 +118,7 @@ import { partTypeStrings } from "@/constants/part-type-strings";
 import { containsLineItemWithPartType } from "@/helpers/service-package-helper";
 import { containsRecalParts } from "@/helpers/recal-helper.js";
 import donationBlock from "@/experiment-components/donation-block.vue";
+import { partNumberStrings } from "@/constants/part-number-strings";
 
 export default {
     name: "confirmation",
@@ -219,7 +216,7 @@ export default {
         };
 
         const donationItems = lineItemsFromSubmittedOrder.supportingItems?.filter(
-            (item) => item.partNumber === "DONATION"
+            (item) => item.partNumber === partNumberStrings.DONATION
         );
         const donationAmount = donationItems?.length > 0 ? donationItems[0].sellingPrice : 0;
 
@@ -532,13 +529,9 @@ export default {
                 "test",
                 false
             ).catch((error) => {
-                // this.$refs.navbar.removeLoader();
-                console.error("Error!!! error: ", error);
                 return error;
             });
 
-            console.log("ran addDonation()... (*fake call*) donationResponse: ", donationResponse);
-
             if (donationResponse?.status == "200") {
                 this.showDonationSuccess = true;
                 this.showDonationError = false;
@@ -561,7 +554,6 @@ export default {
     watch: {
         donationAmount(newValue) {
             newValue = parseInt(newValue);
-            console.log("WATCHED donationAmount changed: ", newValue);
 
             // this.addDonation(newValue);
             // TODO - when backend code is final, then remove the below and restore the line above
diff --git a/src/layouts/quote/service-package-question/service-package-question.spec.js b/src/layouts/quote/service-package-question/service-package-question.spec.js
index 6fc5d0a4d..f55b33ab7 100644
--- a/src/layouts/quote/service-package-question/service-package-question.spec.js
+++ b/src/layouts/quote/service-package-question/service-package-question.spec.js
@@ -35,7 +35,7 @@ jest.mock("@/mixins/experiment-mixin.js", () => ({
             }
         },
         hasSettingEqualTo(settingName, settingValue) {
-            return true;
+            return false;
         },
     },
 }));
@@ -851,7 +851,7 @@ function setupMocks({ mountOptionsMockData, props = mockProps }) {
             },
         },
     };
-    
+
     mountOptionsMockData = Object.assign(mountOptionsMockDataDefault, mountOptionsMockData);
     const mountOptions = getMountOptions(mountOptionsMockData);
 
diff --git a/src/layouts/quote/service-package-question/service-package-question.vue b/src/layouts/quote/service-package-question/service-package-question.vue
index 982d03948..ea40b2780 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -227,11 +227,9 @@ export default {
     methods: {
         processIfStatements,
         hasPricingByDay() {
-            return (
-                experimentMixin.methods.hasSettingEqualTo(
-                    experimentSettings.PRICING_BY_DAY,
-                    "true"
-                ) && !this.isInsuranceSelected
+            return experimentMixin.methods.hasSettingEqualTo(
+                experimentSettings.PRICING_BY_DAY,
+                "true"
             );
         },
         getHeaderTextFromCms(cmsWidgetName) {
@@ -264,6 +262,10 @@ export default {
                     servicePackageDiscount,
                 })
             ).toFixed(2);
+
+            if (this.hasPricingByDay()) {
+                return "$" + formattedPriceFloat;
+            }
             return (this.isInsuranceSelected ? "As little as $" : "$") + formattedPriceFloat;
         },
         getPackagePrice(packageName, { discountedPrice = false, servicePackageDiscount = false }) {
diff --git a/src/layouts/schedule/schedule.spec.js b/src/layouts/schedule/schedule.spec.js
index 18e659ec5..48e6e8afa 100644
--- a/src/layouts/schedule/schedule.spec.js
+++ b/src/layouts/schedule/schedule.spec.js
@@ -304,6 +304,7 @@ describe("schedule.vue...", () => {
                     days: [],
                 };
                 wrapper.vm.updateFooterButtonText = jest.fn();
+                wrapper.vm.setDisplayWaitList = jest.fn();
                 const nextFunction = jest.fn((c) => {
                     c(wrapper.vm);
                 });
@@ -338,6 +339,7 @@ describe("schedule.vue...", () => {
                     })
                 );
                 expect(wrapper.vm.updateFooterButtonText).toHaveBeenCalled();
+                expect(wrapper.vm.setDisplayWaitList).toHaveBeenCalled();
             });
         });
 
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index 27587d08c..925683073 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -43,6 +43,8 @@
                         customComponentId="timeSlotModalQuestion"
                         v-model="selectedTimeSlotInfo"
                         cmsWidgetName="TimeSlotModalQuestion"
+                        waitListLabelWidget="WaitListLabelWidget"
+                        waitListQuestionWidget="WaitListQuestionWidget"
                         mobilePremiumCmsWidgetName="MobilePremiumTimeSlotModal"
                         mobileCmsWidgetName="MobileTimeSlotModal"
                         dropoffCmsWidgetName="DropOffTimeSlotModal"
@@ -51,6 +53,7 @@
                         :selectedDate="selectedDate"
                         :appointmentType="appointmentType"
                         :premiumAppointmentFee="mobilePremiumAppointmentFee"
+                        :displayWaitList="displayWaitList"
                         :timeSlotsForSelectedDate="timeSlotsForSelectedDate"
                         :estimatedServiceMinutesMinimum="
                             selectableDatesData.estimatedServiceMinutesMinimum
@@ -58,6 +61,7 @@
                         :estimatedServiceMinutesMaximum="
                             selectableDatesData.estimatedServiceMinutesMaximum
                         "
+                        @waitListRequested-emitted="handleWaitListRequested"
                         @time-slot-modal-closed="timeSlotModalClosed"
                         validationRules="time-slot-selection-required"
                         @TimeSlotSelected="forwardButtonAction" />
@@ -217,6 +221,8 @@ export default {
             selectedTimeSlotInfo: this.getSelectedTimeSlotInfo(),
             selectableDatesData: [],
             mobilePremiumAppointmentFee: null,
+            waitListRequested: null,
+            displayWaitList: null,
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -295,6 +301,7 @@ export default {
                 ? resultMap.premiumFeeWithPrice[0]
                 : null;
             vm.updateFooterButtonText(vm.selectedTimeSlotInfo);
+            vm.setDisplayWaitList();
         });
     },
     computed: {
@@ -469,6 +476,29 @@ export default {
         forwardButtonAction() {
             this.updateSupportingItems();
 
+            if (this.waitListRequested) {
+                var gaLabel = store.getters.isMobileAppointment
+                    ? "checked_mobile"
+                    : "checked_inshop";
+
+                const currentDate = new Date();
+                const dateString = this.selectableDatesData.days[0].date;
+                const [year, month, day] = dateString.split("-").map(Number);
+                const appointmentDate = new Date(year, month - 1, day);
+                const timeDifference = appointmentDate - currentDate;
+
+                // Convert the time difference from milliseconds to days
+                const daysUntilAppointment = Math.ceil(timeDifference / (1000 * 60 * 60 * 24));
+
+                gaLabel +=
+                    "_" +
+                    daysUntilAppointment.toString() +
+                    "_" +
+                    store.getters.order.serviceLocation.zipCode +
+                    "_" +
+                    store.getters.order.serviceLocation.zipCodeCtu;
+                this.pushEventToGA("waitlist", "add_to_waitlist_check_box_status", gaLabel, true);
+            }
             if (this.selectedTimeSlotInfo.timeSlot.jobMinMinutes == null) {
                 this.selectedTimeSlotInfo.timeSlot.jobMinMinutes =
                     this.selectableDatesData?.estimatedServiceMinutesMinimum?.toString();
@@ -482,8 +512,44 @@ export default {
                 false
             );
 
+            this.dispatchStoreAction(
+                this.storeActions.SAVE_WAITLIST_REQUESTED,
+                this.waitListRequested,
+                false
+            );
+
             this.$router.navigateWithSaving(this.navigationScenarios.CLICKED_FORWARD, this.$route);
         },
+        setDisplayWaitList() {
+            if (
+                experimentMixin.methods.hasSettingEqualTo(
+                    experimentSettings.DISPLAY_WAITLIST,
+                    "true"
+                )
+            ) {
+                const dateString = this.selectableDatesData.days[0].date;
+                const [year, month, day] = dateString.split("-").map(Number);
+                const targetDate = new Date(year, month - 1, day);
+                const currentDate = new Date();
+                const futureDate = new Date(currentDate);
+                const experimentThresholdDays = experimentMixin.methods.hasSetting(
+                    experimentSettings.WAITLIST_THRESHOLD_DAYS
+                )
+                    ? parseInt(
+                          experimentMixin.methods.getSettingValue(
+                              experimentSettings.WAITLIST_THRESHOLD_DAYS
+                          )
+                      )
+                    : 0;
+                futureDate.setDate(currentDate.getDate() + experimentThresholdDays);
+
+                if (targetDate >= futureDate) {
+                    this.displayWaitList = true;
+                } else {
+                    this.displayWaitList = false;
+                }
+            }
+        },
         updateSupportingItems() {
             const supportingItems = this.getSupportingItems();
 
@@ -532,6 +598,9 @@ export default {
                 }
             }
         },
+        handleWaitListRequested(value) {
+            this.waitListRequested = value;
+        },
     },
     watch: {
         selectedDate(newValue, oldValue) {
diff --git a/src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue b/src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue
index a0b5e9f99..40c3926ba 100644
--- a/src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue
+++ b/src/layouts/schedule/time-slot-modal-question/time-slot-modal-question.vue
@@ -26,7 +26,21 @@
                 isRequired
                 validationRules="time-slot-required" />
             <div
-                class="mt-1 mb-2 supplemental-information"
+                v-if="hasWaitListExperiment && displayWaitListFeature"
+                class="mt-5 bg-light rounded waitlist">
+                <textBlock
+                    cmsWidgetName="WaitListLabelWidget"
+                    typeStyle="medium"
+                    fontWeight="600"
+                    marginTopSizeOverride="0" />
+                <checkboxQuestion
+                    class="mt-3"
+                    cmsWidgetName="WaitListQuestionWidget"
+                    v-model="waitListRequested"
+                    @click="waitListChecked" />
+            </div>
+            <div
+                class="mt-5 mb-2 supplemental-information"
                 v-if="supplementalInformationBlock"
                 v-html="supplementalInformationBlock"></div>
             <textBlock
@@ -44,7 +58,11 @@
 import modal from "@/digital-components/modal/modal";
 import textBlock from "@/digital-components/text-block/text-block";
 import buttonQuestion from "@/digital-components/button-question/button-question";
+import checkboxQuestion from "@/digital-components/checkbox-question/checkbox-question";
 import timeSlotModalListButton from "./time-slot-modal-list-button/time-slot-modal-list-button";
+import experimentMixin from "@/mixins/experiment-mixin";
+import { experimentSettings } from "@/constants/experiments";
+import store from "@/store";
 
 // Helpers
 import { deepClone } from "@/helpers/object-helper";
@@ -82,7 +100,7 @@ defineRule("time-slot-required", required(errorMessages.OPTION_REQUIRED));
 
 export default {
     name: "time-slot-modal-question",
-    emits: ["update:modelValue", "TimeSlotSelected"],
+    emits: ["update:modelValue", "TimeSlotSelected", "click-event"],
     props: {
         modelValue: {
             type: Object,
@@ -112,12 +130,14 @@ export default {
         validationRules: String,
         customComponentId: String,
         selectedDate: String,
+        displayWaitList: Boolean,
     },
     data() {
         return {
             isModalOpened: false,
             selectedRouteCode: this.getSelectedRouteCode(),
             timeSlotModalListButton: timeSlotModalListButton,
+            waitListRequested: this.getWaitListRequestedFromStore(),
         };
     },
     setup(props) {
@@ -330,6 +350,15 @@ export default {
                 return this.getAvailableTimeSlotsForInshop(this.timeSlotsForSelectedDate.timeSlots);
             }
         },
+        hasWaitListExperiment() {
+            return experimentMixin.methods.hasSettingEqualTo(
+                experimentSettings.DISPLAY_WAITLIST,
+                "true"
+            );
+        },
+        displayWaitListFeature() {
+            return this.displayWaitList;
+        },
     },
     methods: {
         openModal() {
@@ -445,6 +474,9 @@ export default {
 
             return selectedRouteCode;
         },
+        getWaitListRequestedFromStore() {
+            return store.getters.order.customer?.waitListRequested;
+        },
         autoSelectTimeSlotIfOnlyOneIsAvailable() {
             const numberOfOptions = this.availableTimeSlots?.length;
             if (numberOfOptions === 1) {
@@ -493,6 +525,9 @@ export default {
                 isPremiumAppointment: null,
             };
         },
+        waitListChecked(event) {
+            this.$emit("waitListRequested-emitted", event.target.checked);
+        },
     },
     unmounted() {
         if (this.isModalOpened) this.closeModal();
@@ -515,6 +550,7 @@ export default {
         modal,
         textBlock,
         buttonQuestion,
+        checkboxQuestion,
     },
 };
 </script>
@@ -538,5 +574,19 @@ export default {
             margin-bottom: 8px;
         }
     }
+    .waitlist {
+        box-shadow: 0px 1px 4px 0px #00000033;
+        border-radius: 8px;
+        font-size: $h6-font-size;
+        padding: 16px;
+        margin-top: 16px;
+        margin-bottom: -8px;
+        .ui-checkbox {
+            padding-left: 0px;
+        }
+        .form-check-input {
+            margin-left: 0px;
+        }
+    }
 }
 </style>
diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js
index 9bb8f0cda..7b4cd203c 100644
--- a/src/mixins/analytics-mixin.js
+++ b/src/mixins/analytics-mixin.js
@@ -42,11 +42,16 @@ export default {
             await this.validateSession();
 
             const submittedOrder = baseMixin.methods.getSubmittedOrder();
+            const hasSubmittedOrder = baseMixin.methods.hasSubmittedOrder();
 
             const refSequenceNum =
                 store.getters.order.referralSequenceNumber ||
                 submittedOrder?.referralSequenceNumber;
 
+            const parentAccountNum = hasSubmittedOrder
+                ? submittedOrder.payment.parentAccountNumber
+                : store.getters.order.payment.parentAccountNumber;
+
             var payload = {
                 userId: getUserIdValue(),
                 sessionKey: getSessionKeyValue(),
@@ -57,7 +62,7 @@ export default {
                 shouldUseSessionId: false,
                 experimentsForUser: store.getters.applicationUser.experiments,
                 referralSequenceNumber: refSequenceNum,
-                parentAccountNumber: store.getters.order.payment.parentAccountNumber,
+                parentAccountNumber: parentAccountNum,
             };
 
             await baseMixin.methods.dispatchStoreAction(storeActions.LOG_PAGE_VIEW, payload, false);
diff --git a/src/store/index.js b/src/store/index.js
index 6234f7b1a..3408c0b26 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -98,6 +98,7 @@ const getDefaultState = () => {
                 emailAddress: null,
                 phoneNumber: null,
                 isSmsOptIn: null,
+                waitListRequested: null,
             },
             damage: {
                 isRepair: null,
@@ -346,6 +347,9 @@ export const mutations = {
     updateCustomerIsSmsOptin(state, isSmsOptIn) {
         state.order.customer.isSmsOptIn = isSmsOptIn;
     },
+    updateCustomerWaitListRequested(state, waitListRequested) {
+        state.order.customer.waitListRequested = waitListRequested;
+    },
     updateVehicle(state, vehicleInfo) {
         state.order.vehicle.year = vehicleInfo.year;
         state.order.vehicle.make = vehicleInfo.make;
@@ -3081,6 +3085,10 @@ export const actions = {
         context.commit(storeMutations.UPDATE_CUSTOMER_IS_SMS_OPT_IN, isSmsOptIn);
     },
 
+    saveWaitListRequested(context, waitListRequested) {
+        context.commit(storeMutations.UPDATE_CUSTOMER_WAITLIST_REQUESTED, waitListRequested);
+    },
+
     savePageData(context, emailOrSms) {
         context.commit(storeMutations.UPDATE_PAGE_DATA, emailOrSms);
     },