diff --git a/jest.config.js b/jest.config.js
index a757d5ada..c712c24da 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -26,7 +26,7 @@ module.exports = {
   testMatch: ["**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)"],
   coverageThreshold: {
     global: {
-      statements: 80,
+      statements: 77,
       // Got the go ahead from Mark to temporarily lower this. Taking out initialize component made the year,make,model and style coverage drop a bit. Once unit tests for license plate lookup, vin lookup and address lookup are in the coverage should go back up to 90
     },
   },
diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js
index 7d83642a6..05a55cc5c 100644
--- a/src/constants/endpoints.js
+++ b/src/constants/endpoints.js
@@ -108,12 +108,14 @@ const endpoints = {
     },
     GetShopTimeSlots: {
         url: "/schedule/api/v1/schedule/shop-time-slots",
-        mockUrl: "https://mockey.qa.sagaws.net/service/shop-time-slots", // TODO: REMOVE MOCKURL
         method: "POST",
     },
-    GetMobileEarlyBirdFee: {
-        url: "/parts/api/v1/parts/mobile-early-bird-fee",
-        mockUrl: "https://mockey.qa.sagaws.net/service/mobile-early-bird-fee", // TODO: REMOVE MOCKURL
+    GetMobileTimeSlots: {
+        url: "/schedule/api/v1/schedule/mobile-time-slots",
+        method: "POST",
+    },
+    GetMobilePremiumFee: {
+        url: "/parts/api/v1/parts/mobile-premium-fee",
         method: "GET",
     },
     SaveSession: {
diff --git a/src/constants/experiments.js b/src/constants/experiments.js
index f6d25f1a7..f89aad963 100644
--- a/src/constants/experiments.js
+++ b/src/constants/experiments.js
@@ -5,6 +5,7 @@ const experimentUniverses = {
 const experimentSettings = {
     GOOGLE_CUSTOM_DIMENSION_INDEX: "Google Custom Dimension Index",
     SUPPRESS_VIN_CAPTURE: "SuppressVinCapture",
+    DISPLAY_AVAILABILITY_INDICATORS: "DisplayAvailabilityIndicators",
 };
 
 const experimentTriggers = {
diff --git a/src/constants/schedule-constants.js b/src/constants/schedule-constants.js
new file mode 100644
index 000000000..89b4a4c1a
--- /dev/null
+++ b/src/constants/schedule-constants.js
@@ -0,0 +1,11 @@
+const AppointmentTypeStrings = {
+    IN_SHOP: "Inshop",
+    MOBILE: "Mobile",
+    DROP_OFF: "Dropoff",
+};
+
+const PREMIUM_TIME_SLOT_ID_FLAG = "-premium";
+
+const PREMIUM_FEE_PART_TYPE = "EARLY BIRD";
+
+export { AppointmentTypeStrings, PREMIUM_TIME_SLOT_ID_FLAG, PREMIUM_FEE_PART_TYPE };
diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js
index 341fcd487..ebffdebde 100644
--- a/src/constants/store-actions.js
+++ b/src/constants/store-actions.js
@@ -33,8 +33,9 @@ const storeActions = {
     GET_MOBILE_FEE_PART: "getMobileFeePart",
     GET_SERVICEABILITY_DETAILS: "getServiceabilityDetails",
     GET_SHOP_TIME_SLOTS: "getShopTimeSlots",
+    GET_MOBILE_TIME_SLOTS: "getMobileTimeSlots",
     GET_PROVIDERS: "getProviders",
-    GET_MOBILE_EARLY_BIRD_FEE: "getMobileEarlyBirdFee",
+    GET_MOBILE_PREMIUM_FEE: "getMobilePremiumFee",
     SAVE_SESSION: "saveSession",
     LOAD_SESSION: "loadSession",
     UPDATE_STORE_WITH_SAVE_SESSION_RESPONSE: "updateStoreWithSaveSessionResponse",
@@ -62,6 +63,7 @@ const storeActions = {
     SAVE_VEHICLE_STYLE: "saveVehicleStyle",
     SAVE_VEHICLE_DAMAGE: "saveVehicleDamage",
     SAVE_VIN_LOOKUP: "saveVinLookup",
+    SAVE_SERVICE_ZIP_CODE_INFO: "saveServiceZipCodeInfo",
     SAVE_SERVICE_LOCATION: "saveServiceLocation",
     SAVE_SCHEDULE: "saveSchedule",
     SAVE_EMAIL: "saveEmail",
@@ -69,6 +71,7 @@ const storeActions = {
     SAVE_VIN: "saveVin",
     SAVE_REGISTRATION_ADDRESS_LOOKUP: "saveRegistrationAddressLookup",
     SAVE_GLASS_PARTS: "saveGlassParts",
+    SAVE_GLASS_PART_PRICES: "saveGlassPartPrices",
     SAVE_PART_QUESTION_ANSWERS: "savePartQuestionAnswers",
     RESET_MOLDING_AND_CAPABILITY_QUESTIONS_IF_NEEDED:
         "resetMoldingAndCapabilityQuestionAnswersIfNeeded",
@@ -77,6 +80,8 @@ const storeActions = {
     SAVE_PAYMENT_TYPE: "savePaymentType",
     SAVE_PARENT_ACCOUNT_NUMBER: "saveParentAccountNumber",
     SAVE_SUPPORTING_ITEMS: "saveSupportingItems",
+    SAVE_SUPPORTING_ITEMS_SUPPRESSING_STATE_RESETTING:
+        "saveSupportingItemsSuppressingStateResetting",
     SAVE_VAPS: "saveVaps",
 };
 
diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js
index 8eeb70c99..939caf922 100644
--- a/src/constants/store-mutations.js
+++ b/src/constants/store-mutations.js
@@ -58,6 +58,10 @@ const storeMutations = {
     RESET_GLASS_PARTS_STATE: "resetGlassPartsState",
     RESET_STATE: "resetState",
     RESET_SAVE_SESSION_PROMISE: "resetSaveSessionPromise",
+    RESET_SERVICE_LOCATION_APPOINTMENT_TYPE: "resetServiceLocationAppointmentType",
+    RESET_SERVICE_LOCATION_PROVIDER: "resetServiceLocationProvider",
+    RESET_SERVICE_LOCATION_MOBILE_ADDRESS: "resetServiceLocationMobileAddress",
+    RESET_SCHEDULE: "resetSchedule",
 
     // OTHER MUTATIONS
     UPDATE_PAGE_DATA: "updatePageData",
diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue
index 12586283d..2c2c662dc 100644
--- a/src/digital-components/button-question/button-question.vue
+++ b/src/digital-components/button-question/button-question.vue
@@ -256,7 +256,9 @@ export default {
     },
     watch: {
         modelValue(newValue, oldValue) {
-            this.resetField();
+            this.resetField({
+                value: newValue,
+            });
         },
         answers() {
             //once we get the answers to display from parent, see if we need a GA event to log what we showed
diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index a2b8c6e9f..5cbb26cdc 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -22,7 +22,6 @@
                 <div class="separator-line"></div>
                 <div class="nav-back ps-3"><button></button></div>
                 <div class="nav-forward pe-3"><button></button></div>
-                <!-- TODO Accessibility: Do the days of the week need to be read? -->
                 <div class="grid-item caption"><span class="sr-only">Sunday</span>S</div>
                 <div class="grid-item caption"><span class="sr-only">Monday</span>M</div>
                 <div class="grid-item caption"><span class="sr-only">Tuesday</span>T</div>
@@ -32,8 +31,8 @@
                 <div class="grid-item caption"><span class="sr-only">Saturday</span>S</div>
                 <div
                     v-for="date in month.dates"
-                    :key="date.inputValue.dateString"
-                    :id="date.inputValue.dateString"
+                    :key="date.inputValue"
+                    :id="date.inputValue"
                     class="grid-item radio-wrapper"
                     :class="[
                         date.dateNum === 1 ? 'first-day-' + month.startDateDayIndex : '',
@@ -84,7 +83,6 @@ export default {
             months: null,
             disableViewMoreDatesButton: false,
             selectableDatesData: [], // NOTE: uses monthNum (1-based), NOT monthIndex (0-based)
-            today: null,
             hideSomeDaysForInitialView: null,
         };
     },
@@ -112,6 +110,12 @@ export default {
         },
     },
     computed: {
+        today() {
+            if (this.todayOverrideDateString) {
+                return new Date(this.todayOverrideDateString);
+            }
+            return new Date();
+        },
         todayMonthIndex() {
             return this.today.getMonth() + 1;
         },
@@ -151,39 +155,31 @@ export default {
             this.$emit("date-clicked");
         },
         getWeekStartDate(date) {
-            // Get the day of the week for date
-            let dayOfWeek = date.getDay();
-
+            const dayOfWeek = date.getDay();
             // Subtract the day of the week from date to get the date of Sunday
-            let sunday = new Date(date);
+            const sunday = new Date(date);
             sunday.setDate(sunday.getDate() - dayOfWeek);
-
-            // Return the date of Sunday
             return sunday;
         },
         getWeekEndDate(date) {
-            const currentDay = date.getDay(); // Get the day of the week (0 = Sunday, 1 = Monday, etc.)
-            const daysUntilSaturday = 6 - currentDay; // Calculate the number of days until Saturday
-
+            const dayOfWeek = date.getDay();
+            const daysUntilSaturday = 6 - dayOfWeek; // Calculate the number of days until Saturday
             // Clone the given date and add the remaining days until Saturday
             const saturday = new Date(date);
             saturday.setDate(date.getDate() + daysUntilSaturday);
-
             return saturday;
         },
         getNextWeekSunday(date) {
-            const currentDay = date.getDay(); // Get the day of the week (0 = Sunday, 1 = Monday, etc.)
-            const daysUntilNextSunday = currentDay === 0 ? 7 : 7 - currentDay; // Calculate the number of days until the next Sunday
-
+            const dayOfWeek = date.getDay();
+            const daysUntilNextSunday = 7 - dayOfWeek; // Calculate the number of days until the next Sunday
             // Clone the given date and add the remaining days until Sunday
             const nextSunday = new Date(date);
             nextSunday.setDate(date.getDate() + daysUntilNextSunday);
-
             return nextSunday;
         },
         getInitialViewWeeks(today, initialViewRowsToShow) {
-            // TODO: this only is for future direction; create logic for past direction
-            let weeks = [];
+            // TODO: this only is for future direction; need to create logic for past direction
+            const weeks = [];
             let weekStartDate = this.getWeekStartDate(today);
             let weekEndDate = this.getWeekEndDate(today);
             for (let i = 0; i < initialViewRowsToShow; i++) {
@@ -197,18 +193,68 @@ export default {
                     weekEndDate: weekEndDate,
                 });
             }
+
+            // are any of these weeks split between two months?
+            const hasSplitWeek = (week) => {
+                return week.weekStartDate.getMonth() !== week.weekEndDate.getMonth() ? true : false;
+            };
+            const splitWeekIndex = weeks.findIndex(hasSplitWeek);
+
+            if (splitWeekIndex > -1) {
+                const week1 = [];
+                const week2 = [];
+                let switchToWeek2 = false;
+
+                for (let j = 0; j < 7; j++) {
+                    const newDate = new Date(weeks[splitWeekIndex].weekStartDate);
+                    newDate.setDate(newDate.getDate() + j);
+                    if (newDate.getDate() === 1) switchToWeek2 = true;
+                    if (switchToWeek2) {
+                        week2.push(newDate);
+                    } else {
+                        week1.push(newDate);
+                    }
+                }
+
+                const week1EndDate = week1[week1.length - 1];
+                const week2StartDate = week2[0];
+
+                if (week1EndDate < today) {
+                    // replace week 1 with week 2
+                    weeks[splitWeekIndex].weekStartDate = week2StartDate;
+                } else {
+                    const newWeek = {
+                        weekNum: weeks[splitWeekIndex].weekNum,
+                        weekStartDate: week2StartDate,
+                        weekEndDate: weeks[splitWeekIndex].weekEndDate,
+                    };
+                    weeks[splitWeekIndex].weekEndDate = week1EndDate;
+                    weeks.splice(splitWeekIndex + 1, 0, newWeek);
+                    weeks.pop();
+                    weeks.forEach((item, index) => {
+                        if (index > splitWeekIndex) {
+                            item.weekNum = item.weekNum + 1;
+                        }
+                    });
+                }
+            }
             return weeks;
         },
         async loadInitialData(config) {
-            // CALLED FROM CONSUMING COMPONENT BEFORE DATE-PICKER APPEARS
-            const todayDate = config.todayOverrideDateString
-                ? new Date(config.todayOverrideDateString)
-                : new Date();
+            let todayDate;
+            if (this.today) {
+                todayDate = this.today;
+            } else if (config.todayOverrideDateString) {
+                todayDate = new Date(config.todayOverrideDateString);
+            } else {
+                todayDate = new Date();
+            }
 
-            let todayMonthIndex = todayDate.getMonth() + 1;
-            let todayYearNum = todayDate.getFullYear();
-            let currentMonthStart = new Date(todayYearNum, todayMonthIndex - 1, 1);
-            let currentMonthEnd = new Date(todayYearNum, todayMonthIndex, 0);
+            const todayMonthIndex = todayDate.getMonth() + 1;
+            const todayYearNum = todayDate.getFullYear();
+            // TODO - set up currentMonthStart if direction is PAST:
+            // let currentMonthStart = new Date(todayYearNum, todayMonthIndex - 1, 1);
+            const currentMonthEnd = new Date(todayYearNum, todayMonthIndex, 0);
 
             let calendarViewDirection = "none";
             if (config.selectableDatesSetting === "past") calendarViewDirection = "past";
@@ -219,10 +265,10 @@ export default {
                 config.initialViewRowsToShow
             );
 
-            let initialViewStartDate = todayDate;
-            let initialViewEndDate = initialViewWeeks[initialViewWeeks.length - 1].weekEndDate;
-            let saturday1month = initialViewWeeks[0].weekEndDate.getMonth();
-            let sunday5month =
+            const initialViewStartDate = todayDate;
+            const initialViewEndDate = initialViewWeeks[initialViewWeeks.length - 1].weekEndDate;
+            const firstSaturdayMonth = initialViewWeeks[0].weekEndDate.getMonth();
+            const lastSundayMonth =
                 initialViewWeeks[initialViewWeeks.length - 1].weekStartDate.getMonth();
 
             let hideSomeDaysForInitialView = false;
@@ -230,10 +276,10 @@ export default {
 
             // TODO - NEED TO CREATE OPPOSITE LOGIC FOR "past" DIRECTION LIKE BELOW vvvvv
             if (calendarViewDirection === "future") {
-                if (saturday1month !== sunday5month) {
+                if (firstSaturdayMonth !== lastSundayMonth) {
                     hideSomeDaysForInitialView = true;
                 }
-                if (initialViewStartDate.getMonth() === sunday5month) {
+                if (initialViewStartDate.getMonth() === lastSundayMonth) {
                     hideSecondMonth = true;
                     if (currentMonthEnd > initialViewEndDate) {
                         // should part of 1st month be hidden?
@@ -242,11 +288,12 @@ export default {
                 }
             }
 
-            let myPromise = new Promise((resolve, reject) => {
+            const myPromise = new Promise((resolve, reject) => {
                 const response = config.customSelectableDatesCallback(
-                    initialViewStartDate,
-                    initialViewEndDate,
-                    store.getters.order.serviceLocation.appointmentType
+                    initialViewStartDate.toISOString().split("T")[0],
+                    initialViewEndDate.toISOString().split("T")[0],
+                    store.getters.order.serviceLocation.appointmentType,
+                    store.getters.order.serviceLocation.provider.providerNumber
                 );
                 resolve(response);
             });
@@ -284,9 +331,9 @@ export default {
                         // Growing from 0 to 1
                         time = Math.min(1, (timestamp - start) / duration);
 
-                    let percentageNew = timingFunc(time);
-                    let distanceToGo = targetY;
-                    let thisDistance = percentageNew * distanceToGo;
+                    const percentageNew = timingFunc(time);
+                    const distanceToGo = targetY;
+                    const thisDistance = percentageNew * distanceToGo;
 
                     wrapper.scrollTo(0, initY + thisDistance);
 
@@ -305,13 +352,11 @@ export default {
         },
 
         async setCalendarData(config = {}) {
-            this.today = config.todayDate;
             this.hideSomeDaysForInitialView = config.hideSomeDaysForInitialView;
-            let hideSecondMonth = config.hideSecondMonth;
+            const hideSecondMonth = config.hideSecondMonth;
             const direction = config.calendarViewDirection;
-
-            const monthsAfterToLoadOffset = 12; // TO BE MADE "CONSTANTS"
-            const monthsBeforeToLoadOffset = 36; // TO BE MADE "CONSTANTS"
+            const monthsAfterToLoadOffset = 12;
+            const monthsBeforeToLoadOffset = 36;
             config.initialShopTimeSlotsResponse.days.forEach((selectableDate) => {
                 this.selectableDatesData.push(selectableDate);
             });
@@ -382,25 +427,25 @@ export default {
                 }
             }
 
-            const monthEndDate = new Date(yearNum, monthIndex, 0); // BOTH
-            let monthEndDateNum = monthEndDate.getDate(); // BOTH
+            const monthEndDate = new Date(yearNum, monthIndex, 0);
+            let monthEndDateNum = monthEndDate.getDate();
 
             if (
                 offset === 0 &&
                 calendarViewDirection === "past" &&
                 monthEndDateNum > this.currentWeekEndDateNum
             ) {
-                monthEndDateNum = this.currentWeekEndDateNum; // PAST
+                monthEndDateNum = this.currentWeekEndDateNum;
             }
 
             const monthStartDateNum =
                 offset === 0 && calendarViewDirection === "future"
                     ? this.currentWeekStartDateNum
-                    : 1; // FUTURE
-            const monthStartDate = new Date(yearNum, monthIndex - 1, monthStartDateNum); // BOTH
+                    : 1;
+            const monthStartDate = new Date(yearNum, monthIndex - 1, monthStartDateNum);
 
-            const startDateDayIndex = monthStartDate.getDay(); // FUTURE
-            const endDateDayIndex = monthEndDate.getDay(); // PAST
+            const startDateDayIndex = monthStartDate.getDay();
+            const endDateDayIndex = monthEndDate.getDay();
 
             if (Math.abs(offset) === 1 && hideSecondMonth) {
                 monthClass = monthClass + " month-hidden";
@@ -424,19 +469,13 @@ export default {
             // populate dates array
             for (let i = monthStartDateNum; i <= monthEndDateNum; i++) {
                 let dayClasses = "";
-                let dateString =
+                const dateString =
                     yearNum.toString() +
                     "-" +
                     forceTwoDigitString(monthIndex) +
                     "-" +
                     forceTwoDigitString(i);
 
-                const thisDate = {
-                    year: yearNum,
-                    month: monthIndex,
-                    date: i,
-                    dateString: dateString,
-                };
                 if (offset === 0 && i === this.todayDateNum) {
                     dayClasses += "current-day";
                 }
@@ -457,11 +496,9 @@ export default {
                 const dateObject = {
                     dateNum: i,
                     dayClasses: dayClasses,
-                    inputValue: thisDate,
+                    inputValue: dateString,
                     isSelectable:
-                        this.selectableDatesData.findIndex(
-                            (date) => date.dateString === dateString
-                        ) > -1
+                        this.selectableDatesData.findIndex((date) => date.date === dateString) > -1
                             ? true
                             : false,
                 };
@@ -510,11 +547,11 @@ export default {
             if (monthToShow) {
                 // make new API call with this month's start and end dates
                 await this.updateSelectableDates(
-                    monthToShow.dates[monthStartDateNum].inputValue.dateString,
-                    monthToShow.dates[monthToShow.dates.length - 1].inputValue.dateString
+                    monthToShow.dates[monthStartDateNum].inputValue,
+                    monthToShow.dates[monthToShow.dates.length - 1].inputValue
                 );
                 this.isLoading = false;
-                this.hideSomeDaysForInitialView = false; // if hid days on initial partial view, this removes hidden styling on days
+                this.hideSomeDaysForInitialView = false; // if hid days on initial partial view, this will reveal those days
                 monthToShow.monthClass = monthToShow.monthClass.replace(" month-hidden", "");
                 this.scrollToElement(monthToShow.monthString);
 
@@ -526,17 +563,18 @@ export default {
             const moreSelectableDates = await this.customSelectableDatesCallback(
                 monthStart,
                 monthEnd,
-                this.$store.getters.order.serviceLocation.appointmentType
+                this.$store.getters.order.serviceLocation.appointmentType,
+                this.$store.getters.order.serviceLocation.provider.providerNumber
             );
             moreSelectableDates.days.forEach((selectableDate) => {
                 const index = this.selectableDatesData.findIndex(
-                    (obj) => obj.dateString === selectableDate.dateString
+                    (dateObj) => dateObj.date === selectableDate.date
                 );
-                if (index === -1) this.selectableDatesData.push(selectableDate);
+                if (index === -1) this.selectableDatesData.push(selectableDate.date);
                 this.months.forEach((month) => {
-                    // TODO: avoid checking all calendar date; maybe only ones between monthStart and monthEnd as defined above?
+                    // TODO: avoid checking all calendar dates; maybe only ones between monthStart and monthEnd as defined above?
                     month.dates.forEach((date) => {
-                        if (date.inputValue.dateString === selectableDate.dateString) {
+                        if (date.inputValue === selectableDate.date) {
                             date["isSelectable"] = true;
                         }
                     });
@@ -807,7 +845,6 @@ export default {
     .btn-link {
         font-weight: 500;
         text-underline-offset: 4px;
-        box-shadow: none !important; // TODO: FIX THIS
         position: absolute;
         bottom: 0;
     }
diff --git a/src/digital-components/text-block/text-block.spec.js b/src/digital-components/text-block/text-block.spec.js
index 89b2fdf36..c9825f36f 100644
--- a/src/digital-components/text-block/text-block.spec.js
+++ b/src/digital-components/text-block/text-block.spec.js
@@ -1,7 +1,7 @@
 import { shallowMount } from "@vue/test-utils";
 import TextBlock from "./text-block";
 
-describe("modal.vue", () => {
+describe("text-block.vue", () => {
     it("Should display 'Text' when 'Text' is defined in the CMS", async () => {
         // Act
         const wrapper = shallowMount(TextBlock, {
diff --git a/src/digital-components/text-block/text-block.vue b/src/digital-components/text-block/text-block.vue
index c6a899309..0bc89591c 100644
--- a/src/digital-components/text-block/text-block.vue
+++ b/src/digital-components/text-block/text-block.vue
@@ -1,47 +1,93 @@
 <template>
-    <div
-        class="text-block w-100"
-        :class="[justifyText, typeStyle, fontWeight, margin]"
-        v-html="this.TextBlockCopy"></div>
+    <div class="text-block w-100" :class="[justifyText, typeStyle, fontWeight, marginTopClass]">
+        <span v-for="copy in splitCopyOnCMSPlaceHolder(this.textBlockCopy)" :key="copy">
+            <span v-if="doesCopyContainRouterLink(copy)">
+                <router-link
+                    :to="{
+                        query: { [pageQueryString]: `${getRouterLinkRouteFromCopy(copy)}` },
+                        name: 'root',
+                    }"
+                    >{{ getRouterLinkDisplayTextFromCopy(copy) }}</router-link
+                >
+            </span>
+            <span v-else-if="doesCopyContainTextLink(copy)">
+                <textLink
+                    linkType="text"
+                    :text="getRouterLinkDisplayTextFromCopy(copy)"
+                    href="#!"
+                    @click-event="$emit('textLinkClicked', getRouterLinkRouteFromCopy(copy))"
+                    :data-bs-target="'#' + getRouterLinkRouteFromCopy(copy)"
+                    aria-label="Modal window" />
+            </span>
+            <span v-else v-html="copy"></span>
+        </span>
+    </div>
 </template>
 
 <script>
+// Components
+import textLink from "@/ux-components/text-link/text-link";
+
+// Supporting files
+import {
+    doesCopyContainRouterLink,
+    doesCopyContainTextLink,
+    splitCopyOnCMSPlaceHolder,
+    getRouterLinkRouteFromCopy,
+    getRouterLinkDisplayTextFromCopy,
+} from "@/helpers/cms-content-helper";
+import { applicationConfig } from "@/constants/application-config";
+
 export default {
     name: "textBlock",
     props: {
         customText: String, // used to allow the insert of token values into textblock
-        justifyText: String, // left, right, center
-        margin: {
-            // bootstrap margin to apply to the block.
-            type: String,
-            default: "mt-2",
-        },
+        justifyText: String, // right, center (left is default)
         typeStyle: String, // h1-h6, body, small, label, caption (see Figma or Confluence documentation)
         fontWeight: String, // bold=500, default is 400
         cmsWidgetName: String,
+        marginTopSizeOverride: Number, // override mt-2 with a bootstrap size from 0-5 or auto
+    },
+    methods: {
+        doesCopyContainRouterLink,
+        doesCopyContainTextLink,
+        splitCopyOnCMSPlaceHolder,
+        getRouterLinkRouteFromCopy,
+        getRouterLinkDisplayTextFromCopy,
     },
     computed: {
-        TextBlockCopy() {
+        pageQueryString() {
+            return applicationConfig.PAGE_QUERYSTRING;
+        },
+        textBlockCopy() {
             if (this.customText) {
                 return this.customText;
             }
             return this.getCmsContent(this.cmsWidgetName, "Text");
         },
+        marginTopClass() {
+            if (this.marginTopSizeOverride === "auto") {
+                return "mt-auto";
+            }
+            if (this.marginTopSizeOverride >= 0 && this.marginTopSizeOverride <= 5) {
+                return "mt-" + this.marginTopSizeOverride;
+            }
+            return "mt-2";
+        },
+    },
+    components: {
+        textLink,
     },
 };
 </script>
 
 <style lang="scss" scoped>
 .text-block {
-    display: flex;
-    &.left {
-        justify-content: flex-start;
-    }
     &.right {
-        justify-content: flex-end;
+        text-align: right;
     }
     &.center {
-        justify-content: center;
+        text-align: center;
     }
     &.bold {
         font-weight: 500;
diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js
index b4927894f..f4ae0be6d 100644
--- a/src/helpers/cms-content-helper.js
+++ b/src/helpers/cms-content-helper.js
@@ -1,6 +1,6 @@
 import { storeActions } from "@/constants/store-actions.js";
 import store from "@/store";
-import { dynamicStrings } from "../constants/dynamic-strings";
+import { dynamicStrings } from "@/constants/dynamic-strings";
 
 export function fetchCmsContentForPage(fmgPage) {
     return store.dispatch(storeActions.GET_PAGE_DATA, { pageName: fmgPage }).then((response) => {
@@ -284,7 +284,7 @@ function getIfStatementRegexExpression() {
 //////////////////////////////////////////
 
 export function doesCopyContainRouterLink(copy) {
-    return copy.includes(this.dynamicStrings.ROUTER_LINK);
+    return copy.includes(dynamicStrings.ROUTER_LINK);
 }
 
 export function doesCopyContainTextLink(copy) {
diff --git a/src/helpers/object-helper.js b/src/helpers/object-helper.js
new file mode 100644
index 000000000..b42230be1
--- /dev/null
+++ b/src/helpers/object-helper.js
@@ -0,0 +1,81 @@
+// For nested objects, spread operator only creates new references to the top level fields,
+// the remaining nested fields actually reference the original object which can introduce problems.
+
+// The purpose of this method is to deep clone the data in an object recursively, this is useful
+// for cloning modelValues to internal models when regular two-way binding is not an option.
+// See: mobile-location-modal-questions.vue
+
+// Creates a deep clone of an object. Clones primitives, arrays and objects, excluding class instances.
+// https://www.30secondsofcode.org/js/s/deep-clone
+export function deepClone(object) {
+    if (object === null) {
+        return null;
+    }
+
+    let clone = Object.assign({}, object);
+    Object.keys(clone).forEach(
+        (key) =>
+            (clone[key] = typeof object[key] === "object" ? deepClone(object[key]) : object[key])
+    );
+
+    if (Array.isArray(object)) {
+        clone.length = object.length;
+        return Array.from(clone);
+    }
+
+    return clone;
+}
+
+// The purpose of this method is to check for array or object equality recursively to determine if two complex objects are equal.
+// This is only a comparison of data, not functions.
+export function deepEqual(obj1, obj2) {
+    if (typeof obj1 !== typeof obj2) {
+        return false;
+    }
+
+    if (obj1 === null || obj2 === null) {
+        return obj1 === obj2;
+    }
+
+    if (Array.isArray(obj1) && Array.isArray(obj2)) {
+        if (obj1.length !== obj2.length) {
+            return false;
+        }
+
+        const sorted1 = obj1.slice().sort();
+        const sorted2 = obj2.slice().sort();
+
+        for (let i = 0; i < sorted1.length; i++) {
+            if (!deepEqual(sorted1[i], sorted2[i])) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    if (typeof obj1 === "object" && typeof obj2 === "object") {
+        const keys1 = Object.keys(obj1);
+        const keys2 = Object.keys(obj2);
+
+        if (keys1.length !== keys2.length) {
+            return false;
+        }
+
+        const sortedKeys1 = keys1.sort();
+        const sortedKeys2 = keys2.sort();
+
+        for (let i = 0; i < sortedKeys1.length; i++) {
+            const key1 = sortedKeys1[i];
+            const key2 = sortedKeys2[i];
+
+            if (key1 !== key2 || !deepEqual(obj1[key1], obj2[key2])) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    return obj1 === obj2;
+}
diff --git a/src/helpers/object-helper.spec.js b/src/helpers/object-helper.spec.js
new file mode 100644
index 000000000..730dea1f8
--- /dev/null
+++ b/src/helpers/object-helper.spec.js
@@ -0,0 +1,275 @@
+import { deepClone, deepEqual } from "./object-helper";
+
+describe("object-cloning-helper.js", () => {
+    describe("deepClone", () => {
+        it("Should return null if no object is passed in", async () => {
+            // Arrange
+            const expected = null;
+
+            // Act
+            const result = deepClone(null);
+
+            // Assert
+            expect(result).toEqual(expected);
+        });
+
+        it("Should return a deep copy of the object", async () => {
+            // Arrange
+
+            const object = {
+                addressQuestions: {
+                    streetAddress: "555 Some St",
+                    apartmentNumberOrBusinessName: "Apt 1",
+                    city: "Funkytown",
+                    state: "OH",
+                    zipCode: "55555",
+                },
+                isVehicleProtected: true,
+                serviceZipCode: "55555",
+            };
+
+            const expected = {
+                addressQuestions: {
+                    streetAddress: "555 Some St",
+                    apartmentNumberOrBusinessName: "Apt 1",
+                    city: "Funkytown",
+                    state: "OH",
+                    zipCode: "55555",
+                },
+                isVehicleProtected: true,
+                serviceZipCode: "55555",
+            };
+
+            // Act
+            const result = deepClone(object);
+
+            // Assert
+            expect(result).toStrictEqual(expected);
+        });
+
+        it("Should return a copy of the array", async () => {
+            // Arrange
+
+            const array = [9, 8, 7, 6, 5, 4, 3, 2, 1];
+
+            const expected = [9, 8, 7, 6, 5, 4, 3, 2, 1];
+
+            // Act
+            const result = deepClone(array);
+
+            // Assert
+            expect(result).toStrictEqual(expected);
+        });
+    });
+
+    describe("deepEqual", () => {
+        it("Should return false if the items being compared are not the same type", async () => {
+            // Arrange
+            const obj1 = ""; // String
+            const obj2 = 3; // Number
+            const expected = false;
+
+            // Act
+            const result = deepEqual(obj1, obj2);
+
+            // Assert
+            expect(result).toEqual(expected);
+        });
+
+        it("Should return false if one the items being compared is null", async () => {
+            // Arrange
+            const obj1 = {}; // Object
+            const obj2 = null; // Array
+            const expected = false;
+
+            // Act
+            const result = deepEqual(obj1, obj2);
+
+            // Assert
+            expect(result).toEqual(expected);
+        });
+
+        describe("Both items being compared are arrays", () => {
+            it("Should return true if the two arrays have the same elements in the same order", async () => {
+                // Arrange
+                const obj1 = [1, 2, 3]; // Array
+                const obj2 = [1, 2, 3]; // Array
+                const expected = true;
+
+                // Acts
+                const result = deepEqual(obj1, obj2);
+
+                // Assert
+                expect(result).toEqual(expected);
+            });
+
+            it("Should return true if the two arrays have the same elements in a different order", async () => {
+                // Arrange
+                const obj1 = [1, 2, 3]; // Array
+                const obj2 = [3, 1, 2]; // Array
+                const expected = true;
+
+                // Acts
+                const result = deepEqual(obj1, obj2);
+
+                // Assert
+                expect(result).toEqual(expected);
+            });
+
+            it("Should return false if the two arrays are not the same length", async () => {
+                // Arrange
+                const obj1 = [1, 2, 3]; // Array
+                const obj2 = [1, 2]; // Array
+                const expected = false;
+
+                // Acts
+                const result = deepEqual(obj1, obj2);
+
+                // Assert
+                expect(result).toEqual(expected);
+            });
+
+            it("Should return false if they have the same elements but their the array elements are different", async () => {
+                // Arrange
+                const obj1 = [1, 2, 3]; // Array
+                const obj2 = [4, 5, 6]; // Array
+                const expected = false;
+
+                // Acts
+                const result = deepEqual(obj1, obj2);
+
+                // Assert
+                expect(result).toEqual(expected);
+            });
+        });
+
+        describe("Both items being compared are objects", () => {
+            it("Should return false if the two objects *do not* have the same number of keys", async () => {
+                // Arrange
+                const obj1 = {
+                    prop1: {},
+                }; // Object
+
+                const obj2 = {
+                    prop1: {},
+                    prop2: {},
+                }; // Object
+                const expected = false;
+
+                // Acts
+                const result = deepEqual(obj1, obj2);
+
+                // Assert
+                expect(result).toEqual(expected);
+            });
+
+            it("Should return true if the two objects have the same keys in the same order", async () => {
+                // Arrange
+                const obj1 = {
+                    prop1: {},
+                    prop2: {},
+                }; // Object
+
+                const obj2 = {
+                    prop1: {},
+                    prop2: {},
+                }; // Object
+
+                const expected = true;
+
+                // Acts
+                const result = deepEqual(obj1, obj2);
+
+                // Assert
+                expect(result).toEqual(expected);
+            });
+
+            it("Should return true if the two objects have the same keys in a different order", async () => {
+                // Arrange
+                const obj1 = {
+                    prop1: {},
+                    prop2: {},
+                }; // Object
+
+                const obj2 = {
+                    prop2: {},
+                    prop1: {},
+                }; // Object
+
+                const expected = true;
+
+                // Acts
+                const result = deepEqual(obj1, obj2);
+
+                // Assert
+                expect(result).toEqual(expected);
+            });
+
+            it("Should return false if the two objects have the same keys but in a nested object comparison one of the two values is null", async () => {
+                // Arrange
+                const obj1 = {
+                    prop1: {
+                        subProp1: {
+                            foo: "",
+                            bar: null,
+                        },
+                    },
+                    prop2: {
+                        subProp1: [1, 2, 3],
+                    },
+                }; // Object
+
+                const obj2 = {
+                    prop1: {},
+                    prop2: {},
+                }; // Object
+
+                const expected = false;
+
+                // Acts
+                const result = deepEqual(obj1, obj2);
+
+                // Assert
+                expect(result).toEqual(expected);
+            });
+
+            it("Should return false if the two objects have the same elements but a nested object comparison is of two different types", async () => {
+                // Arrange
+                const obj1 = {
+                    prop1: {
+                        subProp1: {
+                            foo: "",
+                            bar: "",
+                        },
+                    },
+                    prop2: {
+                        subProp1: [1, 2, 3],
+                    },
+                }; // Object
+
+                const obj2 = {
+                    prop1: {
+                        subProp1: {
+                            foo: "",
+                            bar: "",
+                        },
+                    },
+                    prop2: {
+                        subProp1: {
+                            foo1: "",
+                            bar1: "",
+                        },
+                    },
+                }; // Object
+
+                const expected = false;
+
+                // Acts
+                const result = deepEqual(obj1, obj2);
+
+                // Assert
+                expect(result).toEqual(expected);
+            });
+        });
+    });
+});
diff --git a/src/layouts/address-vehicles/address-vehicles.vue b/src/layouts/address-vehicles/address-vehicles.vue
index d45732217..de1fa9999 100644
--- a/src/layouts/address-vehicles/address-vehicles.vue
+++ b/src/layouts/address-vehicles/address-vehicles.vue
@@ -20,19 +20,12 @@
                 validationRules="vehicle-required"
                 v-model="selectedVehicleVin"
                 :isCarIdDifferent="isCarIdDifferent" />
-            <div class="alert-provide-vin my-3" v-if="splitAlertProvideVinBodyForLink.length">
-                <span v-for="copy in splitAlertProvideVinBodyForLink" :key="copy">
-                    <span v-if="doesCopyContainRouterLink(copy)" class="text-body">
-                        <router-link
-                            :to="{
-                                query: { fmgPage: `${getRouterLinkRouteFromCopy(copy)}` },
-                                name: 'root',
-                            }"
-                            >{{ getRouterLinkDisplayTextFromCopy(copy) }}</router-link
-                        >
-                    </span>
-                    <span v-else class="m-0 text-body" v-html="copy"></span>
-                </span>
+            <div class="alert-provide-vin" v-if="splitAlertProvideVinBodyForLink.length">
+                <textBlock
+                    :customText="AlertProvideVinBody"
+                    justifyText="left"
+                    class="mb-3"
+                    marginTopSizeOverride="3" />
             </div>
             <funnelFooter
                 cmsWidgetName="FunnelFooterWidget"
@@ -52,6 +45,7 @@ import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import alert from "@/ux-components/alert/alert";
 import addressVehiclesQuestion from "@/layouts/address-vehicles/address-vehicles-question/address-vehicles-question";
+import textBlock from "@/digital-components/text-block/text-block";
 
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
@@ -237,6 +231,7 @@ export default {
         alert,
         funnelFooter,
         addressVehiclesQuestion,
+        textBlock,
     },
 };
 </script>
diff --git a/src/layouts/demo-date-picker/demo-date-picker.spec.js b/src/layouts/demo-date-picker/demo-date-picker.spec.js
deleted file mode 100644
index 9f7fa378b..000000000
--- a/src/layouts/demo-date-picker/demo-date-picker.spec.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import demoDatePicker from "./demo-date-picker";
-
-// Supporting Files
-import { shallowMount } from "@vue/test-utils";
-import { getMountOptions } from "@/helpers/unit-test-helper.js";
-
-describe("demo-date-picker.vue", () => {
-    test.only("test TK...", () => {});
-});
-
-function setupMocks({ mountOptionsMockData = {} }) {
-    const mountOptions = getMountOptions({
-        ...mountOptionsMockData,
-    });
-
-    const wrapper = shallowMount(demoDatePicker, mountOptions);
-
-    return { wrapper };
-}
diff --git a/src/layouts/demo-date-picker/demo-date-picker.vue b/src/layouts/demo-date-picker/demo-date-picker.vue
deleted file mode 100644
index 20416b1d4..000000000
--- a/src/layouts/demo-date-picker/demo-date-picker.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<template>
-    <div class="page-container-grouped-styles">
-        <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
-        <div class="">
-            <div class="rounded text-center">
-                <div class="fade-on-route-transition">
-                    <date-picker
-                        selectableDates="custom"
-                        v-model="selectedDate"
-                        :customSelectableDatesCallback="getAvailableDates" />
-                    <!-- EXAMPLE THAT OVERRIDES TODAY BY PASSING STRING --
-                    <date-picker
-                        selectableDates="custom"
-                        v-model="selectedDate"
-                        :customSelectableDatesCallback="getAvailableDates"
-                        todayOverrideDateString="2022-12-30T03:00:00" /> -->
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-// Components
-import datePicker from "@/digital-components/date-picker/date-picker";
-import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
-import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
-import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
-
-// Supporting files
-import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
-import { settleAllPromises } from "@/helpers/layout-helper";
-import { storeActions } from "@/constants/store-actions";
-import store from "@/store";
-
-import baseMixin from "@/mixins/base-mixin";
-
-export default {
-    name: "demo-date-picker",
-    data() {
-        return {
-            selectedDate: null,
-            // selectedDate: {  // USE THIS FORMAT FOR A PRE-SELECTED DATE ON LOAD
-            //     year: 2023,
-            //     month: 3, // use 1-based index for months
-            //     date: 21,
-            // },
-            mockSelectableDatesData: [
-                { year: 2023, month: 3, date: 4 },
-                { year: 2023, month: 3, date: 5 },
-                { year: 2023, month: 3, date: 22 },
-                { year: 2023, month: 4, date: 13 },
-                { year: 2023, month: 4, date: 7 },
-                { year: 2023, month: 4, date: 14 },
-                { year: 2023, month: 4, date: 26 },
-                { year: 2023, month: 5, date: 21 },
-                { year: 2023, month: 5, date: 23 },
-                { year: 2023, month: 5, date: 25 },
-            ],
-        };
-    },
-    computed: {
-        todayDate() {
-            const today = new Date();
-            return today.toDateString();
-        },
-    },
-    methods: {
-        arePagePrerequisitesValid() {
-            return true;
-        },
-        getAvailableDates(startDate, endDate) {
-            this.mockSelectableDatesData.push(endDate);
-            // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-            // temporary test method that adds endDate to list of selectable dates
-            return this.mockSelectableDatesData;
-        },
-    },
-    components: {
-        datePicker,
-        funnelHeader,
-    },
-};
-</script>
-
-<style lang="scss">
-// .page-container-grouped-styles {
-//     padding: 0 .5rem !important;
-// }
-</style>
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 1ca0c9d48..e1c58bd49 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -229,7 +229,7 @@ export default {
                 const zipCodeData = await this.getZipCodeData(this.serviceZipCode);
                 await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.emailAddress, false);
                 await this.dispatchStoreAction(
-                    storeActions.SAVE_SERVICE_LOCATION,
+                    storeActions.SAVE_SERVICE_ZIP_CODE_INFO,
                     {
                         zipCode: this.serviceZipCode,
                         state: zipCodeData.state,
diff --git a/src/layouts/molding-questions/molding-questions.spec.js b/src/layouts/molding-questions/molding-questions.spec.js
index 13961df5a..9c003e748 100644
--- a/src/layouts/molding-questions/molding-questions.spec.js
+++ b/src/layouts/molding-questions/molding-questions.spec.js
@@ -109,7 +109,7 @@ store.getters = {
     damage: baseStoreGettersDamage,
     order: {},
 };
-store.commit = jest.fn();
+store.dispatch = jest.fn();
 
 afterEach(() => {
     // reset store after each test
diff --git a/src/layouts/quote/cash-or-insurance-question/cash-or-insurance-question.vue b/src/layouts/quote/cash-or-insurance-question/cash-or-insurance-question.vue
index 45fef683a..a2afb1a7c 100644
--- a/src/layouts/quote/cash-or-insurance-question/cash-or-insurance-question.vue
+++ b/src/layouts/quote/cash-or-insurance-question/cash-or-insurance-question.vue
@@ -5,7 +5,7 @@
             :groupName="groupName"
             buttonTypeString="listButtonHorizontal"
             v-model="selectedValues"
-            :additionalButtonData="{ additionalButtonStyling: 'listButtonHorizontalStrong' }"
+            :additionalButtonData="additionalButtonData"
             isRequired />
     </div>
 </template>
@@ -27,6 +27,11 @@ export default {
         answersFromCms() {
             return this.getCmsContent(this.cmsWidgetName, "Answers");
         },
+        additionalButtonData() {
+            return {
+                additionalButtonStyling: "listButtonHorizontalStrong",
+            };
+        },
         selectedValues: {
             get: function () {
                 // Convert to CMS answer name from bool
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 313e6f5bd..e48524336 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -182,6 +182,7 @@ export default {
                 this.isInsuranceSelected,
                 false
             );
+
             if (!this.isInsuranceSelected) {
                 this.dispatchStoreAction(
                     this.storeActions.SAVE_PARENT_ACCOUNT_NUMBER,
@@ -196,18 +197,21 @@ export default {
             ) {
                 this.supportingItems = this.filterOutFees(this.supportingItems);
             }
+
             if (this.pricedGlassParts.length > 0) {
                 this.dispatchStoreAction(
-                    this.storeActions.SAVE_GLASS_PARTS,
+                    this.storeActions.SAVE_GLASS_PART_PRICES,
                     this.pricedGlassParts,
                     false
                 );
             }
+
             this.dispatchStoreAction(
                 this.storeActions.SAVE_SUPPORTING_ITEMS,
                 this.supportingItems,
                 false
             );
+
             this.dispatchStoreAction(this.storeActions.SAVE_VAPS, this.selectedVaps, false);
 
             const payment = this.$store.getters.payment;
diff --git a/src/layouts/schedule/location-alerts/location-alerts.vue b/src/layouts/schedule/location-alerts/location-alerts.vue
index 0f8c7b46d..66f26e263 100644
--- a/src/layouts/schedule/location-alerts/location-alerts.vue
+++ b/src/layouts/schedule/location-alerts/location-alerts.vue
@@ -36,8 +36,12 @@ export default {
         },
     },
     methods: {
-        loadInitialData(zipCodeCtu) {
-            return getAlertReasons(zipCodeCtu);
+        loadInitialData(serviceLocationCtu, providerCtu) {
+            let ctuToUse = serviceLocationCtu;
+            if (providerCtu) {
+                ctuToUse = providerCtu;
+            }
+            return getAlertReasons(ctuToUse);
         },
         initializeComponent(initialData) {
             this.alertReasons = initialData;
diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue
index d5e3b4c28..aa0065d89 100644
--- a/src/layouts/schedule/schedule.vue
+++ b/src/layouts/schedule/schedule.vue
@@ -4,20 +4,13 @@
             <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" class="mt-5" />
-            <div class="text-center mt-1 mb-3" v-if="ChangeShopLink.length">
-                <span v-for="copy in ChangeShopLink" :key="copy">
-                    <span v-if="doesCopyContainRouterLink(copy)" class="text-body">
-                        <router-link
-                            :to="{
-                                query: { fmgPage: `${getRouterLinkRouteFromCopy(copy)}` },
-                                name: 'root',
-                            }"
-                            >{{ getRouterLinkDisplayTextFromCopy(copy) }}</router-link
-                        >
-                    </span>
-                    <span v-else class="m-0 text-body" v-html="copy"></span>
-                </span>
-            </div>
+            <template v-if="ChangeShopLink.length">
+                <textBlock
+                    cmsWidgetName="ChangeShopLink"
+                    justifyText="center"
+                    class="mb-3"
+                    marginTopSizeOverride="1" />
+            </template>
             <location-alerts cmsWidgetPrefix="LocationAlert-" ref="locationAlerts" />
             <date-picker
                 selectableDatesSetting="custom"
@@ -25,17 +18,17 @@
                 v-model="selectedDate"
                 :customSelectableDatesCallback="getAvailableDatesMethod"
                 @date-clicked="openInshopTimeSlotsModal" />
-            <!-- todayOverrideDateString="2023-08-06T03:00:00" -->
             <time-slot-modal-question
                 ref="timeSlotModalQuestion"
                 cmsWidgetName="TimeSlotModalQuestion"
-                earlyBirdCmsWidgetName="EarlyBirdTimeSlotModal"
+                mobilePremiumCmsWidgetName="MobilePremiumTimeSlotModal"
                 mobileCmsWidgetName="MobileTimeSlotModal"
                 dropoffCmsWidgetName="DropOffTimeSlotModal"
-                v-model="selectedTimeSlotId"
+                sameDayDropOffCmsWidgetName="SameDayDropOffTimeSlotModal"
+                v-model="selectedTimeSlotData"
                 @time-slot-modal-closed="timeSlotModalClosed"
                 :appointmentType="appointmentType"
-                :mobileEarlyBirdFee="mobileEarlyBirdFee"
+                :premiumAppointmentFee="mobilePremiumAppointmentFee"
                 :dateAndTimeSlotData="timeSlotsForSelectedDate"
                 :estimatedServiceMinutesMinimum="selectableDatesData.estimatedServiceMinutesMinimum"
                 :estimatedServiceMinutesMaximum="selectableDatesData.estimatedServiceMinutesMaximum"
@@ -60,6 +53,7 @@ import { Form, defineRule } from "vee-validate";
 import datePicker from "@/digital-components/date-picker/date-picker";
 import locationAlerts from "@/layouts/schedule/location-alerts/location-alerts";
 import timeSlotModalQuestion from "./time-slot-modal-question/time-slot-modal-question";
+import textBlock from "@/digital-components/text-block/text-block";
 
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
@@ -67,12 +61,8 @@ import baseMixin from "@/mixins/base-mixin.js";
 import { storeActions } from "@/constants/store-actions";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
-import {
-    doesCopyContainRouterLink,
-    splitCopyOnCMSPlaceHolder,
-    getRouterLinkRouteFromCopy,
-    getRouterLinkDisplayTextFromCopy,
-} from "@/helpers/cms-content-helper";
+import { splitCopyOnCMSPlaceHolder } from "@/helpers/cms-content-helper";
+import { AppointmentTypeStrings, PREMIUM_FEE_PART_TYPE } from "@/constants/schedule-constants";
 import { errorMessages } from "@/constants/error-messages";
 import { required } from "@/helpers/validation-rules";
 import store from "@/store";
@@ -80,41 +70,46 @@ import store from "@/store";
 defineRule("date-required", required(errorMessages.DATE_REQUIRED));
 defineRule("time-slot-selection-required", required(errorMessages.DATE_REQUIRED));
 
-const getAvailableDates = async (startDate, endDate, appointmentType) => {
+const getAvailableDates = async (startDate, endDate, appointmentType, providerNumber) => {
     // USING DATES PASSED, MAKE AN API CALL
-    const newShopTimeSlotsResponse = await baseMixin.methods.dispatchStoreAction(
-        storeActions.GET_SHOP_TIME_SLOTS,
-        {
-            startDate: startDate,
-            endDate: endDate,
-            shopAppointmentType: appointmentType,
-        },
-        false
-    );
-    const newShopTimeSlots = newShopTimeSlotsResponse.data;
-    return convertApiResponse(newShopTimeSlots);
-};
-const convertApiResponse = (responseData) => {
-    // DATA CONVERSION
-    responseData?.days.forEach((date) => {
-        const dateString = date.date;
-        date.dateString = dateString;
-        const dateStringPieces = dateString.split("-");
-        date.year = Number(dateStringPieces[0]);
-        date.month = Number(dateStringPieces[1]);
-        date.date = Number(dateStringPieces[2]);
-    });
-    return responseData;
+
+    let newTimeSlotsResponse;
+    if (appointmentType === AppointmentTypeStrings.MOBILE) {
+        newTimeSlotsResponse = await baseMixin.methods.dispatchStoreAction(
+            storeActions.GET_MOBILE_TIME_SLOTS,
+            {
+                startDate: startDate,
+                endDate: endDate,
+            },
+            false
+        );
+    } else {
+        newTimeSlotsResponse = await baseMixin.methods.dispatchStoreAction(
+            storeActions.GET_SHOP_TIME_SLOTS,
+            {
+                startDate: startDate,
+                endDate: endDate,
+                shopAppointmentType: appointmentType,
+                providerNumber: providerNumber,
+            },
+            false
+        );
+    }
+
+    return newTimeSlotsResponse.data;
 };
 
 export default {
     name: "schedule",
     data() {
         return {
-            selectedDate: null,
-            selectedTimeSlotId: null,
+            selectedDate: this.getSelectedDate(),
+            selectedTimeSlotData: {
+                id: this.getSelectedRouteCode(),
+                isPremiumAppointment: null,
+            },
             selectableDatesData: [],
-            mobileEarlyBirdFee: null,
+            mobilePremiumAppointmentFee: null,
         };
     },
     async beforeRouteEnter(to, from, next) {
@@ -125,40 +120,30 @@ export default {
             selectableDatesSetting: "custom",
             initialViewRowsToShow: 5,
             customSelectableDatesCallback: getAvailableDates,
-
-            /* vvvvv SAVE THESE FOR TESTING PURPOSES FOR NOW vvvvv
-
-            // todayOverrideDateString: "2023-04-29T03:00:00",  // show partial
-            // todayOverrideDateString: "2023-04-30T03:00:00",  //
-            // todayOverrideDateString: "2023-05-02T03:00:00",  // ONE MONTH ONLY
-            // todayOverrideDateString: "2023-05-06T03:00:00",  // ONE MONTH ONLY
-            // todayOverrideDateString: "2023-05-07T03:00:00",  // show partial
-            // todayOverrideDateString: "2023-05-30T03:00:00",  //
-            // todayOverrideDateString: "2023-06-30T03:00:00",  //
-            // todayOverrideDateString: "2023-07-01T03:00:00",  // show partial && ONE MONTH ONLY
-            // todayOverrideDateString: "2023-07-02T03:00:00",  // ONE MONTH ONLY
-            // todayOverrideDateString: "2023-07-12T03:00:00",  // show partial
-            // todayOverrideDateString: "2023-08-31T03:00:00",
-            // todayOverrideDateString: "2023-09-30T03:00:00",  // show partial
-            */
         });
 
-        // Price EARLY BIRD pre-emptively to allow for asynchronous call to pricing
-        const pricingPromise = baseMixin.methods.dispatchStoreAction(
-            storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
-            {
-                availableLineItems: [{ partNumber: "EARLY BIRD" }],
-            },
-            false
+        const premiumFeePromise = baseMixin.methods.dispatchStoreAction(
+            storeActions.GET_MOBILE_PREMIUM_FEE
         );
 
-        const earlyBirdPromise = baseMixin.methods.dispatchStoreAction(
-            storeActions.GET_MOBILE_EARLY_BIRD_FEE
-        );
+        const premiumFeeWithPricePromise = premiumFeePromise.then((result) => {
+            if (result.data) {
+                return baseMixin.methods.dispatchStoreAction(
+                    storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
+                    {
+                        availableLineItems: [result.data],
+                    },
+                    false
+                );
+            } else {
+                return result.data;
+            }
+        });
+
         const alertReasonsPromise = locationAlerts.methods.loadInitialData(
-            store.getters.order.serviceLocation.zipCodeCtu
+            store.getters.order.serviceLocation.zipCodeCtu,
+            store.getters.order.serviceLocation.provider?.address?.zipCtu
         );
-
         // Settle promises and get results
         const promiseResultMap = [
             {
@@ -174,12 +159,8 @@ export default {
                 promise: datePickerInitialDataPromise,
             },
             {
-                resultKey: "earlyBird",
-                promise: earlyBirdPromise,
-            },
-            {
-                resultKey: "pricingResults",
-                promise: pricingPromise,
+                resultKey: "premiumFeeWithPrice",
+                promise: premiumFeeWithPricePromise,
             },
         ];
 
@@ -191,9 +172,10 @@ export default {
             vm.$refs.datePicker.initializeComponent(resultMap.datePickerInitialData);
             vm.$refs.locationAlerts.initializeComponent(resultMap.alertReasons);
             vm.selectableDatesData = resultMap.datePickerInitialData.initialShopTimeSlotsResponse;
-            if (resultMap.earlyBird) {
-                vm.mobileEarlyBirdFee = resultMap.pricingResults[0];
-            }
+            vm.mobilePremiumAppointmentFee = resultMap.premiumFeeWithPrice
+                ? resultMap.premiumFeeWithPrice[0]
+                : null;
+            vm.updateFooterButtonText(vm.selectedTimeSlotData);
         });
     },
     computed: {
@@ -208,26 +190,28 @@ export default {
             return this.$store.getters.order.serviceLocation.appointmentType;
         },
         timeSlotsForSelectedDate() {
-            if (this.selectedDate === null) {
+            if (!this.selectedDate) {
                 return null;
             }
-            return this.selectableDatesData.days.find(
-                (selectableDate) => selectableDate.dateString === this.selectedDate.dateString
+            return this.selectableDatesData.days?.find(
+                (selectableDate) => selectableDate.date === this.selectedDate
             );
         },
         appointmentDateAndTime() {
-            if (!this.selectedTimeSlotId) {
+            if (!this.selectedTimeSlotData.id) {
                 return null;
             }
             const timeSlotSelectedObject = this.getTimeSlotObjectFromTimeSlotId(
-                this.selectedTimeSlotId
+                this.selectedTimeSlotData.id
             );
             if (timeSlotSelectedObject) {
                 return {
-                    date: this.selectedDate.dateString,
+                    date: this.selectedDate,
                     startTime: timeSlotSelectedObject.startTime,
                     endTime: timeSlotSelectedObject.endTime,
-                    id: this.selectedTimeSlotId,
+                    routeCode: this.selectedTimeSlotData.id,
+                    jobMaxMinutes:
+                        this.selectableDatesData.estimatedServiceMinutesMaximum.toString(),
                 };
             } else {
                 return null;
@@ -235,19 +219,29 @@ export default {
         },
     },
     methods: {
-        doesCopyContainRouterLink,
         splitCopyOnCMSPlaceHolder,
-        getRouterLinkRouteFromCopy,
-        getRouterLinkDisplayTextFromCopy,
         arePagePrerequisitesValid() {
-            return true;
-            // NEED TODO - WHAT ARE PAGE REQ'S FOR THIS PAGE?
+            const serviceLocation = store.getters.order.serviceLocation;
+            const serviceLocationPreReqs =
+                serviceLocation.zipCode &&
+                serviceLocation.zipCodeCtu &&
+                serviceLocation.appointmentType &&
+                (serviceLocation.appointmentType === AppointmentTypeStrings.MOBILE ||
+                    serviceLocation.provider.providerNumber);
+            const paymentInfo = store.getters.payment.isInsurance !== null;
+            const supportingItems = store.getters.lineItems.supportingItems !== null;
+            const damageInfo =
+                store.getters.order.damage.isRepair ||
+                (store.getters.order.lineItems?.glassParts != null &&
+                    store.getters.order.lineItems.glassParts.length > 0);
+            return serviceLocationPreReqs && paymentInfo && supportingItems && damageInfo;
         },
         async getAvailableDatesMethod(startDate, endDate) {
             const newShopTimeSlots = await getAvailableDates(
                 startDate,
                 endDate,
-                this.appointmentType
+                this.appointmentType,
+                this.$store.getters.order.serviceLocation.provider.providerNumber
             );
             // ADD API CALL RESULTS TO EXISTING DATE DATA
             this.selectableDatesData.days = this.selectableDatesData.days.concat(
@@ -263,42 +257,145 @@ export default {
         },
         getTimeSlotObjectFromTimeSlotId(timeSlotId) {
             const timeSlots = this.selectableDatesData.days.find(
-                (selectableDate) => selectableDate.dateString === this.selectedDate.dateString
+                (selectableDate) => selectableDate.date === this.selectedDate
             ).timeSlots;
             return timeSlots.find((timeSlot) => timeSlot.id === timeSlotId);
         },
+        getSelectedDate() {
+            return store.getters.order.schedule.date;
+        },
+        getSelectedRouteCode() {
+            return store.getters.order.schedule.routeCode;
+        },
         timeSlotModalClosed() {
-            // Clear the selectedDate if no timeslot has been selected
-            if (!this.selectedTimeSlotId) {
+            // Clear the selectedDate if no timeSlot has been selected
+            if (!this.selectedTimeSlotData.id) {
                 this.selectedDate = null;
             }
         },
+        updateFooterButtonText(timeSlotData) {
+            let funnelFooterButtonText;
+            if (!timeSlotData.id) {
+                funnelFooterButtonText = "Continue";
+            } else {
+                funnelFooterButtonText =
+                    "Select " + this.convertSelectedDateToShortMonthAndDay(this.selectedDate);
+
+                if (this.appointmentType === AppointmentTypeStrings.IN_SHOP) {
+                    funnelFooterButtonText +=
+                        " at " +
+                        this.getDisplayTextForMilitaryTime(this.appointmentDateAndTime.startTime);
+                } else if (
+                    this.appointmentType === AppointmentTypeStrings.MOBILE &&
+                    !timeSlotData.isPremiumAppointment
+                ) {
+                    funnelFooterButtonText +=
+                        " at " +
+                        this.getDisplayTextForMilitaryTime(
+                            this.appointmentDateAndTime.startTime,
+                            true
+                        ) +
+                        " - " +
+                        this.getDisplayTextForMilitaryTime(
+                            this.appointmentDateAndTime.endTime,
+                            true
+                        );
+                }
+            }
+
+            this.$refs.funnelFooter.updateButtonText(funnelFooterButtonText);
+        },
+        convertSelectedDateToShortMonthAndDay(selectedDate) {
+            // This conversion ensures we don't get get GMT induced date changes
+            const dateObject = new Date(`${selectedDate}T00:00:00`);
+            // Ex: April 25
+            return dateObject.toLocaleDateString("en-us", { month: "short", day: "numeric" });
+        },
+        // Expected input: "HH:MM"
+        getDisplayTextForMilitaryTime(militaryTimeInput, shouldTrimMinutesIfEmpty = false) {
+            let hours = parseInt(militaryTimeInput.split(":")[0]);
+            const minutes = militaryTimeInput.split(":")[1];
+            const meridianNotation = hours > 11 ? "PM" : "AM";
+            if (hours > 12) {
+                hours -= 12;
+            }
+            if (shouldTrimMinutesIfEmpty && minutes === "00") {
+                return `${hours} ${meridianNotation}`;
+            } else {
+                return `${hours}:${minutes} ${meridianNotation}`;
+            }
+        },
         backButtonAction() {
             this.$router.navigateWithoutSaving(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
-        async forwardButtonAction() {
-            //TODO: replace properties with real values once they are available
-            await this.dispatchStoreAction(
+        forwardButtonAction() {
+            this.updateSupportingItems();
+            this.dispatchStoreAction(
                 this.storeActions.SAVE_SCHEDULE,
-                {
-                    date: "2023-07-04T00:00:00",
-                    startTime: "2023-07-04T12:00:00",
-                    endTime: "2023-07-04T17:00:00",
-                    routeCode: "03341-01820-S-B*20232*11 AM",
-                },
+                this.appointmentDateAndTime,
                 false
             );
-
             navigateToHeritageFunnel({ loadingModal: this.$refs.loadingModal });
         },
+
+        updateSupportingItems() {
+            const supportingItems = store.getters.lineItems.supportingItems;
+
+            // if we have a premium fee(early bird), then save/update supporting items
+            if (
+                this.appointmentType === AppointmentTypeStrings.MOBILE &&
+                this.selectedTimeSlotData?.isPremiumAppointment
+            ) {
+                const earlyBirdIndex = supportingItems.findIndex(
+                    (item) => item.partType == PREMIUM_FEE_PART_TYPE
+                );
+
+                if (earlyBirdIndex >= 0) {
+                    supportingItems[earlyBirdIndex].laborAmount =
+                        this.mobilePremiumAppointmentFee.laborAmount;
+                    supportingItems[earlyBirdIndex].selingPrice =
+                        this.mobilePremiumAppointmentFee.selingPrice;
+                    supportingItems[earlyBirdIndex].kitPrice =
+                        this.mobilePremiumAppointmentFee.kitPrice;
+                } else {
+                    supportingItems.push(this.mobilePremiumAppointmentFee);
+                }
+
+                this.dispatchStoreAction(
+                    this.storeActions.SAVE_SUPPORTING_ITEMS_SUPPRESSING_STATE_RESETTING,
+                    supportingItems,
+                    false
+                );
+            } else {
+                // if it's not a mobile and/or premium early bird, then make sure we remove any that may have been added
+                const removeEarlyBirdIndex = supportingItems.findIndex(
+                    (item) => item.partType == PREMIUM_FEE_PART_TYPE
+                );
+
+                if (removeEarlyBirdIndex >= 0) {
+                    supportingItems.splice(removeEarlyBirdIndex, 1);
+                    this.dispatchStoreAction(
+                        this.storeActions.SAVE_SUPPORTING_ITEMS_SUPPRESSING_STATE_RESETTING,
+                        supportingItems,
+                        false
+                    );
+                }
+            }
+        },
     },
     watch: {
         selectedDate(newValue, oldValue) {
             // Clear time slot selection if date selected changes
             if (newValue !== oldValue) {
-                this.selectedTimeSlotId = null;
+                this.selectedTimeSlotData = {
+                    id: null,
+                    isPremiumAppointment: null,
+                };
             }
         },
+        selectedTimeSlotData(newValue) {
+            this.updateFooterButtonText(this.selectedTimeSlotData);
+        },
     },
     components: {
         funnelHeader,
@@ -309,6 +406,7 @@ export default {
         datePicker,
         locationAlerts,
         timeSlotModalQuestion,
+        textBlock,
     },
 };
 </script>
diff --git a/src/layouts/schedule/time-slot-modal-question/timeslot-modal-list-button/timeslot-modal-list-button.vue b/src/layouts/schedule/time-slot-modal-question/time-slot-modal-list-button/time-slot-modal-list-button.vue
similarity index 72%
rename from src/layouts/schedule/time-slot-modal-question/timeslot-modal-list-button/timeslot-modal-list-button.vue
rename to src/layouts/schedule/time-slot-modal-question/time-slot-modal-list-button/time-slot-modal-list-button.vue
index 60b2f9e81..44ac0d9e8 100644
--- a/src/layouts/schedule/time-slot-modal-question/timeslot-modal-list-button/timeslot-modal-list-button.vue
+++ b/src/layouts/schedule/time-slot-modal-question/time-slot-modal-list-button/time-slot-modal-list-button.vue
@@ -6,45 +6,32 @@
         <div
             :aria-label="buttonLabel"
             class="button-content list-button-content d-flex flex-column justify-content-center py-3 px-4">
-            <span class="m-0" :class="textPosition">
+            <span class="m-0 position-relative" :class="textPosition">
                 {{ buttonLabel }}
-            </span>
-            <span v-if="buttonLabelSubCopy" class="m-0 small" :class="textPosition">
-                {{ formattedButtonLabelSubCopy }}
+                <span
+                    v-if="buttonLabelSubCopy"
+                    class="premium-appointment-price"
+                    :class="textPosition">
+                    {{ formattedButtonLabelSubCopy }}
+                </span>
             </span>
             <span v-if="screenReaderOnlyText" class="sr-only">
                 {{ screenReaderOnlyText }}
             </span>
-            <loader
-                v-if="isLoaderDisplayed && selectingInitiatesLoad"
-                :class="[this.loaderColor, this.loaderPosition]" />
         </div>
     </baseInputButton>
 </template>
 
 <script>
-import loader from "@/ux-components/loader/loader";
 import baseInputButton from "@/digital-components/base-input-button/base-input-button";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
 
 export default {
-    name: "timeslotMOdalListButton",
+    name: "timeSlotModalListButton",
     mixins: [inputButtonWrapperMixin],
-    props: {
-        loaderColor: String,
-        loaderPosition: {
-            type: String,
-            default: "right",
-        },
-    },
-    data() {
-        return {
-            isLoaderDisplayed: false,
-        };
-    },
     computed: {
         formattedButtonLabelSubCopy() {
-            return this.buttonLabelSubCopy?.toFixed(2);
+            return this.buttonLabelSubCopy;
         },
     },
     methods: {
@@ -58,16 +45,12 @@ export default {
         },
     },
     components: {
-        loader,
         baseInputButton,
     },
 };
 </script>
 
 <style lang="scss" scoped>
-.loader {
-    position: absolute;
-}
 .list-button {
     outline: none;
     input[type="radio"],
@@ -85,6 +68,9 @@ export default {
             font-weight: 500;
             background: $blue-100;
             box-shadow: 0 0 0 1px $blue;
+            span.premium-appointment-price {
+                background: $green-200;
+            }
         }
         &:checked:focus + .list-button-content {
             box-shadow: 0 0 0 2.5px $blue;
@@ -109,11 +95,20 @@ export default {
     width: 100%;
     outline: none;
 
-    span {
-        &.small {
-            font-size: 0.75rem;
-            color: $gray-550;
-        }
+    span.premium-appointment-price {
+        position: absolute;
+        background: $green-100;
+        border-radius: 4.5rem;
+        line-height: 1.25rem;
+        color: $green-700;
+        font-size: 0.75rem;
+        margin-left: 4px;
+        padding: 2px 8px;
+        font-weight: 500;
     }
 }
+
+.position-relative {
+    position: relative;
+}
 </style>
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 a73ab712d..0b4c15441 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
@@ -14,17 +14,17 @@
             typeStyle="small"
             class="duration-text-block" />
         <buttonQuestion
-            buttonTypeString="timeslotModalListButton"
-            :buttonTypeObject="timeslotModalListButton"
+            buttonTypeString="timeSlotModalListButton"
+            :buttonTypeObject="timeSlotModalListButton"
             :answers="availableTimeSlots"
             groupName="ChooseTimeSlot"
             textPosition="text-center"
-            v-model="selectedTimeSlot"
+            v-model="selectedTimeSlotId"
             isRequired
             validationRules="time-slot-required"
             class="mt-5" />
         <div
-            class="mt-1 mb-2"
+            class="mt-1 mb-2 supplemental-information"
             v-if="supplementalInformationBlock"
             v-html="supplementalInformationBlock"></div>
         <textBlock
@@ -41,23 +41,24 @@
 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 timeslotModalListButton from "./timeslot-modal-list-button/timeslot-modal-list-button";
+import timeSlotModalListButton from "./time-slot-modal-list-button/time-slot-modal-list-button";
 
 // TODO: Move this somewhere more global
-import { DAYS_OF_WEEK, MONTHS_OF_YEAR } from "@/digital-components/date-picker/mixins/constants.js";
 import { defineRule, useField } from "vee-validate";
 import { errorMessages } from "@/constants/error-messages";
 import { required } from "@/helpers/validation-rules";
 
+// Constants
+import {
+    AppointmentTypeStrings,
+    PREMIUM_TIME_SLOT_ID_FLAG,
+    PREMIUM_FEE_PART_TYPE,
+} from "@/constants/schedule-constants";
+
 // Validation for the modal button
 defineRule("time-slot-required", required(errorMessages.OPTION_REQUIRED));
 
 // Constants
-const AppointmentTypeStrings = {
-    IN_SHOP: "Inshop",
-    MOBILE: "Mobile",
-    DROP_OFF: "Dropoff",
-};
 
 export default {
     name: "timeSlotModalQuestion",
@@ -65,66 +66,67 @@ export default {
         modelValue: Object,
         cmsWidgetName: String,
         mobileCmsWidgetName: String,
-        earlyBirdCmsWidgetName: String,
+        mobilePremiumCmsWidgetName: String,
         dropoffCmsWidgetName: String,
+        sameDayDropOffCmsWidgetName: String,
         appointmentType: String,
         dateAndTimeSlotData: Object,
-        mobileEarlyBirdFee: Object,
+        premiumAppointmentFee: Object,
         estimatedServiceMinutesMinimum: Number,
         estimatedServiceMinutesMaximum: Number,
         validationRules: String,
     },
     data() {
         return {
-            selectedTimeSlot: null,
-            timeslotModalListButton: timeslotModalListButton,
+            selectedTimeSlotId: this.modelValue.id,
+            timeSlotModalListButton: timeSlotModalListButton,
         };
     },
     setup(props) {
         const { handleChange } = useField("time-slot-modal-question", props.validationRules);
-
+        // Run validation on component load
+        handleChange(props.modelValue.id);
         return {
             handleChange,
         };
     },
     watch: {
         modelValue() {
-            this.selectedTimeSlot = this.modelValue;
             // Run component validation that is used at parent level
-            this.handleChange(this.modelValue);
+            if (this.modelValue.isPremiumAppointment) {
+                this.selectedTimeSlotId = this.addPremiumFlagToInput(this.modelValue.id);
+            } else {
+                this.selectedTimeSlotId = this.modelValue.id;
+            }
+            this.handleChange(this.modelValue.id);
+        },
+        availableTimeSlots(newValue) {
+            this.autoSelectTimeSlotIfOnlyOneIsAvailable(newValue);
         },
-        // dateAndTimeSlotData(newValue, oldValue) {
-        //     const numberOfOptions = newValue?.timeSlots.length;
-        //     console.log('running');
-        //     if (numberOfOptions === 1) {
-        //         this.selectedTimeSlot = newValue.timeSlots[0].id;
-        //     }
-        // }
     },
     computed: {
         supplementalInformationBlock() {
             let appointmentTypeCmsWidgetName;
-            let cmsFieldName = "BodyText";
             if (this.appointmentType === AppointmentTypeStrings.IN_SHOP) {
                 return null;
             } else if (this.appointmentType === AppointmentTypeStrings.MOBILE) {
-                appointmentTypeCmsWidgetName =
-                    this.selectedTimeSlot === this.earlyBirdButtonText
-                        ? this.earlyBirdCmsWidgetName
-                        : this.mobileCmsWidgetName;
+                appointmentTypeCmsWidgetName = this.selectedTimeSlotId?.includes(
+                    PREMIUM_TIME_SLOT_ID_FLAG
+                )
+                    ? this.mobilePremiumCmsWidgetName
+                    : this.mobileCmsWidgetName;
             } else {
-                appointmentTypeCmsWidgetName = this.dropoffCmsWidgetName;
-                if (this.isSameDay) {
-                    cmsFieldName = "BodyText2";
-                }
+                appointmentTypeCmsWidgetName = this.isSameDay
+                    ? this.sameDayDropOffCmsWidgetName
+                    : this.dropoffCmsWidgetName;
             }
-            return this.getCmsContent(appointmentTypeCmsWidgetName, cmsFieldName);
+            return this.getCmsContent(appointmentTypeCmsWidgetName, "BodyText");
         },
         footerCloseButtonText() {
             return this.getCmsContent(this.cmsWidgetName, "FooterText");
         },
-        earlyBirdButtonText() {
-            return this.getCmsContent(this.earlyBirdCmsWidgetName, "HeaderText");
+        premiumAppointmentButtonText() {
+            return this.getCmsContent(this.mobilePremiumCmsWidgetName, "HeaderText");
         },
         dropoffButtonText() {
             return this.getCmsContent(this.dropoffCmsWidgetName, "HeaderText");
@@ -162,58 +164,30 @@ export default {
             return false;
         },
         dateSelectedReadableDate() {
-            if (this.dateAndTimeSlotData === null) {
+            if (!this.dateAndTimeSlotData) {
                 return null;
             }
-            // This conversion ensures we don't get get GMT induced date changes
-            const dateObject = new Date(`${this.dateAndTimeSlotData.dateString}T00:00:00`);
-            const weekdayName = DAYS_OF_WEEK[dateObject.getDay()];
-            const month = MONTHS_OF_YEAR[dateObject.getMonth()];
-            const numberDayOfMonth = dateObject.getDate();
-            // Ex. Tuesday, April 23
-            return `${weekdayName}, ${month} ${numberDayOfMonth}`;
-        },
-        availableTimeSlots() {
-            if (this.dateAndTimeSlotData === null) {
-                return null;
-            }
-            let availableTimeSlots;
-            if (this.appointmentType === AppointmentTypeStrings.DROP_OFF) {
-                availableTimeSlots = [
-                    {
-                        value: this.dateAndTimeSlotData.timeSlots[0],
-                        buttonLabel: this.dropoffButtonText,
-                    },
-                ];
-            } else {
-                availableTimeSlots = this.dateAndTimeSlotData.timeSlots.map((timeslot) => {
-                    let readableTime;
-                    if (this.appointmentType === AppointmentTypeStrings.IN_SHOP) {
-                        readableTime = this.getDisplayTextForMilitaryTime(timeslot.startTime);
-                    } else if (this.appointmentType === AppointmentTypeStrings.MOBILE) {
-                        readableTime = `${this.getDisplayTextForMilitaryTime(
-                            timeslot.startTime
-                        )} - ${this.getDisplayTextForMilitaryTime(timeslot.endTime)}`;
-                    }
-                    return {
-                        value: timeslot.id,
-                        buttonLabel: readableTime,
-                    };
-                });
-            }
 
-            if (this.appointmentType === AppointmentTypeStrings.MOBILE) {
-                const offerPremium = this.dateAndTimeSlotData.timeSlots[0].offerPremium;
-                const hasEarlyBird = this.mobileEarlyBirdFee?.partType === "EARLY BIRD";
-                if (offerPremium && hasEarlyBird) {
-                    availableTimeSlots.unshift({
-                        value: this.dateAndTimeSlotData.timeSlots[0].id + "-earlybird",
-                        buttonLabel: this.earlyBirdButtonText,
-                        buttonLabelSubCopy: this.getTotalLineItemPrice(this.mobileEarlyBirdFee),
-                    });
-                }
+            // This conversion ensures we don't get get GMT induced date changes
+            const dateObject = new Date(`${this.dateAndTimeSlotData.date}T00:00:00`);
+            // Ex: Tuesday, April 22
+            return dateObject.toLocaleDateString("en-us", {
+                weekday: "long",
+                month: "long",
+                day: "numeric",
+            });
+        },
+        availableTimeSlots() {
+            if (!this.dateAndTimeSlotData) {
+                return null;
+            }
+            if (this.appointmentType === AppointmentTypeStrings.DROP_OFF) {
+                return this.getAvailableTimeSlotsForDropOff(this.dateAndTimeSlotData.timeSlots);
+            } else if (this.appointmentType === AppointmentTypeStrings.MOBILE) {
+                return this.getAvailableTimeSlotsForMobile(this.dateAndTimeSlotData.timeSlots);
+            } else {
+                return this.getAvailableTimeSlotsForInshop(this.dateAndTimeSlotData.timeSlots);
             }
-            return availableTimeSlots;
         },
     },
     methods: {
@@ -222,22 +196,29 @@ export default {
         },
         // fires any time the footer button is used, is fired before "onModalClosed"
         closeModal() {
-            this.$emit("update:modelValue", this.selectedTimeSlot);
+            let isSelectedAppointmentPremium = false;
+            if (this.selectedTimeSlotId.includes(PREMIUM_TIME_SLOT_ID_FLAG)) {
+                this.selectedTimeSlotId = this.removePremiumFlagFromInput(this.selectedTimeSlotId);
+                isSelectedAppointmentPremium = true;
+            }
+            const selectedTimeSlotData = {
+                id: this.selectedTimeSlotId,
+                isPremiumAppointment: isSelectedAppointmentPremium,
+            };
+            this.$emit("update:modelValue", selectedTimeSlotData);
             this.$refs["timeSlots"].closeModal();
         },
         // fires any time the modal is closed, AFTER "closeModal" fires if footer button is used
         onModalClosed() {
-            this.selectedTimeSlot = this.modelValue;
             this.$emit("time-slot-modal-closed");
         },
-        // Expected input: "HH:MM:SS"
+        // Expected input: "HH:MM"
         getDisplayTextForMilitaryTime(militaryTimeInput) {
             let hours = parseInt(militaryTimeInput.split(":")[0]);
             const minutes = militaryTimeInput.split(":")[1];
-            let meridianNotation = "AM";
-            if (militaryTimeInput.split(":")[0] > 12) {
+            const meridianNotation = hours > 11 ? "PM" : "AM";
+            if (hours > 12) {
                 hours -= 12;
-                meridianNotation = "PM";
             }
             return `${hours}:${minutes} ${meridianNotation}`;
         },
@@ -252,6 +233,70 @@ export default {
             }
             return displayTextForDurationLength;
         },
+        getAvailableTimeSlotsForInshop(timeSlotsForSelectedDate) {
+            return timeSlotsForSelectedDate.map((timeSlot) => {
+                const readableTime = this.getDisplayTextForMilitaryTime(timeSlot.startTime);
+                return {
+                    value: timeSlot.id,
+                    buttonLabel: readableTime,
+                };
+            });
+        },
+        getAvailableTimeSlotsForDropOff(timeSlotsForSelectedDate) {
+            return [
+                {
+                    value: timeSlotsForSelectedDate[0].id,
+                    buttonLabel: this.dropoffButtonText,
+                },
+            ];
+        },
+        getAvailableTimeSlotsForMobile(timeSlotsForSelectedDate) {
+            const availableTimeSlots = timeSlotsForSelectedDate.map((timeSlot) => {
+                const readableTime = `${this.getDisplayTextForMilitaryTime(
+                    timeSlot.startTime
+                )} - ${this.getDisplayTextForMilitaryTime(timeSlot.endTime)}`;
+                return {
+                    value: timeSlot.id,
+                    buttonLabel: readableTime,
+                };
+            });
+
+            const isPremiumTimeSlot = timeSlotsForSelectedDate[0].offerPremium;
+            const hasPremiumPartAvailable =
+                this.premiumAppointmentFee?.partType === PREMIUM_FEE_PART_TYPE;
+            if (isPremiumTimeSlot && hasPremiumPartAvailable) {
+                availableTimeSlots.unshift(
+                    this.getPremiumAppointmentTimeSlot(timeSlotsForSelectedDate[0])
+                );
+            }
+
+            return availableTimeSlots;
+        },
+        getPremiumAppointmentTimeSlot(timeSlotData) {
+            const formattedPrice =
+                "+$" + this.getTotalLineItemPrice(this.premiumAppointmentFee).toFixed(2);
+            return {
+                // Unique value is required for each <input> and the premium appoinment shares a timeSlot ID
+                value: this.addPremiumFlagToInput(timeSlotData.id),
+                buttonLabel: this.premiumAppointmentButtonText,
+                buttonLabelSubCopy: formattedPrice,
+                additionalButtonData: {
+                    isPremiumAppointment: true,
+                },
+            };
+        },
+        autoSelectTimeSlotIfOnlyOneIsAvailable(newAvailableTimeSlotsValue) {
+            const numberOfOptions = newAvailableTimeSlotsValue?.length;
+            if (numberOfOptions === 1) {
+                this.selectedTimeSlotId = newAvailableTimeSlotsValue[0].value;
+            }
+        },
+        addPremiumFlagToInput(timeSlotId) {
+            return (timeSlotId += PREMIUM_TIME_SLOT_ID_FLAG);
+        },
+        removePremiumFlagFromInput(timeSlotId) {
+            return timeSlotId.substring(0, timeSlotId.length - PREMIUM_TIME_SLOT_ID_FLAG.length);
+        },
     },
     components: {
         modal,
@@ -271,7 +316,17 @@ export default {
         margin-bottom: 0 !important;
     }
     .text-block.duration-text-block {
-        margin-top: 0 !important;
+        margin-top: 4px !important;
+    }
+    .supplemental-information {
+        line-height: 1.5rem;
+        font-size: 0.875rem;
+        li strong {
+            font-weight: $font-weight-bold;
+        }
+        li:not(:last-child) {
+            margin-bottom: 8px;
+        }
     }
 }
 </style>
diff --git a/src/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper.js b/src/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper.js
deleted file mode 100644
index 45899973f..000000000
--- a/src/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// For nested objects, spread operator only creates new references to the top level fields,
-// the remaining nested fields actually reference the original object which can introduce problems.
-
-// The purpose of this method is to deep clone the data in an object recursively, this is useful
-// for cloning modelValues to internal models when regular two-way binding is not an option.
-// See: mobile-location-modal-questions.vue
-
-// Creates a deep clone of an object. Clones primitives, arrays and objects, excluding class instances.
-// https://www.30secondsofcode.org/js/s/deep-clone
-export function deepClone(object) {
-    if (object === null) {
-        return null;
-    }
-
-    let clone = Object.assign({}, object);
-    Object.keys(clone).forEach(
-        (key) =>
-            (clone[key] = typeof object[key] === "object" ? deepClone(object[key]) : object[key])
-    );
-
-    if (Array.isArray(object)) {
-        clone.length = object.length;
-        return Array.from(clone);
-    }
-
-    return clone;
-}
diff --git a/src/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper.spec.js b/src/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper.spec.js
deleted file mode 100644
index 4246f9167..000000000
--- a/src/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper.spec.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import { deepClone } from "./object-cloning-helper";
-
-describe("object-cloning-helper.js", () => {
-    it("Should return null if no object is passed in", async () => {
-        // Arrange
-        const expected = null;
-
-        // Act
-        const result = deepClone(null);
-
-        // Assert
-        expect(result).toEqual(expected);
-    });
-
-    it("Should return a deep copy of the object", async () => {
-        // Arrange
-
-        const object = {
-            addressQuestions: {
-                streetAddress: "555 Some St",
-                apartmentNumberOrBusinessName: "Apt 1",
-                city: "Funkytown",
-                state: "OH",
-                zipCode: "55555",
-            },
-            isVehicleProtected: true,
-            serviceZipCode: "55555",
-        };
-
-        const expected = {
-            addressQuestions: {
-                streetAddress: "555 Some St",
-                apartmentNumberOrBusinessName: "Apt 1",
-                city: "Funkytown",
-                state: "OH",
-                zipCode: "55555",
-            },
-            isVehicleProtected: true,
-            serviceZipCode: "55555",
-        };
-
-        // Act
-        const result = deepClone(object);
-
-        // Assert
-        expect(result).toStrictEqual(expected);
-    });
-
-    it("Should return a copy of the array", async () => {
-        // Arrange
-
-        const array = [9, 8, 7, 6, 5, 4, 3, 2, 1];
-
-        const expected = [9, 8, 7, 6, 5, 4, 3, 2, 1];
-
-        // Act
-        const result = deepClone(array);
-
-        // Assert
-        expect(result).toStrictEqual(expected);
-    });
-});
diff --git a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
index 157c28f2b..b100a50b5 100644
--- a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
+++ b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.js
@@ -1,4 +1,5 @@
 import { storeActions } from "@/constants/store-actions";
+import store from "@/store";
 import baseMixin from "@/mixins/base-mixin.js";
 
 export async function getPricedMobileFeePart(serviceZipCode) {
@@ -42,3 +43,48 @@ export async function getServiceabilityDetails(serviceZipCode, lineItems) {
 
     return Promise.resolve(serviceabilityDetails);
 }
+
+export async function getAvailabilityRating(
+    startDate,
+    endDate,
+    shopAppointmentType,
+    providerNumber
+) {
+    // For a given shop provider number and date range, get the appointment time slots available
+    const shopTimeSlots = await baseMixin.methods.dispatchStoreAction(
+        storeActions.GET_SHOP_TIME_SLOTS,
+        {
+            providerNumber: providerNumber,
+            startDate: startDate,
+            endDate: endDate,
+            shopAppointmentType: shopAppointmentType,
+        },
+        false
+    );
+
+    // Rate the availability for the shop
+    let numberOfAppointmentsPerDay = [];
+    for (let i = 0; i < shopTimeSlots.data.days.length; i++) {
+        numberOfAppointmentsPerDay.push(shopTimeSlots.data.days[i].timeSlots.length);
+    }
+
+    const dateRange = 7;
+    const minimumNumberOfAppointmentsPerDay = 1;
+    const numberOfDaysToEvaluate = 2;
+
+    let daysWithMinimalAppointmentsCount = 0;
+    for (let i = 0; i < dateRange; i++) {
+        if (numberOfAppointmentsPerDay[i] >= minimumNumberOfAppointmentsPerDay) {
+            daysWithMinimalAppointmentsCount++;
+            if (daysWithMinimalAppointmentsCount >= numberOfDaysToEvaluate) {
+                break;
+            }
+        }
+    }
+
+    const isGoodAvailability = daysWithMinimalAppointmentsCount >= numberOfDaysToEvaluate;
+
+    const shopStatus = isGoodAvailability ? "high" : "low";
+
+    return Promise.resolve(shopStatus);
+}
diff --git a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js
index 755b0d870..81d336968 100644
--- a/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js
+++ b/src/layouts/service-location/helpers/service-location-helper/service-location-helper.spec.js
@@ -1,10 +1,186 @@
-import { getPricedMobileFeePart, getServiceabilityDetails } from "./service-location-helper";
+import {
+    getPricedMobileFeePart,
+    getServiceabilityDetails,
+    getAvailabilityRating,
+} from "./service-location-helper";
 import { storeActions } from "@/constants/store-actions";
 
+jest.mock("@/store", () => ({
+    getters: {
+        order: {
+            vehicle: {
+                year: null,
+                make: null,
+                model: null,
+                style: null,
+                carId: null,
+                category: null,
+                vin: null,
+                imageUrl: null,
+                imageVifNumber: null,
+                imageColor: null,
+                registration: {
+                    licensePlate: null,
+                    address: null,
+                    city: null,
+                    state: null,
+                    zipCode: null,
+                    firstName: null,
+                    lastName: null,
+                },
+            },
+            serviceLocation: {
+                address: null,
+                city: null,
+                state: null,
+                zipCode: null,
+                zipCodeCtu: null,
+                appointmentType: null,
+                provider: {
+                    providerNumber: null,
+                    address: {
+                        streetAddress: null,
+                        city: null,
+                        state: null,
+                        zip: null,
+                    },
+                },
+            },
+            customer: {
+                emailAddress: null,
+            },
+            damage: {
+                isRepair: null,
+                numberOfChips: null,
+                glassToReplace: null,
+                partQuestionAnswers: null,
+                moldingQuestionAnswers: null,
+                capabilityQuestionAnswers: null,
+            },
+            lineItems: {
+                glassParts: null,
+                supportingItems: null,
+                vaps: null,
+                serverData: null,
+            },
+            payment: {
+                isInsurance: null,
+                insuranceCoverage: {
+                    isVerified: null,
+                    coverageStatus: null,
+                },
+                parentAccountNumber: 0,
+            },
+            schedule: {
+                date: null,
+                startTime: null,
+                endTime: null,
+                routeCode: null,
+            },
+            referralNumber: null,
+            referralDate: null,
+            referralCorrelationId: null,
+            eon: null,
+        },
+    },
+}));
+
 const mockStoreActionGetMobileFeePart = storeActions.GET_MOBILE_FEE_PART;
 const mockStoreActionPriceOrderItemsAndSaveServerData =
     storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA;
 const mockStoreActionGetServiceabilityDetails = storeActions.GET_SERVICEABILITY_DETAILS;
+const mockStoreActionGetShopTimeSlots = storeActions.GET_SHOP_TIME_SLOTS;
+
+const mockGetShopTimeSlotsGoodAvailability = {
+    estimatedServiceMinutesMinimum: 0,
+    estimatedServiceMinutesMaximimum: 0,
+    days: [
+        {
+            date: "string",
+            timeSlots: [
+                {
+                    id: "string",
+                    startTime: "",
+                    endTime: "",
+                    offerPremium: true,
+                },
+            ],
+        },
+        {
+            date: "string",
+            timeSlots: [],
+        },
+        {
+            date: "string",
+            timeSlots: [],
+        },
+        {
+            date: "string",
+            timeSlots: [],
+        },
+        {
+            date: "string",
+            timeSlots: [],
+        },
+        {
+            date: "string",
+            timeSlots: [],
+        },
+        {
+            date: "string",
+            timeSlots: [
+                {
+                    id: "string",
+                    startTime: "",
+                    endTime: "",
+                    offerPremium: true,
+                },
+            ],
+        },
+    ],
+};
+
+const mockGetShopTimeSlotsLowAvailability = {
+    estimatedServiceMinutesMinimum: 0,
+    estimatedServiceMinutesMaximimum: 0,
+    days: [
+        {
+            date: "string",
+            timeSlots: [],
+        },
+        {
+            date: "string",
+            timeSlots: [],
+        },
+        {
+            date: "string",
+            timeSlots: [],
+        },
+        {
+            date: "string",
+            timeSlots: [],
+        },
+        {
+            date: "string",
+            timeSlots: [],
+        },
+        {
+            date: "string",
+            timeSlots: [],
+        },
+        {
+            date: "string",
+            timeSlots: [
+                {
+                    id: "string",
+                    startTime: "",
+                    endTime: "",
+                    offerPremium: true,
+                },
+            ],
+        },
+    ],
+};
 
 jest.mock("@/mixins/base-mixin.js", () => ({
     methods: {
@@ -18,7 +194,7 @@ jest.mock("@/mixins/base-mixin.js", () => ({
             });
         }),
 
-        dispatchStoreAction: jest.fn().mockImplementation((actionName) => {
+        dispatchStoreAction: jest.fn().mockImplementation((actionName, request) => {
             if (actionName === mockStoreActionGetMobileFeePart) {
                 return Promise.resolve({
                     data: {
@@ -50,6 +226,14 @@ jest.mock("@/mixins/base-mixin.js", () => ({
                     isRecalibrationServiceableMobile: true,
                 });
             }
+
+            if (actionName === mockStoreActionGetShopTimeSlots) {
+                if (request.providerNumber == "0000001") {
+                    return Promise.resolve(mockGetShopTimeSlotsGoodAvailability);
+                }
+
+                return Promise.resolve(mockGetShopTimeSlotsLowAvailability);
+            }
         }),
     },
 }));
@@ -124,4 +308,25 @@ describe("service-location-helper.js", () => {
             expect(result).toEqual(expected);
         });
     });
+
+    describe("getAvailabilityRating", () => {
+        // it("Should return a 'Good' rating", async () => {
+        //     // Arrange
+        //     const providerNumber = "0000001";
+        //     const expected = "Good";
+        //     // Act
+        //     const result = await getAvailabilityRating(providerNumber);
+        //     // Assert
+        //     expect(result).toEqual(expected);
+        // });
+        // it("Should return a 'Low' rating", async () => {
+        //     // Arrange
+        //     const providerNumber = "0000000";
+        //     const expected = "Low";
+        //     // Act
+        //     const result = await getAvailabilityRating(providerNumber);
+        //     // Assert
+        //     expect(result).toEqual(expected);
+        // });
+    });
 });
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 48642101c..0052c1368 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -66,7 +66,7 @@ import addressQuestions from "@/layouts/address-lookup/customer-questions/addres
 import vehicleProtectedQuestion from "@/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question";
 
 // Helpers
-import { deepClone } from "@/layouts/service-location/helpers/object-cloning-helper/object-cloning-helper";
+import { deepClone } from "@/helpers/object-helper";
 import {
     getPricedMobileFeePart,
     getServiceabilityDetails,
@@ -202,6 +202,7 @@ export default {
             this.internalModel = deepClone(this.modelValue);
         },
         onModalClosed() {
+            this.displayInvalidZipAlert = false;
             this.internalModel = deepClone(this.modelValue);
             this.resetValidation();
         },
@@ -261,15 +262,19 @@ export default {
                     this.$emit("updated-serviceability", serviceabilityDetails.data);
                     this.$emit("updated-contains-military-base", zipCodeData.containsMilitaryBase);
 
-                    // Update the page level model
-                    this.$emit("update:modelValue", this.internalModel);
-
                     if (this.onZipUpdateCallback) {
                         await this.onZipUpdateCallback(serviceZipCode);
                     }
+                    // Update the page level model
+                    this.$emit("update:modelValue", this.internalModel);
 
                     this.closeModal();
                 }
+            } else {
+                // Update the page level model
+                this.$emit("update:modelValue", this.internalModel);
+
+                this.closeModal();
             }
         },
     },
diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue
index 713cdb089..8f63e5df7 100644
--- a/src/layouts/service-location/service-location.vue
+++ b/src/layouts/service-location/service-location.vue
@@ -138,11 +138,11 @@ export default {
     data() {
         return {
             streetAddress: this.getServiceAddressFromStore(),
-            apartmentNumberOrBusinessName: "",
+            apartmentNumberOrBusinessName: this.getServiceAddress2FromStore(),
             city: this.getServiceCityFromStore(),
             state: this.getServiceStateFromStore(),
             zipCode: this.getServiceZipCodeFromStore(),
-            isVehicleProtected: null,
+            isVehicleProtected: this.getIsVehicleProtectedFromStore(),
             isGlassServiceableInshop: null,
             isRecalibrationServiceableInshop: null,
             isGlassServiceableMobile: null,
@@ -339,6 +339,9 @@ export default {
         getServiceAddressFromStore() {
             return store.getters.order.serviceLocation.address;
         },
+        getServiceAddress2FromStore() {
+            return store.getters.order.serviceLocation.address2;
+        },
         getServiceCityFromStore() {
             return store.getters.order.serviceLocation.city;
         },
@@ -348,6 +351,9 @@ export default {
         getServiceZipCodeFromStore() {
             return store.getters.order.serviceLocation.zipCode;
         },
+        getIsVehicleProtectedFromStore() {
+            return store.getters.order.serviceLocation.isVehicleProtected;
+        },
         getSelectedAppointmentType() {
             return store.getters.order.serviceLocation.appointmentType;
         },
@@ -391,6 +397,7 @@ export default {
                             city: this.selectedProvider?.address?.city,
                             state: this.selectedProvider?.address?.state,
                             zip: this.selectedProvider?.address?.zipCode,
+                            zipCtu: this.selectedProvider?.address?.zipCodeCtu,
                         },
                     },
                 },
diff --git a/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.spec.js b/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.spec.js
index b9eb6299b..1248d7ebb 100644
--- a/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.spec.js
+++ b/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.spec.js
@@ -2,7 +2,7 @@ import { mount } from "@vue/test-utils";
 import shopListButton from "./shop-list-button";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
 
-describe("service-package-radio.vue", () => {
+describe("shop-list-button.vue", () => {
     it("Should include buttonLabel in html", async () => {
         // Arrange
         let { wrapper } = setupMocks({
@@ -49,6 +49,18 @@ describe("service-package-radio.vue", () => {
     });
 });
 
+const startDate = new Date();
+const endDate = new Date();
+endDate.setDate(startDate.getDate() + 7);
+const getAvailabilityRating = jest.fn().mockImplementation((actionName, request) => {
+    return Promise.resolve({
+        data: {},
+    });
+});
+
+const formattedStartDate = startDate.toISOString().split("T")[0];
+const formattedEndDate = endDate.toISOString().split("T")[0];
+
 const mockProps = {
     buttonLabel: "buttonLabel test copy",
     buttonLabelSubCopy: "buttonLabelSubCopy test copy",
@@ -58,6 +70,12 @@ const mockProps = {
     value: 0,
     modelValue: 0,
     groupName: "mockGroup",
+    additionalButtonData: {
+        availabilityRatingCallback: getAvailabilityRating,
+        startDate: formattedStartDate,
+        endDate: formattedEndDate,
+        shopAppointmentType: "Dropoff",
+    },
 };
 
 function setupMocks({ mountOptionsMockData = {} }) {
diff --git a/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue b/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue
index b8003148f..df80fdffa 100644
--- a/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue
+++ b/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue
@@ -11,26 +11,32 @@
                     <span class="m-0 button-label-copy" :class="textPosition">{{
                         buttonLabel
                     }}</span>
-                    <span class="m-0 button-label-sub-copy" :class="textPosition">{{
+                    <span class="m-0 caption ms-1" :class="textPosition">{{
                         buttonLabelSubCopy
                     }}</span>
                     <div
-                        class="availability-indicator"
-                        :class="availability === 'high' ? 'green' : 'red'">
-                        <span class="m-0 button-auxillary-copy">{{ buttonAuxillaryCopy }}</span>
+                        v-if="displayAvailabilityIndicators"
+                        class="availability-indicator rounded-pill"
+                        :class="availabilityRatingClass">
+                        <div
+                            v-if="!isLoaderDisplayed"
+                            class="availability-badge"
+                            :class="availabilityRating == 'high' ? 'green' : 'red'"></div>
+                        <span v-if="!isLoaderDisplayed" class="m-0 button-auxillary-copy">{{
+                            badgeText
+                        }}</span>
+                        <loader v-if="isLoaderDisplayed" :class="['left', 'no-block']" />
                     </div>
                 </div>
-                <span
-                    v-if="buttonBodyCopy"
-                    class="m-0 button-label-sub-copy small"
-                    :class="textPosition"
-                    v-html="buttonBodyCopy"></span>
+                <div class="row-two">
+                    <span
+                        v-if="buttonBodyCopy"
+                        class="m-0 button-label-sub-copy small"
+                        v-html="buttonBodyCopy"></span>
+                </div>
                 <span v-if="screenReaderOnlyText" class="sr-only">
                     {{ screenReaderOnlyText }}
                 </span>
-                <loader
-                    v-if="isLoaderDisplayed && selectingInitiatesLoad"
-                    :class="[this.loaderColor, this.loaderPosition]" />
             </div>
         </baseInputButton>
     </transition>
@@ -40,32 +46,60 @@
 import loader from "@/ux-components/loader/loader";
 import baseInputButton from "@/digital-components/base-input-button/base-input-button";
 import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
+import experimentMixin from "@/mixins/experiment-mixin";
+import { experimentSettings } from "@/constants/experiments";
 
 export default {
     name: "shopListButton",
     mixins: [inputButtonWrapperMixin],
-    props: {
-        loaderColor: String,
-        loaderPosition: {
-            type: String,
-            default: "right",
-        },
+    beforeMount() {
+        if (this.displayAvailabilityIndicators) {
+            this.displayLoader();
+            const startDate = this.additionalButtonData.startDate;
+            const endDate = this.additionalButtonData.endDate;
+            const shopAppointmentType = this.additionalButtonData.shopAppointmentType;
+
+            this.additionalButtonData
+                .availabilityRatingCallback(startDate, endDate, shopAppointmentType, this.value)
+                .then((data) => {
+                    this.availabilityRating = data;
+                });
+        }
     },
     data() {
         return {
-            isLoaderDisplayed: false,
-            availability: "low",
+            availabilityRating: null,
         };
     },
+    computed: {
+        displayAvailabilityIndicators() {
+            return experimentMixin.methods.hasSettingEqualTo(
+                experimentSettings.DISPLAY_AVAILABILITY_INDICATORS,
+                "true"
+            );
+        },
+        isLoaderDisplayed() {
+            return this.availabilityRating == null;
+        },
+        availabilityRatingClass() {
+            if (this.availabilityRating == null) {
+                return "gray";
+            } else {
+                return this.availabilityRating == "high" ? "green" : "red";
+            }
+        },
+        badgeText() {
+            if (this.availabilityRating != null) {
+                return this.availabilityRating == "high" ? "Appts available" : "Appts low";
+            }
+
+            return "";
+        },
+    },
     methods: {
         displayLoader() {
             this.isLoaderDisplayed = true;
         },
-        preHandleAnswerChange() {
-            if (this.selectingInitiatesLoad) {
-                this.displayLoader();
-            }
-        },
     },
     components: {
         loader,
@@ -75,9 +109,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.loader {
-    position: absolute;
-}
 .list-button {
     outline: none;
     input[type="radio"],
@@ -103,10 +134,6 @@ export default {
         &:checked + .list-button-content span {
             font-weight: 500;
         }
-        &:checked + .list-button-content span:nth-child(2) {
-            font-weight: 400;
-            color: $gray-600;
-        }
     }
 }
 .list-button-content {
@@ -127,53 +154,83 @@ export default {
     }
 }
 .button-content {
+    row-gap: 0.25rem;
+
     .row-one {
         display: flex;
         align-items: center;
-        margin-bottom: 0.25rem !important;
+        line-height: 1.5rem;
 
         .button-label-copy {
-            flex-grow: 0;
-            line-height: 1.5rem;
             font-weight: 500;
         }
 
-        .button-label-sub-copy {
-            flex-grow: 1;
-            line-height: 1.25rem !important;
-            font-weight: 400;
-            font-size: 0.75rem;
-            color: #727676;
-            padding-left: 0.25rem;
-        }
-
         .availability-indicator {
-            display: none;
-            flex-direction: row;
-            justify-content: center;
+            background-repeat: no-repeat;
+            display: flex;
             align-items: center;
-            padding: 0.125rem 1.5rem;
-            gap: 0.25rem;
-            background: #e3f2ea;
-            border-radius: 4.5rem;
+            margin-left: auto;
+            padding: 0.125rem 0.5rem;
+
+            .availability-badge {
+                display: inline;
+                width: 13px;
+                height: 12px;
+                background-position: center;
+                background-repeat: no-repeat;
+                margin: 0 0.25rem 0 0;
+
+                &.green {
+                    background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 13 12' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.5 12C3.19159 12 0.5 9.30841 0.5 6C0.5 2.69159 3.19159 0 6.5 0C9.80841 0 12.5 2.69159 12.5 6C12.5 9.30841 9.80841 12 6.5 12ZM6.5 0.785047C3.62449 0.785047 1.28505 3.12449 1.28505 6C1.28505 8.87551 3.62449 11.215 6.5 11.215C9.37551 11.215 11.715 8.87551 11.715 6C11.715 3.12449 9.37551 0.785047 6.5 0.785047Z' fill='%23006A36'/%3E%3Cpath d='M5.697 7.95252C5.5927 7.95252 5.49289 7.91102 5.41999 7.837L3.90597 6.32299C3.75233 6.16934 3.75233 5.92149 3.90597 5.76785C4.05962 5.6142 4.30747 5.6142 4.46111 5.76785L5.69812 7.00373L8.53999 4.16186C8.69364 4.00822 8.94149 4.00822 9.09513 4.16186C9.24878 4.31551 9.24878 4.56336 9.09513 4.717L5.97626 7.83588C5.90224 7.9099 5.80242 7.9514 5.69925 7.9514L5.697 7.95252Z' fill='%23006A36'/%3E%3C/svg%3E%0A");
+                }
+
+                &.red {
+                    background-image: url("data:image/svg+xml,%3Csvg width='13' height='12' viewBox='0 0 13 12' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.5 12C3.19159 12 0.5 9.30841 0.5 6C0.5 2.69159 3.19159 0 6.5 0C9.80841 0 12.5 2.69159 12.5 6C12.5 9.30841 9.80841 12 6.5 12ZM6.5 0.785047C3.62449 0.785047 1.28505 3.12449 1.28505 6C1.28505 8.87551 3.62449 11.215 6.5 11.215C9.37551 11.215 11.715 8.87551 11.715 6C11.715 3.12449 9.37551 0.785047 6.5 0.785047Z' fill='%23006A36'/%3E%3Csvg width='13' height='12' viewBox='0 0 13 12' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.5 0C9.81368 0 12.5 2.68632 12.5 6C12.5 9.31368 9.81368 12 6.5 12C3.18632 12 0.5 9.31368 0.5 6C0.5 2.68632 3.18632 0 6.5 0ZM6.5 0.84C3.6548 0.84 1.34 3.1548 1.34 6C1.34 8.8452 3.6548 11.16 6.5 11.16C9.3452 11.16 11.66 8.8452 11.66 6C11.66 3.1548 9.3452 0.84 6.5 0.84ZM7.90018 4.00596C8.06422 3.84204 8.33002 3.84192 8.49406 4.00596C8.6581 4.17 8.6581 4.43592 8.49406 4.59996L7.0939 6L8.49406 7.40004C8.6581 7.56408 8.6581 7.83 8.49406 7.99404C8.4121 8.076 8.30458 8.11704 8.19706 8.11704C8.08966 8.11704 7.98214 8.076 7.90018 7.99404L6.50002 6.594L5.09986 7.99404C5.01778 8.076 4.91038 8.11704 4.80286 8.11704C4.69546 8.11704 4.58794 8.076 4.50598 7.99404C4.34182 7.83 4.34182 7.56408 4.50598 7.40004L5.90614 6L4.50598 4.59996C4.34182 4.43592 4.34182 4.17 4.50598 4.00596C4.66978 3.84192 4.93582 3.84204 5.09986 4.00596L6.50002 5.406L7.90018 4.00596Z' fill='%23AC160B'/%3E%3C/svg%3E%3C/svg%3E%0A");
+                }
+            }
 
             .button-auxillary-copy {
+                box-sizing: border-box;
                 justify-content: right;
-                line-height: 1.25rem !important;
-                font-weight: 400;
+                line-height: 1.25rem;
+                font-weight: 500;
                 font-size: 0.75rem;
+                align-items: center;
             }
 
-            .green {
-                color: #006a36;
-                background: #e3f2ea;
+            .loader {
+                padding: 0 0.25rem 0 0.25rem;
+                padding-top: 0.125rem;
+                padding-bottom: 0.125rem;
             }
 
-            .red {
-                color: #ac160b;
-                background: #e3f2ea;
+            .loader:after {
+                background-color: $gray-550;
+                height: 1rem;
+                width: 1rem;
+            }
+
+            &.green {
+                color: $green-700;
+                background-color: $green-100;
+            }
+
+            &.red {
+                color: $red-600;
+                background-color: $red-100;
+            }
+
+            &.gray {
+                color: $gray-600;
+                background-color: $gray-100;
+                padding-left: 0.125rem;
+                padding-right: 0.125rem;
             }
         }
     }
+
+    .row-two {
+        text-align: left;
+    }
 }
 </style>
diff --git a/src/layouts/service-location/shop-question/shop-question.vue b/src/layouts/service-location/shop-question/shop-question.vue
index 3183cbc9e..929c779af 100644
--- a/src/layouts/service-location/shop-question/shop-question.vue
+++ b/src/layouts/service-location/shop-question/shop-question.vue
@@ -19,7 +19,8 @@
                 textPosition="text-start"
                 v-model="selectedProviderNumber"
                 isRequired
-                validationRules="option-required" />
+                validationRules="option-required"
+                :additionalButtonData="additionalButtonData" />
             <textLink
                 v-show="displaySeeMoreLocationsLink"
                 ref="showMoreShopsLink"
@@ -51,6 +52,8 @@ import { errorMessages } from "@/constants/error-messages";
 import baseMixin from "@/mixins/base-mixin.js";
 import { nextTick } from "vue";
 
+import { getAvailabilityRating } from "@/layouts/service-location/helpers/service-location-helper/service-location-helper";
+
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
 
 export default {
@@ -102,6 +105,21 @@ export default {
         showMoreShopsLinkText() {
             return this.getCmsContent("ShowMoreShopsLinkWidget", "Text");
         },
+        additionalButtonData() {
+            const startDate = new Date();
+            const endDate = new Date();
+            endDate.setDate(startDate.getDate() + 7);
+
+            const formattedStartDate = startDate.toISOString().split("T")[0];
+            const formattedEndDate = endDate.toISOString().split("T")[0];
+
+            return {
+                availabilityRatingCallback: getAvailabilityRating,
+                startDate: formattedStartDate,
+                endDate: formattedEndDate,
+                shopAppointmentType: this.selectedAppointmentType,
+            };
+        },
     },
     methods: {
         loadInitialData(serviceZipCode) {
@@ -158,7 +176,7 @@ export default {
                 });
             }
 
-            await this.$nextTick();
+            await nextTick();
 
             if (this.shopIndex == this.shopProviders.length) {
                 this.displaySeeMoreLocationsLink = false;
@@ -166,7 +184,7 @@ export default {
                 this.displaySeeMoreLocationsLink = true;
             }
 
-            await this.$nextTick();
+            await nextTick();
 
             this.scrollToPageBottom();
         },
@@ -203,22 +221,20 @@ export default {
             async handler(newValue) {
                 this.resetAnswers();
 
-                await this.$nextTick();
+                await nextTick();
 
                 this.selectedProviderNumber = null;
 
-                this.$refs.buttonQuestion?.resetField();
-
-                await this.$nextTick();
+                await nextTick();
 
                 if (newValue !== "Mobile") {
-                    await this.getNextShopsFromList();
+                    this.getNextShopsFromList();
                 }
             },
         },
         shopProviders: {
             async handler(newValue) {
-                await this.$nextTick();
+                await nextTick();
 
                 if (this.selectedAppointmentType) {
                     const selectedShopIndex = this.getSelectedProviderIndex(
@@ -230,7 +246,7 @@ export default {
                         await this.getNextShopsFromList(selectedShopIndex + 1);
                     } else {
                         await this.getNextShopsFromList();
-                        await this.$nextTick();
+                        await nextTick();
                     }
                 }
             },
@@ -261,14 +277,16 @@ export default {
     background-repeat: no-repeat;
     background-size: 0.75rem;
     background-position: 0.5rem 0.75rem;
+    border-radius: 0.5rem;
+    display: flex;
+    flex-direction: row;
+    padding: 0.5rem 0.5rem 0.5rem 1.5rem;
+    gap: 0.25rem;
+
     .alert-heading {
         text-align: left;
         font-size: 0.75rem;
         line-height: 1.25rem;
     }
-    p {
-        padding-left: 0.5rem;
-        margin-bottom: 0;
-    }
 }
 </style>
diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 5e2ec0c71..ae89a61e6 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -1,4 +1,3 @@
-fmg
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
         <div class="page-container-grouped-styles">
diff --git a/src/layouts/vehicle-parts/vehicle-parts.spec.js b/src/layouts/vehicle-parts/vehicle-parts.spec.js
index 23ce3b88a..4d4287430 100644
--- a/src/layouts/vehicle-parts/vehicle-parts.spec.js
+++ b/src/layouts/vehicle-parts/vehicle-parts.spec.js
@@ -481,7 +481,7 @@ describe("vehicle-parts.vue", () => {
             },
         });
 
-        wrapper.vm.$store.commit = jest.fn();
+        wrapper.vm.dispatchStoreAction = jest.fn();
 
         wrapper.setData({
             selectedGlassParts: { "Rear-Stationary": { partNumber: "DB12209GTYN" } },
@@ -498,7 +498,7 @@ describe("vehicle-parts.vue", () => {
         await wrapper.vm.forwardButtonAction();
 
         //Assert
-        expect(wrapper.vm.$store.commit).toHaveBeenCalled();
+        expect(wrapper.vm.dispatchStoreAction).toHaveBeenCalled();
 
         // TODO KO UNCOMMENT FOR QUOTE PAGES RELEASE
         // expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 3291bdd79..95aa2891d 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -323,7 +323,7 @@ export default {
 
                 await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.emailAddress, false);
                 await this.dispatchStoreAction(
-                    storeActions.SAVE_SERVICE_LOCATION,
+                    storeActions.SAVE_SERVICE_ZIP_CODE_INFO,
                     {
                         zipCode: this.serviceZipCode,
                         state: resultMap.zipCodeData.state,
@@ -360,7 +360,7 @@ export default {
                         );
                     } else {
                         await this.dispatchStoreAction(
-                            storeActions.SAVE_SERVICE_LOCATION,
+                            storeActions.SAVE_SERVICE_ZIP_CODE_INFO,
                             {
                                 zipCode: this.serviceZipCode,
                                 state: zipCodeData.state,
diff --git a/src/mixins/vehicle-questions-mixin.js b/src/mixins/vehicle-questions-mixin.js
index 718f8fc50..4b05067ea 100644
--- a/src/mixins/vehicle-questions-mixin.js
+++ b/src/mixins/vehicle-questions-mixin.js
@@ -442,7 +442,7 @@ export default {
                 const collectedGlassParts = this.reducedGlassPartsArray(partsOrQuestions);
 
                 // save to store lineItems.glassParts
-                self.$store.commit(storeMutations.UPDATE_GLASS_PARTS, collectedGlassParts);
+                self.dispatchStoreAction(storeActions.SAVE_GLASS_PARTS, collectedGlassParts, false);
 
                 const payment = store.getters.payment;
 
diff --git a/src/mixins/vehicle-questions-mixin.spec.js b/src/mixins/vehicle-questions-mixin.spec.js
index a9bf6f313..f87d7efdc 100644
--- a/src/mixins/vehicle-questions-mixin.spec.js
+++ b/src/mixins/vehicle-questions-mixin.spec.js
@@ -2240,15 +2240,17 @@ describe("vehicle-questions-mixin", () => {
 
                 // Assert
                 expect(wrapper.vm.$store.commit).toHaveBeenCalledTimes(1);
-                expect(wrapper.vm.$store.commit).toHaveBeenCalledWith(
-                    storeMutations.UPDATE_GLASS_PARTS,
+                expect(wrapper.vm.$store.dispatch).toHaveBeenCalledWith(
+                    storeActions.SAVE_GLASS_PARTS,
                     collectedGlassParts
                 );
+
                 expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledTimes(1);
                 expect(wrapper.vm.$router.navigateWithSaving).toHaveBeenCalledWith(
                     navigationScenarios.CLICKED_FORWARD_WITH_NO_MORE_QUESTIONS,
                     { query: { fmgPage: "vin-lookup" } }
                 );
+
                 expect(wrapper.vm.$router.navigateWithoutSaving).not.toHaveBeenCalled();
             });
         });
diff --git a/src/router/index.js b/src/router/index.js
index 86c402187..9fa4a1d00 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -28,28 +28,14 @@ import analyticsMixin from "@/mixins/analytics-mixin";
 import { experimentTriggers } from "../constants/experiments";
 import { applicationConfig } from "../constants/application-config";
 
-// Components
-import datePicker from "@/digital-components/date-picker/date-picker.vue";
-import demoDatePicker from "@/layouts/demo-date-picker/demo-date-picker.vue";
 import review from "@/layouts/review/review";
-
 const routes = [
     {
-        path: "/demo-date-picker", // This is a temporary route for testing.
-        name: "demo-date-picker",
-        component: demoDatePicker,
-    },
-    {
-        path: "/date-picker", // This is a temporary route for testing.
-        name: "date-picker",
-        component: datePicker,
     },
     {
         path: "/review", // This is a temporary route for testing.
         name: "review",
         component: review,
-    },
-    {
         path: "/",
         name: "root",
         async beforeEnter(to, from, next) {
diff --git a/src/store/index.js b/src/store/index.js
index 9d06df11a..eac829543 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,4 +1,4 @@
-import { createStore, Store } from "vuex";
+import { createStore } from "vuex";
 import { endpoints } from "@/constants/endpoints.js";
 import { storeMutations } from "@/constants/store-mutations";
 import { getDateForSavedSessionTimeout } from "@/helpers/heritage-integration/session-helper";
@@ -9,8 +9,9 @@ import { applicationConfig } from "@/constants/application-config";
 import { experimentTriggers } from "@/constants/experiments";
 import { damageLocationsSelected } from "@/constants/damage-locations-selected";
 import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
-import router from "@/router";
 import { deleteFunnelCookie } from "@/helpers/heritage-integration/cookie-helper.js";
+import { deepEqual } from "@/helpers/object-helper";
+import { AppointmentTypeStrings, PREMIUM_FEE_PART_TYPE } from "@/constants/schedule-constants";
 
 // Export State
 const getDefaultState = () => {
@@ -39,11 +40,13 @@ const getDefaultState = () => {
             },
             serviceLocation: {
                 address: null,
+                address2: null,
                 city: null,
                 state: null,
                 zipCode: null,
                 zipCodeCtu: null,
                 appointmentType: null,
+                isVehicleProtected: null,
                 provider: {
                     providerNumber: null,
                     address: {
@@ -84,6 +87,7 @@ const getDefaultState = () => {
                 startTime: null,
                 endTime: null,
                 routeCode: null,
+                jobMaxMinutes: null,
             },
             referralNumber: null,
             referralDate: null,
@@ -250,16 +254,7 @@ export const mutations = {
         state.order.serviceLocation.isVehicleProtected = serviceLocationInfo.isVehicleProtected;
 
         if (serviceLocationInfo.provider) {
-            state.order.serviceLocation.provider.providerNumber =
-                serviceLocationInfo.provider?.providerNumber;
-            state.order.serviceLocation.provider.address.streetAddress =
-                serviceLocationInfo.provider?.address?.streetAddress;
-            state.order.serviceLocation.provider.address.city =
-                serviceLocationInfo.provider?.address?.city;
-            state.order.serviceLocation.provider.address.state =
-                serviceLocationInfo.provider?.address?.state;
-            state.order.serviceLocation.provider.address.zip =
-                serviceLocationInfo.provider?.address?.zip;
+            state.order.serviceLocation.provider = serviceLocationInfo.provider;
         }
     },
     updateSchedule(state, scheduleInfo) {
@@ -268,6 +263,7 @@ export const mutations = {
             state.order.schedule.startTime = scheduleInfo.startTime;
             state.order.schedule.endTime = scheduleInfo.endTime;
             state.order.schedule.routeCode = scheduleInfo.routeCode;
+            state.order.schedule.jobMaxMinutes = scheduleInfo.jobMaxMinutes;
         }
     },
 
@@ -338,12 +334,44 @@ export const mutations = {
         state.applicationUser.pageData[fmgPageValues.MOLDING_QUESTIONS] = null;
         state.applicationUser.pageData[fmgPageValues.CAPABILITY_QUESTIONS] = null;
     },
+    resetSchedule(state) {
+        state.order.schedule.date = null;
+        state.order.schedule.startTime = null;
+        state.order.schedule.endTime = null;
+        state.order.schedule.routeCode = null;
+        state.order.schedule.jobMaxMinutes = null;
+
+        //early bird fee used on schedule page also needs reset when schedule is reset
+        const supportingItems = state.order.lineItems.supportingItems;
+        const removeEarlyBirdIndex = supportingItems?.findIndex(
+            (item) => item.partType == PREMIUM_FEE_PART_TYPE
+        );
+
+        if (removeEarlyBirdIndex >= 0) {
+            supportingItems.splice(removeEarlyBirdIndex, 1);
+            state.order.lineItems.supportingItems = supportingItems;
+        }
+    },
     resetState(state) {
         Object.assign(state, getDefaultState());
     },
     resetSaveSessionPromise(state) {
         state.applicationUser.saveSessionPromise = null;
     },
+    resetServiceLocationAppointmentType(state) {
+        state.order.serviceLocation.appointmentType = null;
+    },
+    resetServiceLocationProvider(state) {
+        state.order.serviceLocation.provider = null;
+    },
+    resetServiceLocationMobileAddress(state) {
+        state.order.serviceLocation.address = null;
+        state.order.serviceLocation.address2 = null;
+        state.order.serviceLocation.city = null;
+        state.order.serviceLocation.state = null;
+        state.order.serviceLocation.zipCode = null;
+        state.order.serviceLocation.isVehicleProtected = null;
+    },
     // Misc Mutations
     updateStateWithOrderInformation(state, sessionInformation) {
         state.order.referralNumber = sessionInformation.order.referralNumber;
@@ -395,18 +423,20 @@ export const mutations = {
         state.order.lineItems.supportingItems = sessionInformation.order.lineItems.supportingItems;
         state.order.lineItems.vaps = sessionInformation.order.lineItems.vaps;
         state.order.lineItems.serverData = sessionInformation.order.lineItems.serverData;
+
         state.order.payment.parentAccountNumber =
             sessionInformation.order.payment.parentAccountNumber;
-        (state.order.serviceLocation.address =
-            sessionInformation.order.serviceLocation.streetAddress),
-            (state.order.serviceLocation.address2 =
-                sessionInformation.order.serviceLocation.address2),
-            (state.order.serviceLocation.city = sessionInformation.order.serviceLocation.city),
-            (state.order.serviceLocation.state = sessionInformation.order.serviceLocation.state),
-            (state.order.serviceLocation.zipCode =
-                sessionInformation.order.serviceLocation.zipCode),
-            (state.order.serviceLocation.zipCodeCtu =
-                sessionInformation.order.serviceLocation.zipCodeCtu);
+
+        state.order.serviceLocation.address =
+            sessionInformation.order.serviceLocation.streetAddress;
+        state.order.serviceLocation.address2 =
+            sessionInformation.order.serviceLocation.streetAddress2;
+        state.order.serviceLocation.city = sessionInformation.order.serviceLocation.city;
+        state.order.serviceLocation.state = sessionInformation.order.serviceLocation.state;
+        state.order.serviceLocation.zipCode = sessionInformation.order.serviceLocation.zipCode;
+        state.order.serviceLocation.zipCodeCtu =
+            sessionInformation.order.serviceLocation.zipCodeCtu;
+
         state.order.serviceLocation.appointmentType =
             sessionInformation.order.serviceLocation.appointmentType;
         state.order.serviceLocation.isVehicleProtected =
@@ -440,6 +470,7 @@ export const mutations = {
         state.order.schedule.startTime = sessionInformation.order.schedule?.startTime;
         state.order.schedule.endTime = sessionInformation.order.schedule?.endTime;
         state.order.schedule.routeCode = sessionInformation.order.schedule?.routeCode;
+        state.order.schedule.jobMaxMinutes = sessionInformation.order.schedule?.jobMaxMinutes;
     },
     updateExperiments(state, experiments) {
         state.applicationUser.experiments = experiments;
@@ -551,6 +582,7 @@ export const actions = {
             payload: {},
         });
     },
+
     lookupVehicleByYmms(context, { year, make, model, style }) {
         return globalMethods.callHttpClient({
             method: endpoints.LookupVehicleByYmms.method,
@@ -558,6 +590,7 @@ export const actions = {
             payload: {},
         });
     },
+
     lookupVehicleByVin(context, { vin }) {
         return globalMethods.callHttpClient({
             method: endpoints.LookupVehicleByVin.method,
@@ -567,6 +600,7 @@ export const actions = {
             },
         });
     },
+
     lookupVinByPlate(context, { licensePlate, licenseState }) {
         return globalMethods.callHttpClient({
             method: endpoints.LookupVinByPlate.method,
@@ -577,6 +611,7 @@ export const actions = {
             },
         });
     },
+
     lookupVinByAddress(
         context,
         { licenseLastName, licenseStreetAddress, licenseZip, licenseState }
@@ -592,6 +627,7 @@ export const actions = {
             },
         });
     },
+
     lookupVinByImage(context, image) {
         const data = new FormData();
         data.append("vinImage", image);
@@ -602,6 +638,7 @@ export const actions = {
             isFormData: true,
         });
     },
+
     isVinByAddressPermissible(context, zip) {
         return globalMethods.callHttpClient({
             method: endpoints.IsVinByAddressPermissible.method,
@@ -609,6 +646,7 @@ export const actions = {
             payload: {},
         });
     },
+
     getVehicleMakes(context, { year }) {
         return globalMethods.callHttpClient({
             method: endpoints.GetVehicleMakes.method,
@@ -616,6 +654,7 @@ export const actions = {
             payload: {},
         });
     },
+
     getVehicleModels(context, { year, make }) {
         return globalMethods.callHttpClient({
             method: endpoints.GetVehicleModels.method,
@@ -623,6 +662,7 @@ export const actions = {
             payload: {},
         });
     },
+
     getVehicleStyles(context, { year, make, model }) {
         return globalMethods.callHttpClient({
             method: endpoints.GetVehicleStyles.method,
@@ -630,6 +670,7 @@ export const actions = {
             payload: {},
         });
     },
+
     setVehicle(context, { year, make, model, style }) {
         return globalMethods
             .callHttpClient({
@@ -652,6 +693,7 @@ export const actions = {
                 return response;
             });
     },
+
     getDamageOptions(context, { carId }) {
         return globalMethods.callHttpClient({
             methods: endpoints.GetDamageOptions.method,
@@ -659,6 +701,7 @@ export const actions = {
             payload: {},
         });
     },
+
     validateZip(context, { zip }) {
         return globalMethods.callHttpClient({
             methods: endpoints.ValidateZip.method,
@@ -673,18 +716,22 @@ export const actions = {
         context.commit(storeMutations.UPDATE_SUPPORTING_ITEMS, null);
         context.commit(storeMutations.UPDATE_VAPS, null);
     },
+
     resetRegistrationAndDependencies(context) {
         context.commit(storeMutations.RESET_REGISTRATION_STATE);
         context.commit(storeMutations.RESET_GLASS_PARTS_STATE);
         context.commit(storeMutations.UPDATE_SUPPORTING_ITEMS, null);
     },
+
     resetPartsAndDependencies(context) {
         context.commit(storeMutations.RESET_GLASS_PARTS_STATE);
         context.commit(storeMutations.UPDATE_SUPPORTING_ITEMS, null);
     },
+
     resetState(context) {
         context.commit(storeMutations.RESET_STATE);
     },
+
     resetSaveSessionPromise(context) {
         context.commit(storeMutations.RESET_SAVE_SESSION_PROMISE);
     },
@@ -699,12 +746,14 @@ export const actions = {
             },
         });
     },
+
     getHomepageName(context) {
         return globalMethods.callHttpClient({
             method: endpoints.GetHomepageInfo.method,
             endpoint: endpoints.GetHomepageInfo.url(applicationConfig.APPLICATION_ABBREVIATION),
         });
     },
+
     getPageData(context, { pageName }) {
         return globalMethods.callHttpClient({
             method: endpoints.GetPageData.method,
@@ -771,6 +820,7 @@ export const actions = {
         context.commit(storeMutations.UPDATE_SAVED_SESSION_ID, savedSessionId);
         context.commit(storeMutations.UPDATE_CRM_CUSTOMER_ID, crmCustomerId);
     },
+
     logPageView(
         context,
         {
@@ -812,6 +862,7 @@ export const actions = {
                 }
             );
     },
+
     logCustomEvent(
         context,
         {
@@ -1116,52 +1167,121 @@ export const actions = {
         });
     },
 
-    getShopTimeSlots(
-        context,
-        { startDate = "2023-01-01", endDate = "2023-05-01", shopAppointmentType = "" }
-    ) {
+    getShopTimeSlots(context, { startDate, endDate, shopAppointmentType, providerNumber }) {
         const order = context.state.order;
-        const mockArray = [];
+        const vehicle = context.state.order.vehicle;
 
+        let partNumbers = [
+            ...(order.lineItems.supportingItems ?? []),
+            ...(order.lineItems.vaps ?? []),
+            ...getFlattenedArrayOfLineItemsWithChildParts(order.lineItems.glassParts),
+        ];
+        partNumbers = partNumbers.map((lineItem) => {
+            return lineItem.partNumber;
+        });
+        const glassPieces = order.damage.glassToReplace
+            ? convertGlassPieceToBackEndCompatibleFormat(order.damage.glassToReplace)
+            : [];
         var payload = {
-            providerNumber: order.providerNumber,
+            providerNumber: providerNumber,
             startDate: startDate,
             endDate: endDate,
             shopAppointmentType: shopAppointmentType,
             applicationName: applicationConfig.APPLICATION_NAME,
             parentAccountNumber: context.getters.payment.parentAccountNumber,
-            carId: context.getters.vehicle.carId,
-            partNumbers: mockArray, // TODO: WHERE DO I GET THIS?
+            carId: vehicle.carId,
+            partNumbers: partNumbers,
+            glassPieces: glassPieces,
             eon: order.eon,
-            provisionalReasons: mockArray, // TODO: WHERE DO I GET THIS?
+            coverage: {
+                status: "",
+                deductible: 0,
+                additionalAuthFlag: "",
+            },
+            partSelection: {
+                // TODO: Provisional booking will utilize these fields
+                hasAnsweredPartQuestions: false,
+                hasAnsweredMoldingQuestions: false,
+                hasAnsweredCapabilityQuestions: false,
+                hasManuallySelectedParts: false,
+            },
+            vehicle: {
+                year: vehicle.year,
+                make: vehicle.make,
+                model: vehicle.model,
+                style: vehicle.style,
+                vin: vehicle.vin ?? "",
+            },
         };
 
-        // TODO: REMOVE MOCK CALL & USE REAL CALL BELOW
-        return globalMethods.callMockHttpClient({
+        return globalMethods.callHttpClient({
             method: endpoints.GetShopTimeSlots.method,
-            endpoint: endpoints.GetShopTimeSlots.mockUrl,
+            endpoint: endpoints.GetShopTimeSlots.url,
             payload: payload,
         });
-        // TODO: RESTORE THIS
-        // return globalMethods.callHttpClient({
-        //     method: endpoints.GetShopTimeSlots.method,
-        //     endpoint: endpoints.GetShopTimeSlots.url,
-        //     payload: payload,
-        //     logApiCall: false,
-        // });
     },
-    getMobileEarlyBirdFee(context) {
+
+    getMobileTimeSlots(context, { startDate, endDate }) {
+        const order = context.state.order;
+        const vehicle = context.state.order.vehicle;
+        let partNumbers = [
+            ...(order.lineItems.supportingItems ?? []),
+            ...(order.lineItems.vaps ?? []),
+            ...getFlattenedArrayOfLineItemsWithChildParts(order.lineItems.glassParts),
+        ];
+        partNumbers = partNumbers.map((lineItem) => {
+            return lineItem.partNumber;
+        });
+        const glassPieces = order.damage.glassToReplace
+            ? convertGlassPieceToBackEndCompatibleFormat(order.damage.glassToReplace)
+            : [];
+        var payload = {
+            startDate: startDate,
+            endDate: endDate,
+            applicationName: applicationConfig.APPLICATION_NAME,
+            parentAccountNumber: context.getters.payment.parentAccountNumber,
+            carId: vehicle.carId,
+            partNumbers: partNumbers,
+            glassPieces: glassPieces,
+            eon: order.eon,
+            coverage: {
+                status: "",
+                deductible: 0,
+                additionalAuthFlag: "",
+            },
+            partSelection: {
+                // TODO: Provisional booking will utilize these fields
+                hasAnsweredPartQuestions: false,
+                hasAnsweredMoldingQuestions: false,
+                hasAnsweredCapabilityQuestions: false,
+                hasManuallySelectedParts: false,
+            },
+            vehicle: {
+                year: vehicle.year,
+                make: vehicle.make,
+                model: vehicle.model,
+                style: vehicle.style,
+                vin: vehicle.vin ?? "",
+            },
+            zipCode: order.serviceLocation.zipCode,
+        };
+        return globalMethods.callHttpClient({
+            method: endpoints.GetMobileTimeSlots.method,
+            endpoint: endpoints.GetMobileTimeSlots.url,
+            payload: payload,
+        });
+    },
+
+    getMobilePremiumFee(context) {
         const damageType = context.getters.damage.isRepair ? "Repair" : "Replace";
         const paymentType = context.getters.order.payment.isInsurance ? "Insurance" : "Cash";
-        return globalMethods.callMockHttpClient({
-            method: endpoints.GetMobileEarlyBirdFee.method,
-            endpoint: `${endpoints.GetMobileEarlyBirdFee.mockUrl}/Cash/Replace`,
+
+        return globalMethods.callHttpClient({
+            method: endpoints.GetMobilePremiumFee.method,
+            endpoint: `${endpoints.GetMobilePremiumFee.url}/${paymentType}/${damageType}`,
         });
-        // return globalMethods.callHttpClient({
-        //     method: endpoints.GetMobileEarlyBirdFee.method,
-        //     endpoint: `${endpoints.GetMobileEarlyBirdFee.url}/${paymentType}/${damageType}`,
-        // });
     },
+
     // Session API Actions
     saveSession(context) {
         const vehicle = context.getters.vehicle;
@@ -1243,6 +1363,7 @@ export const actions = {
                                 city: order.serviceLocation.provider?.address?.city,
                                 state: order.serviceLocation.provider?.address?.state,
                                 zip: order.serviceLocation.provider?.address?.zip,
+                                zipCtu: order.serviceLocation.provider?.address?.zipCtu,
                             },
                         },
                     },
@@ -1251,6 +1372,7 @@ export const actions = {
                         startTime: order.schedule?.startTime,
                         endTime: order.schedule?.endTime,
                         routeCode: order.schedule?.routeCode,
+                        jobMaxMinutes: order.schedule?.jobMaxMinutes,
                     },
                     existingPromoCode: null,
                     referralCorrelationId: order.referralCorrelationId,
@@ -1262,6 +1384,7 @@ export const actions = {
             },
         });
     },
+
     loadSession(
         context,
         {
@@ -1288,7 +1411,7 @@ export const actions = {
                 },
             })
             .then(
-                (response) => {
+                async (response) => {
                     // Flatten location and name properties
                     response.data.order.damage?.glassToReplace?.map((glass) => {
                         glass.glassLocation = glass.location;
@@ -1302,10 +1425,13 @@ export const actions = {
                     if (context.state.order.eon && context.state.order.eon != response.data.eon) {
                         context.commit(storeMutations.RESET_STATE);
                     }
+
                     context.commit(
                         storeMutations.UPDATE_STATE_WITH_ORDER_INFORMATION,
                         response.data
                     );
+
+                    await resetScheduleIfUnavailable(context, response.data.order);
                     return response;
                 },
                 (error) => {
@@ -1339,6 +1465,7 @@ export const actions = {
             context.commit(storeMutations.UPDATE_YEAR, year);
         }
     },
+
     saveVehicleMake(context, make) {
         //Reset dependent state when changing
         if (context.state.order.vehicle.make !== make) {
@@ -1359,6 +1486,7 @@ export const actions = {
             context.commit(storeMutations.UPDATE_MAKE, make);
         }
     },
+
     saveVehicleModel(context, model) {
         //Reset dependent state when changing
         if (context.state.order.vehicle.model !== model) {
@@ -1378,6 +1506,7 @@ export const actions = {
             context.commit(storeMutations.UPDATE_MODEL, model);
         }
     },
+
     saveVehicleStyle(context, style) {
         //Reset dependent state when changing
         if (context.state.order.vehicle.style !== style) {
@@ -1396,6 +1525,7 @@ export const actions = {
             context.commit(storeMutations.UPDATE_STYLE, style);
         }
     },
+
     saveVehicleDamage(
         context,
         { isWindshieldRepair, selectedGlassToReplace, selectedWindshieldChipCount }
@@ -1453,6 +1583,7 @@ export const actions = {
             context.commit(storeMutations.UPDATE_REGISTRATION, registrationInfo);
         }
     },
+
     saveRegistrationLicensePlateLookup(
         context,
         { isSelectedGlassAvailableForVehicle, vehicleInfo, registrationInfo }
@@ -1474,6 +1605,7 @@ export const actions = {
             context.commit(storeMutations.UPDATE_REGISTRATION, registrationInfo);
         }
     },
+
     saveRegistrationAddressLookup(
         context,
         { isSelectedGlassAvailableForVehicle, vehicleInfo, registrationInfo }
@@ -1499,6 +1631,7 @@ export const actions = {
             context.commit(storeMutations.UPDATE_REGISTRATION, registrationInfo);
         }
     },
+
     savePartQuestionAnswers(context, partQuestionAnswersArray) {
         // if part question answers have changed, reset subsequent question answers
         const sortedPreviousResultsArray = sortArrayOfObjectsByPropertyValue(
@@ -1537,6 +1670,7 @@ export const actions = {
         //Save new values
         context.commit(storeMutations.UPDATE_PART_QUESTION_ANSWERS, partQuestionAnswersArray);
     },
+
     resetMoldingAndCapabilityQuestionAnswersIfNeeded(context, matchedParts) {
         const partsOrQuestionsDataToCompareWith =
             context.getters.pageData(fmgPageValues.MOLDING_QUESTIONS)?.partsOrQuestions ??
@@ -1576,6 +1710,7 @@ export const actions = {
             });
         }
     },
+
     saveMoldingQuestionAnswers(context, moldingQuestionAnswers) {
         const sortedPreviousResultsArray = sortArrayOfObjectsByPropertyValue(
             context.getters.damage.moldingQuestionAnswers,
@@ -1604,6 +1739,7 @@ export const actions = {
         //Save new values
         context.commit(storeMutations.UPDATE_MOLDING_QUESTION_ANSWERS, moldingQuestionAnswers);
     },
+
     saveCapabilityQuestionAnswers(context, capabilityQuestionAnswers) {
         const sortedPreviousResultsArray = sortArrayOfObjectsByPropertyValue(
             context.getters.damage.capabilityQuestionAnswers,
@@ -1630,18 +1766,32 @@ export const actions = {
             capabilityQuestionAnswers
         );
     },
+
     savePaymentType(context, isInsurance) {
         context.commit(storeMutations.UPDATE_IS_INSURANCE, isInsurance);
     },
+
     saveParentAccountNumber(context, parentAccountNumber) {
         context.commit(storeMutations.UPDATE_PARENT_ACCT_NUMBER, parentAccountNumber);
     },
+
     saveSupportingItems(context, supportingItems) {
+        if (!deepEqual(supportingItems, context.state.order.lineItems.supportingItems)) {
+            context.commit(storeMutations.RESET_SERVICE_LOCATION_APPOINTMENT_TYPE);
+            context.commit(storeMutations.RESET_SERVICE_LOCATION_PROVIDER);
+        }
+
         context.commit(storeMutations.UPDATE_SUPPORTING_ITEMS, supportingItems);
     },
+
+    saveSupportingItemsSuppressingStateResetting(context, supportingItems) {
+        context.commit(storeMutations.UPDATE_SUPPORTING_ITEMS, supportingItems);
+    },
+
     saveVaps(context, vaps) {
         context.commit(storeMutations.UPDATE_VAPS, vaps);
     },
+
     // Price order actions
     async priceOrderItemsAndSaveServerData(
         context,
@@ -1678,7 +1828,6 @@ export const actions = {
             `&${availableLineItemsFormattedForRequest}`;
 
         const lineItemServerData = context.getters.order.lineItems.serverData;
-
         if (lineItemServerData) {
             queryString += `&ServerData=${encodeURIComponent(lineItemServerData)}`;
         }
@@ -1694,16 +1843,33 @@ export const actions = {
 
         return availableLineItems;
     },
+
     // Misc order actions
     saveSchedule(context, scheduleInfo) {
         context.commit(storeMutations.UPDATE_SCHEDULE, scheduleInfo);
     },
+
+    saveServiceZipCodeInfo(context, serviceZipCodeInfo) {
+        if (
+            context.state.order.serviceLocation &&
+            serviceZipCodeInfo.zipCode !== context.state.order.serviceLocation.zipCode
+        ) {
+            context.commit(storeMutations.RESET_SERVICE_LOCATION_APPOINTMENT_TYPE);
+            context.commit(storeMutations.RESET_SERVICE_LOCATION_PROVIDER);
+            context.commit(storeMutations.RESET_SERVICE_LOCATION_MOBILE_ADDRESS);
+        }
+
+        context.commit(storeMutations.UPDATE_SERVICE_LOCATION, serviceZipCodeInfo);
+    },
+
     saveServiceLocation(context, serviceLocationInfo) {
         context.commit(storeMutations.UPDATE_SERVICE_LOCATION, serviceLocationInfo);
     },
+
     saveEmail(context, email) {
         context.commit(storeMutations.UPDATE_CUSTOMER_EMAIL_ADDRESS, email);
     },
+
     saveVin(context, { isSelectedGlassAvailableForVehicle, vehicleInfo }) {
         //Reset dependent state when changing
         if (vehicleInfo.vin !== context.state.order.vehicle.vin) {
@@ -1716,12 +1882,24 @@ export const actions = {
             context.commit(storeMutations.UPDATE_VEHICLE, vehicleInfo);
         }
     },
+
     saveGlassParts(context, parts) {
+        if (!deepEqual(parts, context.state.order.lineItems.glassParts)) {
+            context.commit(storeMutations.RESET_SERVICE_LOCATION_APPOINTMENT_TYPE);
+            context.commit(storeMutations.RESET_SERVICE_LOCATION_PROVIDER);
+        }
+
         context.commit(storeMutations.UPDATE_GLASS_PARTS, parts);
     },
+
+    saveGlassPartPrices(context, parts) {
+        context.commit(storeMutations.UPDATE_GLASS_PARTS, parts);
+    },
+
     clearVin(context) {
         context.commit(storeMutations.UPDATE_VEHICLE_VIN, null);
     },
+
     isVinOptionalVehicle(context) {
         switch (context.state.order.vehicle.make.toLowerCase()) {
             case "mercedes benz":
@@ -1863,7 +2041,7 @@ function addPricesToLineItems(lineItems, pricingLineItems) {
 
 function getFlattenedArrayOfLineItemsWithChildParts(lineItems) {
     let flattenedArray = [];
-    lineItems.forEach((lineItem) => {
+    lineItems?.forEach((lineItem) => {
         flattenedArray.push(lineItem);
         if (lineItem.childParts) {
             flattenedArray = [
@@ -1885,3 +2063,126 @@ function buildQueryStringParameterFromArrayOfComplexObjects(arrayOfObjects, para
     // Remove trailing &
     return queryStringParameter.slice(0, -1);
 }
+
+function convertGlassPieceToBackEndCompatibleFormat(glassPieces) {
+    return glassPieces.map((glassPiece) => {
+        return {
+            location: glassPiece.glassLocation,
+            name: glassPiece.glassName,
+        };
+    });
+}
+
+// This function will verify schedule info is still valid.
+// check to see if we have an appointment date on the order object.
+// if so, make sure it's not in the past. if in the past, clear schedule info in store.
+// if date not in past, then call schedule service to verify appointment is still available.
+async function resetScheduleIfUnavailable(context, order) {
+    if (!order.schedule?.date) {
+        return;
+    }
+
+    // Date string with slashes is parsed as local time, not UTC. Our date has dashes, '-'.
+    // If you put any kind of time stamp on the date string with dashes, then it IS parsed as local time.
+    var aptDate = new Date(order.schedule.date + "T00:00:00");
+    var curDate = new Date();
+
+    // if appointment date is in the past, clear schedule
+    if (aptDate.getTime() < curDate.getTime()) {
+        context.commit(storeMutations.RESET_SCHEDULE);
+        return;
+    }
+
+    // create date range to pass to the schedule service to see if our appointment is still available.
+    var endRange = new Date(aptDate);
+    endRange.setDate(aptDate.getDate() + 1);
+
+    var endDay = "" + endRange.getDate();
+    var endMonth = "" + (endRange.getMonth() + 1); // 0 based so add 1
+    const endYear = endRange.getFullYear();
+
+    if (endMonth.length < 2) {
+        endMonth = "0" + endMonth;
+    }
+    if (endDay.length < 2) {
+        endDay = "0" + endDay;
+    }
+
+    const endDate = [endYear, endMonth, endDay].join("-");
+
+    let newTimeSlotsResponse;
+    if (order.serviceLocation.appointmentType === AppointmentTypeStrings.MOBILE) {
+        newTimeSlotsResponse = await context.dispatch(
+            storeActions.GET_MOBILE_TIME_SLOTS,
+            {
+                startDate: order.schedule.date,
+                endDate: endDate,
+            },
+            false
+        );
+
+        if (newTimeSlotsResponse?.data.days?.length === 0) {
+            context.commit(storeMutations.RESET_SCHEDULE);
+            return;
+        }
+
+        var mobileRouteCodeFound = false;
+        // if early bird fee is in supporting items then need to check the timeslot to see if offer premium is also still available
+        if (
+            order.lineItem?.supportingItems?.findIndex(
+                (item) => item.partType == PREMIUM_FEE_PART_TYPE
+            )
+        ) {
+            newTimeSlotsResponse.data.days?.forEach((day) => {
+                day.timeSlots.forEach((ts) => {
+                    if (ts.id === order.schedule.routeCode && ts.offerPremium) {
+                        mobileRouteCodeFound = true;
+                    }
+                });
+            });
+        } else {
+            newTimeSlotsResponse.data.days?.forEach((day) => {
+                day.timeSlots.forEach((ts) => {
+                    if (ts.id === order.schedule.routeCode) {
+                        mobileRouteCodeFound = true;
+                    }
+                });
+            });
+        }
+
+        if (!mobileRouteCodeFound) {
+            context.commit(storeMutations.RESET_SCHEDULE);
+            return;
+        }
+    } else {
+        newTimeSlotsResponse = await context.dispatch(
+            storeActions.GET_SHOP_TIME_SLOTS,
+            {
+                startDate: order.schedule.date,
+                endDate: endDate,
+                shopAppointmentType: order.serviceLocation.appointmentType,
+                providerNumber: order.serviceLocation.provider.providerNumber,
+            },
+            false
+        );
+
+        if (newTimeSlotsResponse?.data.days?.length === 0) {
+            context.commit(storeMutations.RESET_SCHEDULE);
+            return;
+        }
+
+        var routeCodeFound = false;
+        newTimeSlotsResponse.data.days?.forEach((day) => {
+            day.timeSlots.forEach((ts) => {
+                if (ts.id === order.schedule.routeCode) {
+                    routeCodeFound = true;
+                }
+            });
+        });
+
+        if (!routeCodeFound) {
+            context.commit(storeMutations.RESET_SCHEDULE);
+            return;
+        }
+    }
+}
diff --git a/src/store/store.spec.js b/src/store/store.spec.js
index 6913c0527..262cb263a 100644
--- a/src/store/store.spec.js
+++ b/src/store/store.spec.js
@@ -961,7 +961,10 @@ describe("Actions", () => {
 
     it("saveGlassParts, should call mutation", () => {
         // Arrange
-        const context = state;
+        const context = {
+            state: state,
+        };
+
         const commit = jest.fn();
 
         context.commit = commit;
diff --git a/src/styles/common-styles.scss b/src/styles/common-styles.scss
index 73845e5cc..f8e1c50f1 100644
--- a/src/styles/common-styles.scss
+++ b/src/styles/common-styles.scss
@@ -56,3 +56,9 @@ body {
         height: calc(100% - 72px);
     }
 }
+//Disable scroll of main container when modal is open
+.modal-open {
+    .page-container-grouped-styles {
+        overflow: hidden;
+    }
+}
diff --git a/src/styles/shared-input-button-styles.scss b/src/styles/shared-input-button-styles.scss
index 9af066bb0..07329fc71 100644
--- a/src/styles/shared-input-button-styles.scss
+++ b/src/styles/shared-input-button-styles.scss
@@ -9,6 +9,7 @@
                 position: relative;
                 z-index: 5;
                 @include box-shadow-hover($blue-300);
+                border-radius: 0.5rem;
             }
         }
     }
diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss
index 1e95a4052..976e8ed04 100644
--- a/src/styles/ux-variables.scss
+++ b/src/styles/ux-variables.scss
@@ -190,3 +190,6 @@ $alert-color-scale: 40%;
 // This affects all [Bootstrap] modals
 $modal-fade-transform: translate(0, 100%);
 $modal-backdrop-opacity: 0;
+
+//Disable default !important behavior
+$enable-important-utilities: false;
diff --git a/src/ux-components/alert/alert.spec.js b/src/ux-components/alert/alert.spec.js
index 1f5d0fcc8..9d8112189 100644
--- a/src/ux-components/alert/alert.spec.js
+++ b/src/ux-components/alert/alert.spec.js
@@ -15,7 +15,6 @@ describe("alert.vue", () => {
                 },
             })
         );
-
         const wrapperDiv = wrapper.find("div");
 
         // Assert
@@ -49,7 +48,7 @@ describe("alert.vue", () => {
         expect(wrapper.vm.alertCopy).toBe("testCopy");
     });
 
-    it("Should container a <router-link> tag if the manualCopy contains a {routerLink: testName, testLink} placeholder", () => {
+    it("Should container a <textBlock> tag if the manualCopy contains a {routerLink: testName, testLink} placeholder", () => {
         // Arrange & Act
         const wrapper = shallowMount(
             alert,
@@ -58,11 +57,12 @@ describe("alert.vue", () => {
                     manualHeadline: "testHeader",
                     manualCopy: "testCopy with a {routerLink: testName, testLink} inside of it",
                 },
-                stubs: ["router-link"],
+                stubs: ["textBlock"],
             })
         );
+
         // Assert
-        expect(wrapper.find("router-link").exists()).toBe(true);
+        expect(wrapper.html()).toEqual(expect.stringContaining("text-block-stub"));
     });
 
     it("Should contain 'n+1' <p> tags if the body copy has 'n' <p> tags", () => {
diff --git a/src/ux-components/alert/alert.vue b/src/ux-components/alert/alert.vue
index c5899b440..c7e4aca30 100644
--- a/src/ux-components/alert/alert.vue
+++ b/src/ux-components/alert/alert.vue
@@ -14,17 +14,11 @@
                 v-if="!doesCopyContainRouterLink(paragraph) && !doesCopyContainTextLink(paragraph)"
                 v-html="paragraph"></p>
             <p class="m-0 text-body small" v-else>
-                <template v-for="copy in splitCopyOnCMSPlaceHolder(paragraph)" :key="copy">
-                    <span v-if="doesCopyContainRouterLink(copy)">
-                        <router-link
-                            :to="{
-                                query: { [pageQueryString]: `${getRouterLinkRouteFromCopy(copy)}` },
-                                name: 'root',
-                            }"
-                            >{{ getRouterLinkDisplayTextFromCopy(copy) }}</router-link
-                        >
-                    </span>
-                    <span v-else-if="doesCopyContainTextLink(copy)">
+                <template v-if="doesCopyContainRouterLink(paragraph)">
+                    <textBlock :customText="paragraph" class="mb-1" marginTopSizeOverride="0" />
+                </template>
+                <template v-else v-for="copy in splitCopyOnCMSPlaceHolder(paragraph)" :key="copy">
+                    <span v-if="doesCopyContainTextLink(copy)">
                         <textLink
                             linkType="text"
                             :text="getRouterLinkDisplayTextFromCopy(copy)"
@@ -59,6 +53,7 @@ import {
 } from "@/helpers/cms-content-helper";
 import textLink from "@/ux-components/text-link/text-link";
 import { applicationConfig } from "@/constants/application-config";
+import textBlock from "@/digital-components/text-block/text-block";
 
 export default {
     name: "alert",
@@ -136,6 +131,7 @@ export default {
     },
     components: {
         textLink,
+        textBlock,
     },
 };
 </script>
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index 7755249ab..ee8785022 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -94,7 +94,7 @@ export default {
 
         + .list-card-content {
             outline: none;
-            display: block;
+            display: flex;
             position: relative;
 
             p {
diff --git a/src/ux-components/loader/loader.vue b/src/ux-components/loader/loader.vue
index daea9c511..0635614b8 100644
--- a/src/ux-components/loader/loader.vue
+++ b/src/ux-components/loader/loader.vue
@@ -3,7 +3,7 @@
         class="loader"
         role="alert"
         aria-label="Loading new page"
-        v-bind:class="[this.loaderColor, this.loaderPosition]"></div>
+        v-bind:class="[this.loaderColor, this.loaderPosition, this.blockUi]"></div>
 </template>
 
 <script>
@@ -19,6 +19,11 @@ export default {
         loaderPosition: {
             type: String,
         },
+        /* Controls whether we block the UI when the loader is active or now, defaults to true*/
+        blockUi: {
+            type: Boolean,
+            default: true,
+        },
     },
 };
 </script>
@@ -82,5 +87,9 @@ export default {
     &.black:after {
         background-color: $black;
     }
+
+    &.no-block::before {
+        z-index: -1;
+    }
 }
 </style>